diff --git a/.github/workflows/IOSDeploy.yaml b/.github/workflows/IOSDeploy.yaml
index 2e97a37a4..c85106021 100644
--- a/.github/workflows/IOSDeploy.yaml
+++ b/.github/workflows/IOSDeploy.yaml
@@ -3,7 +3,7 @@ name: Deploy EAS Build
 on:
   push:
     branches:
-      - prod
+      - mobile-prod
 
 jobs:
   build:
diff --git a/.github/workflows/MobileCI.yaml b/.github/workflows/MobileCI.yaml
index fce05dff9..3e9a2d90d 100644
--- a/.github/workflows/MobileCI.yaml
+++ b/.github/workflows/MobileCI.yaml
@@ -97,7 +97,12 @@ jobs:
         run: cd ../shared && npm ci
       - name: Generate API types
         run: cd ../shared && npm run generate:api
+      - name: Install Doppler CLI
+        uses: dopplerhq/cli-action@v3
       - name: Run tests with coverage
+        # Not needed currently, just for builds and deployment using doppler run command
+        env:
+          DOPPLER_TOKEN: ${{ secrets.DOPPLER_TOKEN_MOBILE }}
         run: npm run test:coverage
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v5
diff --git a/.github/workflows/WebCI.yaml b/.github/workflows/WebCI.yaml
index c8669506f..59c2517de 100644
--- a/.github/workflows/WebCI.yaml
+++ b/.github/workflows/WebCI.yaml
@@ -128,7 +128,12 @@ jobs:
         run: |
           npm install --package-lock-only
           git diff --exit-code package-lock.json
+      - name: Install Doppler CLI
+        uses: dopplerhq/cli-action@v3
       - name: Build application
+        # Not needed currently, just for builds and deployment using doppler run command
+        env:
+          DOPPLER_TOKEN: ${{ secrets.DOPPLER_TOKEN_WEB }}
         run: npm run build
       - name: Upload build artifacts
         uses: actions/upload-artifact@v4
diff --git a/.github/workflows/claude.yml b/.github/workflows/claude.yml
new file mode 100644
index 000000000..d300267f1
--- /dev/null
+++ b/.github/workflows/claude.yml
@@ -0,0 +1,50 @@
+name: Claude Code
+
+on:
+  issue_comment:
+    types: [created]
+  pull_request_review_comment:
+    types: [created]
+  issues:
+    types: [opened, assigned]
+  pull_request_review:
+    types: [submitted]
+
+jobs:
+  claude:
+    if: |
+      (github.event_name == 'issue_comment' && contains(github.event.comment.body, '@claude')) ||
+      (github.event_name == 'pull_request_review_comment' && contains(github.event.comment.body, '@claude')) ||
+      (github.event_name == 'pull_request_review' && contains(github.event.review.body, '@claude')) ||
+      (github.event_name == 'issues' && (contains(github.event.issue.body, '@claude') || contains(github.event.issue.title, '@claude')))
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      pull-requests: read
+      issues: read
+      id-token: write
+      actions: read # Required for Claude to read CI results on PRs
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 1
+
+      - name: Run Claude Code
+        id: claude
+        uses: anthropics/claude-code-action@v1
+        with:
+          claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
+
+          # This is an optional setting that allows Claude to read CI results on PRs
+          additional_permissions: |
+            actions: read
+
+          # Optional: Give a custom prompt to Claude. If this is not specified, Claude will perform the instructions specified in the comment that tagged it.
+          # prompt: 'Update the pull request description to include a summary of changes.'
+
+          # Optional: Add claude_args to customize behavior and configuration
+          # See https://github.com/anthropics/claude-code-action/blob/main/docs/usage.md
+          # or https://code.claude.com/docs/en/cli-reference for available options
+          # claude_args: '--allowed-tools Bash(gh pr:*)'
+
diff --git a/CLAUDE.md b/CLAUDE.md
new file mode 100644
index 000000000..5c05c489b
--- /dev/null
+++ b/CLAUDE.md
@@ -0,0 +1,400 @@
+# SelfServe
+
+## Project Structure
+
+```
+clients/
+  web/src/
+    routes/        # File-based routing (TanStack Router)
+    components/    # Feature-organized React components (ui/, home/, requests/, rooms/, profile/)
+    hooks/         # Custom React hooks
+    lib/           # Utilities (cn helper, etc.)
+    tests/         # Test files
+  shared/src/
+    api/           # HTTP client and config
+    types/         # Shared API types
+  mobile/          # React Native app (mirrors web structure)
+backend/
+  cmd/             # Entry points
+  config/          # Config loading
+  internal/
+    handler/       # HTTP handlers (Fiber)
+    repository/    # Database access (pgx)
+    models/        # Domain models with validation tags
+    service/       # Business logic and app initialization
+```
+
+## Frontend Patterns
+
+### File Naming
+
+- Components: PascalCase (`Button.tsx`, `HomeHeader.tsx`)
+- Hooks: kebab-case with `use-` prefix (`use-dropdown.ts`)
+- Utilities: camelCase (`utils.ts`)
+- Routes: kebab-case with `.` segments (`_protected/rooms.index.tsx`)
+- Layout routes: underscore prefix (`__root.tsx`, `_protected.tsx`)
+
+### Component Structure
+
+Functional components only. Props typed with `type` or `interface`. Single named export per file.
+
+```tsx
+type ButtonVariant = "primary" | "secondary";
+type ButtonProps = ButtonHTMLAttributes<HTMLButtonElement> & {
+  variant?: ButtonVariant;
+};
+
+const variantStyles: Record<ButtonVariant, string> = {
+  primary: "bg-primary text-white hover:bg-primary-hover",
+  secondary: "bg-bg-container text-text-default hover:bg-bg-selected",
+};
+
+export function Button({ variant = "secondary", className = "", ...props }: ButtonProps) {
+  return (
+    <button
+      className={cn(variantStyles[variant], className)}
+      {...props}
+    />
+  );
+}
+```
+
+### Routing (TanStack Router)
+
+File-based routing. Route components exported as `Route` const. Dynamic segments use `$` prefix.
+
+```tsx
+export const Route = createFileRoute("/_protected/home")({
+  component: HomePage,
+});
+
+function HomePage() {
+  // implementation
+}
+```
+
+Protected routes use the `_protected` layout route. Dynamic routes: `guests.$guestId.tsx`.
+
+### Styling (Tailwind CSS)
+
+Utility-first with no custom CSS components. Use `cn()` for conditional/merged classes.
+
+```tsx
+import { cn } from "@/lib/utils";
+
+// Variant map pattern
+const variantStyles: Record<Variant, string> = { ... };
+
+// Merge classes
+<div className={cn("base-class", isActive && "active-class", className)} />
+```
+
+**Custom theme tokens** (use these instead of raw colors):
+- Text: `text-text-default`, `text-text-subtle`, `text-text-secondary`
+- Background: `bg-bg-primary`, `bg-bg-container`, `bg-bg-selected`, `bg-bg-disabled`
+- Stroke: `stroke-default`, `stroke-subtle`, `stroke-disabled`
+- Brand: `bg-primary`, `hover:bg-primary-hover`
+- Status: success, warning, danger, info variants
+
+### Imports
+
+Use path aliases — never relative imports that traverse directories.
+
+```ts
+import { Button } from "@/components/ui/Button";
+import { request } from "@shared/api/client";
+import type { User } from "@shared/types/api.types";
+```
+
+Named exports only. Default exports are only acceptable in generated code.
+
+### Data Fetching (TanStack Query)
+
+QueryClient defaults: `staleTime: 60_000`, `retry: 1`, `refetchOnWindowFocus: false`.
+
+Query key convention: `["resource", id]`.
+
+```ts
+const { data } = useQuery({
+  queryKey: ["rooms", hotelId],
+  queryFn: () => getRooms(hotelId),
+});
+```
+
+### Mutations (TanStack Query)
+
+```ts
+const { mutate } = useMutation({
+  mutationFn: (value: string) => request({ url: `/resource/${id}`, method: "PUT", data: { field: value } }),
+  onSuccess: (result) => { /* handle success */ },
+  onError: (error) => { /* handle error */ },
+  onSettled: () => {
+    queryClient.invalidateQueries({ queryKey: ["resource", id] });
+  },
+});
+```
+
+### Optimistic Updates (TanStack Query)
+
+Use this pattern for mutations that should update the UI immediately before the server responds.
+
+```ts
+const { mutate } = useMutation({
+  mutationFn: (value: string) =>
+    request({ url: `/resource/${id}`, method: "PUT", data: { field: value } }),
+  onMutate: async (value) => {
+    // Cancel any in-flight refetches to avoid overwriting optimistic update
+    await queryClient.cancelQueries({ queryKey: ["resource", id] });
+    // Snapshot previous value for rollback
+    const previous = queryClient.getQueryData<ResourceType>(["resource", id]);
+    // Optimistically update the cache
+    queryClient.setQueryData<ResourceType>(["resource", id], (old) => ({
+      ...old,
+      field: value,
+    }));
+    return { previous };
+  },
+  onError: (_err, _vars, context) => {
+    // Roll back to snapshot on failure
+    queryClient.setQueryData(["resource", id], context?.previous);
+  },
+  onSettled: () => {
+    // Always resync with server after mutation
+    queryClient.invalidateQueries({ queryKey: ["resource", id] });
+  },
+});
+```
+
+### Custom Hooks
+
+Follow `use*` naming. Generic hooks accept type parameters.
+
+```ts
+export const useDropdown = <T>({ selected, onChangeSelectedItems }: UseDropdownOptions<T>) => {
+  // implementation
+};
+```
+
+### Authentication (Clerk)
+
+Use `useUser()` for current user. Gate rendering with `<SignedIn>` / `<SignedOut>`. Protected pages live under the `_protected` layout route which handles redirect to login.
+
+```tsx
+const { user } = useUser();
+```
+
+Token is injected into all API requests automatically via the shared `HttpClient` — no manual token handling needed in components.
+
+### API Client
+
+Centralized in `@shared/api/client`. Typed generic methods: `get<T>()`, `post<T>()`, `put<T>()`, `patch<T>()`, `delete<T>()`. Config is set once at app startup via `setConfig()`.
+
+```ts
+import { request } from "@shared/api/client";
+
+const data = await request<ResponseType>({ url: "/endpoint", method: "GET" });
+```
+
+### Form Handling
+
+Controlled inputs with `value` / `onChange`. Submit via `useMutation`. No form libraries — use plain React state.
+
+### TypeScript
+
+- `strict: true` always
+- Prefer `type` over `interface` (use `interface` only for extensible contracts)
+- Use type-only imports: `import type { Foo } from "..."`
+- Generic types with descriptive names (`<T>`, `<TItem>`, `<TData>`)
+
+---
+
+## Backend Patterns (Go)
+
+### Layered Architecture
+
+1. **Handler** — HTTP input/output, validation, delegates to repository
+2. **Repository** — Database queries, returns domain models and sentinel errors
+3. **Models** — Structs with JSON and validation tags
+4. **Service** — App initialization and wiring
+5. **Config** — Environment variable loading
+
+### Dependency Injection
+
+Handlers receive repository interfaces, not concrete types. Enables mock-based testing.
+
+```go
+type UsersRepository interface {
+  GetUserByID(ctx context.Context, id string) (models.User, error)
+}
+
+type UsersHandler struct {
+  repo UsersRepository
+}
+
+func NewUsersHandler(repo UsersRepository) *UsersHandler {
+  return &UsersHandler{repo: repo}
+}
+```
+
+### Error Handling
+
+Sentinel errors at the repository layer:
+
+```go
+var ErrNotFoundInDB = errors.New("not found in db")
+var ErrAlreadyExistsInDB = errors.New("already exists in db")
+```
+
+Map to HTTP errors in handlers:
+
+```go
+if errors.Is(err, errs.ErrNotFoundInDB) {
+  return errs.NotFound("User", "id", id)
+}
+```
+
+Available HTTP error constructors in `errs` package:
+- `BadRequest(msg string) HTTPError`
+- `NotFound(title, withKey string, withValue any) HTTPError`
+- `InvalidRequestData(errors map[string]string) HTTPError`
+- `InternalServerError() HTTPError`
+
+### Validation (Go)
+
+Struct tags with `go-playground/validator`. Custom validators: `notblank`, `timezone`, `uuid`.
+
+```go
+type CreateUser struct {
+  ID        string  `json:"id"        validate:"notblank"`
+  FirstName string  `json:"first_name" validate:"notblank"`
+  Timezone  *string `json:"timezone,omitempty" validate:"omitempty,timezone"`
+}
+```
+
+Parse and validate in one step using `httpx.BindAndValidate`.
+
+### API Documentation
+
+All handler functions must have Swagger annotations:
+
+```go
+// GetUserByID godoc
+// @Summary      Get user by ID
+// @Description  Retrieves a user by their unique app ID
+// @Tags         users
+// @Accept       json
+// @Produce      json
+// @Param        id  path      string  true  "User ID"
+// @Success      200   {object}  models.User
+// @Failure      404   {object}  errs.HTTPError
+// @Router       /users/{id} [get]
+```
+
+### Testing (Go)
+
+Table-driven tests with `t.Parallel()`. Mock interfaces for repositories.
+
+```go
+func TestUsersHandler_GetUserByID(t *testing.T) {
+  t.Parallel()
+
+  t.Run("returns 200 with user", func(t *testing.T) {
+    t.Parallel()
+    // arrange
+    mockRepo := &mockUsersRepository{...}
+    handler := NewUsersHandler(mockRepo)
+    // act + assert
+  })
+}
+```
+
+### Configuration (Go)
+
+Environment variables loaded via `sethvargo/go-envconfig` into structs with `env` tags. Grouped by domain with prefixes.
+
+```go
+type Config struct {
+  Application `env:",prefix=APP_"`
+  DB          `env:",prefix=DB_"`
+  Clerk       `env:",prefix=CLERK_"`
+  LLM         `env:",prefix=LLM_"`
+}
+```
+
+### Logging
+
+Use `slog` package for structured logging. No `fmt.Println` in production paths.
+
+### CLI Commands (`backend/cmd/cli`)
+
+Commands are registered in `main.go` and implemented in per-topic files (e.g. `guests.go`).
+
+**Registering a command:**
+```go
+// main.go
+var commands = map[string]command{
+  "reindex-guests": {
+    description: "Fetch all guests from the database and reindex them in OpenSearch",
+    run:         runReindexGuests,
+  },
+}
+```
+
+**Backfill/reindex pattern** — paginated DB read via `iter.Seq2`, batched writes to the sink:
+
+```go
+// repository: paginated generator using cursor pagination
+func (r *GuestsRepository) AllGuestDocuments(ctx context.Context) iter.Seq2[*models.GuestDocument, error] {
+  return func(yield func(*models.GuestDocument, error) bool) {
+    var cursorName, cursorID string
+    for {
+      // fetch page using (cursorName, cursorID) as cursor
+      // yield each doc; return on last page or if yield returns false
+    }
+  }
+}
+
+// cli: accumulate into batches, flush when full
+batch := make([]*models.GuestDocument, 0, batchSize)
+for doc, err := range repo.AllGuestDocuments(ctx) {
+  if err != nil { return err }
+  batch = append(batch, doc)
+  if len(batch) == batchSize {
+    if err := sink.BulkIndex(ctx, batch); err != nil { return err }
+    batch = batch[:0]
+  }
+}
+if len(batch) > 0 {
+  if err := sink.BulkIndex(ctx, batch); err != nil { return err }
+}
+```
+
+- DB is read in pages, sink is written in batches — neither loaded fully into memory
+- `iter.Seq2` is used so the caller drives iteration with a plain `for range`
+- No semaphore needed unless batches are indexed concurrently
+
+---
+
+## Mobile Patterns (React Native)
+
+### Styling
+
+Use NativeWind (Tailwind) classes via `className` as the default. Fall back to inline `style` only when NativeWind cannot express it — the two known cases are:
+
+- **Transforms on icon components** (e.g. rotation) — pass `style={{ transform: [...] }}` directly to the icon since wrapping in a `View` with a transform class is unreliable in RN.
+- **Dynamic border colors** — when a border color must come from a runtime value (not a fixed Tailwind token), use inline style.
+
+All other colors, spacing, layout, and typography should use NativeWind classes. Custom design tokens (colors, etc.) belong in `tailwind.config.js` so they can be used as classes everywhere.
+
+### API Calls
+
+Always prefer hooks and utilities from `clients/shared/src/api/` over writing raw `useQuery` calls inline. If a shared hook exists (e.g. `useGetDepartments`), use it. If one doesn't exist yet, add it to `shared` so it can be reused across web and mobile.
+
+---
+
+## Testing (Frontend)
+
+- Vitest as test runner
+- Testing Library for component tests
+- jsdom environment
+- Test files in `tests/` directory or colocated with `*.test.ts` suffix
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e69de29bb..460bfb60f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -0,0 +1,41 @@
+# Contributing
+
+## Local Setup
+
+### Docker
+
+To run the backend via Docker, the container fetches secrets directly from Doppler at startup using a service token.
+
+Generate a token and export it in your shell:
+
+```bash
+eval $(make docker-token)
+```
+
+Then start the stack:
+
+```bash
+make docker-up
+```
+
+You'll need to re-run `eval $(make docker-token)` in any new shell session, or add `DOPPLER_TOKEN` to your shell profile.
+
+### OpenSearch
+
+Run OpenSearch locally with the security plugin disabled (no TLS or auth required for local dev):
+
+```bash
+docker run -d --name opensearch \
+  -p 9200:9200 -p 9600:9600 \
+  -e "discovery.type=single-node" \
+  -e "DISABLE_SECURITY_PLUGIN=true" \
+  opensearchproject/opensearch:latest
+```
+
+Verify it's running:
+
+```bash
+curl http://localhost:9200
+```
+
+> In production, OpenSearch uses TLS and credentials injected via Doppler. `OPENSEARCH_INSECURE_SKIP_TLS` should be `false` in prod.
diff --git a/README.md b/README.md
index 36e16edfd..df3a37313 100644
--- a/README.md
+++ b/README.md
@@ -3,3 +3,91 @@
 **Streamline hospitality staff operations**
 
 ![Repobeats analytics](https://repobeats.axiom.co/api/embed/a87cdebacff1d8354221554cbf2baca35800352c.svg "Repobeats analytics image")
+
+## Environment Setup with Doppler
+
+This project uses [Doppler](https://doppler.com) for centralized secrets management across 3 projects:
+
+- **selfserve-backend** - Go backend secrets (DB, Clerk, AWS S3, etc.)
+- **selfserve-web** - React web app secrets (API URL, Clerk keys, etc.)
+- **selfserve-mobile** - React Native mobile app secrets (API URL, etc.)
+
+Each project has 3 configs: `dev`, `tst`, `prd`
+
+### First-time Setup
+
+1. **Install Doppler CLI**:
+
+   ```bash
+   brew install dopplerhq/cli/doppler
+   ```
+
+2. **Authenticate** (one-time per machine):
+
+   ```bash
+   doppler login
+   ```
+
+   This will open your browser to authenticate with Doppler.
+
+3. **Setup each project** (run in respective directories):
+
+   ```bash
+   # Backend
+   cd backend
+   doppler setup
+   # Auto selected project: selfserve-backend
+   # Auto selected config: dev
+
+   # Web
+   cd clients/web
+   doppler setup
+   # Auto selected project: selfserve-web
+   # Auto selected config: dev
+
+   # Mobile
+   cd clients/mobile
+   doppler setup
+   # Auto selected project: selfserve-mobile
+   # Auto selected config: dev
+   ```
+
+### Running Apps
+
+```bash
+# Backend
+cd backend
+make air          # Hot reload
+make test
+# Or: make run    # Direct run
+# Or: make dev    # Build then run
+
+# Web
+cd clients/web
+npm run dev       # Start dev server
+
+# Mobile
+cd clients/mobile
+npm run start     # Start Expo
+```
+
+### Managing Secrets
+
+**Via Web UI**:
+
+- Visit [Doppler Dashboard](https://dashboard.doppler.com/)
+- Select your project (backend/web/mobile)
+- Add/edit secrets in the `dev` config
+
+**Via CLI**:
+
+```bash
+# View all secrets for current project
+doppler secrets
+
+# Set a secret
+doppler secrets set SECRET_NAME=value
+
+# Download secrets to .env format (for reference)
+doppler secrets download --no-file --format env
+```
diff --git a/backend/.env.sample b/backend/.env.sample
index 1b2f56ed9..e8750f41d 100644
--- a/backend/.env.sample
+++ b/backend/.env.sample
@@ -1,7 +1,24 @@
-DB_HOST=localhost
-DB_PORT=54322
-DB_USER=postgres
-DB_PASSWORD=postgres
-DB_NAME=postgres
-DB_MAX_CONNS=8
-DB_MAX_CONN_LIFETIME=30s
\ No newline at end of file
+DB_USER="" 
+DB_PASSWORD="" 
+DB_HOST=""
+DB_PORT=""
+DB_NAME=""
+PORT="8080"
+APP_LOG_LEVEL="info"
+AWS_S3_ACCESS_KEY_ID=""
+AWS_S3_SECRET_ACCESS_KEY_ID=""
+AWS_S3_REGION=""
+AWS_S3_BUCKET_NAME=""
+
+DEV_CLERK_SECRET_KEY="secret"
+DEV_CLERK_WEBHOOK_SIGNATURE="secret"
+ENV="dev/prod"
+
+NGROK_DOMAIN="your own stable domain"
+LLM_API_KEY=""
+LLM_MODEL="gemini-3-flash-preview"
+LLM_MAX_OUTPUT_TOKENS="1024"
+
+# Redis Configuration
+REDIS_ADDR=localhost:6379
+REDIS_PASSWORD=
diff --git a/backend/Dockerfile b/backend/Dockerfile
index 0d2de7267..42e3b8b5c 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -26,6 +26,10 @@ FROM alpine:latest
 
 WORKDIR /app
 
+# Install Doppler CLI
+RUN apk add --no-cache curl gnupg && \
+    curl -Ls https://cli.doppler.com/install.sh | sh
+
 # Copy the binary from the builder stage
 # Makefile builds to bin/selfserve
 COPY --from=builder /app/bin/selfserve .
@@ -33,5 +37,5 @@ COPY --from=builder /app/bin/selfserve .
 # Expose port 8080
 EXPOSE 8080
 
-# Command to run the executable
-CMD ["./selfserve"]
+# Doppler fetches secrets at runtime — DOPPLER_TOKEN must be set
+CMD ["doppler", "run", "--", "./selfserve"]
diff --git a/backend/Makefile b/backend/Makefile
index c959e86ed..f408314aa 100644
--- a/backend/Makefile
+++ b/backend/Makefile
@@ -3,11 +3,11 @@ CMD_PATH := ./cmd/server
 DOCKER_IMAGE_NAME := selfserve-backend
 PORT := 8080
 ENV_FILE := config/.env
-LOAD_ENV := set -a; [ -f $(ENV_FILE) ] && . $(ENV_FILE); set +a;
+LOAD_ENV := doppler run --
 LLM_URL := http://127.0.0.1:11434
 
-.PHONY: all build run dev test format tidy download clean docker-build docker-run \
-        migrate-new migrate-up migrate-down migrate-status migrate-reset db-start db-stop db-reset db-setup-env swagger swagger-fmt docker-build docker-run llm-start genkit-run seed
+.PHONY: all build run dev test format tidy download clean docker-build docker-run docker-token docker-up docker-down \
+        migrate-new migrate-up migrate-down migrate-status migrate-reset db-start db-stop db-reset swagger swagger-fmt docker-build docker-run llm-start genkit-run seed cli
 
 all: build
 
@@ -42,11 +42,11 @@ genkit-run: llm-start db-start
 	@$(LOAD_ENV) \
 	genkit start -- go run $(CMD_PATH)
 
-sync-users:
-	@$(LOAD_ENV) go run ./cmd/clerk/sync.go
+cli:
+	@$(LOAD_ENV) go run ./cmd/cli $(filter-out $@,$(MAKECMDGOALS))
 
-rooms-list-seed:
-	@$(LOAD_ENV) bash scripts/rooms-list-seed.sh
+seed:
+	@$(LOAD_ENV) bash scripts/seed.sh
 
 test:
 	@$(LOAD_ENV) \
@@ -80,6 +80,15 @@ docker-run:
 		--name $(APP_NAME)-container \
 		$(DOCKER_IMAGE_NAME)
 
+docker-token:
+	@echo "export DOPPLER_TOKEN=$$(doppler configs tokens create docker --project selfserve-backend --config prd --plain)"
+
+docker-up:
+	@docker compose up --build
+
+docker-down:
+	docker compose down
+
 # =============================================================================
 # Supabase Migrations
 # =============================================================================
@@ -122,40 +131,4 @@ db-stop:
 
 # Reset local database (stops, clears, restarts)
 db-reset:
-	supabase db reset
-
-# Set up .env file with local Supabase connection details
-# This creates or updates config/.env with local Supabase defaults
-db-setup-env:
-	@echo "Setting up $(ENV_FILE) for local Supabase..."
-	@if [ ! -f $(ENV_FILE) ]; then \
-		echo "# Application Configuration" > $(ENV_FILE); \
-		echo "APP_PORT=8080" >> $(ENV_FILE); \
-		echo "APP_LOG_LEVEL=info" >> $(ENV_FILE); \
-		echo "" >> $(ENV_FILE); \
-		echo "# Database Configuration (Local Supabase)" >> $(ENV_FILE); \
-		echo "DB_HOST=localhost" >> $(ENV_FILE); \
-		echo "DB_PORT=54322" >> $(ENV_FILE); \
-		echo "DB_USER=postgres" >> $(ENV_FILE); \
-		echo "DB_PASSWORD=postgres" >> $(ENV_FILE); \
-		echo "DB_NAME=postgres" >> $(ENV_FILE); \
-		echo "DB_MAX_CONNS=8" >> $(ENV_FILE); \
-		echo "DB_MAX_CONN_LIFETIME=30s" >> $(ENV_FILE); \
-		echo "Created $(ENV_FILE) with local Supabase defaults"; \
-	else \
-		echo "$(ENV_FILE) already exists. Updating DB_* variables..."; \
-		grep -v "^DB_" $(ENV_FILE) > $(ENV_FILE).tmp || true; \
-		echo "" >> $(ENV_FILE).tmp; \
-		echo "# Database Configuration (Local Supabase)" >> $(ENV_FILE).tmp; \
-		echo "DB_HOST=localhost" >> $(ENV_FILE).tmp; \
-		echo "DB_PORT=54322" >> $(ENV_FILE).tmp; \
-		echo "DB_USER=postgres" >> $(ENV_FILE).tmp; \
-		echo "DB_PASSWORD=postgres" >> $(ENV_FILE).tmp; \
-		echo "DB_NAME=postgres" >> $(ENV_FILE).tmp; \
-		echo "DB_MAX_CONNS=8" >> $(ENV_FILE).tmp; \
-		echo "DB_MAX_CONN_LIFETIME=30s" >> $(ENV_FILE).tmp; \
-		mv $(ENV_FILE).tmp $(ENV_FILE); \
-		echo "Updated DB_* variables in $(ENV_FILE)"; \
-	fi
-	@echo ""
-	@echo "Note: Make sure Supabase is running locally with 'make db-start'"
\ No newline at end of file
+	supabase db reset
\ No newline at end of file
diff --git a/backend/README.md b/backend/README.md
index ed5272ba3..351ab5c35 100644
--- a/backend/README.md
+++ b/backend/README.md
@@ -5,6 +5,7 @@
 ### Prerequisites
 
 - **Go 1.24.0 or later** - [Install Go](https://go.dev/doc/install)
+- **Doppler CLI** - [Install Doppler](https://docs.doppler.com/docs/install-cli) or `brew install dopplerhq/cli/doppler`
 
 ### Installation Steps
 
@@ -12,60 +13,54 @@
    ```bash
    go install github.com/air-verse/air@latest
    ```
-2. **Install LLM Provider**:
-   ```bash
-   brew install ollama
-   ollama serve
-   ollama pull qwen2.5:7b-instruct
-   ```
+2. **Set Gemini API key** — add `LLM_API_KEY` to your environment (get one at [Google AI Studio](https://aistudio.google.com/apikey)).
+
 3. **Download dependencies**:
+
    ```bash
    make download
    ```
 
-4. **Set up environment variables**:
-   
-   (Slack us for these)
-   Create a `config/.env` file with the following variables:
-   ```env
-   # Application Configuration
-   APP_PORT=8080
-   APP_LOG_LEVEL=info
-
-   # Database Configuration (required)
-   DB_HOST=your-database-host
-   DB_PORT=5432
-   DB_USER=your-database-user
-   DB_PASSWORD=your-database-password
-   DB_NAME=your-database-name
-   DB_MAX_CONNS=8
-   DB_MAX_CONN_LIFETIME=30s
+4. **Set up Doppler secrets management**:
+
+   a. Authenticate with Doppler (first time only):
+
+   ```bash
+   doppler login
    ```
 
-   > **Note**: All database variables (DB_HOST, DB_PORT, DB_USER, DB_PASSWORD, DB_NAME) are required. The application will fail to start if they are missing.
+   b. Set up the backend project:
 
-   **LLM Configuration** – used for parsing request text (e.g. `/request/parse`). Add this to your existing .env:
-   ```env
-   LLM_SERVER_ADDRESS=http://127.0.0.1:11434
-   LLM_MODEL=qwen2.5:3b
-   LLM_TIMEOUT=60
+   ```bash
+   cd backend
+   doppler setup
    ```
 
-5. **Run with hot reload** (development):
+   This will configure your local environment to use the `selfserve-backend` project with the `dev` config
+
+5. **Start local Supabase**:
+
    ```bash
-   air
+   make db-start
    ```
 
-   Or run directly:
+6. **Run with hot reload** (development):
+
    ```bash
-   make dev
+   make air
    ```
 
-   Or run with GenKit UI:
+   Or run directly without hot reload:
+
    ```bash
-   make genkit-run
+   make run
    ```
 
+   Or build and run:
+
+   ```bash
+   make dev
+   ```
 
 ## Directory Structure
 
@@ -129,7 +124,7 @@ Logic traversal:
 ┌──────────────▼──────────────────────────┐
 │       Storage Layer                     │
 │  (internal/service/storage/postgres/)   │
-│  The Database itself                    │    
+│  The Database itself                    │
 └─────────────────────────────────────────┘
 ```
 
@@ -151,20 +146,19 @@ Logic traversal:
 
 ## Development
 
-
 ```bash
 # Build
 make build
 
 # Run
+make air    # Hot reload
+
+# Or run directly
 make run
 
-# Build and run
+# Or build and run
 make dev
 
-# OR air to build and run if you installed air above
-air
-
 # Run tests
 make test
 
@@ -177,17 +171,6 @@ make clean
 
 ## Configuration
 
-The application reads configuration from environment variables (loaded from `config/.env`):
-
-- `APP_PORT`: Server port (default: 8080)
-- `APP_LOG_LEVEL`: Log level (default: info)
-- `DB_HOST`, `DB_PORT`, `DB_USER`, `DB_PASSWORD`, `DB_NAME`: Database connection details
-- `DB_MAX_CONNS`: Maximum database connections (default: 8)
-- `DB_MAX_CONN_LIFETIME`: Connection lifetime (default: 30s)
-
-- `LLM_SERVER_ADDRESS`: LLM server URL (default: http://127.0.0.1:11434)
-- `LLM_MODEL`: Model name, e.g. qwen2.5:7b-instruct, llama3.2, gemma2
-- `LLM_TIMEOUT`: Response timeout in seconds (default: 60)
-- `LLM_MAX_OUTPUT_TOKENS`: Max tokens for generation; lower values reduce latency (default: 1024)
-- `LLM_TEMPERATURE`: Sampling temperature 0–1; lower is more deterministic and often faster for extraction
+The application reads configuration from environment variables injected by Doppler:
 
+See config/.env.sample
diff --git a/backend/cli b/backend/cli
new file mode 100755
index 000000000..55f24370c
Binary files /dev/null and b/backend/cli differ
diff --git a/backend/cmd/clerk/sync.go b/backend/cmd/clerk/sync.go
deleted file mode 100644
index fecefbcad..000000000
--- a/backend/cmd/clerk/sync.go
+++ /dev/null
@@ -1,55 +0,0 @@
-package main
-
-import (
-	"context"
-	"fmt"
-	"log"
-
-	"github.com/generate/selfserve/config"
-	"github.com/generate/selfserve/internal/repository"
-	"github.com/generate/selfserve/internal/service/clerk"
-	storage "github.com/generate/selfserve/internal/service/storage/postgres"
-	"github.com/sethvargo/go-envconfig"
-)
-
-func main() {
-	ctx := context.Background()
-	var cfg config.Config
-	if err := envconfig.Process(ctx, &cfg); err != nil {
-		log.Fatal("failed to process config:", err)
-	}
-
-	repo, err := storage.NewRepository(cfg.DB)
-	if err != nil {
-		log.Fatal("failed to connect to db:", err)
-	}
-	defer repo.Close()
-	usersRepo := repository.NewUsersRepository(repo.DB)
-
-	path := "/users"
-	err = syncUsers(ctx, cfg.BaseURL+path, cfg.SecretKey, usersRepo)
-	if err != nil {
-		log.Fatal(err)
-	}
-	fmt.Println("Sync completed successfully")
-}
-
-func syncUsers(ctx context.Context, clerkBaseURL string, clerkSecret string,
-	usersRepo storage.UsersRepository) error {
-
-	users, err := clerk.FetchUsersFromClerk(clerkBaseURL, clerkSecret)
-	if err != nil {
-		return err
-	}
-
-	transformed, err := clerk.ValidateAndReformatUserData(users)
-	if err != nil {
-		return err
-	}
-
-	if err := usersRepo.BulkInsertUsers(ctx, transformed); err != nil {
-		return fmt.Errorf("failed to insert users: %w", err)
-	}
-
-	return nil
-}
diff --git a/backend/cmd/clerk/sync_test.go b/backend/cmd/clerk/sync_test.go
deleted file mode 100644
index d978295fa..000000000
--- a/backend/cmd/clerk/sync_test.go
+++ /dev/null
@@ -1,172 +0,0 @@
-package main
-
-import (
-	"context"
-	"errors"
-	"net/http"
-	"net/http/httptest"
-	"testing"
-
-	"github.com/generate/selfserve/internal/models"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-type mockUsersRepositorySync struct {
-	bulkInsertFunc func(ctx context.Context, users []*models.CreateUser) error
-}
-
-func (m *mockUsersRepositorySync) InsertUser(ctx context.Context, user *models.CreateUser) (*models.User, error) {
-	return nil, nil
-}
-
-func (m *mockUsersRepositorySync) BulkInsertUsers(ctx context.Context, users []*models.CreateUser) error {
-	return m.bulkInsertFunc(ctx, users)
-}
-
-func TestSyncUsers(t *testing.T) {
-	t.Parallel()
-
-	t.Run("successfully syncs valid users from Clerk", func(t *testing.T) {
-		t.Parallel()
-
-		var capturedUsers []*models.CreateUser
-
-		server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			assert.Contains(t, r.Header.Get("Authorization"), "Bearer ")
-
-			w.WriteHeader(http.StatusOK)
-			_, _ = w.Write([]byte(`[
-				{
-					"id": "user_123",
-					"first_name": "John",
-					"last_name": "Doe",
-					"has_image": false,
-					"image_url": null
-				},
-				{
-					"id": "user_456",
-					"first_name": "Jane",
-					"last_name": "Smith",
-					"has_image": true,
-					"image_url": "https://example.com/jane.jpg"
-				}
-			]`))
-		}))
-		defer server.Close()
-
-		userMock := &mockUsersRepositorySync{
-			bulkInsertFunc: func(ctx context.Context, users []*models.CreateUser) error {
-				capturedUsers = users
-				return nil
-			},
-		}
-
-		err := syncUsers(context.Background(), server.URL, "test_secret", userMock)
-		require.NoError(t, err)
-
-		assert.Len(t, capturedUsers, 2)
-		assert.Equal(t, "user_123", capturedUsers[0].ID)
-		assert.Equal(t, "John", capturedUsers[0].FirstName)
-		assert.Equal(t, "Doe", capturedUsers[0].LastName)
-		assert.Nil(t, capturedUsers[0].ProfilePicture)
-		assert.Equal(t, "user_456", capturedUsers[1].ID)
-		assert.Equal(t, "Jane", capturedUsers[1].FirstName)
-		assert.Equal(t, "Smith", capturedUsers[1].LastName)
-		assert.Equal(t, "https://example.com/jane.jpg", *capturedUsers[1].ProfilePicture)
-	})
-
-	t.Run("returns error when Clerk API fails", func(t *testing.T) {
-		t.Parallel()
-
-		server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			w.WriteHeader(http.StatusUnauthorized)
-		}))
-		defer server.Close()
-
-		userMock := &mockUsersRepositorySync{
-			bulkInsertFunc: func(ctx context.Context, users []*models.CreateUser) error {
-				return nil
-			},
-		}
-
-		err := syncUsers(context.Background(), server.URL, "bad_secret", userMock)
-		require.Error(t, err)
-	})
-
-	t.Run("returns error when validation fails", func(t *testing.T) {
-		t.Parallel()
-
-		server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			w.WriteHeader(http.StatusOK)
-			_, _ = w.Write([]byte(`[
-				{
-					"id": "",
-					"first_name": "",
-					"last_name": "",
-					"has_image": false
-				}
-			]`))
-		}))
-		defer server.Close()
-
-		userMock := &mockUsersRepositorySync{
-			bulkInsertFunc: func(ctx context.Context, users []*models.CreateUser) error {
-				return nil
-			},
-		}
-
-		err := syncUsers(context.Background(), server.URL, "test_secret", userMock)
-		require.Error(t, err)
-	})
-
-	t.Run("returns error when bulk insert fails", func(t *testing.T) {
-		t.Parallel()
-
-		server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			w.WriteHeader(http.StatusOK)
-			_, _ = w.Write([]byte(`[
-				{
-					"id": "user_123",
-					"first_name": "John",
-					"last_name": "Doe",
-					"has_image": false
-				}
-			]`))
-		}))
-		defer server.Close()
-
-		userMock := &mockUsersRepositorySync{
-			bulkInsertFunc: func(ctx context.Context, users []*models.CreateUser) error {
-				return errors.New("db connection failed")
-			},
-		}
-
-		err := syncUsers(context.Background(), server.URL, "test_secret", userMock)
-		require.Error(t, err)
-		assert.Contains(t, err.Error(), "db connection failed")
-	})
-
-	t.Run("handles empty user list from Clerk", func(t *testing.T) {
-		t.Parallel()
-
-		var insertCalled bool
-
-		server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			w.WriteHeader(http.StatusOK)
-			_, _ = w.Write([]byte(`[]`))
-		}))
-		defer server.Close()
-
-		userMock := &mockUsersRepositorySync{
-			bulkInsertFunc: func(ctx context.Context, users []*models.CreateUser) error {
-				insertCalled = true
-				return nil
-			},
-		}
-
-		err := syncUsers(context.Background(), server.URL, "test_secret", userMock)
-		require.NoError(t, err)
-		assert.True(t, insertCalled)
-	})
-}
diff --git a/backend/cmd/cli/guests.go b/backend/cmd/cli/guests.go
new file mode 100644
index 000000000..23cb947db
--- /dev/null
+++ b/backend/cmd/cli/guests.go
@@ -0,0 +1,67 @@
+package main
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/generate/selfserve/config"
+	"github.com/generate/selfserve/internal/models"
+	"github.com/generate/selfserve/internal/repository"
+	opensearchstorage "github.com/generate/selfserve/internal/service/storage/opensearch"
+	storage "github.com/generate/selfserve/internal/service/storage/postgres"
+)
+
+const reindexBatchSize = 100
+
+func runReindexGuests(ctx context.Context, cfg config.Config, _ []string) error {
+	pgRepo, err := storage.NewRepository(cfg.DB)
+	if err != nil {
+		return fmt.Errorf("failed to connect to db: %w", err)
+	}
+	defer pgRepo.Close()
+
+	osClient, err := opensearchstorage.NewClient(cfg.OpenSearch)
+	if err != nil {
+		return fmt.Errorf("failed to connect to opensearch: %w", err)
+	}
+
+	if err := opensearchstorage.EnsureGuestsIndex(ctx, osClient); err != nil {
+		return fmt.Errorf("failed to ensure guests index: %w", err)
+	}
+
+	guestsRepo := repository.NewGuestsRepository(pgRepo.DB)
+	osGuestsRepo := repository.NewOpenSearchGuestsRepository(osClient)
+
+	var total int
+	batch := make([]*models.GuestDocument, 0, reindexBatchSize)
+
+	flush := func() error {
+		if err := osGuestsRepo.BulkIndexGuests(ctx, batch); err != nil {
+			return err
+		}
+		total += len(batch)
+		batch = batch[:0]
+		return nil
+	}
+
+	for doc, err := range guestsRepo.AllGuestDocuments(ctx) {
+		if err != nil {
+			return fmt.Errorf("failed to fetch guest documents: %w", err)
+		}
+		batch = append(batch, doc)
+		if len(batch) == reindexBatchSize {
+			if err := flush(); err != nil {
+				return fmt.Errorf("failed to bulk index batch: %w", err)
+			}
+		}
+	}
+
+	if len(batch) > 0 {
+		if err := flush(); err != nil {
+			return fmt.Errorf("failed to bulk index batch: %w", err)
+		}
+	}
+
+	fmt.Printf("reindex-guests completed: %d indexed\n", total)
+	return nil
+}
diff --git a/backend/cmd/cli/hotels.go b/backend/cmd/cli/hotels.go
new file mode 100644
index 000000000..868121d88
--- /dev/null
+++ b/backend/cmd/cli/hotels.go
@@ -0,0 +1,34 @@
+package main
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/generate/selfserve/config"
+	"github.com/generate/selfserve/internal/repository"
+	storage "github.com/generate/selfserve/internal/service/storage/postgres"
+)
+
+func runBackfillHotelDepartments(ctx context.Context, cfg config.Config, _ []string) error {
+	repo, err := storage.NewRepository(cfg.DB)
+	if err != nil {
+		return fmt.Errorf("failed to connect to db: %w", err)
+	}
+	defer repo.Close()
+
+	hotelsRepo := repository.NewHotelsRepository(repo.DB)
+
+	var total int
+	for hotel, err := range hotelsRepo.AllHotelsWithoutDepartments(ctx) {
+		if err != nil {
+			return fmt.Errorf("failed to fetch hotels: %w", err)
+		}
+		if err := hotelsRepo.InsertDefaultDepartments(ctx, hotel.ID); err != nil {
+			return fmt.Errorf("failed to insert departments for hotel %s: %w", hotel.ID, err)
+		}
+		total++
+	}
+
+	fmt.Printf("backfill-hotel-departments completed: %d hotels seeded\n", total)
+	return nil
+}
diff --git a/backend/cmd/cli/main.go b/backend/cmd/cli/main.go
new file mode 100644
index 000000000..a33688ef9
--- /dev/null
+++ b/backend/cmd/cli/main.go
@@ -0,0 +1,81 @@
+package main
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"log"
+	"os"
+
+	"github.com/generate/selfserve/config"
+	"github.com/sethvargo/go-envconfig"
+)
+
+// command is a runnable CLI subcommand.
+type command struct {
+	description string
+	run         func(ctx context.Context, cfg config.Config, args []string) error
+}
+
+// commands is the registry of all available CLI subcommands.
+// To add a new command: add an entry here and implement its run func below.
+//
+//	"my-new-command": {
+//		description: "What this command does",
+//		run:         runMyNewCommand,
+//	},
+var commands = map[string]command{
+	"sync-users": {
+		description: "Sync users from Clerk into the database",
+		run:         runSyncUsers,
+	},
+	"reindex-guests": {
+		description: "Fetch all guests from the database and reindex them in OpenSearch",
+		run:         runReindexGuests,
+	},
+	"backfill-hotel-departments": {
+		description: "Seed default departments for hotels that have no departments",
+		run:         runBackfillHotelDepartments,
+	},
+	"seed-data": {
+		description: "Seed requests and tasks for the hotel belonging to a given user",
+		run:         runSeedData,
+	},
+}
+
+func main() {
+	flag.Usage = printUsage
+	flag.Parse()
+
+	args := flag.Args()
+	if len(args) == 0 {
+		printUsage()
+		os.Exit(1)
+	}
+
+	name := args[0]
+	cmd, ok := commands[name]
+	if !ok {
+		fmt.Fprintf(os.Stderr, "unknown command: %q\n\n", name)
+		printUsage()
+		os.Exit(1)
+	}
+
+	ctx := context.Background()
+	var cfg config.Config
+	if err := envconfig.Process(ctx, &cfg); err != nil {
+		log.Fatal("failed to process config:", err)
+	}
+
+	if err := cmd.run(ctx, cfg, args[1:]); err != nil {
+		log.Fatalf("%s: %v", name, err)
+	}
+}
+
+func printUsage() {
+	fmt.Fprintf(os.Stderr, "Usage: cli <command> [args]\n\nAvailable commands:\n")
+	for name, cmd := range commands {
+		fmt.Fprintf(os.Stderr, "  %-20s %s\n", name, cmd.description)
+	}
+	fmt.Fprintln(os.Stderr)
+}
diff --git a/backend/cmd/cli/seed.go b/backend/cmd/cli/seed.go
new file mode 100644
index 000000000..d781e17b2
--- /dev/null
+++ b/backend/cmd/cli/seed.go
@@ -0,0 +1,425 @@
+package main
+
+import (
+	"context"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"math/rand/v2"
+	"time"
+
+	"github.com/generate/selfserve/config"
+	"github.com/generate/selfserve/internal/errs"
+	"github.com/generate/selfserve/internal/models"
+	"github.com/generate/selfserve/internal/repository"
+	storage "github.com/generate/selfserve/internal/service/storage/postgres"
+	"github.com/google/uuid"
+)
+
+// ─── Seed data ────────────────────────────────────────────────────────────────
+
+type seedRoom struct {
+	number     int
+	floor      int
+	suiteType  string
+	status     string
+	accessible bool
+	features   []string
+}
+
+var seedRooms = []seedRoom{
+	// Floor 1
+	{101, 1, "standard", "available", true, []string{"wifi", "tv"}},
+	{102, 1, "deluxe", "occupied", false, []string{"wifi", "tv", "minibar"}},
+	{103, 1, "suite", "available", false, []string{"wifi", "tv", "jacuzzi", "minibar"}},
+	{104, 1, "standard", "available", false, []string{"wifi", "tv"}},
+	// Floor 2
+	{201, 2, "standard", "occupied", true, []string{"wifi", "tv"}},
+	{202, 2, "deluxe", "occupied", false, []string{"wifi", "tv", "balcony"}},
+	{203, 2, "penthouse", "maintenance", false, []string{"wifi", "tv", "kitchen", "jacuzzi"}},
+	{204, 2, "standard", "available", false, []string{"wifi", "tv"}},
+	// Floor 3
+	{301, 3, "standard", "available", false, []string{"wifi", "tv"}},
+	{302, 3, "deluxe", "occupied", true, []string{"wifi", "tv", "balcony"}},
+	{303, 3, "suite", "occupied", false, []string{"wifi", "tv", "jacuzzi", "minibar", "balcony"}},
+	{304, 3, "standard", "available", false, []string{"wifi", "tv"}},
+	// Floor 4
+	{401, 4, "standard", "available", true, []string{"wifi", "tv"}},
+	{402, 4, "deluxe", "occupied", false, []string{"wifi", "tv", "balcony", "sea_view"}},
+	{403, 4, "suite", "available", false, []string{"wifi", "tv", "jacuzzi", "minibar", "balcony"}},
+	{404, 4, "standard", "maintenance", false, []string{"wifi", "tv"}},
+	// Floor 5
+	{501, 5, "penthouse", "available", false, []string{"wifi", "tv", "kitchen", "jacuzzi", "balcony"}},
+	{502, 5, "penthouse", "occupied", false, []string{"wifi", "tv", "kitchen", "jacuzzi", "balcony", "butler_service"}},
+	{503, 5, "standard", "available", true, []string{"wifi", "tv"}},
+	{504, 5, "deluxe", "available", false, []string{"wifi", "tv", "balcony"}},
+}
+
+type seedGuest struct {
+	firstName           string
+	lastName            string
+	timezone            string
+	roomIndex           int // index into insertedRooms; -1 = no booking
+	phone               string
+	email               string
+	preferences         string
+	notes               string
+	pronouns            string
+	dndStart            string              // "HH:MM:SS", empty = not set
+	dndEnd              string              // "HH:MM:SS", empty = not set
+	housekeepingCadence string              // "daily", "every_other_day", etc.; empty = not set
+	assistance          map[string][]string // maps to JSONB {accessibility,dietary,medical}
+	groupSize           int                 // 0 = not set
+}
+
+var seedGuests = []seedGuest{
+	{
+		firstName: "Alice", lastName: "Johnson", timezone: "America/New_York", roomIndex: 1,
+		phone: "+1 (212) 555-0101", email: "alice.johnson@example.com",
+		preferences:         "Extra pillows, Egyptian cotton linens, high floor preferred",
+		notes:               "VIP — champagne on arrival. Loyalty member since 2018. Allergy to lavender products.",
+		pronouns:            "she/her",
+		dndStart:            "22:00:00",
+		dndEnd:              "08:00:00",
+		housekeepingCadence: "daily",
+		assistance:          nil,
+		groupSize:           1,
+	},
+	{
+		firstName: "Bob", lastName: "Smith", timezone: "America/Chicago", roomIndex: 5,
+		phone: "+1 (312) 555-0102", email: "bob.smith@example.com",
+		preferences:         "Hypoallergenic bedding, no feather products, firm pillows",
+		notes:               "Corporate account — Acme Corp. Business traveller, early checkout likely.",
+		pronouns:            "he/him",
+		dndStart:            "23:00:00",
+		dndEnd:              "07:00:00",
+		housekeepingCadence: "daily",
+		assistance:          map[string][]string{"dietary": {"gluten_free"}},
+		groupSize:           2,
+	},
+	{
+		firstName: "Carol", lastName: "Williams", timezone: "America/Los_Angeles", roomIndex: 10,
+		phone: "+1 (310) 555-0103", email: "carol.williams@example.com",
+		preferences:         "No feather pillows, quiet room, low-level floor preferred",
+		notes:               "Celebrating anniversary. Requested rose petal turndown on 2026-04-02.",
+		pronouns:            "she/her",
+		dndStart:            "21:00:00",
+		dndEnd:              "09:00:00",
+		housekeepingCadence: "every_other_day",
+		assistance:          map[string][]string{"medical": {"low_noise_environment"}},
+		groupSize:           2,
+	},
+	{
+		firstName: "David", lastName: "Brown", timezone: "Europe/London", roomIndex: -1,
+		phone: "+44 20 7946 0104", email: "david.brown@example.com",
+		preferences:         "Earl Grey tea on arrival, Financial Times delivered daily",
+		notes:               "Regular guest — previous stays in 2024 and 2025. Prefers ground floor.",
+		pronouns:            "he/him",
+		dndStart:            "",
+		dndEnd:              "",
+		housekeepingCadence: "daily",
+		assistance:          nil,
+		groupSize:           0,
+	},
+	{
+		firstName: "Emma", lastName: "Davis", timezone: "America/New_York", roomIndex: 4,
+		phone: "+1 (646) 555-0105", email: "emma.davis@example.com",
+		preferences:         "Crib required (infant), blackout curtains, quiet room",
+		notes:               "Family with 8-month-old infant. Baby amenities pre-arranged.",
+		pronouns:            "she/her",
+		dndStart:            "20:00:00",
+		dndEnd:              "09:00:00",
+		housekeepingCadence: "daily",
+		assistance:          map[string][]string{"dietary": {"nut_free"}},
+		groupSize:           3,
+	},
+	{
+		firstName: "Liam", lastName: "Garcia", timezone: "America/Denver", roomIndex: 9,
+		phone: "+1 (720) 555-0106", email: "liam.garcia@example.com",
+		preferences:         "Accessible bathroom, roll-in shower, lowered bed if available",
+		notes:               "Uses manual wheelchair. Requires accessible room features.",
+		pronouns:            "he/him",
+		dndStart:            "",
+		dndEnd:              "",
+		housekeepingCadence: "daily",
+		assistance:          map[string][]string{"accessibility": {"wheelchair", "roll_in_shower"}},
+		groupSize:           1,
+	},
+	{
+		firstName: "Olivia", lastName: "Martinez", timezone: "America/Los_Angeles", roomIndex: 13,
+		phone: "+1 (213) 555-0107", email: "olivia.martinez@example.com",
+		preferences:         "Sea view room, sparkling water in minibar, late check-out if available",
+		notes:               "Influencer — do not photograph without consent. PR rate applied.",
+		pronouns:            "she/her",
+		dndStart:            "23:00:00",
+		dndEnd:              "10:00:00",
+		housekeepingCadence: "every_other_day",
+		assistance:          nil,
+		groupSize:           1,
+	},
+	{
+		firstName: "Noah", lastName: "Thompson", timezone: "Europe/Paris", roomIndex: 17,
+		phone: "+33 1 42 96 0108", email: "noah.thompson@example.com",
+		preferences:         "Champagne on ice, fresh flowers daily, butler service preferred",
+		notes:               "Penthouse repeat guest. Platinum tier — complimentary airport transfer.",
+		pronouns:            "he/him",
+		dndStart:            "00:00:00",
+		dndEnd:              "11:00:00",
+		housekeepingCadence: "twice_daily",
+		assistance:          nil,
+		groupSize:           2,
+	},
+	{
+		firstName: "Sophie", lastName: "Chen", timezone: "Asia/Shanghai", roomIndex: -1,
+		phone: "+86 138 0013 0109", email: "sophie.chen@example.com",
+		preferences:         "Mandarin-speaking staff preferred, Chinese breakfast option",
+		notes:               "International delegate — attending conference. Translation services arranged.",
+		pronouns:            "she/her",
+		dndStart:            "",
+		dndEnd:              "",
+		housekeepingCadence: "daily",
+		assistance:          map[string][]string{"dietary": {"vegetarian"}},
+		groupSize:           0,
+	},
+	{
+		firstName: "James", lastName: "Wilson", timezone: "America/New_York", roomIndex: -1,
+		phone: "+1 (917) 555-0110", email: "james.wilson@example.com",
+		preferences:         "Top-floor room, gym access, in-room espresso machine",
+		notes:               "Frequent solo traveller. No housekeeping during stay — do not disturb.",
+		pronouns:            "he/him",
+		dndStart:            "08:00:00",
+		dndEnd:              "20:00:00",
+		housekeepingCadence: "on_request",
+		assistance:          nil,
+		groupSize:           0,
+	},
+}
+
+type seedRequest struct {
+	name         string
+	description  string
+	priority     models.RequestPriority
+	status       models.RequestStatus
+	assignToUser bool
+	roomIndex    int // index into insertedRooms; -1 = no room
+}
+
+var seedRequests = []seedRequest{
+	// ── High priority ──────────────────────────────────────────────────────────
+	{"Fix broken AC in suite", "Guest reported AC not working since check-in. Temperature rising above 28°C.", models.PriorityHigh, models.StatusPending, false, 2},
+	{"Flooding in room 204", "Toilet overflow — housekeeping and maintenance needed immediately", models.PriorityHigh, models.StatusPending, true, 7},
+	{"Medical equipment needed", "Guest requires wheelchair for lobby transit. Confirm accessible lift route.", models.PriorityHigh, models.StatusPending, true, -1},
+	{"Fire alarm panel fault", "Panel showing fault on floor 3 — inspect before end of shift", models.PriorityHigh, models.StatusPending, false, -1},
+	{"Penthouse elevator out of service", "Floor 5 service elevator not responding. Guest unable to access penthouse with luggage.", models.PriorityHigh, models.StatusPending, false, 16},
+	{"Burst pipe in room 404", "Water leak reported behind bathroom wall. Room taken out of service.", models.PriorityHigh, models.StatusPending, true, 15},
+
+	// ── Medium priority ────────────────────────────────────────────────────────
+	{"Extra towels and toiletries", "Guest requested two sets of towels and extra shampoo", models.PriorityMedium, models.StatusPending, false, 0},
+	{"Room service delivery", "Breakfast for two, requested via in-room tablet", models.PriorityMedium, models.StatusPending, true, 9},
+	{"Late checkout request", "Guest requesting checkout at 2pm instead of 11am. Verify availability.", models.PriorityMedium, models.StatusPending, false, 5},
+	{"Replace burnt-out bulbs", "Two bulbs out in bathroom and bedside lamp not working", models.PriorityMedium, models.StatusPending, true, 3},
+	{"Minibar restock", "Minibar needs full restock after checkout", models.PriorityMedium, models.StatusPending, false, 5},
+	{"Dinner reservation assist", "Guest needs help booking a table for 4 tonight at a nearby restaurant", models.PriorityMedium, models.StatusCompleted, true, -1},
+	{"Baby crib delivery", "Family with infant requesting a standard travel crib with fitted sheet and blanket", models.PriorityMedium, models.StatusPending, false, 4},
+	{"WiFi troubleshooting floor 4", "Guest on floor 4 reports WiFi dropping every 30 minutes. Suspected extender issue.", models.PriorityMedium, models.StatusPending, true, 12},
+	{"Accessible shower seat", "Guest needs a fold-down shower seat installed in accessible bathroom", models.PriorityMedium, models.StatusPending, false, 9},
+	{"Sea-view room balcony door stuck", "Balcony door handle loose and door difficult to open from inside", models.PriorityMedium, models.StatusPending, false, 13},
+
+	// ── Low priority ──────────────────────────────────────────────────────────
+	{"Extra pillow request", "Guest requested two additional pillows (hypoallergenic)", models.PriorityLow, models.StatusPending, false, 10},
+	{"Lost & found inquiry", "Guest asking about a left-behind phone charger from yesterday", models.PriorityLow, models.StatusCompleted, false, -1},
+	{"Pool towel replenishment", "Pool deck running low on towels — restock from laundry", models.PriorityLow, models.StatusPending, true, -1},
+	{"Newspaper delivery", "Daily newspaper delivery requested for the week (Financial Times)", models.PriorityLow, models.StatusPending, false, 1},
+	{"Gym equipment wipe-down", "Routine sanitisation of gym equipment requested by guest", models.PriorityLow, models.StatusCompleted, false, -1},
+	{"Wine pairing recommendation", "Couple would like a wine pairing recommendation for their dinner", models.PriorityLow, models.StatusPending, false, -1},
+	{"Print boarding passes", "Guest needs three boarding passes printed at concierge", models.PriorityLow, models.StatusPending, true, -1},
+	{"Deep clean after checkout", "Full deep clean required before next guest", models.PriorityLow, models.StatusCompleted, false, 11},
+	{"Fresh flowers daily — penthouse", "Penthouse guest requested fresh floral arrangement refreshed each morning", models.PriorityLow, models.StatusPending, false, 17},
+	{"Butler service introduction", "New penthouse guest has not met their assigned butler yet", models.PriorityLow, models.StatusPending, true, 17},
+	{"Champagne ice bucket top-up", "Ice has melted in penthouse champagne bucket — guest requests fresh ice", models.PriorityLow, models.StatusPending, true, 17},
+	{"Complimentary airport transfer booking", "Platinum guest departing tomorrow — arrange airport transfer to JFK", models.PriorityLow, models.StatusPending, false, 17},
+}
+
+// ─── Command ──────────────────────────────────────────────────────────────────
+
+func runSeedData(ctx context.Context, cfg config.Config, args []string) error {
+	if len(args) == 0 {
+		return errors.New("usage: seed-data <user-id>")
+	}
+	userID := args[0]
+
+	repo, err := storage.NewRepository(cfg.DB)
+	if err != nil {
+		return fmt.Errorf("failed to connect to db: %w", err)
+	}
+	defer repo.Close()
+
+	usersRepo := repository.NewUsersRepository(repo.DB)
+	roomsRepo := repository.NewRoomsRepository(repo.DB)
+	guestsRepo := repository.NewGuestsRepository(repo.DB)
+	bookingsRepo := repository.NewGuestBookingsRepository(repo.DB)
+	requestsRepo := repository.NewRequestsRepo(repo.DB)
+	hotelsRepo := repository.NewHotelsRepository(repo.DB)
+
+	user, err := usersRepo.FindUser(ctx, userID)
+	if err != nil {
+		if errors.Is(err, errs.ErrNotFoundInDB) {
+			return fmt.Errorf("user %q not found", userID)
+		}
+		return fmt.Errorf("failed to fetch user: %w", err)
+	}
+
+	hotelID := user.HotelID
+	fmt.Printf("seeding data for hotel %s (user: %s)\n\n", hotelID, userID)
+
+	// ── Departments ────────────────────────────────────────────────────────────
+	departments, err := hotelsRepo.GetDepartmentsByHotelID(ctx, hotelID)
+	if err != nil {
+		return fmt.Errorf("failed to fetch departments: %w", err)
+	}
+	if len(departments) == 0 {
+		return fmt.Errorf("hotel %s has no departments — run backfill-hotel-departments first", hotelID)
+	}
+	departmentIDs := make([]string, len(departments))
+	for i, d := range departments {
+		departmentIDs[i] = d.ID
+	}
+	fmt.Printf("found %d departments\n\n", len(departmentIDs))
+
+	// ── Rooms ──────────────────────────────────────────────────────────────────
+	fmt.Println("inserting rooms...")
+	insertedRooms := make([]*models.Room, len(seedRooms))
+	for i, s := range seedRooms {
+		room, err := roomsRepo.InsertRoom(ctx, hotelID, s.number, s.floor, s.suiteType, s.status, s.accessible, s.features)
+		if err != nil {
+			return fmt.Errorf("failed to insert room %d: %w", s.number, err)
+		}
+		insertedRooms[i] = room
+		fmt.Printf("  room %d (floor %d, %s, %s)\n", room.RoomNumber, room.Floor, room.SuiteType, room.RoomStatus)
+	}
+
+	// ── Guests + bookings ──────────────────────────────────────────────────────
+	fmt.Println("\ninserting guests...")
+	now := time.Now()
+	arrival := now.AddDate(0, 0, -3)
+	departure := now.AddDate(0, 0, 4)
+
+	for _, s := range seedGuests {
+		guest, err := guestsRepo.InsertGuest(ctx, &models.CreateGuest{
+			FirstName: s.firstName,
+			LastName:  s.lastName,
+			Timezone:  ptr(s.timezone),
+		})
+		if err != nil {
+			return fmt.Errorf("failed to insert guest %s %s: %w", s.firstName, s.lastName, err)
+		}
+
+		// Enrich guest with extended profile fields via raw UPDATE.
+		var assistanceJSON []byte
+		if s.assistance != nil {
+			assistanceJSON, err = json.Marshal(s.assistance)
+			if err != nil {
+				return fmt.Errorf("failed to marshal assistance for guest %s: %w", guest.ID, err)
+			}
+		} else {
+			assistanceJSON = []byte("{}")
+		}
+
+		dndStartVal := nullableStr(s.dndStart)
+		dndEndVal := nullableStr(s.dndEnd)
+		housekeepingVal := nullableStr(s.housekeepingCadence)
+		phoneVal := nullableStr(s.phone)
+		emailVal := nullableStr(s.email)
+		prefsVal := nullableStr(s.preferences)
+		notesVal := nullableStr(s.notes)
+		pronounsVal := nullableStr(s.pronouns)
+
+		_, err = repo.DB.Exec(ctx, `
+			UPDATE guests SET
+				phone                = $1,
+				email                = $2,
+				preferences          = $3,
+				notes                = $4,
+				pronouns             = $5,
+				do_not_disturb_start = $6,
+				do_not_disturb_end   = $7,
+				housekeeping_cadence = $8,
+				assistance           = $9
+			WHERE id = $10
+		`, phoneVal, emailVal, prefsVal, notesVal, pronounsVal,
+			dndStartVal, dndEndVal, housekeepingVal, string(assistanceJSON), guest.ID)
+		if err != nil {
+			return fmt.Errorf("failed to update guest profile for %s: %w", guest.ID, err)
+		}
+
+		fmt.Printf("  %s %s", guest.FirstName, guest.LastName)
+
+		if s.roomIndex >= 0 && s.roomIndex < len(insertedRooms) {
+			room := insertedRooms[s.roomIndex]
+			if err := bookingsRepo.InsertGuestBooking(ctx, guest.ID, room.ID, hotelID, arrival, departure); err != nil {
+				return fmt.Errorf("failed to insert booking for guest %s: %w", guest.ID, err)
+			}
+			fmt.Printf(" → room %d", room.RoomNumber)
+
+			if s.groupSize > 0 {
+				_, err = repo.DB.Exec(ctx, `
+					UPDATE guest_bookings SET group_size = $1
+					WHERE guest_id = $2 AND room_id = $3 AND hotel_id = $4 AND status = 'active'
+				`, s.groupSize, guest.ID, room.ID, hotelID)
+				if err != nil {
+					return fmt.Errorf("failed to set group_size for guest %s: %w", guest.ID, err)
+				}
+				fmt.Printf(" (party of %d)", s.groupSize)
+			}
+		}
+		fmt.Println()
+	}
+
+	// ── Requests ───────────────────────────────────────────────────────────────
+	fmt.Println("\ninserting requests...")
+	for i, s := range seedRequests {
+		deptID := departmentIDs[rand.IntN(len(departmentIDs))]
+		req := &models.Request{
+			ID: uuid.New().String(),
+			MakeRequest: models.MakeRequest{
+				HotelID:     hotelID,
+				Name:        s.name,
+				Description: ptr(s.description),
+				Department:  ptr(deptID),
+				RequestType: "manual",
+				Status:      string(s.status),
+				Priority:    string(s.priority),
+			},
+		}
+		if s.assignToUser {
+			req.UserID = &userID
+		}
+		if s.roomIndex >= 0 && s.roomIndex < len(insertedRooms) {
+			req.RoomID = ptr(insertedRooms[s.roomIndex].ID)
+		}
+		if _, err := requestsRepo.InsertRequest(ctx, req); err != nil {
+			return fmt.Errorf("failed to insert request %q: %w", s.name, err)
+		}
+		roomLabel := "-"
+		if s.roomIndex >= 0 && s.roomIndex < len(insertedRooms) {
+			roomLabel = fmt.Sprintf("room %d", insertedRooms[s.roomIndex].RoomNumber)
+		}
+		fmt.Printf("  [%d/%d] %s (%s / %s / %s)\n", i+1, len(seedRequests), s.name, s.priority, s.status, roomLabel)
+	}
+
+	fmt.Printf("\nseed-data completed: %d rooms, %d guests, %d requests\n",
+		len(seedRooms), len(seedGuests), len(seedRequests))
+	return nil
+}
+
+// nullableStr returns nil if s is empty, otherwise a pointer to s.
+func nullableStr(s string) *string {
+	if s == "" {
+		return nil
+	}
+	return &s
+}
+
+func ptr[T any](v T) *T {
+	return &v
+}
diff --git a/backend/cmd/cli/users.go b/backend/cmd/cli/users.go
new file mode 100644
index 000000000..68419edc8
--- /dev/null
+++ b/backend/cmd/cli/users.go
@@ -0,0 +1,62 @@
+package main
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"log"
+
+	"github.com/generate/selfserve/config"
+	"github.com/generate/selfserve/internal/errs"
+	"github.com/generate/selfserve/internal/models"
+	"github.com/generate/selfserve/internal/repository"
+	"github.com/generate/selfserve/internal/service/clerk"
+	storage "github.com/generate/selfserve/internal/service/storage/postgres"
+)
+
+func runSyncUsers(ctx context.Context, cfg config.Config, _ []string) error {
+	repo, err := storage.NewRepository(cfg.DB)
+	if err != nil {
+		return fmt.Errorf("failed to connect to db: %w", err)
+	}
+	defer repo.Close()
+
+	usersRepo := repository.NewUsersRepository(repo.DB)
+	hotelsRepo := repository.NewHotelsRepository(repo.DB)
+
+	users, err := clerk.FetchUsersFromClerk(cfg.Clerk.BaseURL, cfg.Clerk.SecretKey)
+	if err != nil {
+		return fmt.Errorf("failed to fetch users: %w", err)
+	}
+
+	for _, u := range users {
+		orgID, err := clerk.FetchUserOrgID(cfg.Clerk.BaseURL, cfg.Clerk.SecretKey, u.ID)
+		if err != nil {
+			log.Printf("failed to fetch org for user %s: %v", u.ID, err)
+			continue
+		}
+		if orgID == "" {
+			log.Printf("skipping user %s: no org membership found", u.ID)
+			continue
+		}
+
+		_, err = hotelsRepo.InsertHotel(ctx, &models.CreateHotelRequest{
+			ID:   orgID,
+			Name: "Synced Hotel: " + orgID,
+		})
+		if err != nil && !errors.Is(err, errs.ErrAlreadyExistsInDB) {
+			log.Printf("failed to insert hotel %s: %v", orgID, err)
+			continue
+		}
+
+		if _, err := usersRepo.UpsertUser(ctx, &u, orgID); err != nil {
+			log.Printf("failed to insert user %s: %v", u.ID, err)
+			continue
+		}
+
+		log.Printf("inserted user %s", u.ID)
+	}
+
+	fmt.Println("sync-users completed successfully")
+	return nil
+}
diff --git a/backend/cmd/server/main.go b/backend/cmd/server/main.go
index 5014f25d0..93663cb63 100644
--- a/backend/cmd/server/main.go
+++ b/backend/cmd/server/main.go
@@ -53,6 +53,12 @@ func main() {
 		if err := app.Repo.Close(); err != nil {
 			panic(fmt.Sprintf("failed to close repo: %v", err))
 		}
+		if app.TemporalWorker != nil {
+			app.TemporalWorker.Stop()
+		}
+		if app.TemporalClient != nil {
+			app.TemporalClient.Close()
+		}
 	}()
 
 	go func() {
diff --git a/backend/config/.env.sample b/backend/config/.env.sample
index 88c78c847..a04da8304 100644
--- a/backend/config/.env.sample
+++ b/backend/config/.env.sample
@@ -1,8 +1,14 @@
+# DEPRECATED: This file is for reference only
+# Secrets are managed via Doppler
+# To set up: doppler login && doppler setup
+# To view secrets: doppler secrets
+# To manage: https://dashboard.doppler.com/
+
 # Application
 APP_PORT=8080
 APP_LOG_LEVEL=info
 APP_HOST=localhost:8080
-APP_CORS_ORIGINS=http://localhost:3000,http://localhost:8081,http://localhost:8080,http://127.0.0.1:8080
+APP_CORS_ORIGINS=http://localhost:3000
 
 # Database
 DB_HOST=""
@@ -15,6 +21,7 @@ DB_SSLMODE=disable
 # Clerk
 CLERK_SECRET_KEY=""
 CLERK_WEBHOOK_SIGNATURE=""
+CLERK_BASE_URL="" # Optional
 
 # Status
 ENV=development
@@ -29,8 +36,12 @@ AWS_S3_REGION=""
 AWS_S3_BUCKET_NAME=""
 
 # LLM
-LLM_SERVER_ADDRESS=http://127.0.0.1:11434
-LLM_MODEL=qwen2.5:7b-instruct
-LLM_TIMEOUT=60
+LLM_API_KEY=
+LLM_MODEL=gemini-3-flash-preview
 LLM_MAX_OUTPUT_TOKENS=1024
-LLM_TEMPERATURE=0.2
+
+# OpenSearch
+OPENSEARCH_URL=https://localhost:9200
+OPENSEARCH_USERNAME=admin
+OPENSEARCH_PASSWORD=
+OPENSEARCH_INSECURE_SKIP_TLS=true  # set true for local dev, false for prod
diff --git a/backend/config/config.go b/backend/config/config.go
index 4230c8740..964044922 100644
--- a/backend/config/config.go
+++ b/backend/config/config.go
@@ -3,7 +3,9 @@ package config
 type Config struct {
 	Application `env:",prefix=APP_"`
 	DB          `env:",prefix=DB_"`
+	S3          `env:",prefix=AWS_S3_"`
 	LLM         `env:",prefix=LLM_"`
+	Temporal    `env:",prefix=TEMPORAL_"`
 	Clerk       `env:",prefix=CLERK_"`
-	S3          `env:",prefix=AWS_S3_"`
+	OpenSearch  `env:",prefix=OPENSEARCH_"`
 }
diff --git a/backend/config/llm.go b/backend/config/llm.go
index 905a65326..e909499ea 100644
--- a/backend/config/llm.go
+++ b/backend/config/llm.go
@@ -1,9 +1,7 @@
 package config
 
 type LLM struct {
-	ServerAddress   string  `env:"SERVER_ADDRESS" envDefault:"http://127.0.0.1:11434"`
-	Model           string  `env:"MODEL" envDefault:"qwen2.5:7b-instruct"`
-	Timeout         int     `env:"TIMEOUT" envDefault:"60"`
-	MaxOutputTokens int     `env:"MAX_OUTPUT_TOKENS" envDefault:"1024"`
-	Temperature     float64 `env:"TEMPERATURE" envDefault:"0.2"`
+	APIKey          string `env:"API_KEY"`
+	Model           string `env:"MODEL" envDefault:"gemini-3-flash-preview"`
+	MaxOutputTokens int    `env:"MAX_OUTPUT_TOKENS" envDefault:"1024"`
 }
diff --git a/backend/config/opensearch.go b/backend/config/opensearch.go
new file mode 100644
index 000000000..0fad75ecb
--- /dev/null
+++ b/backend/config/opensearch.go
@@ -0,0 +1,8 @@
+package config
+
+type OpenSearch struct {
+	URL             string `env:"URL,required"`
+	Username        string `env:"USERNAME,default=admin"`
+	Password        string `env:"PASSWORD,required"`
+	InsecureSkipTLS bool   `env:"INSECURE_SKIP_TLS,default=false"`
+}
diff --git a/backend/config/temporal.go b/backend/config/temporal.go
new file mode 100644
index 000000000..28e34e5a0
--- /dev/null
+++ b/backend/config/temporal.go
@@ -0,0 +1,7 @@
+package config
+
+type Temporal struct {
+	HostPort  string `env:"HOST_PORT,required"`
+	Namespace string `env:"NAMESPACE,required"`
+	APIKey    string `env:"API_KEY,required"`
+}
diff --git a/backend/docker-compose.yml b/backend/docker-compose.yml
new file mode 100644
index 000000000..28e82035b
--- /dev/null
+++ b/backend/docker-compose.yml
@@ -0,0 +1,20 @@
+services:
+  api:
+    build: .
+    ports:
+      - "${PORT:-8080}:8080"
+    environment:
+      - DOPPLER_TOKEN
+    depends_on:
+      - opensearch
+    restart: unless-stopped
+
+  opensearch:
+    image: opensearchproject/opensearch:latest
+    environment:
+      - discovery.type=single-node
+      - DISABLE_SECURITY_PLUGIN=true
+    ports:
+      - "9200:9200"
+      - "9600:9600"
+    restart: unless-stopped
diff --git a/backend/docs/swagger.yaml b/backend/docs/swagger.yaml
index df6ba2204..85c52f44b 100644
--- a/backend/docs/swagger.yaml
+++ b/backend/docs/swagger.yaml
@@ -1,25 +1,42 @@
 basePath: /api/v1
 definitions:
-  CreateGuest:
+  ActiveBooking:
     properties:
-      email:
-        example: jane.doe@example.com
+      floor:
+        type: integer
+      room_number:
+        type: integer
+    type: object
+  AssignRequestInput:
+    properties:
+      assign_to_self:
+        type: boolean
+      user_id:
         type: string
+    type: object
+  Assistance:
+    properties:
+      accessibility:
+        items:
+          type: string
+        type: array
+      dietary:
+        items:
+          type: string
+        type: array
+      medical:
+        items:
+          type: string
+        type: array
+    type: object
+  CreateGuest:
+    properties:
       first_name:
         example: Jane
         type: string
       last_name:
         example: Doe
         type: string
-      notes:
-        example: VIP
-        type: string
-      phone:
-        example: +1 (617) 012-3456
-        type: string
-      preferences:
-        example: extra pillows
-        type: string
       profile_picture:
         example: https://example.com/john.jpg
         type: string
@@ -39,7 +56,7 @@ definitions:
         example: John
         type: string
       hotel_id:
-        example: hotel_123
+        example: org_550e8400-e29b-41d4-a716-446655440000
         type: string
       id:
         example: user_123
@@ -47,6 +64,12 @@ definitions:
       last_name:
         example: Doe
         type: string
+      phone_number:
+        example: "+11234567890"
+        type: string
+      primary_email:
+        example: john@example.com
+        type: string
       profile_picture:
         example: https://example.com/john.jpg
         type: string
@@ -57,6 +80,41 @@ definitions:
         example: America/New_York
         type: string
     type: object
+  CreateViewInput:
+    properties:
+      display_name:
+        type: string
+      filters:
+        items:
+          type: integer
+        type: array
+      slug:
+        allOf:
+        - $ref: '#/definitions/github_com_generate_selfserve_internal_models.ViewSlug'
+        enum:
+        - requests_web
+        - rooms_web
+        - guests_web
+    required:
+    - filters
+    - slug
+    type: object
+  Department:
+    properties:
+      created_at:
+        type: string
+      hotel_id:
+        example: org_2abc123
+        type: string
+      id:
+        example: 550e8400-e29b-41d4-a716-446655440000
+        type: string
+      name:
+        example: Housekeeping
+        type: string
+      updated_at:
+        type: string
+    type: object
   Dev:
     properties:
       created_at:
@@ -69,23 +127,65 @@ definitions:
         example: Dao Ho
         type: string
     type: object
+  FilterRoomsRequest:
+    properties:
+      advanced:
+        description: arrivals-today | departures-today
+        items:
+          type: string
+        type: array
+      attributes:
+        description: standard | deluxe | suite | accessible
+        items:
+          type: string
+        type: array
+      cursor:
+        type: string
+      floors:
+        items:
+          type: integer
+        type: array
+      limit:
+        minimum: 0
+        type: integer
+      sort:
+        $ref: '#/definitions/github_com_generate_selfserve_internal_models.RoomSortOption'
+      status:
+        description: occupied | vacant | open-tasks
+        items:
+          type: string
+        type: array
+    type: object
   GenerateRequestInput:
     properties:
       hotel_id:
-        example: 521e8400-e458-41d4-a716-446655440000
+        example: org_521e8400-e458-41d4-a716-446655440000
         type: string
       raw_text:
         example: Guest in room 504 needs extra towels urgently
         type: string
     type: object
+  GenerateRequestResponse:
+    properties:
+      request:
+        $ref: '#/definitions/Request'
+      warning:
+        $ref: '#/definitions/GenerateRequestWarning'
+    type: object
+  GenerateRequestWarning:
+    properties:
+      code:
+        example: room_not_found
+        type: string
+      message:
+        example: Room 301 could not be resolved for this hotel.
+        type: string
+    type: object
   Guest:
     properties:
       created_at:
         example: "2024-01-02T00:00:00Z"
         type: string
-      email:
-        example: jane.doe@example.com
-        type: string
       first_name:
         example: Jane
         type: string
@@ -96,13 +196,7 @@ definitions:
         example: Doe
         type: string
       notes:
-        example: VIP
-        type: string
-      phone:
-        example: +1 (617) 012-3456
-        type: string
-      preferences:
-        example: extra pillows
+        example: VIP guest
         type: string
       profile_picture:
         example: https://example.com/john.jpg
@@ -114,31 +208,132 @@ definitions:
         example: "2024-01-02T00:00:00Z"
         type: string
     type: object
-  GuestWithBooking:
+  GuestFilters:
     properties:
-      first_name:
+      assistance:
+        items:
+          $ref: '#/definitions/github_com_generate_selfserve_internal_models.AssistanceFilter'
+        type: array
+      cursor:
+        type: string
+      floor_sort:
+        allOf:
+        - $ref: '#/definitions/github_com_generate_selfserve_internal_models.FloorSortOrder'
+        enum:
+        - ascending
+        - descending
+      floors:
+        items:
+          type: integer
+        type: array
+      group_size:
+        items:
+          type: integer
+        type: array
+      limit:
+        maximum: 100
+        minimum: 1
+        type: integer
+      request_sort:
+        allOf:
+        - $ref: '#/definitions/github_com_generate_selfserve_internal_models.RequestSortOrder'
+        enum:
+        - high_to_low
+        - low_to_high
+        - urgent
+      search:
+        type: string
+      status:
+        items:
+          $ref: '#/definitions/github_com_generate_selfserve_internal_models.BookingStatus'
+        type: array
+    type: object
+  GuestPage:
+    properties:
+      data:
+        items:
+          $ref: '#/definitions/GuestWithBooking'
+        type: array
+      next_cursor:
+        type: string
+    type: object
+  GuestRequest:
+    properties:
+      created_at:
+        type: string
+      department_id:
+        type: string
+      department_name:
+        type: string
+      description:
         type: string
       floor:
         type: integer
       id:
         type: string
-      last_name:
+      name:
+        type: string
+      notes:
+        type: string
+      priority:
+        type: string
+      request_category:
+        type: string
+      request_type:
+        type: string
+      request_version:
         type: string
       room_number:
         type: integer
+      status:
+        type: string
+      user_id:
+        type: string
+    type: object
+  GuestWithBooking:
+    properties:
+      active_bookings:
+        items:
+          $ref: '#/definitions/ActiveBooking'
+        type: array
+      assistance:
+        $ref: '#/definitions/Assistance'
+      first_name:
+        type: string
+      has_urgent:
+        type: boolean
+      id:
+        type: string
+      last_name:
+        type: string
+      preferred_name:
+        type: string
+      request_count:
+        type: integer
     type: object
   GuestWithStays:
     properties:
+      assistance:
+        $ref: '#/definitions/Assistance'
       current_stays:
         items:
           $ref: '#/definitions/Stay'
         type: array
+      do_not_disturb_end:
+        example: "07:00:00"
+        type: string
+      do_not_disturb_start:
+        example: "17:00:00"
+        type: string
       email:
         example: jane.doe@example.com
         type: string
       first_name:
         example: Jane
         type: string
+      housekeeping_cadence:
+        example: daily
+        type: string
       id:
         example: 530e8400-e458-41d4-a716-446655440000
         type: string
@@ -158,10 +353,15 @@ definitions:
       preferences:
         example: extra pillows
         type: string
+      pronouns:
+        example: she/her
+        type: string
     required:
+    - current_stays
     - first_name
     - id
     - last_name
+    - past_stays
     type: object
   Hotel:
     properties:
@@ -173,7 +373,7 @@ definitions:
         minimum: 1
         type: integer
       id:
-        example: "550e8400-e29b-41d4-a\t716-446655440000"
+        example: org_2abc123
         type: string
       name:
         example: Hotel California
@@ -200,7 +400,7 @@ definitions:
         example: 521e8417-e458-41d4-a716-446655440990
         type: string
       hotel_id:
-        example: 521e8400-e458-41d4-a716-446655440000
+        example: org_521e8400-e458-41d4-a716-446655440000
         type: string
       name:
         example: room cleaning
@@ -209,7 +409,11 @@ definitions:
         example: No special requests
         type: string
       priority:
-        example: urgent
+        enum:
+        - low
+        - medium
+        - high
+        example: high
         type: string
       request_category:
         example: Cleaning
@@ -227,12 +431,60 @@ definitions:
         example: "2024-01-01T00:00:00Z"
         type: string
       status:
-        example: assigned
+        enum:
+        - pending
+        - in progress
+        - completed
+        - archived
+        example: pending
         type: string
       user_id:
         example: 521ee400-e458-41d4-a716-446655440000
         type: string
     type: object
+  Notification:
+    properties:
+      body:
+        type: string
+      created_at:
+        type: string
+      data:
+        items:
+          type: integer
+        type: array
+      id:
+        type: string
+      read_at:
+        type: string
+      title:
+        type: string
+      type:
+        $ref: '#/definitions/github_com_generate_selfserve_internal_models.NotificationType'
+      user_id:
+        type: string
+    type: object
+  OnboardUser:
+    properties:
+      department:
+        example: front_desk
+        type: string
+      hotel_name:
+        example: Hotel California
+        type: string
+      role:
+        example: manager
+        type: string
+    type: object
+  RegisterDeviceTokenInput:
+    properties:
+      platform:
+        enum:
+        - ios
+        - android
+        type: string
+      token:
+        type: string
+    type: object
   Request:
     properties:
       completed_at:
@@ -254,7 +506,7 @@ definitions:
         example: 521e8417-e458-41d4-a716-446655440990
         type: string
       hotel_id:
-        example: 521e8400-e458-41d4-a716-446655440000
+        example: org_521e8400-e458-41d4-a716-446655440000
         type: string
       id:
         example: 530e8400-e458-41d4-a716-446655440000
@@ -266,7 +518,11 @@ definitions:
         example: No special requests
         type: string
       priority:
-        example: urgent
+        enum:
+        - low
+        - medium
+        - high
+        example: high
         type: string
       request_category:
         example: Cleaning
@@ -274,6 +530,9 @@ definitions:
       request_type:
         example: recurring
         type: string
+      request_version:
+        example: "2024-01-02T00:00:00Z"
+        type: string
       reservation_id:
         example: 521e8400-e458-41d4-a716-498655440000
         type: string
@@ -284,15 +543,115 @@ definitions:
         example: "2024-01-01T00:00:00Z"
         type: string
       status:
-        example: assigned
-        type: string
-      updated_at:
-        example: "2024-01-02T00:00:00Z"
+        enum:
+        - pending
+        - in progress
+        - completed
+        - archived
+        example: pending
         type: string
       user_id:
         example: 521ee400-e458-41d4-a716-446655440000
         type: string
     type: object
+  RequestUpdateInput:
+    properties:
+      completed_at:
+        type: string
+      department:
+        type: string
+      description:
+        type: string
+      estimated_completion_time:
+        type: integer
+      guest_id:
+        type: string
+      name:
+        type: string
+      notes:
+        type: string
+      priority:
+        enum:
+        - low
+        - medium
+        - high
+        type: string
+      request_category:
+        type: string
+      request_type:
+        type: string
+      reservation_id:
+        type: string
+      room_id:
+        type: string
+      scheduled_time:
+        type: string
+      status:
+        enum:
+        - pending
+        - in progress
+        - completed
+        - archived
+        type: string
+      unassign:
+        type: boolean
+      user_id:
+        type: string
+    type: object
+  RequestsFeedInput:
+    properties:
+      cursor:
+        type: string
+      departments:
+        items:
+          type: string
+        type: array
+      floors:
+        items:
+          type: integer
+        type: array
+      hotel_id:
+        type: string
+      limit:
+        maximum: 100
+        minimum: 1
+        type: integer
+      priorities:
+        items:
+          type: string
+        type: array
+      search:
+        type: string
+      sort:
+        allOf:
+        - $ref: '#/definitions/github_com_generate_selfserve_internal_models.RequestFeedSort'
+        enum:
+        - priority
+        - newest
+        - oldest
+      status:
+        enum:
+        - pending
+        - in progress
+        - completed
+        - archived
+        type: string
+      unassigned:
+        type: boolean
+      user_id:
+        type: string
+    type: object
+  RoomRequestsResponse:
+    properties:
+      assigned:
+        items:
+          $ref: '#/definitions/GuestRequest'
+        type: array
+      unassigned:
+        items:
+          $ref: '#/definitions/GuestRequest'
+        type: array
+    type: object
   RoomWithOptionalGuestBooking:
     properties:
       booking_status:
@@ -303,6 +662,14 @@ definitions:
         items:
           $ref: '#/definitions/Guest'
         type: array
+      has_unassigned_tasks:
+        type: boolean
+      id:
+        type: string
+      is_accessible:
+        type: boolean
+      priority:
+        $ref: '#/definitions/github_com_generate_selfserve_internal_models.RequestPriority'
       room_number:
         type: integer
       room_status:
@@ -318,6 +685,8 @@ definitions:
       departure_date:
         example: "2024-01-05"
         type: string
+      group_size:
+        type: integer
       room_number:
         example: 101
         type: integer
@@ -337,6 +706,10 @@ definitions:
       last_name:
         example: Doe
         type: string
+      notes:
+        example: VIP guest
+        maxLength: 1000
+        type: string
       profile_picture:
         example: https://example.com/john.jpg
         type: string
@@ -344,6 +717,12 @@ definitions:
         example: America/New_York
         type: string
     type: object
+  UpdateUser:
+    properties:
+      phone_number:
+        example: "+11234567890"
+        type: string
+    type: object
   User:
     properties:
       created_at:
@@ -352,6 +731,10 @@ definitions:
       department:
         example: Housekeeping
         type: string
+      departments:
+        items:
+          type: string
+        type: array
       employee_id:
         example: EMP-1234
         type: string
@@ -359,14 +742,23 @@ definitions:
         example: John
         type: string
       hotel_id:
-        example: hotel_123
+        example: org_550e8400-e29b-41d4-a716-446655440000
         type: string
       id:
         example: user_123
         type: string
+      is_onboarded:
+        example: false
+        type: boolean
       last_name:
         example: Doe
         type: string
+      phone_number:
+        example: "+11234567890"
+        type: string
+      primary_email:
+        example: john@example.com
+        type: string
       profile_picture:
         example: https://example.com/john.jpg
         type: string
@@ -380,12 +772,50 @@ definitions:
         example: "2024-01-01T00:00:00Z"
         type: string
     type: object
-  github_com_generate_selfserve_internal_errs.HTTPError:
+  UserPage:
+    properties:
+      next_cursor:
+        type: string
+      users:
+        items:
+          $ref: '#/definitions/User'
+        type: array
+    type: object
+  View:
+    properties:
+      created_at:
+        type: string
+      display_name:
+        type: string
+      filters:
+        items:
+          type: integer
+        type: array
+      id:
+        type: string
+      slug:
+        $ref: '#/definitions/github_com_generate_selfserve_internal_models.ViewSlug'
+      updated_at:
+        type: string
+      user_id:
+        type: string
+    type: object
+  github_com_generate_selfserve_internal_errs.HTTPError:
     properties:
       code:
         type: integer
       message: {}
     type: object
+  github_com_generate_selfserve_internal_models.AssistanceFilter:
+    enum:
+    - accessibility
+    - dietary
+    - medical
+    type: string
+    x-enum-varnames:
+    - AssistanceAccessibility
+    - AssistanceDietary
+    - AssistanceMedical
   github_com_generate_selfserve_internal_models.BookingStatus:
     enum:
     - active
@@ -394,6 +824,94 @@ definitions:
     x-enum-varnames:
     - BookingStatusActive
     - BookingStatusInactive
+  github_com_generate_selfserve_internal_models.CreateDepartment:
+    properties:
+      name:
+        type: string
+    type: object
+  github_com_generate_selfserve_internal_models.FloorSortOrder:
+    enum:
+    - ascending
+    - descending
+    type: string
+    x-enum-varnames:
+    - FloorSortAscending
+    - FloorSortDescending
+  github_com_generate_selfserve_internal_models.NotificationType:
+    enum:
+    - task_assigned
+    - high_priority_task
+    type: string
+    x-enum-varnames:
+    - TypeTaskAssigned
+    - TypeHighPriorityTask
+  github_com_generate_selfserve_internal_models.RequestFeedSort:
+    enum:
+    - priority
+    - newest
+    - oldest
+    type: string
+    x-enum-varnames:
+    - SortByPriority
+    - SortByNewest
+    - SortByOldest
+  github_com_generate_selfserve_internal_models.RequestPriority:
+    enum:
+    - low
+    - medium
+    - high
+    type: string
+    x-enum-varnames:
+    - PriorityLow
+    - PriorityMedium
+    - PriorityHigh
+  github_com_generate_selfserve_internal_models.RequestSortOrder:
+    enum:
+    - high_to_low
+    - low_to_high
+    - urgent
+    type: string
+    x-enum-varnames:
+    - RequestSortHighToLow
+    - RequestSortLowToHigh
+    - RequestSortUrgent
+  github_com_generate_selfserve_internal_models.RoomSortOption:
+    enum:
+    - ascending
+    - descending
+    - urgency
+    type: string
+    x-enum-varnames:
+    - RoomSortAscending
+    - RoomSortDescending
+    - RoomSortUrgency
+  github_com_generate_selfserve_internal_models.UpdateDepartment:
+    properties:
+      name:
+        type: string
+    type: object
+  github_com_generate_selfserve_internal_models.ViewSlug:
+    enum:
+    - requests_web
+    - rooms_web
+    - guests_web
+    type: string
+    x-enum-varnames:
+    - ViewSlugRequestsWeb
+    - ViewSlugRoomsWeb
+    - ViewSlugGuestsWeb
+  github_com_generate_selfserve_internal_utils.CursorPage-GuestRequest:
+    properties:
+      has_more:
+        type: boolean
+      items:
+        items:
+          $ref: '#/definitions/GuestRequest'
+        type: array
+      next_cursor:
+        description: nil when no more pages
+        type: string
+    type: object
   github_com_generate_selfserve_internal_utils.CursorPage-RoomWithOptionalGuestBooking:
     properties:
       has_more:
@@ -406,6 +924,27 @@ definitions:
         description: nil when no more pages
         type: string
     type: object
+  internal_handler.AddEmployeeDepartmentBody:
+    properties:
+      department_id:
+        type: string
+    type: object
+  internal_handler.SearchUsersBody:
+    properties:
+      cursor:
+        type: string
+      hotel_id:
+        type: string
+      q:
+        type: string
+    type: object
+  internal_handler.UpdateProfilePictureRequest:
+    description: Request body containing the S3 key after uploading
+    properties:
+      key:
+        example: profile-pictures/user123/1706540000.jpg
+        type: string
+    type: object
 host: localhost:8080
 info:
   contact:
@@ -419,29 +958,52 @@ info:
   title: SelfServe API
   version: "1.0"
 paths:
-  /api/v1/guests:
+  /device-tokens:
+    post:
+      consumes:
+      - application/json
+      description: Registers an Expo push token so the user receives mobile push notifications
+      parameters:
+      - description: Device token
+        in: body
+        name: request
+        required: true
+        schema:
+          $ref: '#/definitions/RegisterDeviceTokenInput'
+      responses:
+        "204":
+          description: No Content
+        "400":
+          description: Bad Request
+          schema:
+            $ref: '#/definitions/github_com_generate_selfserve_internal_errs.HTTPError'
+        "500":
+          description: Internal Server Error
+          schema:
+            $ref: '#/definitions/github_com_generate_selfserve_internal_errs.HTTPError'
+      security:
+      - BearerAuth: []
+      summary: Register device token
+      tags:
+      - notifications
+  /devs/{name}:
     get:
-      description: Retrieves guests optionally filtered by floor in which they are
-        staying
+      consumes:
+      - application/json
+      description: Retrieves a developer member by name
       parameters:
-      - description: Hotel ID (UUID)
-        in: header
-        name: X-Hotel-ID
+      - description: Developer name
+        in: path
+        name: name
         required: true
         type: string
-      - description: Floor
-        in: query
-        name: number
-        type: string
       produces:
       - application/json
       responses:
         "200":
           description: OK
           schema:
-            items:
-              $ref: '#/definitions/GuestWithBooking'
-            type: array
+            $ref: '#/definitions/Dev'
         "400":
           description: Bad Request
           schema:
@@ -456,9 +1018,31 @@ paths:
             type: object
       security:
       - BearerAuth: []
-      summary: Get Guests
+      summary: Get developer member
       tags:
-      - guests
+      - devs
+  /guest_bookings/group_sizes:
+    get:
+      description: Retrieves all distinct group sizes across guest bookings
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            items:
+              type: integer
+            type: array
+        "500":
+          description: Internal Server Error
+          schema:
+            additionalProperties:
+              type: string
+            type: object
+      summary: Get available group size options
+      tags:
+      - guest-bookings
+  /guests:
     post:
       consumes:
       - application/json
@@ -494,7 +1078,7 @@ paths:
       summary: Creates a guest
       tags:
       - guests
-  /api/v1/guests/{id}:
+  /guests/{id}:
     get:
       consumes:
       - application/json
@@ -579,11 +1163,53 @@ paths:
       summary: Updates a guest
       tags:
       - guests
-  /api/v1/guests/stays/{id}:
+  /guests/search:
+    post:
+      consumes:
+      - application/json
+      description: Retrieves guests optionally filtered by floor
+      parameters:
+      - description: Hotel ID (UUID)
+        in: header
+        name: X-Hotel-ID
+        required: true
+        type: string
+      - description: Guest filters
+        in: body
+        name: body
+        required: true
+        schema:
+          $ref: '#/definitions/GuestFilters'
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            $ref: '#/definitions/GuestPage'
+        "400":
+          description: Bad Request
+          schema:
+            additionalProperties:
+              type: string
+            type: object
+        "500":
+          description: Internal Server Error
+          schema:
+            additionalProperties:
+              type: string
+            type: object
+      security:
+      - BearerAuth: []
+      summary: Get Guests
+      tags:
+      - guests
+  /guests/stays/{id}:
     get:
       consumes:
       - application/json
       description: Retrieves a single guest with previous stays given an id
+      operationId: getGuestsStaysId
       parameters:
       - description: Guest ID (UUID)
         in: path
@@ -618,7 +1244,47 @@ paths:
       summary: Gets a guest with previous stays
       tags:
       - guests
-  /api/v1/hotels:
+  /hello:
+    get:
+      consumes:
+      - application/json
+      description: Returns a simple hello message
+      produces:
+      - text/plain
+      responses:
+        "200":
+          description: 'Yogurt. Gurt: Yo!'
+          schema:
+            type: string
+      security:
+      - BearerAuth: []
+      summary: Get hello message
+      tags:
+      - hello
+  /hello/{name}:
+    get:
+      consumes:
+      - application/json
+      description: Returns a hello message with the provided name
+      parameters:
+      - description: Name to greet
+        in: path
+        name: name
+        required: true
+        type: string
+      produces:
+      - text/plain
+      responses:
+        "200":
+          description: Yo, {name}!
+          schema:
+            type: string
+      security:
+      - BearerAuth: []
+      summary: Get personalized hello message
+      tags:
+      - hello
+  /hotels:
     post:
       consumes:
       - application/json
@@ -654,7 +1320,7 @@ paths:
       summary: Create hotel
       tags:
       - hotels
-  /api/v1/hotels/{id}:
+  /hotels/{id}:
     get:
       description: Retrieve a hotel's details using its UUID
       parameters:
@@ -685,15 +1351,13 @@ paths:
       summary: Get hotel by ID
       tags:
       - hotels
-  /devs/{name}:
+  /hotels/{id}/departments:
     get:
-      consumes:
-      - application/json
-      description: Retrieves a developer member by name
+      description: Returns all departments for a hotel
       parameters:
-      - description: Developer name
+      - description: Hotel ID
         in: path
-        name: name
+        name: id
         required: true
         type: string
       produces:
@@ -702,158 +1366,246 @@ paths:
         "200":
           description: OK
           schema:
-            $ref: '#/definitions/Dev'
+            items:
+              $ref: '#/definitions/Department'
+            type: array
         "400":
           description: Bad Request
           schema:
-            additionalProperties:
-              type: string
-            type: object
+            $ref: '#/definitions/github_com_generate_selfserve_internal_errs.HTTPError'
         "500":
           description: Internal Server Error
           schema:
-            additionalProperties:
-              type: string
-            type: object
+            $ref: '#/definitions/github_com_generate_selfserve_internal_errs.HTTPError'
       security:
       - BearerAuth: []
-      summary: Get developer member
+      summary: Get departments by hotel
       tags:
-      - devs
-  /hello:
-    get:
+      - hotels
+    post:
       consumes:
       - application/json
-      description: Returns a simple hello message
+      description: Adds a new department to a hotel
+      parameters:
+      - description: Hotel ID
+        in: path
+        name: id
+        required: true
+        type: string
+      - description: Department data
+        in: body
+        name: request
+        required: true
+        schema:
+          $ref: '#/definitions/github_com_generate_selfserve_internal_models.CreateDepartment'
       produces:
-      - text/plain
+      - application/json
       responses:
-        "200":
-          description: 'Yogurt. Gurt: Yo!'
+        "201":
+          description: Created
           schema:
-            type: string
+            $ref: '#/definitions/Department'
+        "400":
+          description: Bad Request
+          schema:
+            $ref: '#/definitions/github_com_generate_selfserve_internal_errs.HTTPError'
+        "500":
+          description: Internal Server Error
+          schema:
+            $ref: '#/definitions/github_com_generate_selfserve_internal_errs.HTTPError'
       security:
       - BearerAuth: []
-      summary: Get hello message
+      summary: Create department
       tags:
-      - hello
-  /hello/{name}:
-    get:
-      consumes:
-      - application/json
-      description: Returns a hello message with the provided name
+      - hotels
+  /hotels/{id}/departments/{deptId}:
+    delete:
+      description: Removes a department from a hotel
       parameters:
-      - description: Name to greet
+      - description: Hotel ID
         in: path
-        name: name
+        name: id
+        required: true
+        type: string
+      - description: Department ID
+        in: path
+        name: deptId
         required: true
         type: string
       produces:
-      - text/plain
+      - application/json
       responses:
-        "200":
-          description: Yo, {name}!
+        "204":
+          description: No Content
+        "400":
+          description: Bad Request
           schema:
-            type: string
+            $ref: '#/definitions/github_com_generate_selfserve_internal_errs.HTTPError'
+        "404":
+          description: Not Found
+          schema:
+            $ref: '#/definitions/github_com_generate_selfserve_internal_errs.HTTPError'
+        "500":
+          description: Internal Server Error
+          schema:
+            $ref: '#/definitions/github_com_generate_selfserve_internal_errs.HTTPError'
       security:
       - BearerAuth: []
-      summary: Get personalized hello message
+      summary: Delete department
       tags:
-      - hello
-  /request:
-    post:
+      - hotels
+    put:
       consumes:
       - application/json
-      description: Creates a request with the given data
+      description: Renames a department
       parameters:
-      - description: Request data
+      - description: Hotel ID
+        in: path
+        name: id
+        required: true
+        type: string
+      - description: Department ID
+        in: path
+        name: deptId
+        required: true
+        type: string
+      - description: Department data
         in: body
         name: request
         required: true
         schema:
-          $ref: '#/definitions/MakeRequest'
+          $ref: '#/definitions/github_com_generate_selfserve_internal_models.UpdateDepartment'
       produces:
       - application/json
       responses:
         "200":
           description: OK
           schema:
-            $ref: '#/definitions/Request'
+            $ref: '#/definitions/Department'
         "400":
           description: Bad Request
           schema:
-            additionalProperties:
-              type: string
-            type: object
+            $ref: '#/definitions/github_com_generate_selfserve_internal_errs.HTTPError'
+        "404":
+          description: Not Found
+          schema:
+            $ref: '#/definitions/github_com_generate_selfserve_internal_errs.HTTPError'
         "500":
           description: Internal Server Error
           schema:
-            additionalProperties:
-              type: string
-            type: object
+            $ref: '#/definitions/github_com_generate_selfserve_internal_errs.HTTPError'
       security:
       - BearerAuth: []
-      summary: creates a request
+      summary: Update department
       tags:
-      - requests
-  /request/cursor/{cursor}:
+      - hotels
+  /hotels/{id}/users:
     get:
-      consumes:
-      - application/json
-      description: Gets 20 requests starting after the cursor ID, filtered by status
+      description: Returns a paginated list of all users for a hotel
       parameters:
-      - description: Cursor UUID
+      - description: Hotel ID
         in: path
-        name: cursor
-        required: true
-        type: string
-      - description: 'Status filter: pending, assigned, in progress, completed'
-        in: query
-        name: status
+        name: id
         required: true
         type: string
-      - description: Hotel UUID
+      - description: Pagination cursor (last seen user ID)
         in: query
-        name: hotel_id
-        required: true
+        name: cursor
         type: string
       produces:
       - application/json
       responses:
         "200":
-          description: Returns requests array and next_cursor
+          description: OK
           schema:
             additionalProperties: true
             type: object
         "400":
           description: Bad Request
           schema:
-            additionalProperties:
-              type: string
-            type: object
+            $ref: '#/definitions/github_com_generate_selfserve_internal_errs.HTTPError'
         "500":
           description: Internal Server Error
           schema:
-            additionalProperties:
-              type: string
-            type: object
+            $ref: '#/definitions/github_com_generate_selfserve_internal_errs.HTTPError'
       security:
       - BearerAuth: []
-      summary: Get requests by cursor
+      summary: Get users by hotel
       tags:
-      - requests
-  /request/generate:
+      - hotels
+  /notifications:
+    get:
+      description: Returns the most recent notifications for the authenticated user
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            items:
+              $ref: '#/definitions/Notification'
+            type: array
+        "500":
+          description: Internal Server Error
+          schema:
+            $ref: '#/definitions/github_com_generate_selfserve_internal_errs.HTTPError'
+      security:
+      - BearerAuth: []
+      summary: List notifications
+      tags:
+      - notifications
+  /notifications/{id}/read:
+    put:
+      description: Marks a single notification as read for the authenticated user
+      parameters:
+      - description: Notification ID
+        in: path
+        name: id
+        required: true
+        type: string
+      responses:
+        "204":
+          description: No Content
+        "404":
+          description: Not Found
+          schema:
+            $ref: '#/definitions/github_com_generate_selfserve_internal_errs.HTTPError'
+        "500":
+          description: Internal Server Error
+          schema:
+            $ref: '#/definitions/github_com_generate_selfserve_internal_errs.HTTPError'
+      security:
+      - BearerAuth: []
+      summary: Mark notification as read
+      tags:
+      - notifications
+  /notifications/read-all:
+    put:
+      description: Marks all unread notifications as read for the authenticated user
+      responses:
+        "204":
+          description: No Content
+        "500":
+          description: Internal Server Error
+          schema:
+            $ref: '#/definitions/github_com_generate_selfserve_internal_errs.HTTPError'
+      security:
+      - BearerAuth: []
+      summary: Mark all notifications as read
+      tags:
+      - notifications
+  /request:
     post:
       consumes:
       - application/json
-      description: Generates a request using AI
+      description: Creates a request with the given data
       parameters:
-      - description: Request data with raw text
+      - description: Request data
         in: body
         name: request
         required: true
         schema:
-          $ref: '#/definitions/GenerateRequestInput'
+          $ref: '#/definitions/MakeRequest'
       produces:
       - application/json
       responses:
@@ -875,104 +1627,123 @@ paths:
             type: object
       security:
       - BearerAuth: []
-      summary: generates a request
+      summary: creates a request
       tags:
       - requests
-  /rooms:
-    get:
-      description: Retrieves rooms optionally filtered by floor, with any active guest
-        bookings
+  /request/{id}:
+    put:
+      consumes:
+      - application/json
+      description: Partially updates a request — only fields present in the body are
+        applied; omitted fields keep their current values
       parameters:
-      - description: Hotel ID (UUID)
-        in: header
-        name: X-Hotel-ID
+      - description: Request ID (UUID)
+        in: path
+        name: id
         required: true
         type: string
-      - collectionFormat: csv
-        description: floors
-        in: query
-        items:
-          type: integer
-        name: floors
-        type: array
-      - description: Opaque cursor for the next page
-        in: query
-        name: cursor
-        type: string
-      - description: Number of items per page (1-100, default 20)
-        in: query
-        name: limit
-        type: integer
+      - description: Fields to update
+        in: body
+        name: request
+        required: true
+        schema:
+          $ref: '#/definitions/RequestUpdateInput'
       produces:
       - application/json
       responses:
         "200":
           description: OK
           schema:
-            $ref: '#/definitions/github_com_generate_selfserve_internal_utils.CursorPage-RoomWithOptionalGuestBooking'
+            $ref: '#/definitions/Request'
         "400":
           description: Bad Request
           schema:
-            additionalProperties:
-              type: string
-            type: object
+            $ref: '#/definitions/github_com_generate_selfserve_internal_errs.HTTPError'
+        "404":
+          description: Not Found
+          schema:
+            $ref: '#/definitions/github_com_generate_selfserve_internal_errs.HTTPError'
         "500":
           description: Internal Server Error
           schema:
-            additionalProperties:
-              type: string
-            type: object
+            $ref: '#/definitions/github_com_generate_selfserve_internal_errs.HTTPError'
       security:
       - BearerAuth: []
-      summary: Get Rooms By Floor
+      summary: Update a request
       tags:
-      - rooms
-  /rooms/floors:
-    get:
-      description: Retrieves all distinct floor numbers
+      - requests
+  /request/{id}/assign:
+    post:
+      consumes:
+      - application/json
+      description: Sets user_id on the latest request version. Set assign_to_self
+        to true to assign to the caller. Omit assign_to_self (or set to false) and
+        provide user_id to assign to another user. Requires X-Hotel-ID to match the
+        request's hotel.
       parameters:
+      - description: Request ID (UUID)
+        in: path
+        name: id
+        required: true
+        type: string
       - description: Hotel ID (UUID)
         in: header
         name: X-Hotel-ID
         required: true
         type: string
+      - description: Self-assign flag and optional assignee
+        in: body
+        name: body
+        required: true
+        schema:
+          $ref: '#/definitions/AssignRequestInput'
       produces:
       - application/json
       responses:
         "200":
           description: OK
           schema:
-            items:
-              type: integer
-            type: array
+            $ref: '#/definitions/Request'
+        "400":
+          description: Bad Request
+          schema:
+            $ref: '#/definitions/github_com_generate_selfserve_internal_errs.HTTPError'
+        "401":
+          description: Unauthorized
+          schema:
+            $ref: '#/definitions/github_com_generate_selfserve_internal_errs.HTTPError'
+        "404":
+          description: Not Found
+          schema:
+            $ref: '#/definitions/github_com_generate_selfserve_internal_errs.HTTPError'
         "500":
           description: Internal Server Error
           schema:
-            additionalProperties:
-              type: string
-            type: object
-      summary: Get Floors
+            $ref: '#/definitions/github_com_generate_selfserve_internal_errs.HTTPError'
+      security:
+      - BearerAuth: []
+      summary: Assign a request to a user
       tags:
-      - rooms
-  /users:
+      - requests
+  /request/generate:
     post:
       consumes:
       - application/json
-      description: Creates a user with the given data
+      description: Generates a request using AI
       parameters:
-      - description: User data
+      - description: Request data with raw text
         in: body
         name: request
         required: true
         schema:
-          $ref: '#/definitions/CreateUser'
+          $ref: '#/definitions/GenerateRequestInput'
       produces:
       - application/json
       responses:
         "200":
           description: OK
           schema:
-            $ref: '#/definitions/User'
+            $ref: '#/definitions/GenerateRequestResponse'
         "400":
           description: Bad Request
           schema:
@@ -987,44 +1758,874 @@ paths:
             type: object
       security:
       - BearerAuth: []
-      summary: Creates a user
+      summary: generates a request
       tags:
-      - users
-  /users/{id}:
-    get:
+      - requests
+  /request/generate/async:
+    post:
       consumes:
       - application/json
-      description: Retrieves a user by their unique app ID
+      description: Starts async request generation via Temporal workflow
       parameters:
-      - description: User ID
-        in: path
-        name: id
+      - description: Request data with raw text
+        in: body
+        name: request
         required: true
-        type: string
+        schema:
+          $ref: '#/definitions/GenerateRequestInput'
       produces:
       - application/json
       responses:
-        "200":
-          description: OK
+        "202":
+          description: Accepted
           schema:
-            $ref: '#/definitions/User'
+            additionalProperties:
+              type: string
+            type: object
         "400":
           description: Bad Request
           schema:
             additionalProperties:
               type: string
             type: object
-        "500":
-          description: Internal Server Error
+        "503":
+          description: Service Unavailable
           schema:
             additionalProperties:
               type: string
             type: object
       security:
       - BearerAuth: []
-      summary: Get user by ID
+      summary: starts request generation workflow
       tags:
-      - users
+      - requests
+  /request/generate/async/{workflowId}:
+    get:
+      description: Gets async request generation workflow status/result
+      parameters:
+      - description: Workflow ID
+        in: path
+        name: workflowId
+        required: true
+        type: string
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            additionalProperties: true
+            type: object
+        "404":
+          description: Not Found
+          schema:
+            additionalProperties:
+              type: string
+            type: object
+        "503":
+          description: Service Unavailable
+          schema:
+            additionalProperties:
+              type: string
+            type: object
+      security:
+      - BearerAuth: []
+      summary: gets request generation workflow status
+      tags:
+      - requests
+  /request/guest/{id}:
+    get:
+      description: Retrieves all requests for a given guest
+      parameters:
+      - description: Guest ID (UUID)
+        in: path
+        name: id
+        required: true
+        type: string
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            $ref: '#/definitions/github_com_generate_selfserve_internal_utils.CursorPage-GuestRequest'
+        "400":
+          description: Bad Request
+          schema:
+            additionalProperties:
+              type: string
+            type: object
+        "500":
+          description: Internal Server Error
+          schema:
+            additionalProperties:
+              type: string
+            type: object
+      security:
+      - BearerAuth: []
+      summary: Get requests by guest
+      tags:
+      - requests
+  /request/room/{id}:
+    get:
+      description: 'Returns two lists for the given room and hotel: requests assigned
+        to the caller and unassigned requests'
+      parameters:
+      - description: Room ID (UUID)
+        in: path
+        name: id
+        required: true
+        type: string
+      - description: Hotel ID (UUID)
+        in: header
+        name: X-Hotel-ID
+        required: true
+        type: string
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            $ref: '#/definitions/RoomRequestsResponse'
+        "400":
+          description: Bad Request
+          schema:
+            additionalProperties:
+              type: string
+            type: object
+        "500":
+          description: Internal Server Error
+          schema:
+            additionalProperties:
+              type: string
+            type: object
+      security:
+      - BearerAuth: []
+      summary: Get requests by room
+      tags:
+      - requests
+  /requests/feed:
+    post:
+      consumes:
+      - application/json
+      description: Returns a paginated list of requests for the hotel, optionally
+        filtered and searched
+      parameters:
+      - description: Feed filters
+        in: body
+        name: request
+        required: true
+        schema:
+          $ref: '#/definitions/RequestsFeedInput'
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            $ref: '#/definitions/github_com_generate_selfserve_internal_utils.CursorPage-GuestRequest'
+        "400":
+          description: Bad Request
+          schema:
+            $ref: '#/definitions/github_com_generate_selfserve_internal_errs.HTTPError'
+        "500":
+          description: Internal Server Error
+          schema:
+            $ref: '#/definitions/github_com_generate_selfserve_internal_errs.HTTPError'
+      security:
+      - BearerAuth: []
+      summary: Get requests feed
+      tags:
+      - requests
+  /rooms:
+    post:
+      consumes:
+      - application/json
+      description: Retrieves rooms with optional filters (status, attributes, advanced,
+        sort) and cursor pagination. Occupancy is derived from active guest_bookings;
+        open tasks from the latest request version per room.
+      parameters:
+      - description: Hotel ID
+        in: header
+        name: X-Hotel-ID
+        required: true
+        type: string
+      - description: Filters and pagination
+        in: body
+        name: body
+        schema:
+          $ref: '#/definitions/FilterRoomsRequest'
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            $ref: '#/definitions/github_com_generate_selfserve_internal_utils.CursorPage-RoomWithOptionalGuestBooking'
+        "400":
+          description: Bad Request
+          schema:
+            additionalProperties:
+              type: string
+            type: object
+        "500":
+          description: Internal Server Error
+          schema:
+            additionalProperties:
+              type: string
+            type: object
+      security:
+      - BearerAuth: []
+      summary: List rooms with filters
+      tags:
+      - rooms
+  /rooms/{id}:
+    get:
+      description: Retrieves a single room by its UUID
+      parameters:
+      - description: Hotel ID (UUID)
+        in: header
+        name: X-Hotel-ID
+        required: true
+        type: string
+      - description: Room ID (UUID)
+        in: path
+        name: id
+        required: true
+        type: string
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            $ref: '#/definitions/RoomWithOptionalGuestBooking'
+        "400":
+          description: Bad Request
+          schema:
+            $ref: '#/definitions/github_com_generate_selfserve_internal_errs.HTTPError'
+        "404":
+          description: Not Found
+          schema:
+            $ref: '#/definitions/github_com_generate_selfserve_internal_errs.HTTPError'
+        "500":
+          description: Internal Server Error
+          schema:
+            $ref: '#/definitions/github_com_generate_selfserve_internal_errs.HTTPError'
+      security:
+      - BearerAuth: []
+      summary: Get room by ID
+      tags:
+      - rooms
+  /rooms/floors:
+    get:
+      description: Retrieves all distinct floor numbers
+      parameters:
+      - description: Hotel ID (UUID)
+        in: header
+        name: X-Hotel-ID
+        required: true
+        type: string
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            items:
+              type: integer
+            type: array
+        "500":
+          description: Internal Server Error
+          schema:
+            additionalProperties:
+              type: string
+            type: object
+      summary: Get Floors
+      tags:
+      - rooms
+  /s3/presigned-get-url/{key}:
+    get:
+      consumes:
+      - application/json
+      description: Generates a presigned URL for a file. The key is the full S3 path
+        (e.g., profile-pictures/user123/image.jpg)
+      parameters:
+      - description: File key (full path after /presigned-url/)
+        in: path
+        name: key
+        required: true
+        type: string
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: Presigned URL
+          schema:
+            type: string
+        "400":
+          description: Bad Request
+          schema:
+            additionalProperties:
+              type: string
+            type: object
+        "500":
+          description: Internal Server Error
+          schema:
+            additionalProperties:
+              type: string
+            type: object
+      summary: Generate a presigned URL for a file
+      tags:
+      - s3
+  /s3/presigned-url/{key}:
+    get:
+      consumes:
+      - application/json
+      description: Generates a presigned URL for a file. The key is the full S3 path
+        (e.g., profile-pictures/user123/image.jpg)
+      parameters:
+      - description: File key (full path after /presigned-url/)
+        in: path
+        name: key
+        required: true
+        type: string
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: Presigned URL
+          schema:
+            type: string
+        "400":
+          description: Bad Request
+          schema:
+            additionalProperties:
+              type: string
+            type: object
+        "500":
+          description: Internal Server Error
+          schema:
+            additionalProperties:
+              type: string
+            type: object
+      summary: Generate a presigned URL for a file
+      tags:
+      - s3
+  /s3/upload-url/{userId}:
+    get:
+      description: Generates a presigned S3 URL and unique key for uploading a profile
+        picture. After uploading to S3, use PUT /users/{userId}/profile-picture to
+        save the key.
+      parameters:
+      - description: User ID
+        in: path
+        name: userId
+        required: true
+        type: string
+      - default: jpg
+        description: File extension (jpg, jpeg, png, webp)
+        in: query
+        name: ext
+        type: string
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: Returns presigned_url and key
+          schema:
+            additionalProperties:
+              type: string
+            type: object
+        "400":
+          description: Bad Request
+          schema:
+            additionalProperties:
+              type: string
+            type: object
+        "500":
+          description: Internal Server Error
+          schema:
+            additionalProperties:
+              type: string
+            type: object
+      summary: Get presigned URL for profile picture upload
+      tags:
+      - s3
+  /users:
+    post:
+      consumes:
+      - application/json
+      description: Creates a user with the given data
+      parameters:
+      - description: User data
+        in: body
+        name: request
+        required: true
+        schema:
+          $ref: '#/definitions/CreateUser'
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            $ref: '#/definitions/User'
+        "400":
+          description: Bad Request
+          schema:
+            additionalProperties:
+              type: string
+            type: object
+        "500":
+          description: Internal Server Error
+          schema:
+            additionalProperties:
+              type: string
+            type: object
+      security:
+      - BearerAuth: []
+      summary: Creates a user
+      tags:
+      - users
+  /users/{id}:
+    get:
+      consumes:
+      - application/json
+      description: Retrieves a user by their unique app ID
+      parameters:
+      - description: User ID
+        in: path
+        name: id
+        required: true
+        type: string
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            $ref: '#/definitions/User'
+        "400":
+          description: Bad Request
+          schema:
+            additionalProperties:
+              type: string
+            type: object
+        "500":
+          description: Internal Server Error
+          schema:
+            additionalProperties:
+              type: string
+            type: object
+      security:
+      - BearerAuth: []
+      summary: Get user by ID
+      tags:
+      - users
+    put:
+      consumes:
+      - application/json
+      description: Updates allowed fields on a user
+      parameters:
+      - description: User ID
+        in: path
+        name: id
+        required: true
+        type: string
+      - description: Fields to update
+        in: body
+        name: request
+        required: true
+        schema:
+          $ref: '#/definitions/UpdateUser'
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            $ref: '#/definitions/User'
+        "400":
+          description: Bad Request
+          schema:
+            additionalProperties:
+              type: string
+            type: object
+        "404":
+          description: Not Found
+          schema:
+            additionalProperties:
+              type: string
+            type: object
+        "500":
+          description: Internal Server Error
+          schema:
+            additionalProperties:
+              type: string
+            type: object
+      security:
+      - BearerAuth: []
+      summary: Update user
+      tags:
+      - users
+  /users/{id}/departments:
+    post:
+      consumes:
+      - application/json
+      description: Creates a row in employee_departments linking the user to a department
+      parameters:
+      - description: User ID
+        in: path
+        name: id
+        required: true
+        type: string
+      - description: Department to add
+        in: body
+        name: request
+        required: true
+        schema:
+          $ref: '#/definitions/internal_handler.AddEmployeeDepartmentBody'
+      produces:
+      - application/json
+      responses:
+        "204":
+          description: No Content
+        "400":
+          description: Bad Request
+          schema:
+            $ref: '#/definitions/github_com_generate_selfserve_internal_errs.HTTPError'
+        "500":
+          description: Internal Server Error
+          schema:
+            $ref: '#/definitions/github_com_generate_selfserve_internal_errs.HTTPError'
+      security:
+      - BearerAuth: []
+      summary: Add department to employee
+      tags:
+      - users
+  /users/{id}/departments/{deptId}:
+    delete:
+      consumes:
+      - application/json
+      description: Deletes a row from employee_departments unlinking the user from
+        a department
+      parameters:
+      - description: User ID
+        in: path
+        name: id
+        required: true
+        type: string
+      - description: Department ID
+        in: path
+        name: deptId
+        required: true
+        type: string
+      produces:
+      - application/json
+      responses:
+        "204":
+          description: No Content
+        "400":
+          description: Bad Request
+          schema:
+            $ref: '#/definitions/github_com_generate_selfserve_internal_errs.HTTPError'
+        "500":
+          description: Internal Server Error
+          schema:
+            $ref: '#/definitions/github_com_generate_selfserve_internal_errs.HTTPError'
+      security:
+      - BearerAuth: []
+      summary: Remove department from employee
+      tags:
+      - users
+  /users/{id}/onboard:
+    put:
+      consumes:
+      - application/json
+      description: Saves onboarding data and marks a user as onboarded
+      parameters:
+      - description: User ID
+        in: path
+        name: id
+        required: true
+        type: string
+      - description: Onboarding data
+        in: body
+        name: request
+        required: true
+        schema:
+          $ref: '#/definitions/OnboardUser'
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            $ref: '#/definitions/User'
+        "400":
+          description: Bad Request
+          schema:
+            additionalProperties:
+              type: string
+            type: object
+        "404":
+          description: Not Found
+          schema:
+            additionalProperties:
+              type: string
+            type: object
+        "500":
+          description: Internal Server Error
+          schema:
+            additionalProperties:
+              type: string
+            type: object
+      security:
+      - BearerAuth: []
+      summary: Complete user onboarding
+      tags:
+      - users
+  /users/{userId}/profile-picture:
+    delete:
+      consumes:
+      - application/json
+      description: Deletes the user's profile picture from the database
+      parameters:
+      - description: User ID
+        in: path
+        name: userId
+        required: true
+        type: string
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            additionalProperties:
+              type: string
+            type: object
+        "400":
+          description: Bad Request
+          schema:
+            additionalProperties:
+              type: string
+            type: object
+        "500":
+          description: Internal Server Error
+          schema:
+            additionalProperties:
+              type: string
+            type: object
+      summary: Delete user's profile picture
+      tags:
+      - users
+    get:
+      consumes:
+      - application/json
+      description: Retrieves the user's profile picture key and returns a presigned
+        URL for display
+      parameters:
+      - description: User ID
+        in: path
+        name: userId
+        required: true
+        type: string
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: Returns key and presigned_url if profile picture exists
+          schema:
+            additionalProperties:
+              type: string
+            type: object
+        "400":
+          description: Bad Request
+          schema:
+            additionalProperties:
+              type: string
+            type: object
+        "404":
+          description: No profile picture found
+          schema:
+            additionalProperties:
+              type: string
+            type: object
+        "500":
+          description: Internal Server Error
+          schema:
+            additionalProperties:
+              type: string
+            type: object
+      summary: Get user's profile picture
+      tags:
+      - users
+    put:
+      consumes:
+      - application/json
+      description: Saves the S3 key to the user's profile after the image has been
+        uploaded to S3
+      parameters:
+      - description: User ID
+        in: path
+        name: userId
+        required: true
+        type: string
+      - description: S3 key from upload
+        in: body
+        name: request
+        required: true
+        schema:
+          $ref: '#/definitions/internal_handler.UpdateProfilePictureRequest'
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            additionalProperties:
+              type: string
+            type: object
+        "400":
+          description: Bad Request
+          schema:
+            additionalProperties:
+              type: string
+            type: object
+        "500":
+          description: Internal Server Error
+          schema:
+            additionalProperties:
+              type: string
+            type: object
+      summary: Update user's profile picture
+      tags:
+      - users
+  /users/search:
+    post:
+      consumes:
+      - application/json
+      description: Returns a paginated list of users for a hotel, optionally filtered
+        by name. Cursor is the last seen user ID.
+      parameters:
+      - description: Search params
+        in: body
+        name: request
+        required: true
+        schema:
+          $ref: '#/definitions/internal_handler.SearchUsersBody'
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            $ref: '#/definitions/UserPage'
+        "400":
+          description: Bad Request
+          schema:
+            $ref: '#/definitions/github_com_generate_selfserve_internal_errs.HTTPError'
+        "500":
+          description: Internal Server Error
+          schema:
+            $ref: '#/definitions/github_com_generate_selfserve_internal_errs.HTTPError'
+      security:
+      - BearerAuth: []
+      summary: Search users by hotel
+      tags:
+      - users
+  /views:
+    get:
+      description: Returns all saved filter views for the authenticated user scoped
+        to a page slug
+      parameters:
+      - description: Page slug (e.g. requests_web)
+        in: query
+        name: slug
+        required: true
+        type: string
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            items:
+              $ref: '#/definitions/View'
+            type: array
+        "400":
+          description: Bad Request
+          schema:
+            $ref: '#/definitions/github_com_generate_selfserve_internal_errs.HTTPError'
+        "500":
+          description: Internal Server Error
+          schema:
+            $ref: '#/definitions/github_com_generate_selfserve_internal_errs.HTTPError'
+      security:
+      - BearerAuth: []
+      summary: List views
+      tags:
+      - views
+    post:
+      consumes:
+      - application/json
+      description: Saves the current filter state as a named view for the authenticated
+        user
+      parameters:
+      - description: View payload
+        in: body
+        name: request
+        required: true
+        schema:
+          $ref: '#/definitions/CreateViewInput'
+      produces:
+      - application/json
+      responses:
+        "201":
+          description: Created
+          schema:
+            $ref: '#/definitions/View'
+        "400":
+          description: Bad Request
+          schema:
+            $ref: '#/definitions/github_com_generate_selfserve_internal_errs.HTTPError'
+        "500":
+          description: Internal Server Error
+          schema:
+            $ref: '#/definitions/github_com_generate_selfserve_internal_errs.HTTPError'
+      security:
+      - BearerAuth: []
+      summary: Create view
+      tags:
+      - views
+  /views/{id}:
+    delete:
+      description: Deletes a saved filter view owned by the authenticated user
+      parameters:
+      - description: View ID
+        in: path
+        name: id
+        required: true
+        type: string
+      responses:
+        "204":
+          description: No Content
+        "404":
+          description: Not Found
+          schema:
+            $ref: '#/definitions/github_com_generate_selfserve_internal_errs.HTTPError'
+        "500":
+          description: Internal Server Error
+          schema:
+            $ref: '#/definitions/github_com_generate_selfserve_internal_errs.HTTPError'
+      security:
+      - BearerAuth: []
+      summary: Delete view
+      tags:
+      - views
 schemes:
 - http
 - https
diff --git a/backend/doppler.yaml b/backend/doppler.yaml
new file mode 100644
index 000000000..89254250f
--- /dev/null
+++ b/backend/doppler.yaml
@@ -0,0 +1,3 @@
+setup:
+  project: selfserve-backend
+  config: dev
diff --git a/backend/go.mod b/backend/go.mod
index 35c0687f4..51605b2ba 100644
--- a/backend/go.mod
+++ b/backend/go.mod
@@ -11,13 +11,21 @@ require (
 	github.com/firebase/genkit/go v1.4.0
 	github.com/go-playground/validator/v10 v10.30.1
 	github.com/gofiber/adaptor/v2 v2.2.1
+	github.com/opensearch-project/opensearch-go/v2 v2.3.0
+	github.com/redis/go-redis/v9 v9.17.3
 	github.com/sethvargo/go-envconfig v1.3.0
 	github.com/stretchr/testify v1.11.1
 	github.com/swaggo/http-swagger v1.3.4
 	github.com/swaggo/swag v1.16.6
+	go.temporal.io/api v1.62.7
+	go.temporal.io/sdk v1.42.0
+	google.golang.org/genai v1.54.0
 )
 
 require (
+	cloud.google.com/go v0.120.0 // indirect
+	cloud.google.com/go/auth v0.16.2 // indirect
+	cloud.google.com/go/compute/metadata v0.9.0 // indirect
 	github.com/KyleBanks/depth v1.2.1 // indirect
 	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.4 // indirect
 	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.17 // indirect
@@ -36,9 +44,13 @@ require (
 	github.com/aws/smithy-go v1.24.0 // indirect
 	github.com/bahlo/generic-list-go v0.2.0 // indirect
 	github.com/buger/jsonparser v1.1.1 // indirect
+	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/clipperhouse/stringish v0.1.1 // indirect
 	github.com/clipperhouse/uax29/v2 v2.3.0 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
+	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
+	github.com/facebookgo/clock v0.0.0-20150410010913-600d898af40a // indirect
+	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/gabriel-vasile/mimetype v1.4.12 // indirect
 	github.com/go-jose/go-jose/v3 v3.0.4 // indirect
 	github.com/go-logr/logr v1.4.3 // indirect
@@ -56,7 +68,16 @@ require (
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
 	github.com/goccy/go-yaml v1.17.1 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/golang/mock v1.6.0 // indirect
 	github.com/google/dotprompt/go v0.0.0-20251014011017-8d056e027254 // indirect
+	github.com/google/go-cmp v0.7.0 // indirect
+	github.com/google/s2a-go v0.1.9 // indirect
+	github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
+	github.com/googleapis/gax-go/v2 v2.14.2 // indirect
+	github.com/gorilla/websocket v1.5.3 // indirect
+	github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.2 // indirect
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0 // indirect
 	github.com/invopop/jsonschema v0.13.0 // indirect
 	github.com/jackc/pgpassfile v1.0.0 // indirect
 	github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
@@ -64,26 +85,34 @@ require (
 	github.com/leodido/go-urn v1.4.0 // indirect
 	github.com/mailru/easyjson v0.9.0 // indirect
 	github.com/mbleigh/raymond v0.0.0-20250414171441-6b3a58ab9e0a // indirect
+	github.com/nexus-rpc/sdk-go v0.6.0 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
-	github.com/rogpeppe/go-internal v1.14.1 // indirect
+	github.com/robfig/cron v1.2.0 // indirect
+	github.com/stretchr/objx v0.5.2 // indirect
 	github.com/swaggo/files v1.0.1 // indirect
 	github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect
 	github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
 	github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
 	github.com/xeipuuv/gojsonschema v1.2.0 // indirect
 	github.com/yosida95/uritemplate/v3 v3.0.2 // indirect
-	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
-	go.opentelemetry.io/otel v1.36.0 // indirect
-	go.opentelemetry.io/otel/metric v1.36.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.36.0 // indirect
-	go.opentelemetry.io/otel/trace v1.36.0 // indirect
+	go.opentelemetry.io/auto/sdk v1.2.1 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
+	go.opentelemetry.io/otel v1.39.0 // indirect
+	go.opentelemetry.io/otel/metric v1.39.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.39.0 // indirect
+	go.opentelemetry.io/otel/trace v1.39.0 // indirect
 	go.yaml.in/yaml/v3 v3.0.4 // indirect
-	golang.org/x/crypto v0.46.0 // indirect
+	golang.org/x/crypto v0.47.0 // indirect
 	golang.org/x/mod v0.32.0 // indirect
-	golang.org/x/net v0.48.0 // indirect
+	golang.org/x/net v0.49.0 // indirect
 	golang.org/x/sync v0.19.0 // indirect
-	golang.org/x/text v0.32.0 // indirect
+	golang.org/x/text v0.33.0 // indirect
+	golang.org/x/time v0.12.0 // indirect
 	golang.org/x/tools v0.40.0 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20260120221211-b8f7ae30c516 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20260120221211-b8f7ae30c516 // indirect
+	google.golang.org/grpc v1.79.3 // indirect
+	google.golang.org/protobuf v1.36.11 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
 
diff --git a/backend/go.sum b/backend/go.sum
index e5bb36759..818368d1b 100644
--- a/backend/go.sum
+++ b/backend/go.sum
@@ -1,21 +1,35 @@
+cloud.google.com/go v0.120.0 h1:wc6bgG9DHyKqF5/vQvX1CiZrtHnxJjBlKUyF9nP6meA=
+cloud.google.com/go v0.120.0/go.mod h1:/beW32s8/pGRuj4IILWQNd4uuebeT4dkOhKmkfit64Q=
+cloud.google.com/go/auth v0.16.2 h1:QvBAGFPLrDeoiNjyfVunhQ10HKNYuOwZ5noee0M5df4=
+cloud.google.com/go/auth v0.16.2/go.mod h1:sRBas2Y1fB1vZTdurouM0AzuYQBMZinrUYL8EufhtEA=
+cloud.google.com/go/compute/metadata v0.9.0 h1:pDUj4QMoPejqq20dK0Pg2N4yG9zIkYGdBtwLoEkH9Zs=
+cloud.google.com/go/compute/metadata v0.9.0/go.mod h1:E0bWwX5wTnLPedCKqk3pJmVgCBSM6qQI1yTBdEb3C10=
 github.com/KyleBanks/depth v1.2.1 h1:5h8fQADFrWtarTdtDudMmGsC7GPbOAu6RVB3ffsVFHc=
 github.com/KyleBanks/depth v1.2.1/go.mod h1:jzSb9d0L43HxTQfT+oSA1EEp2q+ne2uh6XgeJcm8brE=
 github.com/andybalholm/brotli v1.2.0 h1:ukwgCxwYrmACq68yiUqwIWnGY0cTPox/M94sVwToPjQ=
 github.com/andybalholm/brotli v1.2.0/go.mod h1:rzTDkvFWvIrjDXZHkuS16NPggd91W3kUSvPlQ1pLaKY=
+github.com/aws/aws-sdk-go v1.44.263/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
+github.com/aws/aws-sdk-go-v2 v1.18.0/go.mod h1:uzbQtefpm44goOPmdKyAlXSNcwlRgF3ePWVW6EtJvvw=
 github.com/aws/aws-sdk-go-v2 v1.41.1 h1:ABlyEARCDLN034NhxlRUSZr4l71mh+T5KAeGh6cerhU=
 github.com/aws/aws-sdk-go-v2 v1.41.1/go.mod h1:MayyLB8y+buD9hZqkCW3kX1AKq07Y5pXxtgB+rRFhz0=
 github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.4 h1:489krEF9xIGkOaaX3CE/Be2uWjiXrkCH6gUX+bZA/BU=
 github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.4/go.mod h1:IOAPF6oT9KCsceNTvvYMNHy0+kMF8akOjeDvPENWxp4=
+github.com/aws/aws-sdk-go-v2/config v1.18.25/go.mod h1:dZnYpD5wTW/dQF0rRNLVypB396zWCcPiBIvdvSWHEg4=
 github.com/aws/aws-sdk-go-v2/config v1.32.7 h1:vxUyWGUwmkQ2g19n7JY/9YL8MfAIl7bTesIUykECXmY=
 github.com/aws/aws-sdk-go-v2/config v1.32.7/go.mod h1:2/Qm5vKUU/r7Y+zUk/Ptt2MDAEKAfUtKc1+3U1Mo3oY=
+github.com/aws/aws-sdk-go-v2/credentials v1.13.24/go.mod h1:jYPYi99wUOPIFi0rhiOvXeSEReVOzBqFNOX5bXYoG2o=
 github.com/aws/aws-sdk-go-v2/credentials v1.19.7 h1:tHK47VqqtJxOymRrNtUXN5SP/zUTvZKeLx4tH6PGQc8=
 github.com/aws/aws-sdk-go-v2/credentials v1.19.7/go.mod h1:qOZk8sPDrxhf+4Wf4oT2urYJrYt3RejHSzgAquYeppw=
+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.3/go.mod h1:4Q0UFP0YJf0NrsEuEYHpM9fTSEVnD16Z3uyEF7J9JGM=
 github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.17 h1:I0GyV8wiYrP8XpA70g1HBcQO1JlQxCMTW9npl5UbDHY=
 github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.17/go.mod h1:tyw7BOl5bBe/oqvoIeECFJjMdzXoa/dfVz3QQ5lgHGA=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.33/go.mod h1:7i0PF1ME/2eUPFcjkVIwq+DOygHEoK92t5cDqNgYbIw=
 github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.17 h1:xOLELNKGp2vsiteLsvLPwxC+mYmO6OZ8PYgiuPJzF8U=
 github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.17/go.mod h1:5M5CI3D12dNOtH3/mk6minaRwI2/37ifCURZISxA/IQ=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.27/go.mod h1:UrHnn3QV/d0pBZ6QBAEQcqFLf8FAzLmoUfPVIueOvoM=
 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.17 h1:WWLqlh79iO48yLkj1v3ISRNiv+3KdQoZ6JWyfcsyQik=
 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.17/go.mod h1:EhG22vHRrvF8oXSTYStZhJc1aUgKtnJe+aOiFEV90cM=
+github.com/aws/aws-sdk-go-v2/internal/ini v1.3.34/go.mod h1:Etz2dj6UHYuw+Xw830KfzCfWGMzqvUTCjUj5b76GVDc=
 github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4 h1:WKuaxf++XKWlHWu9ECbMlha8WOEGm0OUEZqm4K/Gcfk=
 github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4/go.mod h1:ZWy7j6v1vWGmPReu0iSGvRiise4YI5SkR3OHKTZ6Wuc=
 github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.17 h1:JqcdRG//czea7Ppjb+g/n4o8i/R50aTBHkA7vu0lK+k=
@@ -24,6 +38,7 @@ github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.4 h1:0ryTNEd
 github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.4/go.mod h1:HQ4qwNZh32C3CBeO6iJLQlgtMzqeG17ziAA/3KDJFow=
 github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.8 h1:Z5EiPIzXKewUQK0QTMkutjiaPVeVYXX7KIqhXu/0fXs=
 github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.8/go.mod h1:FsTpJtvC4U1fyDXk7c71XoDv3HlRm8V3NiYLeYLh5YE=
+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.27/go.mod h1:EOwBD4J4S5qYszS5/3DpkejfuK+Z5/1uzICfPaZLtqw=
 github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.17 h1:RuNSMoozM8oXlgLG/n6WLaFGoea7/CddrCfIiSA+xdY=
 github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.17/go.mod h1:F2xxQ9TZz5gDWsclCtPQscGpP0VUOc8RqgFM3vDENmU=
 github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.17 h1:bGeHBsGZx0Dvu/eJC0Lh9adJa3M1xREcndxLNZlve2U=
@@ -32,18 +47,28 @@ github.com/aws/aws-sdk-go-v2/service/s3 v1.95.1 h1:C2dUPSnEpy4voWFIq3JNd8gN0Y5vY
 github.com/aws/aws-sdk-go-v2/service/s3 v1.95.1/go.mod h1:5jggDlZ2CLQhwJBiZJb4vfk4f0GxWdEDruWKEJ1xOdo=
 github.com/aws/aws-sdk-go-v2/service/signin v1.0.5 h1:VrhDvQib/i0lxvr3zqlUwLwJP4fpmpyD9wYG1vfSu+Y=
 github.com/aws/aws-sdk-go-v2/service/signin v1.0.5/go.mod h1:k029+U8SY30/3/ras4G/Fnv/b88N4mAfliNn08Dem4M=
+github.com/aws/aws-sdk-go-v2/service/sso v1.12.10/go.mod h1:ouy2P4z6sJN70fR3ka3wD3Ro3KezSxU6eKGQI2+2fjI=
 github.com/aws/aws-sdk-go-v2/service/sso v1.30.9 h1:v6EiMvhEYBoHABfbGB4alOYmCIrcgyPPiBE1wZAEbqk=
 github.com/aws/aws-sdk-go-v2/service/sso v1.30.9/go.mod h1:yifAsgBxgJWn3ggx70A3urX2AN49Y5sJTD1UQFlfqBw=
+github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.10/go.mod h1:AFvkxc8xfBe8XA+5St5XIHHrQQtkxqrRincx4hmMHOk=
 github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.13 h1:gd84Omyu9JLriJVCbGApcLzVR3XtmC4ZDPcAI6Ftvds=
 github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.13/go.mod h1:sTGThjphYE4Ohw8vJiRStAcu3rbjtXRsdNB0TvZ5wwo=
+github.com/aws/aws-sdk-go-v2/service/sts v1.19.0/go.mod h1:BgQOMsg8av8jset59jelyPW7NoZcZXLVpDsXunGDrk8=
 github.com/aws/aws-sdk-go-v2/service/sts v1.41.6 h1:5fFjR/ToSOzB2OQ/XqWpZBmNvmP/pJ1jOWYlFDJTjRQ=
 github.com/aws/aws-sdk-go-v2/service/sts v1.41.6/go.mod h1:qgFDZQSD/Kys7nJnVqYlWKnh0SSdMjAi0uSwON4wgYQ=
+github.com/aws/smithy-go v1.13.5/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA=
 github.com/aws/smithy-go v1.24.0 h1:LpilSUItNPFr1eY85RYgTIg5eIEPtvFbskaFcmmIUnk=
 github.com/aws/smithy-go v1.24.0/go.mod h1:LEj2LM3rBRQJxPZTB4KuzZkaZYnZPnvgIhb4pu07mx0=
 github.com/bahlo/generic-list-go v0.2.0 h1:5sz/EEAK+ls5wF+NeqDpk5+iNdMDXrh3z3nPnH1Wvgk=
 github.com/bahlo/generic-list-go v0.2.0/go.mod h1:2KvAjgMlE5NNynlg/5iLrrCCZ2+5xWbdbCW3pNTGyYg=
+github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs=
+github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c=
+github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA=
+github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0=
 github.com/buger/jsonparser v1.1.1 h1:2PnMjfWD7wBILjqQbt530v576A/cAbQvEW9gGIpYMUs=
 github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0=
+github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
+github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/clerk/clerk-sdk-go/v2 v2.5.1 h1:RsakGNW6ie83b9KIRtKzqDXBJ//cURy9SJUbGhrsIKg=
 github.com/clerk/clerk-sdk-go/v2 v2.5.1/go.mod h1:ncFmsPwmD5WpGCNW5bJve862j/HQfpkzsshXYV/quJ8=
 github.com/clipperhouse/stringish v0.1.1 h1:+NSqMOr3GR6k1FdRhhnXrLfztGzuG+VuFDfatpWHKCs=
@@ -51,8 +76,15 @@ github.com/clipperhouse/stringish v0.1.1/go.mod h1:v/WhFtE1q0ovMta2+m+UbpZ+2/HEX
 github.com/clipperhouse/uax29/v2 v2.3.0 h1:SNdx9DVUqMoBuBoW3iLOj4FQv3dN5mDtuqwuhIGpJy4=
 github.com/clipperhouse/uax29/v2 v2.3.0/go.mod h1:Wn1g7MK6OoeDT0vL+Q0SQLDz/KpfsVRgg6W7ihQeh4g=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
+github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
+github.com/facebookgo/clock v0.0.0-20150410010913-600d898af40a h1:yDWHCSQ40h88yih2JAcL6Ls/kVkSE8GFACTGVnMPruw=
+github.com/facebookgo/clock v0.0.0-20150410010913-600d898af40a/go.mod h1:7Ga40egUymuWXxAe151lTNnCv97MddSOVsjpPPkityA=
+github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
+github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
 github.com/firebase/genkit/go v1.4.0 h1:CP1hNWk7z0hosyY53zMH6MFKFO1fMLtj58jGPllQo6I=
 github.com/firebase/genkit/go v1.4.0/go.mod h1:HX6m7QOaGc3MDNr/DrpQZrzPLzxeuLxrkTvfFtCYlGw=
 github.com/gabriel-vasile/mimetype v1.4.12 h1:e9hWvmLYvtp846tLHam2o++qitpguFiYCKbn0w9jyqw=
@@ -107,13 +139,32 @@ github.com/gofiber/adaptor/v2 v2.2.1 h1:givE7iViQWlsTR4Jh7tB4iXzrlKBgiraB/yTdHs9
 github.com/gofiber/adaptor/v2 v2.2.1/go.mod h1:AhR16dEqs25W2FY/l8gSj1b51Azg5dtPDmm+pruNOrc=
 github.com/gofiber/fiber/v2 v2.52.10 h1:jRHROi2BuNti6NYXmZ6gbNSfT3zj/8c0xy94GOU5elY=
 github.com/gofiber/fiber/v2 v2.52.10/go.mod h1:YEcBbO/FB+5M1IZNBP9FO3J9281zgPAreiI1oqg8nDw=
+github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
+github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
+github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=
+github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
+github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
+github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
 github.com/google/dotprompt/go v0.0.0-20251014011017-8d056e027254 h1:okN800+zMJOGHLJCgry+OGzhhtH6YrjQh1rluHmOacE=
 github.com/google/dotprompt/go v0.0.0-20251014011017-8d056e027254/go.mod h1:k8cjJAQWc//ac/bMnzItyOFbfT01tgRTZGgxELCuxEQ=
+github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
 github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
+github.com/google/s2a-go v0.1.9 h1:LGD7gtMgezd8a/Xak7mEWL0PjoTQFvpRudN895yqKW0=
+github.com/google/s2a-go v0.1.9/go.mod h1:YA0Ei2ZQL3acow2O62kdp9UlnvMmU7kA6Eutn0dXayM=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/googleapis/enterprise-certificate-proxy v0.3.6 h1:GW/XbdyBFQ8Qe+YAmFU9uHLo7OnF5tL52HFAgMmyrf4=
+github.com/googleapis/enterprise-certificate-proxy v0.3.6/go.mod h1:MkHOF77EYAE7qfSuSS9PU6g4Nt4e11cnsDUowfwewLA=
+github.com/googleapis/gax-go/v2 v2.14.2 h1:eBLnkZ9635krYIPD+ag1USrOAI0Nr0QYF3+/3GqO0k0=
+github.com/googleapis/gax-go/v2 v2.14.2/go.mod h1:ON64QhlJkhVtSqp4v1uaK92VyZ2gmvDQsweuyLV+8+w=
+github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
+github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.2 h1:sGm2vDRFUrQJO/Veii4h4zG2vvqG6uWNkBHSTqXOZk0=
+github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.2/go.mod h1:wd1YpapPLivG6nQgbf7ZkG1hhSOXDhhn4MLTknx2aAc=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0 h1:asbCHRVmodnJTuQ3qamDwqVOIjwqUPTYmYuemVOx+Ys=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0/go.mod h1:ggCgvZ2r7uOoQjOyu2Y1NhHmEPPzzuhWgcza5M1Ji1I=
 github.com/invopop/jsonschema v0.13.0 h1:KvpoAJWEjR3uD9Kbm2HWJmqsEaHt8lBUpd0qHcIi21E=
 github.com/invopop/jsonschema v0.13.0/go.mod h1:ffZ5Km5SWWRAIN6wbDXItl95euhFz2uON45H2qjYt+0=
 github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
@@ -126,6 +177,10 @@ github.com/jackc/puddle/v2 v2.2.2 h1:PR8nw+E/1w0GLuRFSmiioY6UooMp6KJv0/61nB7icHo
 github.com/jackc/puddle/v2 v2.2.2/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
 github.com/jarcoal/httpmock v1.3.1 h1:iUx3whfZWVf3jT01hQTO/Eo5sAYtB2/rqaUuOtpInww=
 github.com/jarcoal/httpmock v1.3.1/go.mod h1:3yb8rc4BI7TCBhFY8ng0gjuLKJNquuDNiPaZjnENuYg=
+github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
+github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
+github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
+github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/klauspost/compress v1.18.2 h1:iiPHWW0YrcFgpBYhsA6D1+fqHssJscY/Tm/y2Uqnapk=
 github.com/klauspost/compress v1.18.2/go.mod h1:R0h/fSBs8DE4ENlcrlib3PsXS61voFxhIs2DeRhCvJ4=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
@@ -144,16 +199,32 @@ github.com/mattn/go-runewidth v0.0.19 h1:v++JhqYnZuu5jSKrk9RbgF5v4CGUjqRfBm05byF
 github.com/mattn/go-runewidth v0.0.19/go.mod h1:XBkDxAl56ILZc9knddidhrOlY5R/pDhgLpndooCuJAs=
 github.com/mbleigh/raymond v0.0.0-20250414171441-6b3a58ab9e0a h1:v2cBA3xWKv2cIOVhnzX/gNgkNXqiHfUgJtA3r61Hf7A=
 github.com/mbleigh/raymond v0.0.0-20250414171441-6b3a58ab9e0a/go.mod h1:Y6ghKH+ZijXn5d9E7qGGZBmjitx7iitZdQiIW97EpTU=
+github.com/nexus-rpc/sdk-go v0.6.0 h1:QRgnP2zTbxEbiyWG/aXH8uSC5LV/Mg1fqb19jb4DBlo=
+github.com/nexus-rpc/sdk-go v0.6.0/go.mod h1:FHdPfVQwRuJFZFTF0Y2GOAxCrbIBNrcPna9slkGKPYk=
+github.com/opensearch-project/opensearch-go/v2 v2.3.0 h1:nQIEMr+A92CkhHrZgUhcfsrZjibvB3APXf2a1VwCmMQ=
+github.com/opensearch-project/opensearch-go/v2 v2.3.0/go.mod h1:8LDr9FCgUTVoT+5ESjc2+iaZuldqE+23Iq0r1XeNue8=
+github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/redis/go-redis/v9 v9.17.3 h1:fN29NdNrE17KttK5Ndf20buqfDZwGNgoUr9qjl1DQx4=
+github.com/redis/go-redis/v9 v9.17.3/go.mod h1:u410H11HMLoB+TP67dz8rL9s6QW2j76l0//kSOd3370=
+github.com/robfig/cron v1.2.0 h1:ZjScXvvxeQ63Dbyxy76Fj3AT3Ut0aKsyd2/tl3DTMuQ=
+github.com/robfig/cron v1.2.0/go.mod h1:JGuDeoQd7Z6yL4zQhZ3OPEVHB7fL6Ka6skscFHfmt2k=
 github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
 github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
 github.com/sethvargo/go-envconfig v1.3.0 h1:gJs+Fuv8+f05omTpwWIu6KmuseFAXKrIaOZSh8RMt0U=
 github.com/sethvargo/go-envconfig v1.3.0/go.mod h1:JLd0KFWQYzyENqnEPWWZ49i4vzZo/6nRidxI8YvGiHw=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
+github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
+github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
 github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
 github.com/svix/svix-webhooks v1.84.1 h1:N8L4TZAxpFLi+dT4T7Zweorwzqx1lYgGUhedbF3Nb6M=
@@ -181,48 +252,77 @@ github.com/xyproto/randomstring v1.0.5 h1:YtlWPoRdgMu3NZtP45drfy1GKoojuR7hmRcnhZ
 github.com/xyproto/randomstring v1.0.5/go.mod h1:rgmS5DeNXLivK7YprL0pY+lTuhNQW3iGxZ18UQApw/E=
 github.com/yosida95/uritemplate/v3 v3.0.2 h1:Ed3Oyj9yrmi9087+NczuL5BwkIc4wvTb5zIM+UJPGz4=
 github.com/yosida95/uritemplate/v3 v3.0.2/go.mod h1:ILOh0sOhIJR3+L/8afwt/kE++YT040gmv5BQTMR2HP4=
+github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
-go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
-go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
-go.opentelemetry.io/otel v1.36.0 h1:UumtzIklRBY6cI/lllNZlALOF5nNIzJVb16APdvgTXg=
-go.opentelemetry.io/otel v1.36.0/go.mod h1:/TcFMXYjyRNh8khOAO9ybYkqaDBb/70aVwkNML4pP8E=
-go.opentelemetry.io/otel/metric v1.36.0 h1:MoWPKVhQvJ+eeXWHFBOPoBOi20jh6Iq2CcCREuTYufE=
-go.opentelemetry.io/otel/metric v1.36.0/go.mod h1:zC7Ks+yeyJt4xig9DEw9kuUFe5C3zLbVjV2PzT6qzbs=
-go.opentelemetry.io/otel/sdk v1.36.0 h1:b6SYIuLRs88ztox4EyrvRti80uXIFy+Sqzoh9kFULbs=
-go.opentelemetry.io/otel/sdk v1.36.0/go.mod h1:+lC+mTgD+MUWfjJubi2vvXWcVxyr9rmlshZni72pXeY=
-go.opentelemetry.io/otel/trace v1.36.0 h1:ahxWNuqZjpdiFAyrIoQ4GIiAIhxAunQR6MUoKrsNd4w=
-go.opentelemetry.io/otel/trace v1.36.0/go.mod h1:gQ+OnDZzrybY4k4seLzPAWNwVBBVlF2szhehOBB/tGA=
+go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64=
+go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 h1:F7Jx+6hwnZ41NSFTO5q4LYDtJRXBf2PD0rNBkeB/lus=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0/go.mod h1:UHB22Z8QsdRDrnAtX4PntOl36ajSxcdUMt1sF7Y6E7Q=
+go.opentelemetry.io/otel v1.39.0 h1:8yPrr/S0ND9QEfTfdP9V+SiwT4E0G7Y5MO7p85nis48=
+go.opentelemetry.io/otel v1.39.0/go.mod h1:kLlFTywNWrFyEdH0oj2xK0bFYZtHRYUdv1NklR/tgc8=
+go.opentelemetry.io/otel/metric v1.39.0 h1:d1UzonvEZriVfpNKEVmHXbdf909uGTOQjA0HF0Ls5Q0=
+go.opentelemetry.io/otel/metric v1.39.0/go.mod h1:jrZSWL33sD7bBxg1xjrqyDjnuzTUB0x1nBERXd7Ftcs=
+go.opentelemetry.io/otel/sdk v1.39.0 h1:nMLYcjVsvdui1B/4FRkwjzoRVsMK8uL/cj0OyhKzt18=
+go.opentelemetry.io/otel/sdk v1.39.0/go.mod h1:vDojkC4/jsTJsE+kh+LXYQlbL8CgrEcwmt1ENZszdJE=
+go.opentelemetry.io/otel/sdk/metric v1.39.0 h1:cXMVVFVgsIf2YL6QkRF4Urbr/aMInf+2WKg+sEJTtB8=
+go.opentelemetry.io/otel/sdk/metric v1.39.0/go.mod h1:xq9HEVH7qeX69/JnwEfp6fVq5wosJsY1mt4lLfYdVew=
+go.opentelemetry.io/otel/trace v1.39.0 h1:2d2vfpEDmCJ5zVYz7ijaJdOF59xLomrvj7bjt6/qCJI=
+go.opentelemetry.io/otel/trace v1.39.0/go.mod h1:88w4/PnZSazkGzz/w84VHpQafiU4EtqqlVdxWy+rNOA=
+go.temporal.io/api v1.62.7 h1:joCtF30Dr+ynzrFJySewZsWbyf4AETZpuizHhFIyj/o=
+go.temporal.io/api v1.62.7/go.mod h1:iaxoP/9OXMJcQkETTECfwYq4cw/bj4nwov8b3ZLVnXM=
+go.temporal.io/sdk v1.42.0 h1:2Zyrj1PZFd1xQVrrXF6RlE1nHZzZRuWfSyC2TqT3ri8=
+go.temporal.io/sdk v1.42.0/go.mod h1:Xp4TMHsie6kdw0lc0Ae4o8vktze5HZXBynF2DkiXcrQ=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
 go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
 go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
 go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
-golang.org/x/crypto v0.46.0 h1:cKRW/pmt1pKAfetfu+RCEvjvZkA9RimPbh7bhFjGVBU=
-golang.org/x/crypto v0.46.0/go.mod h1:Evb/oLKmMraqjZ2iQTwDwvCtJkczlDuTmdJXoZVzqU0=
+golang.org/x/crypto v0.47.0 h1:V6e3FRj+n4dbpw86FJ8Fv7XVOql7TEwpHapKoMJ/GO8=
+golang.org/x/crypto v0.47.0/go.mod h1:ff3Y9VzzKbwSSEzWqJsJVBnWmRwRSHt/6Op5n9bQc4A=
+golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/mod v0.32.0 h1:9F4d3PHLljb6x//jOyokMv3eX+YDeepZSEo3mFJy93c=
 golang.org/x/mod v0.32.0/go.mod h1:SgipZ/3h2Ci89DlEtEXWUk/HteuRin+HHhN+WbNhguU=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
 golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
-golang.org/x/net v0.48.0 h1:zyQRTTrjc33Lhh0fBgT/H3oZq9WuvRR5gPC70xpDiQU=
-golang.org/x/net v0.48.0/go.mod h1:+ndRgGjkh8FGtu1w1FGbEC31if4VrNVMuKTgcAAnQRY=
+golang.org/x/net v0.49.0 h1:eeHFmOGUTtaaPSGNmjBKpbng9MulQsJURQUAfUwY++o=
+golang.org/x/net v0.49.0/go.mod h1:/ysNB2EvaqvesRkuLAyjI1ycPZlQHM3q01F02UY/MV8=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4=
 golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -231,27 +331,50 @@ golang.org/x/sys v0.40.0 h1:DBZZqJ2Rkml6QMQsZywtnjnnGvHza6BTfYFWY9kjEWQ=
 golang.org/x/sys v0.40.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
 golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
-golang.org/x/text v0.32.0 h1:ZD01bjUt1FQ9WJ0ClOL5vxgxOI/sVCNgX1YtKwcY0mU=
-golang.org/x/text v0.32.0/go.mod h1:o/rUWzghvpD5TXrTIBuJU77MTaN0ljMWE47kxGJQ7jY=
+golang.org/x/text v0.33.0 h1:B3njUFyqtHDUI5jMn1YIr5B0IE2U0qck04r6d4KPAxE=
+golang.org/x/text v0.33.0/go.mod h1:LuMebE6+rBincTi9+xWTY8TztLzKHc/9C1uBCG27+q8=
+golang.org/x/time v0.12.0 h1:ScB/8o8olJvc+CQPWrK3fPZNfh7qgwCrY0zJmoEQLSE=
+golang.org/x/time v0.12.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
 golang.org/x/tools v0.40.0 h1:yLkxfA+Qnul4cs9QA3KnlFu0lVmd8JJfoq+E41uSutA=
 golang.org/x/tools v0.40.0/go.mod h1:Ik/tzLRlbscWpqqMRjyWYDisX8bG13FrdXp3o4Sr9lc=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk=
+gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E=
+google.golang.org/genai v1.54.0 h1:ZQCa70WMTJDI11FdqWCzGvZ5PanpcpfoO6jl/lrSnGU=
+google.golang.org/genai v1.54.0/go.mod h1:A3kkl0nyBjyFlNjgxIwKq70julKbIxpSxqKO5gw/gmk=
+google.golang.org/genproto/googleapis/api v0.0.0-20260120221211-b8f7ae30c516 h1:vmC/ws+pLzWjj/gzApyoZuSVrDtF1aod4u/+bbj8hgM=
+google.golang.org/genproto/googleapis/api v0.0.0-20260120221211-b8f7ae30c516/go.mod h1:p3MLuOwURrGBRoEyFHBT3GjUwaCQVKeNqqWxlcISGdw=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20260120221211-b8f7ae30c516 h1:sNrWoksmOyF5bvJUcnmbeAmQi8baNhqg5IWaI3llQqU=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20260120221211-b8f7ae30c516/go.mod h1:j9x/tPzZkyxcgEFkiKEEGxfvyumM01BEtsW8xzOahRQ=
+google.golang.org/grpc v1.79.3 h1:sybAEdRIEtvcD68Gx7dmnwjZKlyfuc61Dyo9pGXXkKE=
+google.golang.org/grpc v1.79.3/go.mod h1:KmT0Kjez+0dde/v2j9vzwoAScgEPx/Bw1CYChhHLrHQ=
+google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=
+google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
+gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/backend/internal/aiflows/department_lookup.go b/backend/internal/aiflows/department_lookup.go
new file mode 100644
index 000000000..e3dfefdc8
--- /dev/null
+++ b/backend/internal/aiflows/department_lookup.go
@@ -0,0 +1,23 @@
+package aiflows
+
+import (
+	"context"
+	"strings"
+
+	"github.com/generate/selfserve/internal/models"
+)
+
+type DepartmentLookupRepository interface {
+	GetDepartmentsByHotelID(ctx context.Context, hotelID string) ([]*models.Department, error)
+}
+
+// LookupDepartmentID finds the department ID whose name matches the given name
+// (case-insensitive). Returns nil if no match is found.
+func LookupDepartmentID(departments []*models.Department, name string) *string {
+	for _, d := range departments {
+		if strings.EqualFold(d.Name, name) {
+			return &d.ID
+		}
+	}
+	return nil
+}
diff --git a/backend/internal/aiflows/flows.go b/backend/internal/aiflows/flows.go
index f3c4add00..ab87ce364 100644
--- a/backend/internal/aiflows/flows.go
+++ b/backend/internal/aiflows/flows.go
@@ -8,20 +8,136 @@ import (
 	"github.com/firebase/genkit/go/core"
 	"github.com/firebase/genkit/go/genkit"
 	"github.com/generate/selfserve/internal/aiflows/prompts"
+	"github.com/generate/selfserve/internal/models"
+	"google.golang.org/genai"
 )
 
-func DefineGenerateRequest(genkitInstance *genkit.Genkit, model ai.Model, generationConfig *ai.GenerationCommonConfig) *core.Flow[GenerateRequestInput, GenerateRequestOutput, struct{}] {
+func DefineGenerateRequest(genkitInstance *genkit.Genkit, model ai.Model, generationConfig *genai.GenerateContentConfig, roomLookupRepo RoomLookupRepository, guestLookupRepo GuestLookupRepository, userLookupRepo UserLookupRepository, deptLookupRepo DepartmentLookupRepository) *core.Flow[GenerateRequestInput, EnrichedGenerateRequestOutput, struct{}] {
 	generateRequestFlow := genkit.DefineFlow(genkitInstance, "generateRequestFlow",
-		func(ctx context.Context, input GenerateRequestInput) (GenerateRequestOutput, error) {
-			prompt := fmt.Sprintf(prompts.GenerateRequestPrompt, input.RawText)
+		func(ctx context.Context, input GenerateRequestInput) (EnrichedGenerateRequestOutput, error) {
+			departments, err := deptLookupRepo.GetDepartmentsByHotelID(ctx, input.HotelID)
+			if err != nil {
+				return EnrichedGenerateRequestOutput{}, fmt.Errorf("fetch departments: %w", err)
+			}
+
+			deptNames := make([]string, len(departments))
+			for i, d := range departments {
+				deptNames[i] = d.Name
+			}
+
+			prompt := prompts.GenerateRequestPrompt(input.RawText, deptNames)
 			resp, _, err := genkit.GenerateData[GenerateRequestOutput](ctx, genkitInstance, ai.WithPrompt(prompt), ai.WithModel(model), ai.WithConfig(generationConfig))
 			if err != nil {
-				return GenerateRequestOutput{}, err
+				return EnrichedGenerateRequestOutput{}, err
 			}
 
-			return *resp, nil
+			enriched := EnrichedGenerateRequestOutput{
+				GenerateRequestOutput: *resp,
+			}
+
+			output, err := enrichWithRoomLookup(ctx, roomLookupRepo, input.HotelID, enriched)
+			if err != nil {
+				return EnrichedGenerateRequestOutput{}, err
+			}
+
+			output, err = enrichWithGuestLookup(ctx, guestLookupRepo, input.HotelID, output)
+			if err != nil {
+				return EnrichedGenerateRequestOutput{}, err
+			}
+
+			output, err = enrichWithUserLookup(ctx, userLookupRepo, input.HotelID, output)
+			if err != nil {
+				return EnrichedGenerateRequestOutput{}, err
+			}
+
+			return enrichWithDepartmentLookup(departments, output), nil
 		},
 	)
 
 	return generateRequestFlow
 }
+
+func enrichWithRoomLookup(ctx context.Context, roomLookupRepo RoomLookupRepository, hotelID string, output EnrichedGenerateRequestOutput) (EnrichedGenerateRequestOutput, error) {
+	if output.RoomMentioned == nil || !*output.RoomMentioned || output.RoomReference == nil {
+		return output, nil
+	}
+
+	roomResult, err := LookupRoom(ctx, roomLookupRepo, RoomLookupInput{
+		HotelID:       hotelID,
+		RoomReference: *output.RoomReference,
+	})
+	if err != nil {
+		return EnrichedGenerateRequestOutput{}, err
+	}
+
+	output.RoomID = roomResult.RoomID
+	if roomResult.Message != nil {
+		code := "room_not_found"
+		if roomResult.Ambiguous {
+			code = "room_ambiguous"
+		}
+		output.Warning = &GenerateRequestWarning{
+			Code:    code,
+			Message: *roomResult.Message,
+		}
+	}
+
+	return output, nil
+}
+
+func enrichWithGuestLookup(ctx context.Context, guestLookupRepo GuestLookupRepository, hotelID string, output EnrichedGenerateRequestOutput) (EnrichedGenerateRequestOutput, error) {
+
+	if output.GuestName == nil {
+		return output, nil
+	}
+
+	guestID, warning, err := LookupGuest(ctx, guestLookupRepo, GuestLookupInput{
+		HotelID:   hotelID,
+		GuestName: *output.GuestName,
+	})
+	if err != nil {
+		return EnrichedGenerateRequestOutput{}, err
+	}
+
+	output.GuestID = guestID
+	if warning != nil {
+		output.Warning = &GenerateRequestWarning{
+			Code:    "guest_not_found",
+			Message: *warning,
+		}
+	}
+
+	return output, nil
+}
+
+func enrichWithUserLookup(ctx context.Context, userLookupRepo UserLookupRepository, hotelID string, output EnrichedGenerateRequestOutput) (EnrichedGenerateRequestOutput, error) {
+	if output.UserName == nil {
+		return output, nil
+	}
+
+	userID, warning, err := LookupUser(ctx, userLookupRepo, UserLookupInput{
+		HotelID:  hotelID,
+		UserName: *output.UserName,
+	})
+	if err != nil {
+		return EnrichedGenerateRequestOutput{}, err
+	}
+
+	output.UserID = userID
+	if warning != nil {
+		output.Warning = &GenerateRequestWarning{
+			Code:    "user_not_found",
+			Message: *warning,
+		}
+	}
+
+	return output, nil
+}
+
+func enrichWithDepartmentLookup(departments []*models.Department, output EnrichedGenerateRequestOutput) EnrichedGenerateRequestOutput {
+	if output.Department == nil {
+		return output
+	}
+	output.DepartmentID = LookupDepartmentID(departments, *output.Department)
+	return output
+}
diff --git a/backend/internal/aiflows/flows_test.go b/backend/internal/aiflows/flows_test.go
new file mode 100644
index 000000000..6b2aa3073
--- /dev/null
+++ b/backend/internal/aiflows/flows_test.go
@@ -0,0 +1,159 @@
+package aiflows
+
+import (
+	"context"
+	"errors"
+	"testing"
+
+	"github.com/generate/selfserve/internal/errs"
+	"github.com/generate/selfserve/internal/models"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+type mockRoomLookupRepository struct {
+	findRoomByNumberFunc func(ctx context.Context, hotelID string, roomReference string) (*models.Room, error)
+}
+
+func (m *mockRoomLookupRepository) FindRoomByNumber(ctx context.Context, hotelID string, roomReference string) (*models.Room, error) {
+	return m.findRoomByNumberFunc(ctx, hotelID, roomReference)
+}
+
+func TestEnrichWithRoomLookup(t *testing.T) {
+	t.Parallel()
+
+	t.Run("sets room_id when room lookup succeeds", func(t *testing.T) {
+		t.Parallel()
+
+		roomMentioned := true
+		roomReference := "301"
+		repo := &mockRoomLookupRepository{
+			findRoomByNumberFunc: func(ctx context.Context, hotelID string, roomReference string) (*models.Room, error) {
+				require.Equal(t, "550e8400-e29b-41d4-a716-446655440000", hotelID)
+				require.Equal(t, "301", roomReference)
+				return &models.Room{ID: "room-uuid-301"}, nil
+			},
+		}
+
+		output, err := enrichWithRoomLookup(context.Background(), repo, "550e8400-e29b-41d4-a716-446655440000", EnrichedGenerateRequestOutput{
+			GenerateRequestOutput: GenerateRequestOutput{
+				Name:          "Soda Delivery",
+				RequestType:   "one-time",
+				Status:        "pending",
+				Priority:      "medium",
+				RoomMentioned: &roomMentioned,
+				RoomReference: &roomReference,
+			}})
+
+		require.NoError(t, err)
+		require.NotNil(t, output.RoomID)
+		assert.Equal(t, "room-uuid-301", *output.RoomID)
+		assert.Nil(t, output.Warning)
+	})
+
+	t.Run("returns room_not_found warning when lookup misses", func(t *testing.T) {
+		t.Parallel()
+
+		roomMentioned := true
+		roomReference := "999"
+		repo := &mockRoomLookupRepository{
+			findRoomByNumberFunc: func(ctx context.Context, hotelID string, roomReference string) (*models.Room, error) {
+				return nil, errs.ErrNotFoundInDB
+			},
+		}
+
+		output, err := enrichWithRoomLookup(context.Background(), repo, "550e8400-e29b-41d4-a716-446655440000", EnrichedGenerateRequestOutput{
+			GenerateRequestOutput: GenerateRequestOutput{
+				Name:          "Soda Delivery",
+				RequestType:   "one-time",
+				Status:        "pending",
+				Priority:      "medium",
+				RoomMentioned: &roomMentioned,
+				RoomReference: &roomReference,
+			}})
+
+		require.NoError(t, err)
+		assert.Nil(t, output.RoomID)
+		require.NotNil(t, output.Warning)
+		assert.Equal(t, "room_not_found", output.Warning.Code)
+		assert.Equal(t, "Room 999 could not be resolved for this hotel.", output.Warning.Message)
+	})
+
+	t.Run("returns room_ambiguous warning when lookup is ambiguous", func(t *testing.T) {
+		t.Parallel()
+
+		roomMentioned := true
+		roomReference := "301"
+		repo := &mockRoomLookupRepository{
+			findRoomByNumberFunc: func(ctx context.Context, hotelID string, roomReference string) (*models.Room, error) {
+				return nil, errs.ErrAlreadyExistsInDB
+			},
+		}
+
+		output, err := enrichWithRoomLookup(context.Background(), repo, "550e8400-e29b-41d4-a716-446655440000", EnrichedGenerateRequestOutput{
+			GenerateRequestOutput: GenerateRequestOutput{
+				Name:          "Soda Delivery",
+				RequestType:   "one-time",
+				Status:        "pending",
+				Priority:      "medium",
+				RoomMentioned: &roomMentioned,
+				RoomReference: &roomReference,
+			}})
+
+		require.NoError(t, err)
+		assert.Nil(t, output.RoomID)
+		require.NotNil(t, output.Warning)
+		assert.Equal(t, "room_ambiguous", output.Warning.Code)
+		assert.Equal(t, "Room reference was ambiguous. Be more specific.", output.Warning.Message)
+	})
+
+	t.Run("skips lookup when no room was mentioned", func(t *testing.T) {
+		t.Parallel()
+
+		called := false
+		repo := &mockRoomLookupRepository{
+			findRoomByNumberFunc: func(ctx context.Context, hotelID string, roomReference string) (*models.Room, error) {
+				called = true
+				return nil, nil
+			},
+		}
+
+		output, err := enrichWithRoomLookup(context.Background(), repo, "550e8400-e29b-41d4-a716-446655440000", EnrichedGenerateRequestOutput{
+			GenerateRequestOutput: GenerateRequestOutput{
+				Name:        "Lobby Cleanup",
+				RequestType: "one-time",
+				Status:      "pending",
+				Priority:    "low",
+			}})
+
+		require.NoError(t, err)
+		assert.False(t, called)
+		assert.Nil(t, output.RoomID)
+		assert.Nil(t, output.Warning)
+	})
+
+	t.Run("returns hard errors from lookup", func(t *testing.T) {
+		t.Parallel()
+
+		roomMentioned := true
+		roomReference := "301"
+		repo := &mockRoomLookupRepository{
+			findRoomByNumberFunc: func(ctx context.Context, hotelID string, roomReference string) (*models.Room, error) {
+				return nil, errors.New("db offline")
+			},
+		}
+
+		_, err := enrichWithRoomLookup(context.Background(), repo, "550e8400-e29b-41d4-a716-446655440000", EnrichedGenerateRequestOutput{
+			GenerateRequestOutput: GenerateRequestOutput{
+				Name:          "Soda Delivery",
+				RequestType:   "one-time",
+				Status:        "pending",
+				Priority:      "medium",
+				RoomMentioned: &roomMentioned,
+				RoomReference: &roomReference,
+			}})
+
+		require.Error(t, err)
+		assert.EqualError(t, err, "db offline")
+	})
+}
diff --git a/backend/internal/aiflows/genkit.go b/backend/internal/aiflows/genkit.go
index cf312ff18..08e7ec485 100644
--- a/backend/internal/aiflows/genkit.go
+++ b/backend/internal/aiflows/genkit.go
@@ -2,44 +2,51 @@ package aiflows
 
 import (
 	"context"
+	"fmt"
 
 	"github.com/firebase/genkit/go/ai"
 	"github.com/firebase/genkit/go/genkit"
-	"github.com/firebase/genkit/go/plugins/ollama"
+	"github.com/firebase/genkit/go/plugins/googlegenai"
 	"github.com/generate/selfserve/config"
+	"google.golang.org/genai"
 )
 
-const defaultOllamaServer = "http://127.0.0.1:11434"
+const defaultGeminiModel = "gemini-3-flash-preview"
 
-func InitGenkit(ctx context.Context, llmConfig *config.LLM) *GenkitService {
-	serverAddr := llmConfig.ServerAddress
-	if serverAddr == "" {
-		serverAddr = defaultOllamaServer
+func InitGenkit(ctx context.Context, llmConfig *config.LLM, roomLookupRepo RoomLookupRepository, guestLookupRepo GuestLookupRepository, userLookupRepo UserLookupRepository, deptLookupRepo DepartmentLookupRepository) *GenkitService {
+
+	modelName := llmConfig.Model
+	if modelName == "" {
+		modelName = defaultGeminiModel
 	}
-	llmProvider := &ollama.Ollama{
-		ServerAddress: serverAddr,
-		Timeout:       llmConfig.Timeout,
+
+	llmProvider := &googlegenai.GoogleAI{
+		APIKey: llmConfig.APIKey,
 	}
 
 	genkitInstance := genkit.Init(ctx, genkit.WithPlugins(llmProvider))
 
-	model := llmProvider.DefineModel(genkitInstance, ollama.ModelDefinition{
-		Name: llmConfig.Model,
-		Type: "generate",
-	}, &ai.ModelOptions{
+	// gemini-3-flash-preview is not yet in the plugin's known-models list,
+	// so pass explicit capabilities to avoid "unknown model" error.
+	model, err := llmProvider.DefineModel(genkitInstance, modelName, &ai.ModelOptions{
 		Supports: &ai.ModelSupports{
-			Multiturn:  false,
-			SystemRole: false,
-			Tools:      false,
-			Media:      false,
+			Multiturn:   true,
+			Tools:       true,
+			ToolChoice:  true,
+			SystemRole:  true,
+			Media:       true,
+			Constrained: ai.ConstrainedSupportNoTools,
 		},
 	})
+	if err != nil {
+		panic(fmt.Errorf("InitGenkit: define model %q: %w", modelName, err))
+	}
 
-	generationConfig := &ai.GenerationCommonConfig{
-		MaxOutputTokens: llmConfig.MaxOutputTokens,
-		Temperature:     llmConfig.Temperature,
+	generationConfig := &genai.GenerateContentConfig{
+		MaxOutputTokens: int32(llmConfig.MaxOutputTokens),
 	}
-	generateRequestFlow := DefineGenerateRequest(genkitInstance, model, generationConfig)
+
+	generateRequestFlow := DefineGenerateRequest(genkitInstance, model, generationConfig, roomLookupRepo, guestLookupRepo, userLookupRepo, deptLookupRepo)
 
 	return &GenkitService{
 		genkit:              genkitInstance,
diff --git a/backend/internal/aiflows/guest_lookup.go b/backend/internal/aiflows/guest_lookup.go
new file mode 100644
index 000000000..018edf76e
--- /dev/null
+++ b/backend/internal/aiflows/guest_lookup.go
@@ -0,0 +1,30 @@
+package aiflows
+
+import (
+	"context"
+	"fmt"
+)
+
+type GuestLookupRepository interface {
+	FindGuestByName(ctx context.Context, hotelID, name string) ([]string, error)
+}
+
+// LookupGuest returns (guestID, warningMessage, error).
+// warningMessage is non-nil when the name matched 0 or >1 guests.
+func LookupGuest(ctx context.Context, repo GuestLookupRepository, input GuestLookupInput) (guestID *string, warning *string, err error) {
+	ids, err := repo.FindGuestByName(ctx, input.HotelID, input.GuestName)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	switch len(ids) {
+	case 1:
+		return &ids[0], nil, nil
+	case 0:
+		msg := fmt.Sprintf("Guest %q could not be found for this hotel.", input.GuestName)
+		return nil, &msg, nil
+	default:
+		msg := fmt.Sprintf("Guest name %q matched multiple guests. Be more specific.", input.GuestName)
+		return nil, &msg, nil
+	}
+}
diff --git a/backend/internal/aiflows/prompts/generate_request.go b/backend/internal/aiflows/prompts/generate_request.go
index 7683aea27..fb6b5f8b9 100644
--- a/backend/internal/aiflows/prompts/generate_request.go
+++ b/backend/internal/aiflows/prompts/generate_request.go
@@ -1,8 +1,66 @@
 package prompts
 
-const GenerateRequestPrompt = `
-	Generate a request for a hotel guest based on the following description: %s
-	Important:
-	- Only include the defined schema fields
-	- Only include fields where you have actual information
-`
+import "fmt"
+
+// GenerateRequestPrompt builds the LLM prompt for request generation.
+// departments is the list of valid department names for the hotel; pass nil or
+// empty to omit the department constraint.
+func GenerateRequestPrompt(rawText string, departments []string) string {
+	departmentRule := "- If a department is clearly relevant, include it as the department field."
+	if len(departments) > 0 {
+		list := ""
+		for i, d := range departments {
+			if i > 0 {
+				list += ", "
+			}
+			list += fmt.Sprintf("%q", d)
+		}
+		departmentRule = fmt.Sprintf(
+			"- If a department is clearly relevant, set department to one of the following exact names: %s. If none fit, omit the field.",
+			list,
+		)
+	}
+
+	return fmt.Sprintf(`
+	Generate a hotel service request from this description:
+
+	%s
+
+	Return a concrete JSON object instance only.
+	Do not return a JSON schema.
+	Do not return markdown.
+	Do not return code fences.
+	Do not return keys such as "properties" or "additionalProperties".
+
+	Allowed fields (use no others):
+	name, description, request_type, request_category, department, status, priority,
+	estimated_completion_time, notes, room_mentioned, room_reference, guest_name, user_name.
+
+	Rules:
+	- Include only concrete request data, not schema metadata.
+	- Required fields: name, request_type, status, priority.
+	- status must be exactly one of: "pending", "assigned", "in progress", "completed".
+	- priority must be exactly one of: "low", "medium", "high".
+	- If a room is clearly mentioned, include room_mentioned=true and room_reference as the literal room identifier text.
+	- If no room is mentioned, either omit room_mentioned and room_reference, or set room_mentioned=false.
+	- If a guest name is clearly mentioned, include guest_name as the literal name text.
+	- If no guest is mentioned, omit guest_name.
+	- If a staff member or employee name is clearly mentioned as the person to assign the task to, include user_name as the literal name text.
+	- If no staff member is mentioned, omit user_name.
+	- %s
+	- Only include fields when you have real information from the description.
+	- Never set a field to null. If you have no value for a field, omit it entirely.
+
+	Valid example with room mention:
+	{"name":"Soda Delivery","request_type":"one-time","status":"pending","priority":"medium","room_mentioned":true,"room_reference":"301"}
+
+	Valid example with room and guest mention:
+	{"name":"Extra Towels Request","request_type":"one-time","status":"pending","priority":"medium","room_mentioned":true,"room_reference":"204","guest_name":"Maria Lopez"}
+
+	Valid example with staff member mention:
+	{"name":"AC Repair","request_type":"one-time","status":"pending","priority":"high","room_mentioned":true,"room_reference":"512","user_name":"John Smith"}
+
+	Valid example without room mention:
+	{"name":"Extra Towels Request","request_type":"one-time","status":"pending","priority":"medium"}
+`, rawText, departmentRule)
+}
diff --git a/backend/internal/aiflows/room_lookup.go b/backend/internal/aiflows/room_lookup.go
new file mode 100644
index 000000000..07375495b
--- /dev/null
+++ b/backend/internal/aiflows/room_lookup.go
@@ -0,0 +1,43 @@
+package aiflows
+
+import (
+	"context"
+	"errors"
+	"fmt"
+
+	"github.com/generate/selfserve/internal/errs"
+	"github.com/generate/selfserve/internal/models"
+)
+
+type RoomLookupRepository interface {
+	FindRoomByNumber(ctx context.Context, hotelID string, roomReference string) (*models.Room, error)
+}
+
+func LookupRoom(ctx context.Context, repo RoomLookupRepository, input RoomLookupInput) (RoomLookupResult, error) {
+	room, err := repo.FindRoomByNumber(ctx, input.HotelID, input.RoomReference)
+	if err != nil {
+		if errors.Is(err, errs.ErrAlreadyExistsInDB) {
+			message := "Room reference was ambiguous. Be more specific."
+			return RoomLookupResult{
+				Matched:   false,
+				Ambiguous: true,
+				Message:   &message,
+			}, nil
+		}
+		if errors.Is(err, errs.ErrNotFoundInDB) {
+			message := fmt.Sprintf("Room %s could not be resolved for this hotel.", input.RoomReference)
+			return RoomLookupResult{
+				Matched:   false,
+				Ambiguous: false,
+				Message:   &message,
+			}, nil
+		}
+		return RoomLookupResult{}, err
+	}
+
+	return RoomLookupResult{
+		Matched:   true,
+		Ambiguous: false,
+		RoomID:    &room.ID,
+	}, nil
+}
diff --git a/backend/internal/aiflows/service.go b/backend/internal/aiflows/service.go
index 5db226201..20d01ef70 100644
--- a/backend/internal/aiflows/service.go
+++ b/backend/internal/aiflows/service.go
@@ -10,14 +10,14 @@ import (
 // GenerateRequestService defines the interface for generating requests via GenKit.
 // Handlers should depend on this interface to allow for mocking in tests.
 type GenerateRequestService interface {
-	RunGenerateRequest(ctx context.Context, input GenerateRequestInput) (GenerateRequestOutput, error)
+	RunGenerateRequest(ctx context.Context, input GenerateRequestInput) (EnrichedGenerateRequestOutput, error)
 }
 
 type GenkitService struct {
 	genkit              *genkit.Genkit
-	generateRequestFlow *core.Flow[GenerateRequestInput, GenerateRequestOutput, struct{}]
+	generateRequestFlow *core.Flow[GenerateRequestInput, EnrichedGenerateRequestOutput, struct{}]
 }
 
-func (s *GenkitService) RunGenerateRequest(ctx context.Context, input GenerateRequestInput) (GenerateRequestOutput, error) {
+func (s *GenkitService) RunGenerateRequest(ctx context.Context, input GenerateRequestInput) (EnrichedGenerateRequestOutput, error) {
 	return s.generateRequestFlow.Run(ctx, input)
 }
diff --git a/backend/internal/aiflows/types.go b/backend/internal/aiflows/types.go
index cc7bd6be7..a13b931f5 100644
--- a/backend/internal/aiflows/types.go
+++ b/backend/internal/aiflows/types.go
@@ -2,20 +2,58 @@ package aiflows
 
 type GenerateRequestInput struct {
 	RawText string `json:"raw_text"`
+	HotelID string `json:"hotel_id"`
+}
+
+type GenerateRequestWarning struct {
+	Code    string `json:"code"`
+	Message string `json:"message"`
+}
+
+type RoomLookupInput struct {
+	HotelID       string `json:"hotel_id"`
+	RoomReference string `json:"room_reference"`
+}
+
+type RoomLookupResult struct {
+	Matched   bool    `json:"matched"`
+	Ambiguous bool    `json:"ambiguous"`
+	Message   *string `json:"message,omitempty"`
+	RoomID    *string `json:"room_id,omitempty"`
+}
+
+type GuestLookupInput struct {
+	HotelID   string `json:"hotel_id"`
+	GuestName string `json:"guest_name"`
+}
+
+type UserLookupInput struct {
+	HotelID  string `json:"hotel_id"`
+	UserName string `json:"user_name"`
+}
+
+type EnrichedGenerateRequestOutput struct {
+	GuestID       *string `json:"guest_id,omitempty" validate:"omitempty,uuid"`
+	UserID        *string `json:"user_id,omitempty" validate:"omitempty,notblank"`
+	ReservationID *string `json:"reservation_id,omitempty" validate:"omitempty,uuid"`
+	RoomID        *string `json:"room_id,omitempty" validate:"omitempty,uuid"`
+	DepartmentID  *string `json:"department_id,omitempty" validate:"omitempty,uuid"`
+	GenerateRequestOutput
 }
 
 type GenerateRequestOutput struct {
-	GuestID                 *string `json:"guest_id,omitempty"`
-	UserID                  *string `json:"user_id,omitempty"`
-	ReservationID           *string `json:"reservation_id,omitempty"`
-	Name                    string  `json:"name"`
-	Description             *string `json:"description,omitempty"`
-	RoomID                  *string `json:"room_id,omitempty"`
-	RequestCategory         *string `json:"request_category,omitempty"`
-	RequestType             string  `json:"request_type"`
-	Department              *string `json:"department,omitempty"`
-	Status                  string  `json:"status"`
-	Priority                string  `json:"priority"`
-	EstimatedCompletionTime *int    `json:"estimated_completion_time,omitempty"`
-	Notes                   *string `json:"notes,omitempty"`
+	Name                    string                  `json:"name" validate:"notblank"`
+	Description             *string                 `json:"description,omitempty"`
+	RequestCategory         *string                 `json:"request_category,omitempty"`
+	RequestType             string                  `json:"request_type" validate:"notblank"`
+	Department              *string                 `json:"department,omitempty"`
+	Status                  string                  `json:"status" validate:"oneof='pending' 'assigned' 'in progress' 'completed'"`
+	Priority                string                  `json:"priority" validate:"oneof=low medium high"`
+	EstimatedCompletionTime *int                    `json:"estimated_completion_time,omitempty"`
+	Notes                   *string                 `json:"notes,omitempty"`
+	RoomMentioned           *bool                   `json:"room_mentioned,omitempty"`
+	RoomReference           *string                 `json:"room_reference,omitempty"`
+	GuestName               *string                 `json:"guest_name,omitempty"`
+	UserName                *string                 `json:"user_name,omitempty"`
+	Warning                 *GenerateRequestWarning `json:"warning,omitempty"`
 }
diff --git a/backend/internal/aiflows/user_lookup.go b/backend/internal/aiflows/user_lookup.go
new file mode 100644
index 000000000..bcaa406e5
--- /dev/null
+++ b/backend/internal/aiflows/user_lookup.go
@@ -0,0 +1,30 @@
+package aiflows
+
+import (
+	"context"
+	"fmt"
+)
+
+type UserLookupRepository interface {
+	FindUserByName(ctx context.Context, hotelID, name string) ([]string, error)
+}
+
+// LookupUser returns (userID, warningMessage, error).
+// warningMessage is non-nil when the name matched 0 or >1 users.
+func LookupUser(ctx context.Context, repo UserLookupRepository, input UserLookupInput) (userID *string, warning *string, err error) {
+	ids, err := repo.FindUserByName(ctx, input.HotelID, input.UserName)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	switch len(ids) {
+	case 1:
+		return &ids[0], nil, nil
+	case 0:
+		msg := fmt.Sprintf("Staff member %q could not be found for this hotel.", input.UserName)
+		return nil, &msg, nil
+	default:
+		msg := fmt.Sprintf("Staff member name %q matched multiple users. Be more specific.", input.UserName)
+		return nil, &msg, nil
+	}
+}
diff --git a/backend/internal/errs/http.go b/backend/internal/errs/http.go
index 5467d31e2..90604fb29 100644
--- a/backend/internal/errs/http.go
+++ b/backend/internal/errs/http.go
@@ -35,6 +35,10 @@ func Unauthorized() HTTPError {
 	return NewHTTPError(http.StatusUnauthorized, errors.New("unauthorized"))
 }
 
+func Forbidden() HTTPError {
+	return NewHTTPError(http.StatusForbidden, errors.New("forbidden"))
+}
+
 func NotFound(title string, withKey string, withValue any) HTTPError {
 	return NewHTTPError(http.StatusNotFound, fmt.Errorf("%s with %s='%v' not found", title, withKey, withValue))
 }
diff --git a/backend/internal/errs/repository.go b/backend/internal/errs/repository.go
index a929d602a..b9f5d1990 100644
--- a/backend/internal/errs/repository.go
+++ b/backend/internal/errs/repository.go
@@ -4,6 +4,7 @@ import "errors"
 
 // Repository layer errors (errors thrown at the DB level)
 var (
-	ErrNotFoundInDB      = errors.New("not found in DB")
-	ErrAlreadyExistsInDB = errors.New("already exists in DB")
+	ErrNotFoundInDB              = errors.New("not found in DB")
+	ErrAlreadyExistsInDB         = errors.New("already exists in DB")
+	ErrDefaultDepartmentInsertDB = errors.New("failed to insert default departments")
 )
diff --git a/backend/internal/handler/bookings.go b/backend/internal/handler/bookings.go
new file mode 100644
index 000000000..c4fe1cc5b
--- /dev/null
+++ b/backend/internal/handler/bookings.go
@@ -0,0 +1,42 @@
+package handler
+
+import (
+	"context"
+
+	"github.com/generate/selfserve/internal/errs"
+	"github.com/gofiber/fiber/v2"
+)
+
+type GuestBookingsRepository interface {
+	FindGroupSizeOptions(ctx context.Context, hotelID string) ([]int, error)
+}
+
+type GuestBookingHandler struct {
+	repo GuestBookingsRepository
+}
+
+func NewGuestBookingsHandler(repo GuestBookingsRepository) *GuestBookingHandler {
+	return &GuestBookingHandler{repo: repo}
+}
+
+// GetGroupSizeOptions godoc
+// @Summary      Get available group size options
+// @Description  Retrieves all distinct group sizes across guest bookings
+// @Tags         guest-bookings
+// @Produce      json
+// @Success      200  {object}  []int
+// @Failure      500  {object}  map[string]string
+// @Router       /guest_bookings/group_sizes [get]
+func (h *GuestBookingHandler) GetGroupSizeOptions(c *fiber.Ctx) error {
+	hotelID := c.Get("X-Hotel-ID")
+	if hotelID == "" {
+		return errs.BadRequest("X-Hotel-ID header is required")
+	}
+
+	sizes, err := h.repo.FindGroupSizeOptions(c.Context(), hotelID)
+	if err != nil {
+		return errs.InternalServerError()
+	}
+
+	return c.JSON(sizes)
+}
diff --git a/backend/internal/handler/clerk.go b/backend/internal/handler/clerk.go
index 55991ae8f..cdedd9ddb 100644
--- a/backend/internal/handler/clerk.go
+++ b/backend/internal/handler/clerk.go
@@ -1,6 +1,7 @@
 package handler
 
 import (
+	"errors"
 	"net/http"
 
 	"github.com/generate/selfserve/config"
@@ -12,8 +13,9 @@ import (
 )
 
 type ClerkWebHookHandler struct {
-	UsersRepository storage.UsersRepository
-	WebhookVerifier WebhookVerifier
+	UsersRepository  storage.UsersRepository
+	HotelsRepository storage.HotelsRepository
+	WebhookVerifier  WebhookVerifier
 }
 
 type WebhookVerifier interface {
@@ -24,34 +26,73 @@ func NewWebhookVerifier(cfg *config.Config) (WebhookVerifier, error) {
 	return svix.NewWebhook(cfg.Clerk.WebhookSignature)
 }
 
-func NewClerkWebHookHandler(userRepo storage.UsersRepository, WebhookVerifier WebhookVerifier) *ClerkWebHookHandler {
-	return &ClerkWebHookHandler{UsersRepository: userRepo, WebhookVerifier: WebhookVerifier}
+func NewClerkWebHookHandler(userRepo storage.UsersRepository, hotelsRepo storage.HotelsRepository, webhookVerifier WebhookVerifier) *ClerkWebHookHandler {
+	return &ClerkWebHookHandler{
+		UsersRepository:  userRepo,
+		HotelsRepository: hotelsRepo,
+		WebhookVerifier:  webhookVerifier,
+	}
 }
 
-func (h *ClerkWebHookHandler) CreateUser(c *fiber.Ctx) error {
+func (h *ClerkWebHookHandler) verifySvix(c *fiber.Ctx) error {
 	headers := http.Header{}
 	headers.Set("svix-id", c.Get("svix-id"))
 	headers.Set("svix-timestamp", c.Get("svix-timestamp"))
 	headers.Set("svix-signature", c.Get("svix-signature"))
-
-	err := h.WebhookVerifier.Verify(c.Body(), headers)
-	if err != nil {
+	if err := h.WebhookVerifier.Verify(c.Body(), headers); err != nil {
 		return errs.Unauthorized()
 	}
+	return nil
+}
 
-	var CreateUserRequest models.CreateUserWebhook
-	if err := c.BodyParser(&CreateUserRequest); err != nil {
+func (h *ClerkWebHookHandler) CreateOrgMembership(c *fiber.Ctx) error {
+	if err := h.verifySvix(c); err != nil {
+		return err
+	}
+
+	var payload models.CreateUserOrgMembershipWebhook
+	if err := c.BodyParser(&payload); err != nil {
 		return errs.InvalidJSON()
 	}
-	clerkUser := &CreateUserRequest.ClerkUser
-	if err := ValidateCreateUserClerk(clerkUser); err != nil {
+
+	hotel, err := h.HotelsRepository.FindByID(c.Context(), payload.Data.Organization.ID)
+	if err != nil {
+		if errors.Is(err, errs.ErrNotFoundInDB) {
+			return errs.NotFound("hotel", "id", payload.Data.Organization.ID)
+		}
+		return errs.InternalServerError()
+	}
+
+	userData := &payload.Data.PublicUserData
+	_, err = h.UsersRepository.InsertUser(c.Context(), ReformatOrgMembershipUserData(userData, hotel.ID))
+	if err != nil {
+		return errs.InternalServerError()
+	}
+
+	return c.SendStatus(fiber.StatusOK)
+}
+
+// When a new org is created in Clerk, we create a corresponding hotel in our DB
+func (h *ClerkWebHookHandler) OrgCreated(c *fiber.Ctx) error {
+	if err := h.verifySvix(c); err != nil {
 		return err
 	}
 
-	res, err := h.UsersRepository.InsertUser(c.Context(), ReformatUserData(clerkUser))
+	var payload models.CreateOrgWebhook
+	if err := c.BodyParser(&payload); err != nil {
+		return errs.InvalidJSON()
+	}
+
+	_, err := h.HotelsRepository.InsertHotel(c.Context(), &models.CreateHotelRequest{
+		ID:   payload.Data.ID,
+		Name: payload.Data.Name,
+	})
 	if err != nil {
+		if errors.Is(err, errs.ErrAlreadyExistsInDB) {
+			return c.SendStatus(fiber.StatusOK)
+		}
 		return errs.InternalServerError()
 	}
 
-	return c.JSON(res)
+	return c.SendStatus(fiber.StatusOK)
 }
diff --git a/backend/internal/handler/guests.go b/backend/internal/handler/guests.go
index b59690627..17fdcfae1 100644
--- a/backend/internal/handler/guests.go
+++ b/backend/internal/handler/guests.go
@@ -1,8 +1,10 @@
 package handler
 
 import (
+	"context"
 	"errors"
 	"log/slog"
+	"strings"
 
 	"github.com/generate/selfserve/internal/errs"
 	"github.com/generate/selfserve/internal/httpx"
@@ -14,10 +16,19 @@ import (
 
 type GuestsHandler struct {
 	GuestsRepository storage.GuestsRepository
+	UsersRepository  storage.UsersRepository
+	searchGuests     func(ctx context.Context, filters *models.GuestFilters) (*models.GuestPage, error)
 }
 
-func NewGuestsHandler(repo storage.GuestsRepository) *GuestsHandler {
-	return &GuestsHandler{GuestsRepository: repo}
+func NewGuestsHandler(repo storage.GuestsRepository, usersRepo storage.UsersRepository, searchRepo storage.GuestsSearchRepository) *GuestsHandler {
+	// TODO: once OpenSearch setup is complete —
+	// 1. enforce searchRepo as required (fail startup if nil)
+	// 2. remove the Postgres fallback below
+	search := repo.FindGuestsWithActiveBooking
+	if searchRepo != nil {
+		search = searchRepo.SearchGuests
+	}
+	return &GuestsHandler{GuestsRepository: repo, UsersRepository: usersRepo, searchGuests: search}
 }
 
 // CreateGuest godoc
@@ -31,7 +42,7 @@ func NewGuestsHandler(repo storage.GuestsRepository) *GuestsHandler {
 // @Failure      400   {object}  map[string]string "Invalid guest body format"
 // @Failure      500   {object}  map[string]string  "Internal server error"
 // @Security     BearerAuth
-// @Router       /api/v1/guests [post]
+// @Router       /guests [post]
 func (h *GuestsHandler) CreateGuest(c *fiber.Ctx) error {
 	var CreateGuestRequest models.CreateGuest
 	if err := httpx.BindAndValidate(c, &CreateGuestRequest); err != nil {
@@ -61,7 +72,7 @@ func (h *GuestsHandler) CreateGuest(c *fiber.Ctx) error {
 // @Failure      404  {object}  errs.HTTPError  "Guest not found"
 // @Failure      500   {object}  map[string]string "Internal server error"
 // @Security     BearerAuth
-// @Router       /api/v1/guests/{id} [get]
+// @Router       /guests/{id} [get]
 func (h *GuestsHandler) GetGuest(c *fiber.Ctx) error {
 	id := c.Params("id")
 	_, err := uuid.Parse(id)
@@ -92,12 +103,12 @@ func (h *GuestsHandler) GetGuest(c *fiber.Ctx) error {
 // @Failure      400   {object}  map[string]string "Invalid guest ID format"
 // @Failure      404  {object}  errs.HTTPError  "Guest not found"
 // @Failure      500   {object}  map[string]string "Internal server error"
+// @ID           getGuestsStaysId
 // @Security     BearerAuth
-// @Router       /api/v1/guests/stays/{id} [get]
+// @Router       /guests/stays/{id} [get]
 func (h *GuestsHandler) GetGuestWithStays(c *fiber.Ctx) error {
 	id := c.Params("id")
-	_, err := uuid.Parse(id)
-	if err != nil {
+	if !validUUID(id) {
 		return errs.BadRequest("guest id is not a valid UUID")
 	}
 
@@ -105,11 +116,11 @@ func (h *GuestsHandler) GetGuestWithStays(c *fiber.Ctx) error {
 	if err != nil {
 		if errors.Is(err, errs.ErrNotFoundInDB) {
 			return errs.NotFound("guest", "id", id)
+
 		}
-		slog.Error("failed to get guest", "id", id, "error", err)
+		slog.Error("failed to get guest with stays", "id", id, "error", err)
 		return errs.InternalServerError()
 	}
-
 	return c.JSON(guest)
 }
 
@@ -126,7 +137,7 @@ func (h *GuestsHandler) GetGuestWithStays(c *fiber.Ctx) error {
 // @Failure      404   {object}  map[string]string
 // @Failure      500   {object}  map[string]string
 // @Security     BearerAuth
-// @Router       /api/v1/guests/{id} [put]
+// @Router       /guests/{id} [put]
 func (h *GuestsHandler) UpdateGuest(c *fiber.Ctx) error {
 	id := c.Params("id")
 
@@ -159,30 +170,53 @@ func (h *GuestsHandler) UpdateGuest(c *fiber.Ctx) error {
 
 // GetGuests godoc
 // @Summary      Get Guests
-// @Description  Retrieves guests optionally filtered by floor in which they are staying
+// @Description  Retrieves guests optionally filtered by floor
 // @Tags         guests
+// @Accept       json
 // @Produce      json
-// @Param        X-Hotel-ID  header    string  true   "Hotel ID (UUID)"
-// @Param        number      query     string  false  "Floor"
-// @Success      200         {object}  []models.GuestWithBooking
+// @Param        X-Hotel-ID  header    string             true   "Hotel ID (UUID)"
+// @Param        body        body      models.GuestFilters true   "Guest filters"
+// @Success      200         {object}  models.GuestPage
 // @Failure      400         {object}  map[string]string
 // @Failure      500         {object}  map[string]string
 // @Security     BearerAuth
-// @Router       /api/v1/guests [get]
+// @Router       /guests/search [post]
 func (h *GuestsHandler) GetGuests(c *fiber.Ctx) error {
 	hotelID := c.Get("X-Hotel-ID")
-	if !validUUID(hotelID) {
-		return errs.BadRequest("invalid hotel id")
+	var filters models.GuestFilters
+	filters.HotelID = hotelID
+	if err := httpx.BindAndValidate(c, &filters); err != nil {
+		return err
 	}
 
-	filter := new(models.GuestFilters)
-	filter.HotelID = hotelID
-	if err := c.QueryParser(filter); err != nil {
-		return errs.BadRequest("invalid filters")
+	if len(filters.Floors) == 0 {
+		filters.Floors = nil
+	}
+	if len(filters.GroupSize) == 0 {
+		filters.GroupSize = nil
+	}
+	if len(filters.Status) == 0 {
+		filters.Status = nil
+	}
+	if len(filters.Assistance) == 0 {
+		filters.Assistance = nil
+	}
+
+	if filters.Cursor != "" {
+		parts := strings.SplitN(filters.Cursor, "|", 2)
+		if len(parts) != 2 {
+			return errs.BadRequest("invalid cursor")
+		}
+		if _, err := uuid.Parse(parts[1]); err != nil {
+			return errs.BadRequest("invalid cursor")
+		}
+		filters.CursorName = parts[0]
+		filters.CursorID = parts[1]
 	}
 
-	guests, err := h.GuestsRepository.FindGuestsWithActiveBooking(c.Context(), filter)
+	guests, err := h.searchGuests(c.Context(), &filters)
 	if err != nil {
+		slog.Error("failed to get guests", "error", err)
 		return errs.InternalServerError()
 	}
 
diff --git a/backend/internal/handler/guests_test.go b/backend/internal/handler/guests_test.go
index 1f7ed8960..117d7b0c8 100644
--- a/backend/internal/handler/guests_test.go
+++ b/backend/internal/handler/guests_test.go
@@ -4,8 +4,10 @@ import (
 	"bytes"
 	"context"
 	"errors"
+	"fmt"
 	"io"
 	"net/http/httptest"
+	"strings"
 	"testing"
 	"time"
 
@@ -21,7 +23,7 @@ type mockGuestsRepository struct {
 	insertGuestFunc    func(ctx context.Context, req *models.CreateGuest) (*models.Guest, error)
 	findGuestFunc      func(ctx context.Context, id string) (*models.Guest, error)
 	updateGuestFunc    func(ctx context.Context, id string, update *models.UpdateGuest) (*models.Guest, error)
-	findGuestsFunc     func(ctx context.Context, f *models.GuestFilters) ([]*models.GuestWithBooking, error)
+	findGuestsFunc     func(ctx context.Context, f *models.GuestFilters) (*models.GuestPage, error)
 	findGuestStaysFunc func(ctx context.Context, id string) (*models.GuestWithStays, error)
 }
 
@@ -37,7 +39,7 @@ func (m *mockGuestsRepository) UpdateGuest(ctx context.Context, id string, updat
 	return m.updateGuestFunc(ctx, id, update)
 }
 
-func (m *mockGuestsRepository) FindGuestsWithActiveBooking(ctx context.Context, f *models.GuestFilters) ([]*models.GuestWithBooking, error) {
+func (m *mockGuestsRepository) FindGuestsWithActiveBooking(ctx context.Context, f *models.GuestFilters) (*models.GuestPage, error) {
 	return m.findGuestsFunc(ctx, f)
 }
 
@@ -71,7 +73,7 @@ func TestGuestsHandler_CreateGuest(t *testing.T) {
 		}
 
 		app := fiber.New()
-		h := NewGuestsHandler(mock)
+		h := NewGuestsHandler(mock, nil, nil)
 		app.Post("/guests", h.CreateGuest)
 
 		req := httptest.NewRequest("POST", "/guests", bytes.NewBufferString(validBody))
@@ -103,7 +105,7 @@ func TestGuestsHandler_CreateGuest(t *testing.T) {
 		}
 
 		app := fiber.New()
-		h := NewGuestsHandler(mock)
+		h := NewGuestsHandler(mock, nil, nil)
 		app.Post("/guests", h.CreateGuest)
 
 		bodyWithOptionals := `{
@@ -135,7 +137,7 @@ func TestGuestsHandler_CreateGuest(t *testing.T) {
 		}
 
 		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
-		h := NewGuestsHandler(mock)
+		h := NewGuestsHandler(mock, nil, nil)
 		app.Post("/guests", h.CreateGuest)
 
 		req := httptest.NewRequest("POST", "/guests", bytes.NewBufferString(`{invalid json`))
@@ -157,7 +159,7 @@ func TestGuestsHandler_CreateGuest(t *testing.T) {
 		}
 
 		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
-		h := NewGuestsHandler(mock)
+		h := NewGuestsHandler(mock, nil, nil)
 		app.Post("/guests", h.CreateGuest)
 
 		req := httptest.NewRequest("POST", "/guests", bytes.NewBufferString(`{}`))
@@ -183,7 +185,7 @@ func TestGuestsHandler_CreateGuest(t *testing.T) {
 		}
 
 		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
-		h := NewGuestsHandler(mock)
+		h := NewGuestsHandler(mock, nil, nil)
 		app.Post("/guests", h.CreateGuest)
 
 		invalidTimezoneBody := `{
@@ -215,7 +217,7 @@ func TestGuestsHandler_CreateGuest(t *testing.T) {
 		}
 
 		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
-		h := NewGuestsHandler(mock)
+		h := NewGuestsHandler(mock, nil, nil)
 		app.Post("/guests", h.CreateGuest)
 
 		req := httptest.NewRequest("POST", "/guests", bytes.NewBufferString(validBody))
@@ -237,7 +239,7 @@ func TestGuestsHandler_CreateGuest(t *testing.T) {
 		}
 
 		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
-		h := NewGuestsHandler(mock)
+		h := NewGuestsHandler(mock, nil, nil)
 		app.Post("/guests", h.CreateGuest)
 
 		req := httptest.NewRequest("POST", "/guests", bytes.NewBufferString(validBody))
@@ -274,7 +276,7 @@ func TestGuestsHandler_GetGuest(t *testing.T) {
 		}
 
 		app := fiber.New()
-		h := NewGuestsHandler(mock)
+		h := NewGuestsHandler(mock, nil, nil)
 		app.Get("/guests/:id", h.GetGuest)
 
 		req := httptest.NewRequest("GET", "/guests/530e8400-e458-41d4-a716-446655440000", nil)
@@ -297,7 +299,7 @@ func TestGuestsHandler_GetGuest(t *testing.T) {
 		}
 
 		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
-		h := NewGuestsHandler(mock)
+		h := NewGuestsHandler(mock, nil, nil)
 		app.Get("/guests/:id", h.GetGuest)
 
 		req := httptest.NewRequest("GET", "/guests/notaUUID", nil)
@@ -317,7 +319,7 @@ func TestGuestsHandler_GetGuest(t *testing.T) {
 		}
 
 		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
-		h := NewGuestsHandler(mock)
+		h := NewGuestsHandler(mock, nil, nil)
 		app.Get("/guests/:id", h.GetGuest)
 
 		req := httptest.NewRequest("GET", "/guests/530e8400-e458-41d4-a716-446655440001", nil)
@@ -337,7 +339,7 @@ func TestGuestsHandler_GetGuest(t *testing.T) {
 		}
 
 		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
-		h := NewGuestsHandler(mock)
+		h := NewGuestsHandler(mock, nil, nil)
 		app.Get("/guests/:id", h.GetGuest)
 
 		req := httptest.NewRequest("GET", "/guests/530e8400-e458-41d4-a716-446655440001", nil)
@@ -348,34 +350,575 @@ func TestGuestsHandler_GetGuest(t *testing.T) {
 	})
 }
 
+func TestGuestsHandler_GetGuests(t *testing.T) {
+	t.Parallel()
+
+	validHotelID := "org_a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11"
+
+	t.Run("returns 200 with guest page", func(t *testing.T) {
+		t.Parallel()
+
+		mock := &mockGuestsRepository{
+			findGuestsFunc: func(ctx context.Context, f *models.GuestFilters) (*models.GuestPage, error) {
+				return &models.GuestPage{
+					Data: []*models.GuestWithBooking{
+						{ID: "530e8400-e458-41d4-a716-446655440000", FirstName: "John", LastName: "Doe"},
+					},
+					NextCursor: nil,
+				}, nil
+			},
+		}
+
+		app := fiber.New()
+		h := NewGuestsHandler(mock, nil, nil)
+		app.Post("/guests/search", h.GetGuests)
+
+		req := httptest.NewRequest("POST", "/guests/search", bytes.NewBufferString(`{}`))
+		req.Header.Set("Content-Type", "application/json")
+		req.Header.Set("X-Hotel-ID", validHotelID)
+
+		resp, err := app.Test(req)
+		require.NoError(t, err)
+		assert.Equal(t, 200, resp.StatusCode)
+
+		body, _ := io.ReadAll(resp.Body)
+		assert.Contains(t, string(body), "John")
+	})
+
+	t.Run("returns 200 with floor filter", func(t *testing.T) {
+		t.Parallel()
+
+		mock := &mockGuestsRepository{
+			findGuestsFunc: func(ctx context.Context, f *models.GuestFilters) (*models.GuestPage, error) {
+				assert.Equal(t, []int{3}, f.Floors)
+				return &models.GuestPage{
+					Data:       []*models.GuestWithBooking{},
+					NextCursor: nil,
+				}, nil
+			},
+		}
+
+		app := fiber.New()
+		h := NewGuestsHandler(mock, nil, nil)
+		app.Post("/guests/search", h.GetGuests)
+
+		req := httptest.NewRequest("POST", "/guests/search", bytes.NewBufferString(`{"floors":[3]}`))
+		req.Header.Set("Content-Type", "application/json")
+		req.Header.Set("X-Hotel-ID", validHotelID)
+
+		resp, err := app.Test(req)
+		require.NoError(t, err)
+		assert.Equal(t, 200, resp.StatusCode)
+	})
+
+	t.Run("returns 200 with cursor and limit", func(t *testing.T) {
+		t.Parallel()
+
+		cursor := "John Doe|530e8400-e458-41d4-a716-446655440000"
+		nextCursor := "Jane Smith|530e8400-e458-41d4-a716-446655440001"
+
+		mock := &mockGuestsRepository{
+			findGuestsFunc: func(ctx context.Context, f *models.GuestFilters) (*models.GuestPage, error) {
+				assert.Equal(t, "John Doe", f.CursorName)
+				assert.Equal(t, "530e8400-e458-41d4-a716-446655440000", f.CursorID)
+				assert.Equal(t, 10, f.Limit)
+				return &models.GuestPage{
+					Data:       []*models.GuestWithBooking{},
+					NextCursor: &nextCursor,
+				}, nil
+			},
+		}
+
+		app := fiber.New()
+		h := NewGuestsHandler(mock, nil, nil)
+		app.Post("/guests/search", h.GetGuests)
+
+		body := fmt.Sprintf(`{"cursor":"%s","limit":10}`, cursor)
+		req := httptest.NewRequest("POST", "/guests/search", bytes.NewBufferString(body))
+		req.Header.Set("Content-Type", "application/json")
+		req.Header.Set("X-Hotel-ID", validHotelID)
+
+		resp, err := app.Test(req)
+		require.NoError(t, err)
+		assert.Equal(t, 200, resp.StatusCode)
+
+		respBody, _ := io.ReadAll(resp.Body)
+		assert.Contains(t, string(respBody), nextCursor)
+	})
+
+	t.Run("returns 400 when X-Hotel-ID is missing", func(t *testing.T) {
+		t.Parallel()
+
+		mock := &mockGuestsRepository{}
+		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
+		h := NewGuestsHandler(mock, nil, nil)
+		app.Post("/guests/search", h.GetGuests)
+
+		req := httptest.NewRequest("POST", "/guests/search", bytes.NewBufferString(`{}`))
+		req.Header.Set("Content-Type", "application/json")
+
+		resp, err := app.Test(req)
+		require.NoError(t, err)
+		assert.Equal(t, 400, resp.StatusCode)
+	})
+
+	t.Run("returns 400 on invalid cursor", func(t *testing.T) {
+		t.Parallel()
+
+		mock := &mockGuestsRepository{}
+		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
+		h := NewGuestsHandler(mock, nil, nil)
+		app.Post("/guests/search", h.GetGuests)
+
+		req := httptest.NewRequest("POST", "/guests/search", bytes.NewBufferString(`{"cursor":"not-a-uuid"}`))
+		req.Header.Set("Content-Type", "application/json")
+		req.Header.Set("X-Hotel-ID", validHotelID)
+
+		resp, err := app.Test(req)
+		require.NoError(t, err)
+		assert.Equal(t, 400, resp.StatusCode)
+	})
+
+	t.Run("returns 400 on cursor with pipe but invalid UUID", func(t *testing.T) {
+		t.Parallel()
+
+		mock := &mockGuestsRepository{}
+		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
+		h := NewGuestsHandler(mock, nil, nil)
+		app.Post("/guests/search", h.GetGuests)
+
+		req := httptest.NewRequest("POST", "/guests/search", bytes.NewBufferString(`{"cursor":"John Doe|not-a-uuid"}`))
+		req.Header.Set("Content-Type", "application/json")
+		req.Header.Set("X-Hotel-ID", validHotelID)
+
+		resp, err := app.Test(req)
+		require.NoError(t, err)
+		assert.Equal(t, 400, resp.StatusCode)
+	})
+
+	t.Run("passes search filter to repository", func(t *testing.T) {
+		t.Parallel()
+
+		mock := &mockGuestsRepository{
+			findGuestsFunc: func(ctx context.Context, f *models.GuestFilters) (*models.GuestPage, error) {
+				assert.Equal(t, "john", f.Search)
+				return &models.GuestPage{Data: []*models.GuestWithBooking{}, NextCursor: nil}, nil
+			},
+		}
+
+		app := fiber.New()
+		h := NewGuestsHandler(mock, nil, nil)
+		app.Post("/guests/search", h.GetGuests)
+
+		req := httptest.NewRequest("POST", "/guests/search", bytes.NewBufferString(`{"search":"john"}`))
+		req.Header.Set("Content-Type", "application/json")
+		req.Header.Set("X-Hotel-ID", validHotelID)
+
+		resp, err := app.Test(req)
+		require.NoError(t, err)
+		assert.Equal(t, 200, resp.StatusCode)
+	})
+
+	t.Run("passes group_size filter to repository", func(t *testing.T) {
+		t.Parallel()
+
+		mock := &mockGuestsRepository{
+			findGuestsFunc: func(ctx context.Context, f *models.GuestFilters) (*models.GuestPage, error) {
+				assert.Equal(t, []int{2, 3}, f.GroupSize)
+				return &models.GuestPage{Data: []*models.GuestWithBooking{}, NextCursor: nil}, nil
+			},
+		}
+
+		app := fiber.New()
+		h := NewGuestsHandler(mock, nil, nil)
+		app.Post("/guests/search", h.GetGuests)
+
+		req := httptest.NewRequest("POST", "/guests/search", bytes.NewBufferString(`{"group_size":[2,3]}`))
+		req.Header.Set("Content-Type", "application/json")
+		req.Header.Set("X-Hotel-ID", validHotelID)
+
+		resp, err := app.Test(req)
+		require.NoError(t, err)
+		assert.Equal(t, 200, resp.StatusCode)
+	})
+
+	t.Run("returns 400 on invalid JSON", func(t *testing.T) {
+		t.Parallel()
+
+		mock := &mockGuestsRepository{}
+		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
+		h := NewGuestsHandler(mock, nil, nil)
+		app.Post("/guests/search", h.GetGuests)
+
+		req := httptest.NewRequest("POST", "/guests/search", bytes.NewBufferString(`{invalid`))
+		req.Header.Set("Content-Type", "application/json")
+		req.Header.Set("X-Hotel-ID", validHotelID)
+
+		resp, err := app.Test(req)
+		require.NoError(t, err)
+		assert.Equal(t, 400, resp.StatusCode)
+	})
+
+	t.Run("returns 400 when limit is negative", func(t *testing.T) {
+		t.Parallel()
+
+		mock := &mockGuestsRepository{}
+		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
+		h := NewGuestsHandler(mock, nil, nil)
+		app.Post("/guests/search", h.GetGuests)
+
+		req := httptest.NewRequest("POST", "/guests/search", bytes.NewBufferString(`{"limit":-1}`))
+		req.Header.Set("Content-Type", "application/json")
+		req.Header.Set("X-Hotel-ID", validHotelID)
+
+		resp, err := app.Test(req)
+		require.NoError(t, err)
+		assert.Equal(t, 400, resp.StatusCode)
+	})
+
+	t.Run("returns 400 when limit exceeds max", func(t *testing.T) {
+		t.Parallel()
+
+		mock := &mockGuestsRepository{}
+		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
+		h := NewGuestsHandler(mock, nil, nil)
+		app.Post("/guests/search", h.GetGuests)
+
+		req := httptest.NewRequest("POST", "/guests/search", bytes.NewBufferString(`{"limit":101}`))
+		req.Header.Set("Content-Type", "application/json")
+		req.Header.Set("X-Hotel-ID", validHotelID)
+
+		resp, err := app.Test(req)
+		require.NoError(t, err)
+		assert.Equal(t, 400, resp.StatusCode)
+	})
+
+	t.Run("returns empty data when no guests match", func(t *testing.T) {
+		t.Parallel()
+
+		mock := &mockGuestsRepository{
+			findGuestsFunc: func(ctx context.Context, f *models.GuestFilters) (*models.GuestPage, error) {
+				return &models.GuestPage{
+					Data:       []*models.GuestWithBooking{},
+					NextCursor: nil,
+				}, nil
+			},
+		}
+
+		app := fiber.New()
+		h := NewGuestsHandler(mock, nil, nil)
+		app.Post("/guests/search", h.GetGuests)
+
+		req := httptest.NewRequest("POST", "/guests/search", bytes.NewBufferString(`{}`))
+		req.Header.Set("Content-Type", "application/json")
+		req.Header.Set("X-Hotel-ID", validHotelID)
+
+		resp, err := app.Test(req)
+		require.NoError(t, err)
+		assert.Equal(t, 200, resp.StatusCode)
+
+		body, _ := io.ReadAll(resp.Body)
+		assert.Contains(t, string(body), `"data":[]`)
+	})
+
+	t.Run("passes hotel ID correctly to repository", func(t *testing.T) {
+		t.Parallel()
+
+		mock := &mockGuestsRepository{
+			findGuestsFunc: func(ctx context.Context, f *models.GuestFilters) (*models.GuestPage, error) {
+				assert.Equal(t, validHotelID, f.HotelID)
+				return &models.GuestPage{Data: []*models.GuestWithBooking{}, NextCursor: nil}, nil
+			},
+		}
+
+		app := fiber.New()
+		h := NewGuestsHandler(mock, nil, nil)
+		app.Post("/guests/search", h.GetGuests)
+
+		req := httptest.NewRequest("POST", "/guests/search", bytes.NewBufferString(`{}`))
+		req.Header.Set("Content-Type", "application/json")
+		req.Header.Set("X-Hotel-ID", validHotelID)
+
+		resp, err := app.Test(req)
+		require.NoError(t, err)
+		assert.Equal(t, 200, resp.StatusCode)
+	})
+
+	t.Run("returns 500 on repository error", func(t *testing.T) {
+		t.Parallel()
+
+		mock := &mockGuestsRepository{
+			findGuestsFunc: func(ctx context.Context, f *models.GuestFilters) (*models.GuestPage, error) {
+				return nil, errors.New("db error")
+			},
+		}
+
+		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
+		h := NewGuestsHandler(mock, nil, nil)
+		app.Post("/guests/search", h.GetGuests)
+
+		req := httptest.NewRequest("POST", "/guests/search", bytes.NewBufferString(`{}`))
+		req.Header.Set("Content-Type", "application/json")
+		req.Header.Set("X-Hotel-ID", validHotelID)
+
+		resp, err := app.Test(req)
+		require.NoError(t, err)
+		assert.Equal(t, 500, resp.StatusCode)
+	})
+}
+
+func TestGuestsHandler_GetGuestWithStays(t *testing.T) {
+	t.Parallel()
+
+	validID := "530e8400-e458-41d4-a716-446655440000"
+
+	t.Run("returns 200 with guest and stays", func(t *testing.T) {
+		t.Parallel()
+
+		mock := &mockGuestsRepository{
+			findGuestStaysFunc: func(ctx context.Context, id string) (*models.GuestWithStays, error) {
+				return &models.GuestWithStays{
+					ID:        id,
+					FirstName: "John",
+					LastName:  "Doe",
+				}, nil
+			},
+		}
+
+		app := fiber.New()
+		h := NewGuestsHandler(mock, nil, nil)
+		app.Get("/guests/stays/:id", h.GetGuestWithStays)
+
+		req := httptest.NewRequest("GET", "/guests/stays/"+validID, nil)
+		resp, err := app.Test(req)
+		require.NoError(t, err)
+		assert.Equal(t, 200, resp.StatusCode)
+
+		body, _ := io.ReadAll(resp.Body)
+		assert.Contains(t, string(body), validID)
+		assert.Contains(t, string(body), "John")
+	})
+
+	t.Run("returns 400 on invalid UUID", func(t *testing.T) {
+		t.Parallel()
+
+		mock := &mockGuestsRepository{}
+		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
+		h := NewGuestsHandler(mock, nil, nil)
+		app.Get("/guests/stays/:id", h.GetGuestWithStays)
+
+		req := httptest.NewRequest("GET", "/guests/stays/not-a-uuid", nil)
+		resp, err := app.Test(req)
+		require.NoError(t, err)
+		assert.Equal(t, 400, resp.StatusCode)
+	})
+
+	t.Run("returns 404 when guest not found", func(t *testing.T) {
+		t.Parallel()
+
+		mock := &mockGuestsRepository{
+			findGuestStaysFunc: func(ctx context.Context, id string) (*models.GuestWithStays, error) {
+				return nil, errs.ErrNotFoundInDB
+			},
+		}
+
+		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
+		h := NewGuestsHandler(mock, nil, nil)
+		app.Get("/guests/stays/:id", h.GetGuestWithStays)
+
+		req := httptest.NewRequest("GET", "/guests/stays/"+validID, nil)
+		resp, err := app.Test(req)
+		require.NoError(t, err)
+		assert.Equal(t, 404, resp.StatusCode)
+	})
+
+	t.Run("returns 500 on repository error", func(t *testing.T) {
+		t.Parallel()
+
+		mock := &mockGuestsRepository{
+			findGuestStaysFunc: func(ctx context.Context, id string) (*models.GuestWithStays, error) {
+				return nil, errors.New("db error")
+			},
+		}
+
+		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
+		h := NewGuestsHandler(mock, nil, nil)
+		app.Get("/guests/stays/:id", h.GetGuestWithStays)
+
+		req := httptest.NewRequest("GET", "/guests/stays/"+validID, nil)
+		resp, err := app.Test(req)
+		require.NoError(t, err)
+		assert.Equal(t, 500, resp.StatusCode)
+	})
+
+	t.Run("passes correct ID to repository", func(t *testing.T) {
+		t.Parallel()
+
+		mock := &mockGuestsRepository{
+			findGuestStaysFunc: func(ctx context.Context, id string) (*models.GuestWithStays, error) {
+				assert.Equal(t, validID, id)
+				return &models.GuestWithStays{ID: id, FirstName: "John", LastName: "Doe"}, nil
+			},
+		}
+
+		app := fiber.New()
+		h := NewGuestsHandler(mock, nil, nil)
+		app.Get("/guests/stays/:id", h.GetGuestWithStays)
+
+		req := httptest.NewRequest("GET", "/guests/stays/"+validID, nil)
+		resp, err := app.Test(req)
+		require.NoError(t, err)
+		assert.Equal(t, 200, resp.StatusCode)
+	})
+
+	t.Run("returns new profile fields when present", func(t *testing.T) {
+		t.Parallel()
+
+		pronouns := "she/her"
+		housekeeping := "daily"
+		phone := "+1 (617) 012-3456"
+		email := "jane@example.com"
+		groupSize := 3
+
+		mock := &mockGuestsRepository{
+			findGuestStaysFunc: func(ctx context.Context, id string) (*models.GuestWithStays, error) {
+				return &models.GuestWithStays{
+					ID:                  id,
+					FirstName:           "Jane",
+					LastName:            "Doe",
+					Pronouns:            &pronouns,
+					HousekeepingCadence: &housekeeping,
+					Phone:               &phone,
+					Email:               &email,
+					Assistance: &models.Assistance{
+						Accessibility: []string{"wheelchair"},
+						Dietary:       []string{"peanuts"},
+						Medical:       []string{"pollen allergy"},
+					},
+					CurrentStays: []models.Stay{
+						{
+							ArrivalDate:   time.Now(),
+							DepartureDate: time.Now().Add(24 * time.Hour),
+							RoomNumber:    101,
+							GroupSize:     &groupSize,
+							Status:        models.BookingStatusActive,
+						},
+					},
+				}, nil
+			},
+		}
+
+		app := fiber.New()
+		h := NewGuestsHandler(mock, nil, nil)
+		app.Get("/guests/stays/:id", h.GetGuestWithStays)
+
+		req := httptest.NewRequest("GET", "/guests/stays/"+validID, nil)
+		resp, err := app.Test(req)
+		require.NoError(t, err)
+		assert.Equal(t, 200, resp.StatusCode)
+
+		body, _ := io.ReadAll(resp.Body)
+		assert.Contains(t, string(body), "she/her")
+		assert.Contains(t, string(body), "daily")
+		assert.Contains(t, string(body), "wheelchair")
+		assert.Contains(t, string(body), "peanuts")
+		assert.Contains(t, string(body), "pollen allergy")
+		assert.Contains(t, string(body), "3")
+	})
+
+	t.Run("returns 200 when optional profile fields are absent", func(t *testing.T) {
+		t.Parallel()
+
+		mock := &mockGuestsRepository{
+			findGuestStaysFunc: func(ctx context.Context, id string) (*models.GuestWithStays, error) {
+				return &models.GuestWithStays{
+					ID:        id,
+					FirstName: "John",
+					LastName:  "Doe",
+				}, nil
+			},
+		}
+
+		app := fiber.New()
+		h := NewGuestsHandler(mock, nil, nil)
+		app.Get("/guests/stays/:id", h.GetGuestWithStays)
+
+		req := httptest.NewRequest("GET", "/guests/stays/"+validID, nil)
+		resp, err := app.Test(req)
+		require.NoError(t, err)
+		assert.Equal(t, 200, resp.StatusCode)
+
+		body, _ := io.ReadAll(resp.Body)
+		assert.NotContains(t, string(body), "pronouns")
+		assert.NotContains(t, string(body), "assistance")
+		assert.NotContains(t, string(body), "housekeeping_cadence")
+	})
+
+	t.Run("returns group_size in stay", func(t *testing.T) {
+		t.Parallel()
+
+		groupSize := 5
+		mock := &mockGuestsRepository{
+			findGuestStaysFunc: func(ctx context.Context, id string) (*models.GuestWithStays, error) {
+				return &models.GuestWithStays{
+					ID:        id,
+					FirstName: "John",
+					LastName:  "Doe",
+					PastStays: []models.Stay{
+						{
+							ArrivalDate:   time.Now().Add(-48 * time.Hour),
+							DepartureDate: time.Now().Add(-24 * time.Hour),
+							RoomNumber:    202,
+							GroupSize:     &groupSize,
+							Status:        models.BookingStatusInactive,
+						},
+					},
+				}, nil
+			},
+		}
+
+		app := fiber.New()
+		h := NewGuestsHandler(mock, nil, nil)
+		app.Get("/guests/stays/:id", h.GetGuestWithStays)
+
+		req := httptest.NewRequest("GET", "/guests/stays/"+validID, nil)
+		resp, err := app.Test(req)
+		require.NoError(t, err)
+		assert.Equal(t, 200, resp.StatusCode)
+
+		body, _ := io.ReadAll(resp.Body)
+		assert.Contains(t, string(body), `"group_size":5`)
+	})
+}
+
 func TestGuestsHandler_UpdateGuest(t *testing.T) {
 	t.Parallel()
 
 	validID := "530e8400-e458-41d4-a716-446655440000"
 
-	t.Run("returns 200 on valid update with required fields", func(t *testing.T) {
+	t.Run("returns 200 when updating first and last name", func(t *testing.T) {
 		t.Parallel()
 
 		mock := &mockGuestsRepository{
 			updateGuestFunc: func(ctx context.Context, id string, update *models.UpdateGuest) (*models.Guest, error) {
 				require.Equal(t, validID, id)
-				require.Equal(t, "Jane", update.FirstName)
-				require.Equal(t, "Smith", update.LastName)
+				require.Equal(t, "Jane", *update.FirstName)
+				require.Equal(t, "Smith", *update.LastName)
 
 				return &models.Guest{
 					ID:        validID,
 					CreatedAt: time.Now().Add(-time.Hour),
 					UpdatedAt: time.Now(),
 					CreateGuest: models.CreateGuest{
-						FirstName: update.FirstName,
-						LastName:  update.LastName,
+						FirstName: *update.FirstName,
+						LastName:  *update.LastName,
 					},
 				}, nil
 			},
 		}
 
 		app := fiber.New()
-		h := NewGuestsHandler(mock)
+		h := NewGuestsHandler(mock, nil, nil)
 		app.Put("/guests/:id", h.UpdateGuest)
 
 		req := httptest.NewRequest(
@@ -394,18 +937,122 @@ func TestGuestsHandler_UpdateGuest(t *testing.T) {
 		assert.Contains(t, string(body), "Smith")
 	})
 
-	t.Run("returns 400 when first_name is missing", func(t *testing.T) {
+	t.Run("returns 200 when only first_name is updated", func(t *testing.T) {
+		t.Parallel()
+
+		mock := &mockGuestsRepository{
+			updateGuestFunc: func(ctx context.Context, id string, update *models.UpdateGuest) (*models.Guest, error) {
+				require.Equal(t, "Jane", *update.FirstName)
+				require.Nil(t, update.LastName)
+				return &models.Guest{
+					ID:        validID,
+					CreatedAt: time.Now(),
+					UpdatedAt: time.Now(),
+					CreateGuest: models.CreateGuest{
+						FirstName: *update.FirstName,
+						LastName:  "Doe",
+					},
+				}, nil
+			},
+		}
+
+		app := fiber.New()
+		h := NewGuestsHandler(mock, nil, nil)
+		app.Put("/guests/:id", h.UpdateGuest)
+
+		req := httptest.NewRequest(
+			"PUT",
+			"/guests/"+validID,
+			bytes.NewBufferString(`{"first_name":"Jane"}`),
+		)
+		req.Header.Set("Content-Type", "application/json")
+
+		resp, err := app.Test(req)
+		require.NoError(t, err)
+		assert.Equal(t, 200, resp.StatusCode)
+	})
+
+	t.Run("returns 200 when only notes is updated", func(t *testing.T) {
+		t.Parallel()
+
+		notes := "VIP guest"
+		mock := &mockGuestsRepository{
+			updateGuestFunc: func(ctx context.Context, id string, update *models.UpdateGuest) (*models.Guest, error) {
+				require.Nil(t, update.FirstName)
+				require.Nil(t, update.LastName)
+				require.Equal(t, notes, *update.Notes)
+				return &models.Guest{
+					ID:        validID,
+					CreatedAt: time.Now(),
+					UpdatedAt: time.Now(),
+					Notes:     update.Notes,
+				}, nil
+			},
+		}
+
+		app := fiber.New()
+		h := NewGuestsHandler(mock, nil, nil)
+		app.Put("/guests/:id", h.UpdateGuest)
+
+		req := httptest.NewRequest(
+			"PUT",
+			"/guests/"+validID,
+			bytes.NewBufferString(`{"notes":"VIP guest"}`),
+		)
+		req.Header.Set("Content-Type", "application/json")
+
+		resp, err := app.Test(req)
+		require.NoError(t, err)
+		assert.Equal(t, 200, resp.StatusCode)
+
+		body, _ := io.ReadAll(resp.Body)
+		assert.Contains(t, string(body), "VIP guest")
+	})
+
+	t.Run("returns 200 when no fields are provided", func(t *testing.T) {
+		t.Parallel()
+
+		mock := &mockGuestsRepository{
+			updateGuestFunc: func(ctx context.Context, id string, update *models.UpdateGuest) (*models.Guest, error) {
+				require.Nil(t, update.FirstName)
+				require.Nil(t, update.LastName)
+				require.Nil(t, update.Notes)
+				return &models.Guest{
+					ID:        validID,
+					CreatedAt: time.Now(),
+					UpdatedAt: time.Now(),
+				}, nil
+			},
+		}
+
+		app := fiber.New()
+		h := NewGuestsHandler(mock, nil, nil)
+		app.Put("/guests/:id", h.UpdateGuest)
+
+		req := httptest.NewRequest(
+			"PUT",
+			"/guests/"+validID,
+			bytes.NewBufferString(`{}`),
+		)
+		req.Header.Set("Content-Type", "application/json")
+
+		resp, err := app.Test(req)
+		require.NoError(t, err)
+		assert.Equal(t, 200, resp.StatusCode)
+	})
+
+	t.Run("returns 400 when first_name is blank string", func(t *testing.T) {
 		t.Parallel()
 
 		mock := &mockGuestsRepository{}
 		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
-		h := NewGuestsHandler(mock)
+		h := NewGuestsHandler(mock, nil, nil)
 		app.Put("/guests/:id", h.UpdateGuest)
 
 		req := httptest.NewRequest(
 			"PUT",
 			"/guests/"+validID,
-			bytes.NewBufferString(`{"last_name":"Smith"}`),
+			bytes.NewBufferString(`{"first_name":""}`),
 		)
 		req.Header.Set("Content-Type", "application/json")
 
@@ -417,18 +1064,18 @@ func TestGuestsHandler_UpdateGuest(t *testing.T) {
 		assert.Contains(t, string(body), "first_name")
 	})
 
-	t.Run("returns 400 when last_name is missing", func(t *testing.T) {
+	t.Run("returns 400 when last_name is blank string", func(t *testing.T) {
 		t.Parallel()
 
 		mock := &mockGuestsRepository{}
 		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
-		h := NewGuestsHandler(mock)
+		h := NewGuestsHandler(mock, nil, nil)
 		app.Put("/guests/:id", h.UpdateGuest)
 
 		req := httptest.NewRequest(
 			"PUT",
 			"/guests/"+validID,
-			bytes.NewBufferString(`{"first_name":"Jane"}`),
+			bytes.NewBufferString(`{"last_name":""}`),
 		)
 		req.Header.Set("Content-Type", "application/json")
 
@@ -440,18 +1087,19 @@ func TestGuestsHandler_UpdateGuest(t *testing.T) {
 		assert.Contains(t, string(body), "last_name")
 	})
 
-	t.Run("returns 400 when both required fields are empty strings", func(t *testing.T) {
+	t.Run("returns 400 when notes exceeds 1000 chars", func(t *testing.T) {
 		t.Parallel()
 
 		mock := &mockGuestsRepository{}
 		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
-		h := NewGuestsHandler(mock)
+		h := NewGuestsHandler(mock, nil, nil)
 		app.Put("/guests/:id", h.UpdateGuest)
 
+		longNotes := `{"notes":"` + strings.Repeat("a", 1001) + `"}`
 		req := httptest.NewRequest(
 			"PUT",
 			"/guests/"+validID,
-			bytes.NewBufferString(`{"first_name":"","last_name":""}`),
+			bytes.NewBufferString(longNotes),
 		)
 		req.Header.Set("Content-Type", "application/json")
 
@@ -460,8 +1108,7 @@ func TestGuestsHandler_UpdateGuest(t *testing.T) {
 		assert.Equal(t, 400, resp.StatusCode)
 
 		body, _ := io.ReadAll(resp.Body)
-		assert.Contains(t, string(body), "first_name")
-		assert.Contains(t, string(body), "last_name")
+		assert.Contains(t, string(body), "notes")
 	})
 
 	t.Run("returns 400 on invalid UUID", func(t *testing.T) {
@@ -469,13 +1116,13 @@ func TestGuestsHandler_UpdateGuest(t *testing.T) {
 
 		mock := &mockGuestsRepository{}
 		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
-		h := NewGuestsHandler(mock)
+		h := NewGuestsHandler(mock, nil, nil)
 		app.Put("/guests/:id", h.UpdateGuest)
 
 		req := httptest.NewRequest(
 			"PUT",
 			"/guests/not-a-uuid",
-			bytes.NewBufferString(`{"first_name":"Jane","last_name":"Smith"}`),
+			bytes.NewBufferString(`{"first_name":"Jane"}`),
 		)
 		req.Header.Set("Content-Type", "application/json")
 
@@ -489,7 +1136,7 @@ func TestGuestsHandler_UpdateGuest(t *testing.T) {
 
 		mock := &mockGuestsRepository{}
 		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
-		h := NewGuestsHandler(mock)
+		h := NewGuestsHandler(mock, nil, nil)
 		app.Put("/guests/:id", h.UpdateGuest)
 
 		req := httptest.NewRequest(
@@ -509,13 +1156,13 @@ func TestGuestsHandler_UpdateGuest(t *testing.T) {
 
 		mock := &mockGuestsRepository{}
 		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
-		h := NewGuestsHandler(mock)
+		h := NewGuestsHandler(mock, nil, nil)
 		app.Put("/guests/:id", h.UpdateGuest)
 
 		req := httptest.NewRequest(
 			"PUT",
 			"/guests/"+validID,
-			bytes.NewBufferString(`{"first_name":"Jane","last_name":"Smith","timezone":"Eastern"}`),
+			bytes.NewBufferString(`{"timezone":"Eastern"}`),
 		)
 		req.Header.Set("Content-Type", "application/json")
 
@@ -537,13 +1184,13 @@ func TestGuestsHandler_UpdateGuest(t *testing.T) {
 		}
 
 		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
-		h := NewGuestsHandler(mock)
+		h := NewGuestsHandler(mock, nil, nil)
 		app.Put("/guests/:id", h.UpdateGuest)
 
 		req := httptest.NewRequest(
 			"PUT",
 			"/guests/"+validID,
-			bytes.NewBufferString(`{"first_name":"Jane","last_name":"Smith"}`),
+			bytes.NewBufferString(`{"first_name":"Jane"}`),
 		)
 		req.Header.Set("Content-Type", "application/json")
 
@@ -562,13 +1209,13 @@ func TestGuestsHandler_UpdateGuest(t *testing.T) {
 		}
 
 		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
-		h := NewGuestsHandler(mock)
+		h := NewGuestsHandler(mock, nil, nil)
 		app.Put("/guests/:id", h.UpdateGuest)
 
 		req := httptest.NewRequest(
 			"PUT",
 			"/guests/"+validID,
-			bytes.NewBufferString(`{"first_name":"Jane","last_name":"Smith"}`),
+			bytes.NewBufferString(`{"first_name":"Jane"}`),
 		)
 		req.Header.Set("Content-Type", "application/json")
 
diff --git a/backend/internal/handler/hotels.go b/backend/internal/handler/hotels.go
index fe2806cf0..7ea36e6d1 100644
--- a/backend/internal/handler/hotels.go
+++ b/backend/internal/handler/hotels.go
@@ -4,26 +4,32 @@ import (
 	"context"
 	"errors"
 	"log/slog"
+	"strings"
 
 	"github.com/generate/selfserve/internal/errs"
 	"github.com/generate/selfserve/internal/httpx"
 	"github.com/generate/selfserve/internal/models"
+	storage "github.com/generate/selfserve/internal/service/storage/postgres"
 	"github.com/gofiber/fiber/v2"
-	"github.com/google/uuid"
 )
 
 // HotelRepository defines methods for hotel data access
 type HotelsRepository interface {
 	FindByID(ctx context.Context, id string) (*models.Hotel, error)
 	InsertHotel(ctx context.Context, hotel *models.CreateHotelRequest) (*models.Hotel, error)
+	GetDepartmentsByHotelID(ctx context.Context, hotelID string) ([]*models.Department, error)
+	InsertDepartment(ctx context.Context, hotelID, name string) (*models.Department, error)
+	UpdateDepartment(ctx context.Context, id, hotelID, name string) (*models.Department, error)
+	DeleteDepartment(ctx context.Context, id, hotelID string) error
 }
 
 type HotelsHandler struct {
-	repo HotelsRepository
+	repo      HotelsRepository
+	usersRepo storage.UsersRepository
 }
 
-func NewHotelsHandler(repo HotelsRepository) *HotelsHandler {
-	return &HotelsHandler{repo: repo}
+func NewHotelsHandler(repo HotelsRepository, usersRepo storage.UsersRepository) *HotelsHandler {
+	return &HotelsHandler{repo: repo, usersRepo: usersRepo}
 }
 
 // GetHotelByID retrieves a single hotel by its ID
@@ -36,14 +42,12 @@ func NewHotelsHandler(repo HotelsRepository) *HotelsHandler {
 // @Failure      404  {object}  errs.HTTPError  "Hotel not found"
 // @Failure      500  {object}  errs.HTTPError  "Internal server error"
 // @Security     BearerAuth
-// @Router       /api/v1/hotels/{id} [get]
+// @Router       /hotels/{id} [get]
 func (h *HotelsHandler) GetHotelByID(c *fiber.Ctx) error {
 	idParam := c.Params("id")
 
-	// Validate UUID
-	_, err := uuid.Parse(idParam)
-	if err != nil {
-		return errs.BadRequest("invalid hotel id format")
+	if strings.TrimSpace(idParam) == "" {
+		return errs.BadRequest("hotel id is required")
 	}
 
 	// Fetch hotel
@@ -58,6 +62,174 @@ func (h *HotelsHandler) GetHotelByID(c *fiber.Ctx) error {
 	return c.Status(fiber.StatusOK).JSON(hotel)
 }
 
+// GetHotelUsers godoc
+// @Summary      Get users by hotel
+// @Description  Returns a paginated list of all users for a hotel
+// @Tags         hotels
+// @Produce      json
+// @Param        id      path      string  true   "Hotel ID"
+// @Param        cursor  query     string  false  "Pagination cursor (last seen user ID)"
+// @Success      200     {object}  map[string]interface{}
+// @Failure      400     {object}  errs.HTTPError
+// @Failure      500     {object}  errs.HTTPError
+// @Security     BearerAuth
+// @Router       /hotels/{id}/users [get]
+func (h *HotelsHandler) GetHotelUsers(c *fiber.Ctx) error {
+	hotelID := c.Params("id")
+	if strings.TrimSpace(hotelID) == "" {
+		return errs.BadRequest("hotel id is required")
+	}
+	cursor := c.Query("cursor")
+
+	const pageSize = 20
+	users, nextCursor, err := h.usersRepo.GetUsersByHotel(c.Context(), hotelID, cursor, pageSize)
+	if err != nil {
+		slog.Error("failed to get hotel users", "hotel_id", hotelID, "err", err)
+		slog.Error(err.Error())
+		return errs.InternalServerError()
+	}
+
+	return c.JSON(fiber.Map{
+		"users":       users,
+		"next_cursor": nextCursor,
+	})
+}
+
+// GetDepartmentsByHotelID godoc
+// @Summary      Get departments by hotel
+// @Description  Returns all departments for a hotel
+// @Tags         hotels
+// @Produce      json
+// @Param        id  path      string  true  "Hotel ID"
+// @Success      200  {array}   models.Department
+// @Failure      400  {object}  errs.HTTPError
+// @Failure      500  {object}  errs.HTTPError
+// @Security     BearerAuth
+// @Router       /hotels/{id}/departments [get]
+func (h *HotelsHandler) GetDepartmentsByHotelID(c *fiber.Ctx) error {
+	hotelID := c.Params("id")
+	if strings.TrimSpace(hotelID) == "" {
+		return errs.BadRequest("hotel id is required")
+	}
+
+	departments, err := h.repo.GetDepartmentsByHotelID(c.Context(), hotelID)
+	if err != nil {
+		slog.Error("failed to get departments", "hotel_id", hotelID, "err", err)
+		return errs.InternalServerError()
+	}
+
+	return c.JSON(departments)
+}
+
+// CreateDepartment godoc
+// @Summary      Create department
+// @Description  Adds a new department to a hotel
+// @Tags         hotels
+// @Accept       json
+// @Produce      json
+// @Param        id       path      string                    true  "Hotel ID"
+// @Param        request  body      models.CreateDepartment   true  "Department data"
+// @Success      201      {object}  models.Department
+// @Failure      400      {object}  errs.HTTPError
+// @Failure      500      {object}  errs.HTTPError
+// @Security     BearerAuth
+// @Router       /hotels/{id}/departments [post]
+func (h *HotelsHandler) CreateDepartment(c *fiber.Ctx) error {
+	hotelID := c.Params("id")
+	if strings.TrimSpace(hotelID) == "" {
+		return errs.BadRequest("hotel id is required")
+	}
+
+	var req models.CreateDepartment
+	if err := httpx.BindAndValidate(c, &req); err != nil {
+		return err
+	}
+
+	dept, err := h.repo.InsertDepartment(c.Context(), hotelID, req.Name)
+	if err != nil {
+		slog.Error("failed to create department", "hotel_id", hotelID, "err", err)
+		return errs.InternalServerError()
+	}
+
+	return c.Status(fiber.StatusCreated).JSON(dept)
+}
+
+// UpdateDepartment godoc
+// @Summary      Update department
+// @Description  Renames a department
+// @Tags         hotels
+// @Accept       json
+// @Produce      json
+// @Param        id      path      string                    true  "Hotel ID"
+// @Param        deptId  path      string                    true  "Department ID"
+// @Param        request body      models.UpdateDepartment   true  "Department data"
+// @Success      200     {object}  models.Department
+// @Failure      400     {object}  errs.HTTPError
+// @Failure      404     {object}  errs.HTTPError
+// @Failure      500     {object}  errs.HTTPError
+// @Security     BearerAuth
+// @Router       /hotels/{id}/departments/{deptId} [put]
+func (h *HotelsHandler) UpdateDepartment(c *fiber.Ctx) error {
+	hotelID := c.Params("id")
+	deptID := c.Params("deptId")
+	if strings.TrimSpace(hotelID) == "" {
+		return errs.BadRequest("hotel id is required")
+	}
+	if strings.TrimSpace(deptID) == "" {
+		return errs.BadRequest("department id is required")
+	}
+
+	var req models.UpdateDepartment
+	if err := httpx.BindAndValidate(c, &req); err != nil {
+		return err
+	}
+
+	dept, err := h.repo.UpdateDepartment(c.Context(), deptID, hotelID, req.Name)
+	if err != nil {
+		if errors.Is(err, errs.ErrNotFoundInDB) {
+			return errs.NotFound("department", "id", deptID)
+		}
+		slog.Error("failed to update department", "dept_id", deptID, "err", err)
+		return errs.InternalServerError()
+	}
+
+	return c.JSON(dept)
+}
+
+// DeleteDepartment godoc
+// @Summary      Delete department
+// @Description  Removes a department from a hotel
+// @Tags         hotels
+// @Produce      json
+// @Param        id      path      string  true  "Hotel ID"
+// @Param        deptId  path      string  true  "Department ID"
+// @Success      204
+// @Failure      400     {object}  errs.HTTPError
+// @Failure      404     {object}  errs.HTTPError
+// @Failure      500     {object}  errs.HTTPError
+// @Security     BearerAuth
+// @Router       /hotels/{id}/departments/{deptId} [delete]
+func (h *HotelsHandler) DeleteDepartment(c *fiber.Ctx) error {
+	hotelID := c.Params("id")
+	deptID := c.Params("deptId")
+	if strings.TrimSpace(hotelID) == "" {
+		return errs.BadRequest("hotel id is required")
+	}
+	if strings.TrimSpace(deptID) == "" {
+		return errs.BadRequest("department id is required")
+	}
+
+	if err := h.repo.DeleteDepartment(c.Context(), deptID, hotelID); err != nil {
+		if errors.Is(err, errs.ErrNotFoundInDB) {
+			return errs.NotFound("department", "id", deptID)
+		}
+		slog.Error("failed to delete department", "dept_id", deptID, "err", err)
+		return errs.InternalServerError()
+	}
+
+	return c.SendStatus(fiber.StatusNoContent)
+}
+
 // CreateHotel creates a new hotel
 // @Summary      Create hotel
 // @Description  Create a new hotel with the given data
@@ -69,7 +241,7 @@ func (h *HotelsHandler) GetHotelByID(c *fiber.Ctx) error {
 // @Failure      400    {object}  map[string]string
 // @Failure      500    {object}  map[string]string
 // @Security     BearerAuth
-// @Router       /api/v1/hotels [post]
+// @Router       /hotels [post]
 func (h *HotelsHandler) CreateHotel(c *fiber.Ctx) error {
 	var hotelRequest models.CreateHotelRequest
 
diff --git a/backend/internal/handler/hotels_test.go b/backend/internal/handler/hotels_test.go
index ddd9dd7d5..b2f04a598 100644
--- a/backend/internal/handler/hotels_test.go
+++ b/backend/internal/handler/hotels_test.go
@@ -16,10 +16,10 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-// Mock repository
 type mockHotelsRepository struct {
-	findByIDFunc    func(ctx context.Context, id string) (*models.Hotel, error)
-	insertHotelFunc func(ctx context.Context, req *models.CreateHotelRequest) (*models.Hotel, error)
+	findByIDFunc                func(ctx context.Context, id string) (*models.Hotel, error)
+	insertHotelFunc             func(ctx context.Context, req *models.CreateHotelRequest) (*models.Hotel, error)
+	getDepartmentsByHotelIDFunc func(ctx context.Context, hotelID string) ([]*models.Department, error)
 }
 
 func (m *mockHotelsRepository) FindByID(ctx context.Context, id string) (*models.Hotel, error) {
@@ -30,6 +30,25 @@ func (m *mockHotelsRepository) InsertHotel(ctx context.Context, hotel *models.Cr
 	return m.insertHotelFunc(ctx, hotel)
 }
 
+func (m *mockHotelsRepository) GetDepartmentsByHotelID(ctx context.Context, hotelID string) ([]*models.Department, error) {
+	if m.getDepartmentsByHotelIDFunc != nil {
+		return m.getDepartmentsByHotelIDFunc(ctx, hotelID)
+	}
+	return nil, nil
+}
+
+func (m *mockHotelsRepository) InsertDepartment(ctx context.Context, hotelID, name string) (*models.Department, error) {
+	return nil, nil
+}
+
+func (m *mockHotelsRepository) UpdateDepartment(ctx context.Context, id, hotelID, name string) (*models.Department, error) {
+	return nil, nil
+}
+
+func (m *mockHotelsRepository) DeleteDepartment(ctx context.Context, id, hotelID string) error {
+	return nil
+}
+
 func TestHotelHandler_GetHotelByID(t *testing.T) {
 	t.Parallel()
 
@@ -38,49 +57,28 @@ func TestHotelHandler_GetHotelByID(t *testing.T) {
 
 		mock := &mockHotelsRepository{
 			findByIDFunc: func(ctx context.Context, id string) (*models.Hotel, error) {
+				floors := 10
 				return &models.Hotel{
-					ID: id,
 					CreateHotelRequest: models.CreateHotelRequest{
+						ID:     id,
 						Name:   "Test Hotel",
-						Floors: 10,
+						Floors: &floors,
 					},
 				}, nil
 			},
-			insertHotelFunc: nil, // unused for this test
 		}
 
 		app := fiber.New()
-		h := NewHotelsHandler(mock)
+		h := NewHotelsHandler(mock, nil)
 		app.Get("/hotels/:id", h.GetHotelByID)
 
-		req := httptest.NewRequest("GET", "/hotels/123e4567-e89b-12d3-a456-426614174000", nil)
+		req := httptest.NewRequest("GET", "/hotels/org_2abc123", nil)
 		resp, err := app.Test(req)
 		require.NoError(t, err)
 
 		assert.Equal(t, 200, resp.StatusCode)
 	})
 
-	t.Run("returns 400 on invalid UUID", func(t *testing.T) {
-		t.Parallel()
-
-		mock := &mockHotelsRepository{
-			findByIDFunc: func(ctx context.Context, id string) (*models.Hotel, error) {
-				return nil, nil
-			},
-			insertHotelFunc: nil,
-		}
-
-		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
-		h := NewHotelsHandler(mock)
-		app.Get("/hotels/:id", h.GetHotelByID)
-
-		req := httptest.NewRequest("GET", "/hotels/invalid-uuid", nil)
-		resp, err := app.Test(req)
-		require.NoError(t, err)
-
-		assert.Equal(t, 400, resp.StatusCode)
-	})
-
 	t.Run("returns 404 when hotel not found", func(t *testing.T) {
 		t.Parallel()
 
@@ -88,14 +86,13 @@ func TestHotelHandler_GetHotelByID(t *testing.T) {
 			findByIDFunc: func(ctx context.Context, id string) (*models.Hotel, error) {
 				return nil, errs.ErrNotFoundInDB
 			},
-			insertHotelFunc: nil,
 		}
 
 		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
-		h := NewHotelsHandler(mock)
+		h := NewHotelsHandler(mock, nil)
 		app.Get("/hotels/:id", h.GetHotelByID)
 
-		req := httptest.NewRequest("GET", "/hotels/123e4567-e89b-12d3-a456-426614174000", nil)
+		req := httptest.NewRequest("GET", "/hotels/org_2abc123", nil)
 		resp, err := app.Test(req)
 		require.NoError(t, err)
 
@@ -105,28 +102,31 @@ func TestHotelHandler_GetHotelByID(t *testing.T) {
 
 func TestHotelsHandler_CreateHotel(t *testing.T) {
 	t.Parallel()
+
+	floors := 10
 	validBody := `{
+		"id": "org_2abc123",
 		"name": "The Grand Budapest Hotel",
 		"floors": 10
 	}`
 
-	t.Run("returns 201 on success", func(t *testing.T) {
-		t.Parallel()
-
-		mock := &mockHotelsRepository{
+	newMock := func(returnFloors *int) *mockHotelsRepository {
+		return &mockHotelsRepository{
 			insertHotelFunc: func(ctx context.Context, hotel *models.CreateHotelRequest) (*models.Hotel, error) {
 				return &models.Hotel{
-					ID:                 "generated-uuid",
 					CreatedAt:          time.Now(),
 					UpdatedAt:          time.Now(),
 					CreateHotelRequest: *hotel,
 				}, nil
 			},
-			findByIDFunc: nil,
 		}
+	}
+
+	t.Run("returns 201 on success", func(t *testing.T) {
+		t.Parallel()
 
 		app := fiber.New()
-		h := NewHotelsHandler(mock)
+		h := NewHotelsHandler(newMock(&floors), nil)
 		app.Post("/hotels", h.CreateHotel)
 
 		req := httptest.NewRequest("POST", "/hotels", bytes.NewBufferString(validBody))
@@ -137,7 +137,7 @@ func TestHotelsHandler_CreateHotel(t *testing.T) {
 		assert.Equal(t, 201, resp.StatusCode)
 
 		body, _ := io.ReadAll(resp.Body)
-		assert.Contains(t, string(body), "generated-uuid")
+		assert.Contains(t, string(body), "org_2abc123")
 		assert.Contains(t, string(body), "The Grand Budapest Hotel")
 		assert.Contains(t, string(body), "10")
 	})
@@ -145,19 +145,8 @@ func TestHotelsHandler_CreateHotel(t *testing.T) {
 	t.Run("returns 400 on invalid JSON", func(t *testing.T) {
 		t.Parallel()
 
-		mock := &mockHotelsRepository{
-			insertHotelFunc: func(ctx context.Context, hotel *models.CreateHotelRequest) (*models.Hotel, error) {
-				return &models.Hotel{
-					ID:                 "generated-uuid",
-					CreatedAt:          time.Now(),
-					UpdatedAt:          time.Now(),
-					CreateHotelRequest: *hotel,
-				}, nil
-			},
-		}
-
 		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
-		h := NewHotelsHandler(mock)
+		h := NewHotelsHandler(newMock(nil), nil)
 		app.Post("/hotels", h.CreateHotel)
 
 		req := httptest.NewRequest("POST", "/hotels", bytes.NewBufferString(`{invalid json`))
@@ -168,29 +157,17 @@ func TestHotelsHandler_CreateHotel(t *testing.T) {
 		assert.Equal(t, 400, resp.StatusCode)
 	})
 
-	t.Run("returns 400 on missing required name field", func(t *testing.T) {
+	t.Run("returns 400 on missing id", func(t *testing.T) {
 		t.Parallel()
 
-		mock := &mockHotelsRepository{
-			insertHotelFunc: func(ctx context.Context, hotel *models.CreateHotelRequest) (*models.Hotel, error) {
-				return &models.Hotel{
-					ID:                 "generated-uuid",
-					CreatedAt:          time.Now(),
-					UpdatedAt:          time.Now(),
-					CreateHotelRequest: *hotel,
-				}, nil
-			},
-		}
-
 		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
-		h := NewHotelsHandler(mock)
+		h := NewHotelsHandler(newMock(nil), nil)
 		app.Post("/hotels", h.CreateHotel)
 
-		missingNameBody := `{
+		req := httptest.NewRequest("POST", "/hotels", bytes.NewBufferString(`{
+			"name": "The Grand Budapest Hotel",
 			"floors": 10
-		}`
-
-		req := httptest.NewRequest("POST", "/hotels", bytes.NewBufferString(missingNameBody))
+		}`))
 		req.Header.Set("Content-Type", "application/json")
 		resp, err := app.Test(req)
 		require.NoError(t, err)
@@ -198,33 +175,42 @@ func TestHotelsHandler_CreateHotel(t *testing.T) {
 		assert.Equal(t, 400, resp.StatusCode)
 
 		body, _ := io.ReadAll(resp.Body)
-		assert.Contains(t, string(body), "name")
+		assert.Contains(t, string(body), "id")
 	})
 
-	t.Run("returns 400 on empty name field", func(t *testing.T) {
+	t.Run("returns 400 on empty id", func(t *testing.T) {
 		t.Parallel()
 
-		mock := &mockHotelsRepository{
-			insertHotelFunc: func(ctx context.Context, hotel *models.CreateHotelRequest) (*models.Hotel, error) {
-				return &models.Hotel{
-					ID:                 "generated-uuid",
-					CreatedAt:          time.Now(),
-					UpdatedAt:          time.Now(),
-					CreateHotelRequest: *hotel,
-				}, nil
-			},
-		}
-
 		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
-		h := NewHotelsHandler(mock)
+		h := NewHotelsHandler(newMock(nil), nil)
 		app.Post("/hotels", h.CreateHotel)
 
-		emptyNameBody := `{
-			"name": "",
+		req := httptest.NewRequest("POST", "/hotels", bytes.NewBufferString(`{
+			"id": "",
+			"name": "The Grand Budapest Hotel",
 			"floors": 10
-		}`
+		}`))
+		req.Header.Set("Content-Type", "application/json")
+		resp, err := app.Test(req)
+		require.NoError(t, err)
 
-		req := httptest.NewRequest("POST", "/hotels", bytes.NewBufferString(emptyNameBody))
+		assert.Equal(t, 400, resp.StatusCode)
+
+		body, _ := io.ReadAll(resp.Body)
+		assert.Contains(t, string(body), "id")
+	})
+
+	t.Run("returns 400 on missing name", func(t *testing.T) {
+		t.Parallel()
+
+		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
+		h := NewHotelsHandler(newMock(nil), nil)
+		app.Post("/hotels", h.CreateHotel)
+
+		req := httptest.NewRequest("POST", "/hotels", bytes.NewBufferString(`{
+			"id": "org_2abc123",
+			"floors": 10
+		}`))
 		req.Header.Set("Content-Type", "application/json")
 		resp, err := app.Test(req)
 		require.NoError(t, err)
@@ -235,29 +221,18 @@ func TestHotelsHandler_CreateHotel(t *testing.T) {
 		assert.Contains(t, string(body), "name")
 	})
 
-	t.Run("returns 400 on missing required floors field", func(t *testing.T) {
+	t.Run("returns 400 on empty name", func(t *testing.T) {
 		t.Parallel()
 
-		mock := &mockHotelsRepository{
-			insertHotelFunc: func(ctx context.Context, hotel *models.CreateHotelRequest) (*models.Hotel, error) {
-				return &models.Hotel{
-					ID:                 "generated-uuid",
-					CreatedAt:          time.Now(),
-					UpdatedAt:          time.Now(),
-					CreateHotelRequest: *hotel,
-				}, nil
-			},
-		}
-
 		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
-		h := NewHotelsHandler(mock)
+		h := NewHotelsHandler(newMock(nil), nil)
 		app.Post("/hotels", h.CreateHotel)
 
-		missingFloorsBody := `{
-			"name": "The Grand Budapest Hotel"
-		}`
-
-		req := httptest.NewRequest("POST", "/hotels", bytes.NewBufferString(missingFloorsBody))
+		req := httptest.NewRequest("POST", "/hotels", bytes.NewBufferString(`{
+			"id": "org_2abc123",
+			"name": "",
+			"floors": 10
+		}`))
 		req.Header.Set("Content-Type", "application/json")
 		resp, err := app.Test(req)
 		require.NoError(t, err)
@@ -265,33 +240,21 @@ func TestHotelsHandler_CreateHotel(t *testing.T) {
 		assert.Equal(t, 400, resp.StatusCode)
 
 		body, _ := io.ReadAll(resp.Body)
-		assert.Contains(t, string(body), "floors")
+		assert.Contains(t, string(body), "name")
 	})
 
-	t.Run("returns 400 on floors equal to 0", func(t *testing.T) {
+	t.Run("returns 400 on negative floors", func(t *testing.T) {
 		t.Parallel()
 
-		mock := &mockHotelsRepository{
-			insertHotelFunc: func(ctx context.Context, hotel *models.CreateHotelRequest) (*models.Hotel, error) {
-				return &models.Hotel{
-					ID:                 "generated-uuid",
-					CreatedAt:          time.Now(),
-					UpdatedAt:          time.Now(),
-					CreateHotelRequest: *hotel,
-				}, nil
-			},
-		}
-
 		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
-		h := NewHotelsHandler(mock)
+		h := NewHotelsHandler(newMock(nil), nil)
 		app.Post("/hotels", h.CreateHotel)
 
-		zeroFloorsBody := `{
+		req := httptest.NewRequest("POST", "/hotels", bytes.NewBufferString(`{
+			"id": "org_2abc123",
 			"name": "The Grand Budapest Hotel",
-			"floors": 0
-		}`
-
-		req := httptest.NewRequest("POST", "/hotels", bytes.NewBufferString(zeroFloorsBody))
+			"floors": -1
+		}`))
 		req.Header.Set("Content-Type", "application/json")
 		resp, err := app.Test(req)
 		require.NoError(t, err)
@@ -302,30 +265,18 @@ func TestHotelsHandler_CreateHotel(t *testing.T) {
 		assert.Contains(t, string(body), "floors")
 	})
 
-	t.Run("returns 400 on negative floors", func(t *testing.T) {
+	t.Run("returns 400 on floors equal to 0", func(t *testing.T) {
 		t.Parallel()
 
-		mock := &mockHotelsRepository{
-			insertHotelFunc: func(ctx context.Context, hotel *models.CreateHotelRequest) (*models.Hotel, error) {
-				return &models.Hotel{
-					ID:                 "generated-uuid",
-					CreatedAt:          time.Now(),
-					UpdatedAt:          time.Now(),
-					CreateHotelRequest: *hotel,
-				}, nil
-			},
-		}
-
 		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
-		h := NewHotelsHandler(mock)
+		h := NewHotelsHandler(newMock(nil), nil)
 		app.Post("/hotels", h.CreateHotel)
 
-		negativeFloorsBody := `{
+		req := httptest.NewRequest("POST", "/hotels", bytes.NewBufferString(`{
+			"id": "org_2abc123",
 			"name": "The Grand Budapest Hotel",
-			"floors": -1
-		}`
-
-		req := httptest.NewRequest("POST", "/hotels", bytes.NewBufferString(negativeFloorsBody))
+			"floors": 0
+		}`))
 		req.Header.Set("Content-Type", "application/json")
 		resp, err := app.Test(req)
 		require.NoError(t, err)
@@ -336,6 +287,24 @@ func TestHotelsHandler_CreateHotel(t *testing.T) {
 		assert.Contains(t, string(body), "floors")
 	})
 
+	t.Run("returns 201 with no floors (optional)", func(t *testing.T) {
+		t.Parallel()
+
+		app := fiber.New()
+		h := NewHotelsHandler(newMock(nil), nil)
+		app.Post("/hotels", h.CreateHotel)
+
+		req := httptest.NewRequest("POST", "/hotels", bytes.NewBufferString(`{
+			"id": "org_2abc123",
+			"name": "The Grand Budapest Hotel"
+		}`))
+		req.Header.Set("Content-Type", "application/json")
+		resp, err := app.Test(req)
+		require.NoError(t, err)
+
+		assert.Equal(t, 201, resp.StatusCode)
+	})
+
 	t.Run("returns 500 on db error", func(t *testing.T) {
 		t.Parallel()
 
@@ -346,7 +315,7 @@ func TestHotelsHandler_CreateHotel(t *testing.T) {
 		}
 
 		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
-		h := NewHotelsHandler(mock)
+		h := NewHotelsHandler(mock, nil)
 		app.Post("/hotels", h.CreateHotel)
 
 		req := httptest.NewRequest("POST", "/hotels", bytes.NewBufferString(validBody))
diff --git a/backend/internal/handler/notifications.go b/backend/internal/handler/notifications.go
new file mode 100644
index 000000000..c2d10c8d6
--- /dev/null
+++ b/backend/internal/handler/notifications.go
@@ -0,0 +1,127 @@
+package handler
+
+import (
+	"context"
+	"errors"
+	"log/slog"
+
+	"github.com/generate/selfserve/internal/errs"
+	"github.com/generate/selfserve/internal/httpx"
+	"github.com/generate/selfserve/internal/models"
+	"github.com/gofiber/fiber/v2"
+)
+
+type NotificationsRepository interface {
+	FindByUserID(ctx context.Context, userID string) ([]*models.Notification, error)
+	MarkRead(ctx context.Context, id, userID string) error
+	MarkAllRead(ctx context.Context, userID string) error
+	UpsertDeviceToken(ctx context.Context, userID, token, platform string) error
+}
+
+type NotificationsHandler struct {
+	repo NotificationsRepository
+}
+
+func NewNotificationsHandler(repo NotificationsRepository) *NotificationsHandler {
+	return &NotificationsHandler{repo: repo}
+}
+
+// ListNotifications godoc
+// @Summary      List notifications
+// @Description  Returns the most recent notifications for the authenticated user
+// @Tags         notifications
+// @Produce      json
+// @Success      200  {array}   models.Notification
+// @Failure      500  {object}  errs.HTTPError
+// @Security     BearerAuth
+// @Router       /notifications [get]
+func (h *NotificationsHandler) ListNotifications(c *fiber.Ctx) error {
+	userID := c.Locals("userId").(string)
+
+	notifications, err := h.repo.FindByUserID(c.Context(), userID)
+	if err != nil {
+		slog.Error("failed to list notifications", "err", err)
+		return errs.InternalServerError()
+	}
+
+	if notifications == nil {
+		notifications = []*models.Notification{}
+	}
+
+	return c.JSON(notifications)
+}
+
+// MarkRead godoc
+// @Summary      Mark notification as read
+// @Description  Marks a single notification as read for the authenticated user
+// @Tags         notifications
+// @Param        id  path  string  true  "Notification ID"
+// @Success      204
+// @Failure      404  {object}  errs.HTTPError
+// @Failure      500  {object}  errs.HTTPError
+// @Security     BearerAuth
+// @Router       /notifications/{id}/read [put]
+func (h *NotificationsHandler) MarkRead(c *fiber.Ctx) error {
+	id := c.Params("id")
+	if id == "" {
+		return errs.BadRequest("id is required")
+	}
+
+	userID := c.Locals("userId").(string)
+
+	if err := h.repo.MarkRead(c.Context(), id, userID); err != nil {
+		if errors.Is(err, errs.ErrNotFoundInDB) {
+			return errs.NotFound("notification", "id", id)
+		}
+		slog.Error("failed to mark notification as read", "err", err)
+		return errs.InternalServerError()
+	}
+
+	return c.SendStatus(fiber.StatusNoContent)
+}
+
+// MarkAllRead godoc
+// @Summary      Mark all notifications as read
+// @Description  Marks all unread notifications as read for the authenticated user
+// @Tags         notifications
+// @Success      204
+// @Failure      500  {object}  errs.HTTPError
+// @Security     BearerAuth
+// @Router       /notifications/read-all [put]
+func (h *NotificationsHandler) MarkAllRead(c *fiber.Ctx) error {
+	userID := c.Locals("userId").(string)
+
+	if err := h.repo.MarkAllRead(c.Context(), userID); err != nil {
+		slog.Error("failed to mark all notifications as read", "err", err)
+		return errs.InternalServerError()
+	}
+
+	return c.SendStatus(fiber.StatusNoContent)
+}
+
+// RegisterDeviceToken godoc
+// @Summary      Register device token
+// @Description  Registers an Expo push token so the user receives mobile push notifications
+// @Tags         notifications
+// @Accept       json
+// @Param        request  body  models.RegisterDeviceTokenInput  true  "Device token"
+// @Success      204
+// @Failure      400  {object}  errs.HTTPError
+// @Failure      500  {object}  errs.HTTPError
+// @Security     BearerAuth
+// @Router       /device-tokens [post]
+func (h *NotificationsHandler) RegisterDeviceToken(c *fiber.Ctx) error {
+	var input models.RegisterDeviceTokenInput
+	if err := httpx.BindAndValidate(c, &input); err != nil {
+		return err
+	}
+
+	userID := c.Locals("userId").(string)
+
+	if err := h.repo.UpsertDeviceToken(c.Context(), userID, input.Token, input.Platform); err != nil {
+		slog.Error("failed to register device token", "err", err)
+		return errs.InternalServerError()
+	}
+
+	return c.SendStatus(fiber.StatusNoContent)
+}
diff --git a/backend/internal/handler/notifications_test.go b/backend/internal/handler/notifications_test.go
new file mode 100644
index 000000000..3ad18b05e
--- /dev/null
+++ b/backend/internal/handler/notifications_test.go
@@ -0,0 +1,418 @@
+package handler
+
+import (
+	"bytes"
+	"context"
+	"errors"
+	"io"
+	"net/http/httptest"
+	"testing"
+	"time"
+
+	"github.com/generate/selfserve/internal/errs"
+	"github.com/generate/selfserve/internal/models"
+	"github.com/gofiber/fiber/v2"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+const testUserID = "user_test_123"
+
+type mockNotificationsRepository struct {
+	findByUserIDFunc      func(ctx context.Context, userID string) ([]*models.Notification, error)
+	markReadFunc          func(ctx context.Context, id, userID string) error
+	markAllReadFunc       func(ctx context.Context, userID string) error
+	upsertDeviceTokenFunc func(ctx context.Context, userID, token, platform string) error
+}
+
+func (m *mockNotificationsRepository) FindByUserID(ctx context.Context, userID string) ([]*models.Notification, error) {
+	if m.findByUserIDFunc != nil {
+		return m.findByUserIDFunc(ctx, userID)
+	}
+	return nil, nil
+}
+
+func (m *mockNotificationsRepository) MarkRead(ctx context.Context, id, userID string) error {
+	if m.markReadFunc != nil {
+		return m.markReadFunc(ctx, id, userID)
+	}
+	return nil
+}
+
+func (m *mockNotificationsRepository) MarkAllRead(ctx context.Context, userID string) error {
+	if m.markAllReadFunc != nil {
+		return m.markAllReadFunc(ctx, userID)
+	}
+	return nil
+}
+
+func (m *mockNotificationsRepository) UpsertDeviceToken(ctx context.Context, userID, token, platform string) error {
+	if m.upsertDeviceTokenFunc != nil {
+		return m.upsertDeviceTokenFunc(ctx, userID, token, platform)
+	}
+	return nil
+}
+
+// notifApp builds a test Fiber app with the userId local pre-set (simulating
+// the Clerk auth middleware) and all notification routes registered.
+func notifApp(h *NotificationsHandler) *fiber.App {
+	app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
+	app.Use(func(c *fiber.Ctx) error {
+		c.Locals("userId", testUserID)
+		return c.Next()
+	})
+	app.Get("/notifications", h.ListNotifications)
+	app.Put("/notifications/read-all", h.MarkAllRead)
+	app.Put("/notifications/:id/read", h.MarkRead)
+	app.Post("/device-tokens", h.RegisterDeviceToken)
+	return app
+}
+
+func TestNotificationsHandler_ListNotifications(t *testing.T) {
+	t.Parallel()
+
+	t.Run("returns 200 with notifications", func(t *testing.T) {
+		t.Parallel()
+
+		readAt := time.Now()
+		mock := &mockNotificationsRepository{
+			findByUserIDFunc: func(ctx context.Context, userID string) ([]*models.Notification, error) {
+				return []*models.Notification{
+					{
+						ID:        "notif-1",
+						UserID:    userID,
+						Type:      models.TypeTaskAssigned,
+						Title:     "New task assigned to you",
+						Body:      "Room cleaning",
+						ReadAt:    &readAt,
+						CreatedAt: time.Now(),
+					},
+				}, nil
+			},
+		}
+
+		req := httptest.NewRequest("GET", "/notifications", nil)
+		resp, err := notifApp(NewNotificationsHandler(mock)).Test(req)
+		require.NoError(t, err)
+
+		assert.Equal(t, 200, resp.StatusCode)
+		body, _ := io.ReadAll(resp.Body)
+		assert.Contains(t, string(body), "notif-1")
+		assert.Contains(t, string(body), "New task assigned to you")
+	})
+
+	t.Run("returns 200 with empty array when no notifications", func(t *testing.T) {
+		t.Parallel()
+
+		mock := &mockNotificationsRepository{
+			findByUserIDFunc: func(ctx context.Context, userID string) ([]*models.Notification, error) {
+				return nil, nil
+			},
+		}
+
+		req := httptest.NewRequest("GET", "/notifications", nil)
+		resp, err := notifApp(NewNotificationsHandler(mock)).Test(req)
+		require.NoError(t, err)
+
+		assert.Equal(t, 200, resp.StatusCode)
+		body, _ := io.ReadAll(resp.Body)
+		assert.Contains(t, string(body), "[]")
+	})
+
+	t.Run("passes userId from locals to repository", func(t *testing.T) {
+		t.Parallel()
+
+		var capturedUserID string
+		mock := &mockNotificationsRepository{
+			findByUserIDFunc: func(ctx context.Context, userID string) ([]*models.Notification, error) {
+				capturedUserID = userID
+				return nil, nil
+			},
+		}
+
+		req := httptest.NewRequest("GET", "/notifications", nil)
+		resp, err := notifApp(NewNotificationsHandler(mock)).Test(req)
+		require.NoError(t, err)
+
+		assert.Equal(t, 200, resp.StatusCode)
+		assert.Equal(t, testUserID, capturedUserID)
+	})
+
+	t.Run("returns 500 on repository error", func(t *testing.T) {
+		t.Parallel()
+
+		mock := &mockNotificationsRepository{
+			findByUserIDFunc: func(ctx context.Context, userID string) ([]*models.Notification, error) {
+				return nil, errors.New("db error")
+			},
+		}
+
+		req := httptest.NewRequest("GET", "/notifications", nil)
+		resp, err := notifApp(NewNotificationsHandler(mock)).Test(req)
+		require.NoError(t, err)
+
+		assert.Equal(t, 500, resp.StatusCode)
+	})
+}
+
+func TestNotificationsHandler_MarkRead(t *testing.T) {
+	t.Parallel()
+
+	t.Run("returns 204 on success", func(t *testing.T) {
+		t.Parallel()
+
+		mock := &mockNotificationsRepository{
+			markReadFunc: func(ctx context.Context, id, userID string) error {
+				return nil
+			},
+		}
+
+		req := httptest.NewRequest("PUT", "/notifications/notif-123/read", nil)
+		resp, err := notifApp(NewNotificationsHandler(mock)).Test(req)
+		require.NoError(t, err)
+
+		assert.Equal(t, 204, resp.StatusCode)
+	})
+
+	t.Run("passes correct id and userId to repository", func(t *testing.T) {
+		t.Parallel()
+
+		var capturedID, capturedUserID string
+		mock := &mockNotificationsRepository{
+			markReadFunc: func(ctx context.Context, id, userID string) error {
+				capturedID = id
+				capturedUserID = userID
+				return nil
+			},
+		}
+
+		req := httptest.NewRequest("PUT", "/notifications/notif-abc/read", nil)
+		resp, err := notifApp(NewNotificationsHandler(mock)).Test(req)
+		require.NoError(t, err)
+
+		assert.Equal(t, 204, resp.StatusCode)
+		assert.Equal(t, "notif-abc", capturedID)
+		assert.Equal(t, testUserID, capturedUserID)
+	})
+
+	t.Run("returns 404 when notification not found or already read", func(t *testing.T) {
+		t.Parallel()
+
+		mock := &mockNotificationsRepository{
+			markReadFunc: func(ctx context.Context, id, userID string) error {
+				return errs.ErrNotFoundInDB
+			},
+		}
+
+		req := httptest.NewRequest("PUT", "/notifications/notif-missing/read", nil)
+		resp, err := notifApp(NewNotificationsHandler(mock)).Test(req)
+		require.NoError(t, err)
+
+		assert.Equal(t, 404, resp.StatusCode)
+	})
+
+	t.Run("returns 500 on repository error", func(t *testing.T) {
+		t.Parallel()
+
+		mock := &mockNotificationsRepository{
+			markReadFunc: func(ctx context.Context, id, userID string) error {
+				return errors.New("db error")
+			},
+		}
+
+		req := httptest.NewRequest("PUT", "/notifications/notif-123/read", nil)
+		resp, err := notifApp(NewNotificationsHandler(mock)).Test(req)
+		require.NoError(t, err)
+
+		assert.Equal(t, 500, resp.StatusCode)
+	})
+}
+
+func TestNotificationsHandler_MarkAllRead(t *testing.T) {
+	t.Parallel()
+
+	t.Run("returns 204 on success", func(t *testing.T) {
+		t.Parallel()
+
+		mock := &mockNotificationsRepository{
+			markAllReadFunc: func(ctx context.Context, userID string) error {
+				return nil
+			},
+		}
+
+		req := httptest.NewRequest("PUT", "/notifications/read-all", nil)
+		resp, err := notifApp(NewNotificationsHandler(mock)).Test(req)
+		require.NoError(t, err)
+
+		assert.Equal(t, 204, resp.StatusCode)
+	})
+
+	t.Run("passes userId from locals to repository", func(t *testing.T) {
+		t.Parallel()
+
+		var capturedUserID string
+		mock := &mockNotificationsRepository{
+			markAllReadFunc: func(ctx context.Context, userID string) error {
+				capturedUserID = userID
+				return nil
+			},
+		}
+
+		req := httptest.NewRequest("PUT", "/notifications/read-all", nil)
+		resp, err := notifApp(NewNotificationsHandler(mock)).Test(req)
+		require.NoError(t, err)
+
+		assert.Equal(t, 204, resp.StatusCode)
+		assert.Equal(t, testUserID, capturedUserID)
+	})
+
+	t.Run("returns 500 on repository error", func(t *testing.T) {
+		t.Parallel()
+
+		mock := &mockNotificationsRepository{
+			markAllReadFunc: func(ctx context.Context, userID string) error {
+				return errors.New("db error")
+			},
+		}
+
+		req := httptest.NewRequest("PUT", "/notifications/read-all", nil)
+		resp, err := notifApp(NewNotificationsHandler(mock)).Test(req)
+		require.NoError(t, err)
+
+		assert.Equal(t, 500, resp.StatusCode)
+	})
+}
+
+func TestNotificationsHandler_RegisterDeviceToken(t *testing.T) {
+	t.Parallel()
+
+	t.Run("returns 204 on success for ios", func(t *testing.T) {
+		t.Parallel()
+
+		mock := &mockNotificationsRepository{
+			upsertDeviceTokenFunc: func(ctx context.Context, userID, token, platform string) error {
+				return nil
+			},
+		}
+
+		body := `{"token": "ExponentPushToken[xxx]", "platform": "ios"}`
+		req := httptest.NewRequest("POST", "/device-tokens", bytes.NewBufferString(body))
+		req.Header.Set("Content-Type", "application/json")
+		resp, err := notifApp(NewNotificationsHandler(mock)).Test(req)
+		require.NoError(t, err)
+
+		assert.Equal(t, 204, resp.StatusCode)
+	})
+
+	t.Run("returns 204 on success for android", func(t *testing.T) {
+		t.Parallel()
+
+		mock := &mockNotificationsRepository{
+			upsertDeviceTokenFunc: func(ctx context.Context, userID, token, platform string) error {
+				return nil
+			},
+		}
+
+		body := `{"token": "ExponentPushToken[yyy]", "platform": "android"}`
+		req := httptest.NewRequest("POST", "/device-tokens", bytes.NewBufferString(body))
+		req.Header.Set("Content-Type", "application/json")
+		resp, err := notifApp(NewNotificationsHandler(mock)).Test(req)
+		require.NoError(t, err)
+
+		assert.Equal(t, 204, resp.StatusCode)
+	})
+
+	t.Run("passes correct userId, token and platform to repository", func(t *testing.T) {
+		t.Parallel()
+
+		var capturedUserID, capturedToken, capturedPlatform string
+		mock := &mockNotificationsRepository{
+			upsertDeviceTokenFunc: func(ctx context.Context, userID, token, platform string) error {
+				capturedUserID = userID
+				capturedToken = token
+				capturedPlatform = platform
+				return nil
+			},
+		}
+
+		body := `{"token": "ExponentPushToken[yyy]", "platform": "android"}`
+		req := httptest.NewRequest("POST", "/device-tokens", bytes.NewBufferString(body))
+		req.Header.Set("Content-Type", "application/json")
+		resp, err := notifApp(NewNotificationsHandler(mock)).Test(req)
+		require.NoError(t, err)
+
+		assert.Equal(t, 204, resp.StatusCode)
+		assert.Equal(t, testUserID, capturedUserID)
+		assert.Equal(t, "ExponentPushToken[yyy]", capturedToken)
+		assert.Equal(t, "android", capturedPlatform)
+	})
+
+	t.Run("returns 400 on invalid JSON", func(t *testing.T) {
+		t.Parallel()
+
+		req := httptest.NewRequest("POST", "/device-tokens", bytes.NewBufferString(`{invalid`))
+		req.Header.Set("Content-Type", "application/json")
+		resp, err := notifApp(NewNotificationsHandler(&mockNotificationsRepository{})).Test(req)
+		require.NoError(t, err)
+
+		assert.Equal(t, 400, resp.StatusCode)
+	})
+
+	t.Run("returns 400 when token is missing", func(t *testing.T) {
+		t.Parallel()
+
+		req := httptest.NewRequest("POST", "/device-tokens", bytes.NewBufferString(`{"platform": "ios"}`))
+		req.Header.Set("Content-Type", "application/json")
+		resp, err := notifApp(NewNotificationsHandler(&mockNotificationsRepository{})).Test(req)
+		require.NoError(t, err)
+
+		assert.Equal(t, 400, resp.StatusCode)
+		body, _ := io.ReadAll(resp.Body)
+		assert.Contains(t, string(body), "token")
+	})
+
+	t.Run("returns 400 when platform is missing", func(t *testing.T) {
+		t.Parallel()
+
+		req := httptest.NewRequest("POST", "/device-tokens", bytes.NewBufferString(`{"token": "ExponentPushToken[abc]"}`))
+		req.Header.Set("Content-Type", "application/json")
+		resp, err := notifApp(NewNotificationsHandler(&mockNotificationsRepository{})).Test(req)
+		require.NoError(t, err)
+
+		assert.Equal(t, 400, resp.StatusCode)
+		body, _ := io.ReadAll(resp.Body)
+		assert.Contains(t, string(body), "platform")
+	})
+
+	t.Run("returns 400 when platform is invalid", func(t *testing.T) {
+		t.Parallel()
+
+		body := `{"token": "ExponentPushToken[zzz]", "platform": "windows"}`
+		req := httptest.NewRequest("POST", "/device-tokens", bytes.NewBufferString(body))
+		req.Header.Set("Content-Type", "application/json")
+		resp, err := notifApp(NewNotificationsHandler(&mockNotificationsRepository{})).Test(req)
+		require.NoError(t, err)
+
+		assert.Equal(t, 400, resp.StatusCode)
+		respBody, _ := io.ReadAll(resp.Body)
+		assert.Contains(t, string(respBody), "platform")
+	})
+
+	t.Run("returns 500 on repository error", func(t *testing.T) {
+		t.Parallel()
+
+		mock := &mockNotificationsRepository{
+			upsertDeviceTokenFunc: func(ctx context.Context, userID, token, platform string) error {
+				return errors.New("db error")
+			},
+		}
+
+		body := `{"token": "ExponentPushToken[xxx]", "platform": "ios"}`
+		req := httptest.NewRequest("POST", "/device-tokens", bytes.NewBufferString(body))
+		req.Header.Set("Content-Type", "application/json")
+		resp, err := notifApp(NewNotificationsHandler(mock)).Test(req)
+		require.NoError(t, err)
+
+		assert.Equal(t, 500, resp.StatusCode)
+	})
+}
diff --git a/backend/internal/handler/requests.go b/backend/internal/handler/requests.go
index bc1fce1b3..7a87f5030 100644
--- a/backend/internal/handler/requests.go
+++ b/backend/internal/handler/requests.go
@@ -1,29 +1,45 @@
 package handler
 
 import (
+	"context"
 	"errors"
 	"log/slog"
 	"sort"
+	"strconv"
 	"strings"
+	"time"
 
 	"github.com/generate/selfserve/internal/aiflows"
 	"github.com/generate/selfserve/internal/errs"
+	"github.com/generate/selfserve/internal/httpx"
 	"github.com/generate/selfserve/internal/models"
 	storage "github.com/generate/selfserve/internal/service/storage/postgres"
+	temporalclient "github.com/generate/selfserve/internal/temporal"
+	"github.com/generate/selfserve/internal/utils"
 	"github.com/gofiber/fiber/v2"
+	"github.com/google/uuid"
 )
 
-const defaultPageSize = 20
+const msgTaskAssigned = "New task assigned to you"
+
+// NotificationSender is implemented by the notifications service.
+// It is nilable - if nil, notification triggering is skipped.
+type NotificationSender interface {
+	Notify(ctx context.Context, userID string, notifType models.NotificationType, title, body string) error
+}
 
 type RequestsHandler struct {
 	RequestRepository      storage.RequestsRepository
 	GenerateRequestService aiflows.GenerateRequestService
+	WorkflowClient         temporalclient.GenerateRequestWorkflowClient
+	NotificationSender     NotificationSender
 }
 
-func NewRequestsHandler(repo storage.RequestsRepository, generateRequestService aiflows.GenerateRequestService) *RequestsHandler {
+func NewRequestsHandler(repo storage.RequestsRepository, generateRequestService aiflows.GenerateRequestService, notificationSender NotificationSender) *RequestsHandler {
 	return &RequestsHandler{
 		RequestRepository:      repo,
 		GenerateRequestService: generateRequestService,
+		NotificationSender:     notificationSender,
 	}
 }
 
@@ -40,58 +56,142 @@ func NewRequestsHandler(repo storage.RequestsRepository, generateRequestService
 // @Security     BearerAuth
 // @Router       /request [post]
 func (r *RequestsHandler) CreateRequest(c *fiber.Ctx) error {
-	var incoming models.MakeRequest
-	if err := c.BodyParser(&incoming); err != nil {
-		return errs.InvalidJSON()
+	var requestBody models.MakeRequest
+	if err := httpx.BindAndValidate(c, &requestBody); err != nil {
+		return err
 	}
-	req := models.Request{MakeRequest: incoming}
 
-	if err := validateCreateRequest(&req); err != nil {
-		return err
+	var changedBy *string
+	if uid, ok := c.Locals("userId").(string); ok && uid != "" {
+		changedBy = &uid
 	}
 
+	req := models.Request{ID: uuid.New().String(), MakeRequest: requestBody, ChangedBy: changedBy}
 	res, err := r.RequestRepository.InsertRequest(c.Context(), &req)
 	if err != nil {
 		return errs.InternalServerError()
 	}
 
+	if r.NotificationSender != nil && requestBody.UserID != nil {
+		if err := r.NotificationSender.Notify(c.Context(), *requestBody.UserID, models.TypeTaskAssigned, msgTaskAssigned, res.Name); err != nil {
+			slog.Error("failed to send task assigned notification", "err", err)
+		}
+	}
+
 	return c.JSON(res)
 }
 
-func validateCreateRequest(req *models.Request) error {
-	errors := make(map[string]string)
+// UpdateRequest godoc
+// @Summary      Update a request
+// @Description  Partially updates a request — only fields present in the body are applied; omitted fields keep their current values
+// @Tags         requests
+// @Accept       json
+// @Produce      json
+// @Param        id       path  string              true  "Request ID (UUID)"
+// @Param        request  body  models.RequestUpdateInput  true  "Fields to update"
+// @Success      200  {object}  models.Request
+// @Failure      400  {object}  errs.HTTPError
+// @Failure      404  {object}  errs.HTTPError
+// @Failure      500  {object}  errs.HTTPError
+// @Security     BearerAuth
+// @Router       /request/{id} [put]
+func (r *RequestsHandler) UpdateRequest(c *fiber.Ctx) error {
+	id := c.Params("id")
+	if !validUUID(id) {
+		return errs.BadRequest("request id is not a valid UUID")
+	}
 
-	if !validUUID(req.HotelID) {
-		errors["hotel_id"] = "invalid uuid"
+	var patchInput models.RequestUpdateInput
+	if err := httpx.BindAndValidate(c, &patchInput); err != nil {
+		return err
 	}
 
-	if req.GuestID != nil && !validUUID(*req.GuestID) {
-		errors["guest_id"] = "invalid uuid"
+	var changedBy *string
+	if uid, ok := c.Locals("userId").(string); ok && uid != "" {
+		changedBy = &uid
 	}
-	if req.UserID != nil && !validUUID(*req.UserID) {
-		errors["user_id"] = "invalid uuid"
+
+	res, err := r.RequestRepository.UpdateRequest(c.Context(), id, &patchInput, changedBy)
+	if err != nil {
+		if errors.Is(err, errs.ErrNotFoundInDB) {
+			return errs.NotFound("Request", "id", id)
+		}
+		slog.Error("failed to update request", "err", err, "requestID", id)
+		return errs.InternalServerError()
 	}
-	if req.Name == "" {
-		errors["name"] = "must not be an empty string"
+
+	return c.JSON(res)
+}
+
+// AssignRequest godoc
+// @Summary      Assign a request to a user
+// @Description  Sets user_id on the latest request version. Set assign_to_self to true to assign to the caller. Omit assign_to_self (or set to false) and provide user_id to assign to another user. Requires X-Hotel-ID to match the request's hotel.
+// @Tags         requests
+// @Accept       json
+// @Produce      json
+// @Param        id          path    string                    true  "Request ID (UUID)"
+// @Param        X-Hotel-ID  header  string                    true  "Hotel ID (UUID)"
+// @Param        body        body    models.AssignRequestInput true  "Self-assign flag and optional assignee"
+// @Success      200  {object}  models.Request
+// @Failure      400  {object}  errs.HTTPError
+// @Failure      401  {object}  errs.HTTPError
+// @Failure      404  {object}  errs.HTTPError
+// @Failure      500  {object}  errs.HTTPError
+// @Security     BearerAuth
+// @Router       /request/{id}/assign [post]
+func (r *RequestsHandler) AssignRequest(c *fiber.Ctx) error {
+	userID, ok := c.Locals("userId").(string)
+	if !ok || userID == "" {
+		return errs.Unauthorized()
 	}
-	if req.RequestType == "" {
-		errors["request_type"] = "must not be an empty string"
+
+	hotelID, err := hotelIDFromHeader(c)
+	if err != nil {
+		return err
 	}
-	if req.Status == "" {
-		errors["status"] = "must not be an empty string"
+
+	requestID := c.Params("id")
+	if !validUUID(requestID) {
+		return errs.BadRequest("request id is not a valid UUID")
 	}
-	if req.Priority == "" {
-		errors["priority"] = "must not be an empty string"
+
+	var body models.AssignRequestInput
+	if err := httpx.BindAndValidate(c, &body); err != nil {
+		return err
 	}
 
-	if len(errors) > 0 {
-		var parts []string
-		for field, violation := range errors {
-			parts = append(parts, field+": "+violation)
+	var assigneeID string
+	if body.AssignToSelf != nil && *body.AssignToSelf {
+		assigneeID = userID
+	} else {
+		if body.UserID == nil || strings.TrimSpace(*body.UserID) == "" {
+			return errs.BadRequest("user_id is required when assign_to_self is false or not provided")
 		}
-		return errs.BadRequest(strings.Join(parts, ", "))
+		assigneeID = strings.TrimSpace(*body.UserID)
 	}
-	return nil
+
+	request, err := r.RequestRepository.FindRequest(c.Context(), requestID)
+	if err != nil {
+		if errors.Is(err, errs.ErrNotFoundInDB) {
+			return errs.NotFound("request", "id", requestID)
+		}
+		return errs.InternalServerError()
+	}
+	if request.HotelID != hotelID {
+		return errs.NotFound("request", "id", requestID)
+	}
+
+	update := models.RequestUpdateInput{UserID: &assigneeID}
+	res, err := r.RequestRepository.UpdateRequest(c.Context(), requestID, &update, &userID)
+	if err != nil {
+		if errors.Is(err, errs.ErrNotFoundInDB) {
+			return errs.NotFound("request", "id", requestID)
+		}
+		slog.Error("failed to assign request", "err", err, "requestID", requestID)
+		return errs.InternalServerError()
+	}
+
+	return c.JSON(res)
 }
 
 func (r *RequestsHandler) GetRequest(c *fiber.Ctx) error {
@@ -121,14 +221,10 @@ func (r *RequestsHandler) GetRequests(c *fiber.Ctx) error {
 	return c.JSON(dev)
 }
 
-func validateGenerateRequest(incoming *models.GenerateRequestInput) error {
+func validateGenerateRequest(input *models.GenerateRequestInput) error {
 	errors := make(map[string]string)
 
-	if !validUUID(incoming.HotelID) {
-		errors["hotel_id"] = "invalid uuid"
-	}
-
-	if incoming.RawText == "" {
+	if input.RawText == "" {
 		errors["raw_text"] = "must not be an empty string"
 	}
 
@@ -149,51 +245,6 @@ func validateGenerateRequest(incoming *models.GenerateRequestInput) error {
 	return nil
 }
 
-// GetRequestByCursor godoc
-// @Summary      Get requests by cursor
-// @Description  Gets 20 requests starting after the cursor ID, filtered by status
-// @Tags         requests
-// @Accept       json
-// @Produce      json
-// @Param        cursor    path      string  true  "Cursor UUID"
-// @Param        status    query     string  true  "Status filter: pending, assigned, in progress, completed"
-// @Param        hotel_id  query     string  true  "Hotel UUID"
-// @Success      200     {object}  map[string]interface{}  "Returns requests array and next_cursor"
-// @Failure      400     {object}  map[string]string
-// @Failure      500     {object}  map[string]string
-// @Security     BearerAuth
-// @Router       /request/cursor/{cursor} [get]
-func (r *RequestsHandler) GetRequestByCursor(c *fiber.Ctx) error {
-	cursor := c.Params("cursor")
-	status := c.Query("status")
-	hotelID := c.Query("hotel_id")
-
-	if !validUUID(cursor) {
-		return errs.BadRequest("cursor is not a valid request UUID")
-	}
-
-	if !models.RequestStatus(status).IsValid() {
-		return errs.BadRequest("Status must be one of: pending, assigned, in progress, completed")
-	}
-
-	if !validUUID(hotelID) {
-		return errs.BadRequest("hotel_id is not a valid UUID")
-	}
-
-	requests, nextCursor, err := r.RequestRepository.FindRequestsByStatusPaginated(c.Context(), cursor, status, hotelID, defaultPageSize)
-	if err != nil {
-		if errors.Is(err, errs.ErrNotFoundInDB) {
-			return errs.NotFound("request cursor id", "cursor", cursor)
-		}
-		return c.SendStatus(fiber.ErrInternalServerError.Code)
-	}
-
-	return c.JSON(fiber.Map{
-		"requests":    requests,
-		"next_cursor": nextCursor,
-	})
-}
-
 // GenerateRequest godoc
 // @Summary      generates a request
 // @Description  Generates a request using AI
@@ -201,56 +252,541 @@ func (r *RequestsHandler) GetRequestByCursor(c *fiber.Ctx) error {
 // @Accept       json
 // @Produce      json
 // @Param  request  body  models.GenerateRequestInput  true  "Request data with raw text"
-// @Success      200   {object}  models.Request
+// @Success      200   {object}  models.GenerateRequestResponse
 // @Failure      400   {object}  map[string]string
 // @Failure      500   {object}  map[string]string
 // @Security     BearerAuth
 // @Router       /request/generate [post]
 func (r *RequestsHandler) GenerateRequest(c *fiber.Ctx) error {
-	var incoming models.GenerateRequestInput
-	if err := c.BodyParser(&incoming); err != nil {
+	var input models.GenerateRequestInput
+	if err := c.BodyParser(&input); err != nil {
 		return errs.InvalidJSON()
 	}
 
-	if err := validateGenerateRequest(&incoming); err != nil {
+	if err := httpx.Validate(&input); err != nil {
+		return err
+	}
+
+	if err := validateGenerateRequest(&input); err != nil {
 		return err
 	}
 
 	parsed, err := r.GenerateRequestService.RunGenerateRequest(c.Context(), aiflows.GenerateRequestInput{
-		RawText: incoming.RawText,
+		RawText: input.RawText,
+		HotelID: input.HotelID,
 	})
 	if err != nil {
 		slog.Error("genkit failed to generate a request", "error", err)
 		return errs.InternalServerError()
 	}
+	if err := httpx.Validate(&parsed); err != nil {
+		slog.Error("generated request failed validation", "error", err)
+		return errs.InternalServerError()
+	}
+
+	notes := parsed.Notes
+	if notes == nil {
+		empty := ""
+		notes = &empty
+	}
 
-	req := models.Request{MakeRequest: models.MakeRequest{
-		HotelID:                 incoming.HotelID,
+	req := models.Request{ID: uuid.New().String(), MakeRequest: models.MakeRequest{
+		HotelID:                 input.HotelID,
 		GuestID:                 parsed.GuestID,
 		UserID:                  parsed.UserID,
 		ReservationID:           parsed.ReservationID,
+		RoomID:                  parsed.RoomID,
 		Name:                    parsed.Name,
 		Description:             parsed.Description,
-		RoomID:                  parsed.RoomID,
 		RequestCategory:         parsed.RequestCategory,
 		RequestType:             parsed.RequestType,
-		Department:              parsed.Department,
+		Department:              parsed.DepartmentID,
 		Status:                  parsed.Status,
 		Priority:                parsed.Priority,
 		EstimatedCompletionTime: parsed.EstimatedCompletionTime,
 		ScheduledTime:           nil, // TODO: Potentially add schedule time from user input / auto-scheduling
 		CompletedAt:             nil,
-		Notes:                   parsed.Notes,
+		Notes:                   notes,
 	}}
 
-	if err := validateCreateRequest(&req); err != nil {
+	return c.JSON(models.GenerateRequestResponse{
+		Request: req,
+		Warning: warningFromAI(parsed.Warning),
+	})
+}
+
+func warningFromAI(w *aiflows.GenerateRequestWarning) *models.GenerateRequestWarning {
+	if w == nil {
+		return nil
+	}
+
+	return &models.GenerateRequestWarning{
+		Code:    w.Code,
+		Message: w.Message,
+	}
+}
+
+// StartGenerateRequestAsync godoc
+// @Summary      starts request generation workflow
+// @Description  Starts async request generation via Temporal workflow
+// @Tags         requests
+// @Accept       json
+// @Produce      json
+// @Param  request  body  models.GenerateRequestInput  true  "Request data with raw text"
+// @Success      202   {object}  map[string]string
+// @Failure      400   {object}  map[string]string
+// @Failure      503   {object}  map[string]string
+// @Security     BearerAuth
+// @Router       /request/generate/async [post]
+func (r *RequestsHandler) StartGenerateRequestAsync(c *fiber.Ctx) error {
+	if r.WorkflowClient == nil {
+		return errs.NewHTTPError(fiber.StatusServiceUnavailable, errors.New("temporal workflow client unavailable"))
+	}
+
+	var input models.GenerateRequestInput
+	if err := c.BodyParser(&input); err != nil {
+		return errs.InvalidJSON()
+	}
+	if err := httpx.Validate(&input); err != nil {
+		return err
+	}
+	if err := validateGenerateRequest(&input); err != nil {
 		return err
 	}
 
-	res, err := r.RequestRepository.InsertRequest(c.Context(), &req)
+	workflowID, err := r.WorkflowClient.StartGenerateRequest(c.Context(), aiflows.GenerateRequestInput{
+		RawText: input.RawText,
+		HotelID: input.HotelID,
+	})
 	if err != nil {
+		slog.Error("failed to start generate request workflow", "error", err)
 		return errs.InternalServerError()
 	}
 
-	return c.JSON(res)
+	return c.Status(fiber.StatusAccepted).JSON(fiber.Map{
+		"workflow_id": workflowID,
+	})
+}
+
+// GetGenerateRequestStatus godoc
+// @Summary      gets request generation workflow status
+// @Description  Gets async request generation workflow status/result
+// @Tags         requests
+// @Produce      json
+// @Param        workflowId  path  string  true  "Workflow ID"
+// @Success      200   {object}  map[string]interface{}
+// @Failure      404   {object}  map[string]string
+// @Failure      503   {object}  map[string]string
+// @Security     BearerAuth
+// @Router       /request/generate/async/{workflowId} [get]
+func (r *RequestsHandler) GetGenerateRequestStatus(c *fiber.Ctx) error {
+	if r.WorkflowClient == nil {
+		return errs.NewHTTPError(fiber.StatusServiceUnavailable, errors.New("temporal workflow client unavailable"))
+	}
+
+	workflowID := c.Params("workflowId")
+	if workflowID == "" {
+		return errs.BadRequest("workflow id is required")
+	}
+
+	result, err := r.WorkflowClient.GetGenerateRequestResult(c.Context(), workflowID)
+	if err != nil {
+		if temporalclient.IsWorkflowNotFound(err) {
+			return errs.NotFound("workflow", "id", workflowID)
+		}
+		slog.Error("failed to get generate request workflow status", "error", err, "workflow_id", workflowID)
+		return errs.InternalServerError()
+	}
+
+	statusCode := fiber.StatusOK
+	if result.Status == "pending" {
+		statusCode = fiber.StatusAccepted
+	}
+
+	return c.Status(statusCode).JSON(result)
+}
+
+// GetRequestsByGuest godoc
+// @Summary      Get requests by guest
+// @Description  Retrieves all requests for a given guest
+// @Tags         requests
+// @Produce      json
+// @Param        id  path  string  true  "Guest ID (UUID)"
+// @Success      200  {object}  utils.CursorPage[models.GuestRequest]
+// @Failure      400  {object}  map[string]string
+// @Failure      500  {object}  map[string]string
+// @Security     BearerAuth
+// @Router       /request/guest/{id} [get]
+func (r *RequestsHandler) GetRequestsByGuest(c *fiber.Ctx) error {
+	input := models.GetRequestsByGuestInput{
+		GuestID: c.Params("id"),
+		HotelID: c.Get("X-Hotel-ID"),
+		Cursor:  c.Query("cursor"),
+		Limit:   c.QueryInt("limit"),
+	}
+	if err := httpx.Validate(&input); err != nil {
+		return err
+	}
+
+	cursorID, cursorVersion, err := parseRequestCursor(input.Cursor)
+	if err != nil {
+		return errs.BadRequest("invalid cursor")
+	}
+
+	limit := utils.ResolveLimit(input.Limit)
+	requests, err := r.RequestRepository.FindRequestsByGuestID(c.Context(), input.GuestID, input.HotelID, cursorID, cursorVersion, limit+1)
+	if err != nil {
+		return errs.InternalServerError()
+	}
+
+	page := utils.BuildCursorPage(requests, limit, func(req *models.GuestRequest) string {
+		return req.ID + "|" + req.RequestVersion.UTC().Format(time.RFC3339Nano)
+	})
+
+	return c.JSON(page)
+}
+
+// GetRequestsByRoomID godoc
+// @Summary      Get requests by room
+// @Description  Returns two lists for the given room and hotel: requests assigned to the caller and unassigned requests
+// @Tags         requests
+// @Produce      json
+// @Param        id          path    string  true  "Room ID (UUID)"
+// @Param        X-Hotel-ID  header  string  true  "Hotel ID (UUID)"
+// @Success      200  {object}  models.RoomRequestsResponse
+// @Failure      400  {object}  map[string]string
+// @Failure      500  {object}  map[string]string
+// @Security     BearerAuth
+// @Router       /request/room/{id} [get]
+func (r *RequestsHandler) GetRequestsByRoomID(c *fiber.Ctx) error {
+	userID, ok := c.Locals("userId").(string)
+	if !ok || userID == "" {
+		return errs.Unauthorized()
+	}
+
+	input := models.GetRequestsByRoomInput{
+		RoomID:  c.Params("id"),
+		HotelID: c.Get("X-Hotel-ID"),
+	}
+	if err := httpx.Validate(&input); err != nil {
+		return err
+	}
+
+	assigned, err := r.RequestRepository.FindRequestsByRoomIDAndUserID(c.Context(), input.RoomID, input.HotelID, userID, "", time.Time{}, utils.DefaultPageLimit)
+	if err != nil {
+		slog.Error("FindRequestsByRoomIDAndUserID failed", "err", err, "roomID", input.RoomID)
+		return errs.InternalServerError()
+	}
+
+	unassigned, err := r.RequestRepository.FindUnassignedRequestsByRoomIDAndUserID(c.Context(), input.RoomID, input.HotelID, "", time.Time{}, utils.DefaultPageLimit)
+	if err != nil {
+		slog.Error("FindUnassignedRequestsByRoomIDAndUserID failed", "err", err, "roomID", input.RoomID)
+		return errs.InternalServerError()
+	}
+
+	return c.JSON(models.RoomRequestsResponse{
+		Assigned:   assigned,
+		Unassigned: unassigned,
+	})
+}
+
+// GetRequestsFeed godoc
+// @Summary      Get requests feed
+// @Description  Returns a paginated list of requests for the hotel, optionally filtered and searched
+// @Tags         requests
+// @Accept       json
+// @Produce      json
+// @Param        request  body  models.RequestsFeedInput  true  "Feed filters"
+// @Success      200  {object}  utils.CursorPage[models.GuestRequest]
+// @Failure      400  {object}  errs.HTTPError
+// @Failure      500  {object}  errs.HTTPError
+// @Security     BearerAuth
+// @Router       /requests/feed [post]
+func (r *RequestsHandler) GetRequestsFeed(c *fiber.Ctx) error {
+	var input models.RequestsFeedInput
+	if err := httpx.BindAndValidate(c, &input); err != nil {
+		return err
+	}
+
+	if input.Sort == "" {
+		input.Sort = models.SortByPriority
+	}
+
+	cursorID, cursorCreatedAt, cursorPriorityRank, err := parseFeedCursor(input.Cursor)
+	if err != nil {
+		return errs.BadRequest("invalid cursor")
+	}
+
+	resolvedLimit := utils.ResolveLimit(input.Limit)
+	requests, err := r.RequestRepository.FindRequestsPaginated(
+		c.Context(), &input,
+		cursorID, cursorCreatedAt, cursorPriorityRank,
+		resolvedLimit+1,
+	)
+	if err != nil {
+		return errs.InternalServerError()
+	}
+
+	page := utils.BuildCursorPage(requests, resolvedLimit, buildFeedCursor)
+
+	return c.JSON(page)
+}
+
+// GetRequestActivity godoc
+// @Summary      Get request activity history
+// @Description  Returns a cursor-paginated list of activity events derived from the request's version history, newest first
+// @Tags         requests
+// @Produce      json
+// @Param        id      path   string  true   "Request ID (UUID)"
+// @Param        cursor  query  string  false  "Pagination cursor (timestamp of last seen item)"
+// @Param        limit   query  int     false  "Page size (default 20, max 100)"
+// @Success      200  {object}  models.RequestActivityPage
+// @Failure      400  {object}  errs.HTTPError
+// @Failure      404  {object}  errs.HTTPError
+// @Failure      500  {object}  errs.HTTPError
+// @Security     BearerAuth
+// @Router       /request/{id}/activity [get]
+func (r *RequestsHandler) GetRequestActivity(c *fiber.Ctx) error {
+	id := c.Params("id")
+	if !validUUID(id) {
+		return errs.BadRequest("request id is not a valid UUID")
+	}
+
+	limit := c.QueryInt("limit", 20)
+	if limit < 1 || limit > 100 {
+		limit = 20
+	}
+
+	var cursor time.Time
+	if cursorStr := c.Query("cursor"); cursorStr != "" {
+		var err error
+		cursor, err = time.Parse(time.RFC3339Nano, cursorStr)
+		if err != nil {
+			return errs.BadRequest("invalid cursor")
+		}
+	}
+
+	versions, err := r.RequestRepository.FindRequestVersions(c.Context(), id)
+	if err != nil {
+		if errors.Is(err, errs.ErrNotFoundInDB) {
+			return errs.NotFound("Request", "id", id)
+		}
+		slog.Error("failed to fetch request versions", "err", err, "requestID", id)
+		return errs.InternalServerError()
+	}
+
+	all := buildRequestActivity(versions)
+	// Reverse to newest-first
+	for i, j := 0, len(all)-1; i < j; i, j = i+1, j-1 {
+		all[i], all[j] = all[j], all[i]
+	}
+
+	// Apply cursor: skip items at or after the cursor timestamp
+	start := 0
+	if !cursor.IsZero() {
+		for i, item := range all {
+			if item.Timestamp.Before(cursor) {
+				start = i
+				break
+			}
+		}
+		if start == 0 {
+			return c.JSON(&models.RequestActivityPage{Items: []*models.RequestActivityItem{}})
+		}
+	}
+
+	page := all[start:]
+	var nextCursor *string
+	if len(page) > limit {
+		page = page[:limit]
+		t := page[limit-1].Timestamp.UTC().Format(time.RFC3339Nano)
+		nextCursor = &t
+	}
+
+	return c.JSON(&models.RequestActivityPage{Items: page, NextCursor: nextCursor})
+}
+
+func buildRequestActivity(versions []*models.Request) []*models.RequestActivityItem {
+	items := make([]*models.RequestActivityItem, 0, len(versions))
+
+	for i, v := range versions {
+		if i == 0 {
+			items = append(items, &models.RequestActivityItem{
+				Type:      models.ActivityCreated,
+				ChangedBy: v.ChangedBy,
+				Timestamp: v.RequestVersion,
+			})
+			continue
+		}
+
+		prev := versions[i-1]
+
+		if v.Status != prev.Status {
+			old, cur := prev.Status, v.Status
+			items = append(items, &models.RequestActivityItem{
+				Type:      models.ActivityStatusChanged,
+				ChangedBy: v.ChangedBy,
+				OldValue:  &old,
+				NewValue:  &cur,
+				Timestamp: v.RequestVersion,
+			})
+		}
+
+		if v.Priority != prev.Priority {
+			old, cur := prev.Priority, v.Priority
+			items = append(items, &models.RequestActivityItem{
+				Type:      models.ActivityPriorityChanged,
+				ChangedBy: v.ChangedBy,
+				OldValue:  &old,
+				NewValue:  &cur,
+				Timestamp: v.RequestVersion,
+			})
+		}
+
+		prevUserID := ""
+		if prev.UserID != nil {
+			prevUserID = *prev.UserID
+		}
+		curUserID := ""
+		if v.UserID != nil {
+			curUserID = *v.UserID
+		}
+		if prevUserID != curUserID {
+			if curUserID == "" {
+				items = append(items, &models.RequestActivityItem{
+					Type:      models.ActivityUnassigned,
+					ChangedBy: v.ChangedBy,
+					OldValue:  &prevUserID,
+					Timestamp: v.RequestVersion,
+				})
+			} else {
+				items = append(items, &models.RequestActivityItem{
+					Type:      models.ActivityAssigned,
+					ChangedBy: v.ChangedBy,
+					NewValue:  &curUserID,
+					Timestamp: v.RequestVersion,
+				})
+			}
+		}
+
+		if v.Name != prev.Name {
+			old, cur := prev.Name, v.Name
+			items = append(items, &models.RequestActivityItem{
+				Type:      models.ActivityNameChanged,
+				ChangedBy: v.ChangedBy,
+				OldValue:  &old,
+				NewValue:  &cur,
+				Timestamp: v.RequestVersion,
+			})
+		}
+
+		prevDept := ""
+		if prev.Department != nil {
+			prevDept = *prev.Department
+		}
+		curDept := ""
+		if v.Department != nil {
+			curDept = *v.Department
+		}
+		if prevDept != curDept {
+			items = append(items, &models.RequestActivityItem{
+				Type:      models.ActivityDepartmentChanged,
+				ChangedBy: v.ChangedBy,
+				OldValue:  &prevDept,
+				NewValue:  &curDept,
+				Timestamp: v.RequestVersion,
+			})
+		}
+
+		prevRoom := ""
+		if prev.RoomID != nil {
+			prevRoom = *prev.RoomID
+		}
+		curRoom := ""
+		if v.RoomID != nil {
+			curRoom = *v.RoomID
+		}
+		if prevRoom != curRoom {
+			items = append(items, &models.RequestActivityItem{
+				Type:      models.ActivityRoomChanged,
+				ChangedBy: v.ChangedBy,
+				OldValue:  &prevRoom,
+				NewValue:  &curRoom,
+				Timestamp: v.RequestVersion,
+			})
+		}
+
+		prevDesc := ""
+		if prev.Description != nil {
+			prevDesc = *prev.Description
+		}
+		curDesc := ""
+		if v.Description != nil {
+			curDesc = *v.Description
+		}
+		if prevDesc != curDesc {
+			items = append(items, &models.RequestActivityItem{
+				Type:      models.ActivityDescriptionChanged,
+				ChangedBy: v.ChangedBy,
+				OldValue:  &prevDesc,
+				NewValue:  &curDesc,
+				Timestamp: v.RequestVersion,
+			})
+		}
+	}
+
+	return items
+}
+
+// parseFeedCursor decodes a universal cursor: "priority_rank|created_at_nano|id".
+// Returns zero values and nil error for an empty cursor (first page).
+func parseFeedCursor(cursor string) (id string, createdAt time.Time, priorityRank int, err error) {
+	if cursor == "" {
+		return "", time.Time{}, 0, nil
+	}
+	parts := strings.SplitN(cursor, "|", 3)
+	if len(parts) != 3 {
+		return "", time.Time{}, 0, errors.New("invalid cursor")
+	}
+	rank, rankErr := strconv.Atoi(parts[0])
+	nano, nanoErr := strconv.ParseInt(parts[1], 10, 64)
+	if rankErr != nil || nanoErr != nil {
+		return "", time.Time{}, 0, errors.New("invalid cursor")
+	}
+	return parts[2], time.Unix(0, nano).UTC(), rank, nil
+}
+
+// buildFeedCursor encodes all sort fields into a single universal cursor.
+func buildFeedCursor(req *models.GuestRequest) string {
+	return strconv.Itoa(priorityRankOf(req.Priority)) + "|" +
+		strconv.FormatInt(req.CreatedAt.UnixNano(), 10) + "|" +
+		req.ID
+}
+
+func priorityRankOf(priority string) int {
+	switch priority {
+	case "high":
+		return 1
+	case "medium":
+		return 2
+	default:
+		return 3
+	}
+}
+
+// parseRequestCursor splits a "id|request_version" cursor string.
+// Returns zero values and nil error when cursor is empty (first page).
+func parseRequestCursor(cursor string) (id string, version time.Time, err error) {
+	if cursor == "" {
+		return "", time.Time{}, nil
+	}
+	parts := strings.SplitN(cursor, "|", 2)
+	if len(parts) != 2 {
+		return "", time.Time{}, errors.New("invalid cursor")
+	}
+	version, err = time.Parse(time.RFC3339Nano, parts[1])
+	if err != nil {
+		return "", time.Time{}, errors.New("invalid cursor")
+	}
+	return parts[0], version, nil
 }
diff --git a/backend/internal/handler/requests_test.go b/backend/internal/handler/requests_test.go
index d6b52fbac..efe98b588 100644
--- a/backend/internal/handler/requests_test.go
+++ b/backend/internal/handler/requests_test.go
@@ -12,22 +12,31 @@ import (
 	"github.com/generate/selfserve/internal/aiflows"
 	"github.com/generate/selfserve/internal/errs"
 	"github.com/generate/selfserve/internal/models"
+	temporalclient "github.com/generate/selfserve/internal/temporal"
 	"github.com/gofiber/fiber/v2"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
 type mockRequestRepository struct {
-	makeRequestFunc          func(ctx context.Context, req *models.Request) (*models.Request, error)
-	findRequestFunc          func(ctx context.Context, id string) (*models.Request, error)
-	findRequestsFunc         func(ctx context.Context) ([]models.Request, error)
-	findRequestsByCursorFunc func(ctx context.Context, cursor string, status string, hotelID string, pageSize int) ([]*models.Request, string, error)
+	makeRequestFunc                    func(ctx context.Context, req *models.Request) (*models.Request, error)
+	updateRequestFunc                  func(ctx context.Context, id string, update *models.RequestUpdateInput, changedBy *string) (*models.Request, error)
+	findRequestFunc                    func(ctx context.Context, id string) (*models.Request, error)
+	findRequestsFunc                   func(ctx context.Context) ([]models.Request, error)
+	findRequestsByGuestIDFunc          func(ctx context.Context, guestID, hotelID, cursorID string, cursorVersion time.Time, limit int) ([]*models.GuestRequest, error)
+	findRequestsByRoomIDAndUserIDFunc  func(ctx context.Context, roomID, hotelID, userID, cursorID string, cursorVersion time.Time, limit int) ([]*models.GuestRequest, error)
+	findUnassignedRequestsByRoomIDFunc func(ctx context.Context, roomID, hotelID, cursorID string, cursorVersion time.Time, limit int) ([]*models.GuestRequest, error)
+	findRequestsPaginatedFunc          func(ctx context.Context, input *models.RequestsFeedInput, cursorID string, cursorCreatedAt time.Time, cursorPriorityRank int, limit int) ([]*models.GuestRequest, error)
 }
 
 func (m *mockRequestRepository) InsertRequest(ctx context.Context, req *models.Request) (*models.Request, error) {
 	return m.makeRequestFunc(ctx, req)
 }
 
+func (m *mockRequestRepository) UpdateRequest(ctx context.Context, id string, update *models.RequestUpdateInput, changedBy *string) (*models.Request, error) {
+	return m.updateRequestFunc(ctx, id, update, changedBy)
+}
+
 func (m *mockRequestRepository) FindRequest(ctx context.Context, id string) (*models.Request, error) {
 	return m.findRequestFunc(ctx, id)
 }
@@ -36,18 +45,47 @@ func (m *mockRequestRepository) FindRequests(ctx context.Context) ([]models.Requ
 	return m.findRequestsFunc(ctx)
 }
 
-func (m *mockRequestRepository) FindRequestsByStatusPaginated(ctx context.Context, cursor string, status string, hotelID string, pageSize int) ([]*models.Request, string, error) {
-	return m.findRequestsByCursorFunc(ctx, cursor, status, hotelID, pageSize)
+func (m *mockRequestRepository) FindRequestsByGuestID(ctx context.Context, guestID, hotelID, cursorID string, cursorVersion time.Time, limit int) ([]*models.GuestRequest, error) {
+	return m.findRequestsByGuestIDFunc(ctx, guestID, hotelID, cursorID, cursorVersion, limit)
+}
+
+func (m *mockRequestRepository) FindRequestsByRoomIDAndUserID(ctx context.Context, roomID, hotelID, userID, cursorID string, cursorVersion time.Time, limit int) ([]*models.GuestRequest, error) {
+	return m.findRequestsByRoomIDAndUserIDFunc(ctx, roomID, hotelID, userID, cursorID, cursorVersion, limit)
+}
+
+func (m *mockRequestRepository) FindUnassignedRequestsByRoomIDAndUserID(ctx context.Context, roomID, hotelID, cursorID string, cursorVersion time.Time, limit int) ([]*models.GuestRequest, error) {
+	return m.findUnassignedRequestsByRoomIDFunc(ctx, roomID, hotelID, cursorID, cursorVersion, limit)
+}
+
+func (m *mockRequestRepository) FindRequestsPaginated(ctx context.Context, input *models.RequestsFeedInput, cursorID string, cursorCreatedAt time.Time, cursorPriorityRank int, limit int) ([]*models.GuestRequest, error) {
+	return m.findRequestsPaginatedFunc(ctx, input, cursorID, cursorCreatedAt, cursorPriorityRank, limit)
+}
+
+func (m *mockRequestRepository) FindRequestVersions(ctx context.Context, id string) ([]*models.Request, error) {
+	return nil, nil
 }
 
 type mockLLMService struct {
-	runGenerateRequestFunc func(ctx context.Context, input aiflows.GenerateRequestInput) (aiflows.GenerateRequestOutput, error)
+	runGenerateRequestFunc func(ctx context.Context, input aiflows.GenerateRequestInput) (aiflows.EnrichedGenerateRequestOutput, error)
 }
 
-func (m *mockLLMService) RunGenerateRequest(ctx context.Context, input aiflows.GenerateRequestInput) (aiflows.GenerateRequestOutput, error) {
+func (m *mockLLMService) RunGenerateRequest(ctx context.Context, input aiflows.GenerateRequestInput) (aiflows.EnrichedGenerateRequestOutput, error) {
 	return m.runGenerateRequestFunc(ctx, input)
 }
 
+type mockWorkflowClient struct {
+	startGenerateRequestFunc   func(ctx context.Context, input aiflows.GenerateRequestInput) (workflowID string, err error)
+	getGenerateRequestResultFn func(ctx context.Context, workflowID string) (temporalclient.GenerateRequestResult, error)
+}
+
+func (m *mockWorkflowClient) StartGenerateRequest(ctx context.Context, input aiflows.GenerateRequestInput) (string, error) {
+	return m.startGenerateRequestFunc(ctx, input)
+}
+
+func (m *mockWorkflowClient) GetGenerateRequestResult(ctx context.Context, workflowID string) (temporalclient.GenerateRequestResult, error) {
+	return m.getGenerateRequestResultFn(ctx, workflowID)
+}
+
 func TestRequestHandler_GetRequest(t *testing.T) {
 	t.Parallel()
 
@@ -57,11 +95,11 @@ func TestRequestHandler_GetRequest(t *testing.T) {
 		mock := &mockRequestRepository{
 			findRequestFunc: func(ctx context.Context, name string) (*models.Request, error) {
 				return &models.Request{
-					ID:        "530e8400-e458-41d4-a716-446655440000",
-					CreatedAt: time.Now(),
-					UpdatedAt: time.Now(),
+					ID:             "530e8400-e458-41d4-a716-446655440000",
+					CreatedAt:      time.Now(),
+					RequestVersion: time.Now(),
 					MakeRequest: models.MakeRequest{
-						HotelID:     "521e8400-e458-41d4-a716-446655440000",
+						HotelID:     "org_521e8400-e458-41d4-a716-446655440000",
 						Name:        "room cleaning",
 						RequestType: "recurring",
 						Status:      "assigned",
@@ -72,7 +110,7 @@ func TestRequestHandler_GetRequest(t *testing.T) {
 		}
 
 		app := fiber.New()
-		h := NewRequestsHandler(mock, nil)
+		h := NewRequestsHandler(mock, nil, nil)
 		app.Get("/request/:id", h.GetRequest)
 
 		req := httptest.NewRequest("GET", "/request/530e8400-e458-41d4-a716-446655440000", nil)
@@ -95,7 +133,7 @@ func TestRequestHandler_GetRequest(t *testing.T) {
 		}
 
 		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
-		h := NewRequestsHandler(mock, nil)
+		h := NewRequestsHandler(mock, nil, nil)
 		app.Get("/request/:id", h.GetRequest)
 
 		req := httptest.NewRequest("GET", "/request/notaUUID", nil)
@@ -115,7 +153,7 @@ func TestRequestHandler_GetRequest(t *testing.T) {
 		}
 
 		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
-		h := NewRequestsHandler(mock, nil)
+		h := NewRequestsHandler(mock, nil, nil)
 		app.Get("/request/:id", h.GetRequest)
 
 		req := httptest.NewRequest("GET", "/request/530e8400-e458-41d4-a716-446655440001", nil)
@@ -135,7 +173,7 @@ func TestRequestHandler_GetRequest(t *testing.T) {
 		}
 
 		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
-		h := NewRequestsHandler(mock, nil)
+		h := NewRequestsHandler(mock, nil, nil)
 		app.Get("/request/:id", h.GetRequest)
 
 		req := httptest.NewRequest("GET", "/request/530e8400-e458-41d4-a716-446655440001", nil)
@@ -155,7 +193,7 @@ func TestRequestHandler_GetRequest(t *testing.T) {
 		}
 
 		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
-		h := NewRequestsHandler(mock, nil)
+		h := NewRequestsHandler(mock, nil, nil)
 		app.Get("/request/:id", h.GetRequest)
 
 		req := httptest.NewRequest("GET", "/request/", nil)
@@ -175,11 +213,11 @@ func TestRequestHandler_GetRequests(t *testing.T) {
 			findRequestsFunc: func(ctx context.Context) ([]models.Request, error) {
 				requests := []models.Request{
 					{
-						ID:        "530e8400-e458-41d4-a716-446655440000",
-						CreatedAt: time.Now(),
-						UpdatedAt: time.Now(),
+						ID:             "530e8400-e458-41d4-a716-446655440000",
+						CreatedAt:      time.Now(),
+						RequestVersion: time.Now(),
 						MakeRequest: models.MakeRequest{
-							HotelID:     "521e8400-e458-41d4-a716-446655440000",
+							HotelID:     "org_521e8400-e458-41d4-a716-446655440000",
 							Name:        "room cleaning",
 							RequestType: "recurring",
 							Status:      "assigned",
@@ -187,11 +225,11 @@ func TestRequestHandler_GetRequests(t *testing.T) {
 						},
 					},
 					{
-						ID:        "530e8400-e458-41d4-a716-446655440001",
-						CreatedAt: time.Now(),
-						UpdatedAt: time.Now(),
+						ID:             "530e8400-e458-41d4-a716-446655440001",
+						CreatedAt:      time.Now(),
+						RequestVersion: time.Now(),
 						MakeRequest: models.MakeRequest{
-							HotelID:     "521e8400-e458-41d4-a716-446655440000",
+							HotelID:     "org_521e8400-e458-41d4-a716-446655440000",
 							Name:        "towel replacement",
 							RequestType: "one-time",
 							Status:      "pending",
@@ -199,11 +237,11 @@ func TestRequestHandler_GetRequests(t *testing.T) {
 						},
 					},
 					{
-						ID:        "530e8400-e458-41d4-a716-446655440002",
-						CreatedAt: time.Now(),
-						UpdatedAt: time.Now(),
+						ID:             "530e8400-e458-41d4-a716-446655440002",
+						CreatedAt:      time.Now(),
+						RequestVersion: time.Now(),
 						MakeRequest: models.MakeRequest{
-							HotelID:     "521e8400-e458-41d4-a716-446655440000",
+							HotelID:     "org_521e8400-e458-41d4-a716-446655440000",
 							Name:        "maintenance repair",
 							RequestType: "one-time",
 							Status:      "in-progress",
@@ -211,11 +249,11 @@ func TestRequestHandler_GetRequests(t *testing.T) {
 						},
 					},
 					{
-						ID:        "530e8400-e458-41d4-a716-446655440003",
-						CreatedAt: time.Now(),
-						UpdatedAt: time.Now(),
+						ID:             "530e8400-e458-41d4-a716-446655440003",
+						CreatedAt:      time.Now(),
+						RequestVersion: time.Now(),
 						MakeRequest: models.MakeRequest{
-							HotelID:     "521e8400-e458-41d4-a716-446655440000",
+							HotelID:     "org_521e8400-e458-41d4-a716-446655440000",
 							Name:        "extra pillows",
 							RequestType: "one-time",
 							Status:      "completed",
@@ -223,11 +261,11 @@ func TestRequestHandler_GetRequests(t *testing.T) {
 						},
 					},
 					{
-						ID:        "530e8400-e458-41d4-a716-446655440004",
-						CreatedAt: time.Now(),
-						UpdatedAt: time.Now(),
+						ID:             "530e8400-e458-41d4-a716-446655440004",
+						CreatedAt:      time.Now(),
+						RequestVersion: time.Now(),
 						MakeRequest: models.MakeRequest{
-							HotelID:     "521e8400-e458-41d4-a716-446655440000",
+							HotelID:     "org_521e8400-e458-41d4-a716-446655440000",
 							Name:        "minibar refill",
 							RequestType: "recurring",
 							Status:      "assigned",
@@ -239,7 +277,7 @@ func TestRequestHandler_GetRequests(t *testing.T) {
 			},
 		}
 		app := fiber.New()
-		h := NewRequestsHandler(mock, nil)
+		h := NewRequestsHandler(mock, nil, nil)
 		app.Get("/request/", h.GetRequests)
 
 		req := httptest.NewRequest("GET", "/request/", nil)
@@ -259,7 +297,7 @@ func TestRequestHandler_GetRequests(t *testing.T) {
 		}
 
 		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
-		h := NewRequestsHandler(mock, nil)
+		h := NewRequestsHandler(mock, nil, nil)
 		app.Get("/request", h.GetRequests)
 
 		req := httptest.NewRequest("GET", "/request", nil)
@@ -279,7 +317,7 @@ func TestRequestHandler_GetRequests(t *testing.T) {
 		}
 
 		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
-		h := NewRequestsHandler(mock, nil)
+		h := NewRequestsHandler(mock, nil, nil)
 		app.Get("/request/:id", h.GetRequest)
 
 		req := httptest.NewRequest("GET", "/request/", nil)
@@ -293,7 +331,7 @@ func TestRequestHandler_GetRequests(t *testing.T) {
 func TestRequestHandler_MakeRequest(t *testing.T) {
 	t.Parallel()
 	validBody := `{
-		"hotel_id": "550e8400-e29b-41d4-a716-446655440000",
+		"hotel_id": "org_550e8400-e29b-41d4-a716-446655440000",
 		"name": "room cleaning",
 		"request_type": "recurring",
 		"status": "pending",
@@ -312,7 +350,7 @@ func TestRequestHandler_MakeRequest(t *testing.T) {
 		}
 
 		app := fiber.New()
-		h := NewRequestsHandler(mock, nil)
+		h := NewRequestsHandler(mock, nil, nil)
 		app.Post("/request", h.CreateRequest)
 
 		req := httptest.NewRequest("POST", "/request", bytes.NewBufferString(validBody))
@@ -339,11 +377,11 @@ func TestRequestHandler_MakeRequest(t *testing.T) {
 		}
 
 		app := fiber.New()
-		h := NewRequestsHandler(mock, nil)
+		h := NewRequestsHandler(mock, nil, nil)
 		app.Post("/request", h.CreateRequest)
 
 		bodyWithOptionalUUIDs := `{
-			"hotel_id": "550e8400-e29b-41d4-a716-446655440000",
+			"hotel_id": "org_550e8400-e29b-41d4-a716-446655440000",
 			"guest_id": "660e8400-e29b-41d4-a716-446655440000",
 			"user_id": "770e8400-e29b-41d4-a716-446655440000",
 			"name": "room cleaning",
@@ -365,6 +403,37 @@ func TestRequestHandler_MakeRequest(t *testing.T) {
 		assert.Contains(t, string(body), "770e8400-e29b-41d4-a716-446655440000")
 	})
 
+	t.Run("accepts in progress status from the request status enum", func(t *testing.T) {
+		t.Parallel()
+
+		mock := &mockRequestRepository{
+			makeRequestFunc: func(ctx context.Context, req *models.Request) (*models.Request, error) {
+				req.ID = "generated-uuid"
+				return req, nil
+			},
+		}
+
+		app := fiber.New()
+		h := NewRequestsHandler(mock, nil, nil)
+		app.Post("/request", h.CreateRequest)
+
+		bodyWithInProgressStatus := `{
+			"hotel_id": "org_550e8400-e29b-41d4-a716-446655440000",
+			"name": "room cleaning",
+			"request_type": "recurring",
+			"status": "in progress",
+			"priority": "medium",
+			"notes": "No special requests"
+		}`
+
+		req := httptest.NewRequest("POST", "/request", bytes.NewBufferString(bodyWithInProgressStatus))
+		req.Header.Set("Content-Type", "application/json")
+		resp, err := app.Test(req)
+		require.NoError(t, err)
+
+		assert.Equal(t, 200, resp.StatusCode)
+	})
+
 	t.Run("returns 400 on invalid JSON", func(t *testing.T) {
 		t.Parallel()
 
@@ -375,7 +444,7 @@ func TestRequestHandler_MakeRequest(t *testing.T) {
 		}
 
 		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
-		h := NewRequestsHandler(mock, nil)
+		h := NewRequestsHandler(mock, nil, nil)
 		app.Post("/request", h.CreateRequest)
 
 		req := httptest.NewRequest("POST", "/request", bytes.NewBufferString(`{invalid json`))
@@ -396,7 +465,7 @@ func TestRequestHandler_MakeRequest(t *testing.T) {
 		}
 
 		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
-		h := NewRequestsHandler(mock, nil)
+		h := NewRequestsHandler(mock, nil, nil)
 		app.Post("/request", h.CreateRequest)
 
 		req := httptest.NewRequest("POST", "/request", bytes.NewBufferString(`{}`))
@@ -411,7 +480,7 @@ func TestRequestHandler_MakeRequest(t *testing.T) {
 		assert.Contains(t, string(body), "name")
 	})
 
-	t.Run("returns 400 on invalid hotel_id uuid", func(t *testing.T) {
+	t.Run("returns 400 on invalid optional guest_id uuid", func(t *testing.T) {
 		t.Parallel()
 
 		mock := &mockRequestRepository{
@@ -421,11 +490,12 @@ func TestRequestHandler_MakeRequest(t *testing.T) {
 		}
 
 		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
-		h := NewRequestsHandler(mock, nil)
+		h := NewRequestsHandler(mock, nil, nil)
 		app.Post("/request", h.CreateRequest)
 
-		invalidUUIDBody := `{
-			"hotel_id": "not-a-uuid",
+		invalidGuestIDBody := `{
+			"hotel_id": "org_550e8400-e29b-41d4-a716-446655440000",
+			"guest_id": "not-a-uuid",
 			"name": "room cleaning",
 			"request_type": "recurring",
 			"status": "pending",
@@ -433,7 +503,7 @@ func TestRequestHandler_MakeRequest(t *testing.T) {
 			"notes": "No special requests"
 		}`
 
-		req := httptest.NewRequest("POST", "/request", bytes.NewBufferString(invalidUUIDBody))
+		req := httptest.NewRequest("POST", "/request", bytes.NewBufferString(invalidGuestIDBody))
 		req.Header.Set("Content-Type", "application/json")
 		resp, err := app.Test(req)
 		require.NoError(t, err)
@@ -441,10 +511,10 @@ func TestRequestHandler_MakeRequest(t *testing.T) {
 		assert.Equal(t, 400, resp.StatusCode)
 
 		body, _ := io.ReadAll(resp.Body)
-		assert.Contains(t, string(body), "hotel_id")
+		assert.Contains(t, string(body), "guest_id")
 	})
 
-	t.Run("returns 400 on invalid optional guest_id uuid", func(t *testing.T) {
+	t.Run("returns 400 on invalid priority enum", func(t *testing.T) {
 		t.Parallel()
 
 		mock := &mockRequestRepository{
@@ -454,20 +524,19 @@ func TestRequestHandler_MakeRequest(t *testing.T) {
 		}
 
 		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
-		h := NewRequestsHandler(mock, nil)
+		h := NewRequestsHandler(mock, nil, nil)
 		app.Post("/request", h.CreateRequest)
 
-		invalidGuestIDBody := `{
-			"hotel_id": "550e8400-e29b-41d4-a716-446655440000",
-			"guest_id": "not-a-uuid",
+		bodyWithInvalidPriority := `{
+			"hotel_id": "org_550e8400-e29b-41d4-a716-446655440000",
 			"name": "room cleaning",
 			"request_type": "recurring",
 			"status": "pending",
-			"priority": "high",
+			"priority": "urgent",
 			"notes": "No special requests"
 		}`
 
-		req := httptest.NewRequest("POST", "/request", bytes.NewBufferString(invalidGuestIDBody))
+		req := httptest.NewRequest("POST", "/request", bytes.NewBufferString(bodyWithInvalidPriority))
 		req.Header.Set("Content-Type", "application/json")
 		resp, err := app.Test(req)
 		require.NoError(t, err)
@@ -475,7 +544,8 @@ func TestRequestHandler_MakeRequest(t *testing.T) {
 		assert.Equal(t, 400, resp.StatusCode)
 
 		body, _ := io.ReadAll(resp.Body)
-		assert.Contains(t, string(body), "guest_id")
+		assert.Contains(t, string(body), "priority")
+		assert.Contains(t, string(body), "low, medium, high")
 	})
 
 	t.Run("returns 500 on db error", func(t *testing.T) {
@@ -488,7 +558,7 @@ func TestRequestHandler_MakeRequest(t *testing.T) {
 		}
 
 		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
-		h := NewRequestsHandler(mock, nil)
+		h := NewRequestsHandler(mock, nil, nil)
 		app.Post("/request", h.CreateRequest)
 
 		req := httptest.NewRequest("POST", "/request", bytes.NewBufferString(validBody))
@@ -504,7 +574,7 @@ func TestRequestHandler_Generate_Request(t *testing.T) {
 	t.Parallel()
 
 	validBody := `{
-		"hotel_id": "550e8400-e29b-41d4-a716-446655440000",
+		"hotel_id": "org_550e8400-e29b-41d4-a716-446655440000",
 		"raw_text": "Room 302 needs extra towels urgently"
 	}`
 
@@ -512,29 +582,23 @@ func TestRequestHandler_Generate_Request(t *testing.T) {
 		t.Parallel()
 
 		description := "Guest requested extra towels for their room"
-		repoMock := &mockRequestRepository{
-			makeRequestFunc: func(ctx context.Context, req *models.Request) (*models.Request, error) {
-				req.ID = "generated-uuid"
-				req.CreatedAt = time.Now()
-				req.UpdatedAt = time.Now()
-				return req, nil
-			},
-		}
 
 		llmMock := &mockLLMService{
-			runGenerateRequestFunc: func(ctx context.Context, input aiflows.GenerateRequestInput) (aiflows.GenerateRequestOutput, error) {
-				return aiflows.GenerateRequestOutput{
-					Name:        "Extra Towels Request",
-					Description: &description,
-					RequestType: "one-time",
-					Status:      "pending",
-					Priority:    "urgent",
+			runGenerateRequestFunc: func(ctx context.Context, input aiflows.GenerateRequestInput) (aiflows.EnrichedGenerateRequestOutput, error) {
+				return aiflows.EnrichedGenerateRequestOutput{
+					GenerateRequestOutput: aiflows.GenerateRequestOutput{
+						Name:        "Extra Towels Request",
+						Description: &description,
+						RequestType: "one-time",
+						Status:      "pending",
+						Priority:    "high",
+					},
 				}, nil
 			},
 		}
 
 		app := fiber.New()
-		h := NewRequestsHandler(repoMock, llmMock)
+		h := NewRequestsHandler(&mockRequestRepository{}, llmMock, nil)
 		app.Post("/request/generate", h.GenerateRequest)
 
 		req := httptest.NewRequest("POST", "/request/generate", bytes.NewBufferString(validBody))
@@ -545,45 +609,40 @@ func TestRequestHandler_Generate_Request(t *testing.T) {
 		assert.Equal(t, 200, resp.StatusCode)
 
 		body, _ := io.ReadAll(resp.Body)
-		assert.Contains(t, string(body), "generated-uuid")
+		assert.Contains(t, string(body), `"request"`)
 		assert.Contains(t, string(body), "Extra Towels Request")
-		assert.Contains(t, string(body), "urgent")
+		assert.Contains(t, string(body), "high")
 	})
 
 	t.Run("returns 200 with all LLM parsed fields", func(t *testing.T) {
 		t.Parallel()
 
 		description := "Full room cleaning requested"
-		department := "housekeeping"
+		departmentID := "550e8400-e29b-41d4-a716-446655440001"
 		category := "Cleaning"
 		notes := "Guest prefers eco-friendly products"
 		estimatedTime := 30
 
-		repoMock := &mockRequestRepository{
-			makeRequestFunc: func(ctx context.Context, req *models.Request) (*models.Request, error) {
-				req.ID = "generated-uuid"
-				return req, nil
-			},
-		}
-
 		llmMock := &mockLLMService{
-			runGenerateRequestFunc: func(ctx context.Context, input aiflows.GenerateRequestInput) (aiflows.GenerateRequestOutput, error) {
-				return aiflows.GenerateRequestOutput{
-					Name:                    "Room Cleaning",
-					Description:             &description,
-					RequestCategory:         &category,
-					RequestType:             "one-time",
-					Department:              &department,
-					Status:                  "pending",
-					Priority:                "normal",
-					EstimatedCompletionTime: &estimatedTime,
-					Notes:                   &notes,
+			runGenerateRequestFunc: func(ctx context.Context, input aiflows.GenerateRequestInput) (aiflows.EnrichedGenerateRequestOutput, error) {
+				return aiflows.EnrichedGenerateRequestOutput{
+					DepartmentID: &departmentID,
+					GenerateRequestOutput: aiflows.GenerateRequestOutput{
+						Name:                    "Room Cleaning",
+						Description:             &description,
+						RequestCategory:         &category,
+						RequestType:             "one-time",
+						Status:                  "pending",
+						Priority:                "medium",
+						EstimatedCompletionTime: &estimatedTime,
+						Notes:                   &notes,
+					},
 				}, nil
 			},
 		}
 
 		app := fiber.New()
-		h := NewRequestsHandler(repoMock, llmMock)
+		h := NewRequestsHandler(&mockRequestRepository{}, llmMock, nil)
 		app.Post("/request/generate", h.GenerateRequest)
 
 		req := httptest.NewRequest("POST", "/request/generate", bytes.NewBufferString(validBody))
@@ -594,8 +653,9 @@ func TestRequestHandler_Generate_Request(t *testing.T) {
 		assert.Equal(t, 200, resp.StatusCode)
 
 		body, _ := io.ReadAll(resp.Body)
+		assert.Contains(t, string(body), `"request"`)
 		assert.Contains(t, string(body), "Room Cleaning")
-		assert.Contains(t, string(body), "housekeeping")
+		assert.Contains(t, string(body), departmentID)
 		assert.Contains(t, string(body), "Cleaning")
 	})
 
@@ -603,7 +663,7 @@ func TestRequestHandler_Generate_Request(t *testing.T) {
 		t.Parallel()
 
 		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
-		h := NewRequestsHandler(&mockRequestRepository{}, &mockLLMService{})
+		h := NewRequestsHandler(&mockRequestRepository{}, &mockLLMService{}, nil)
 		app.Post("/request/generate", h.GenerateRequest)
 
 		req := httptest.NewRequest("POST", "/request/generate", bytes.NewBufferString(`{invalid json`))
@@ -618,7 +678,7 @@ func TestRequestHandler_Generate_Request(t *testing.T) {
 		t.Parallel()
 
 		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
-		h := NewRequestsHandler(&mockRequestRepository{}, &mockLLMService{})
+		h := NewRequestsHandler(&mockRequestRepository{}, &mockLLMService{}, nil)
 		app.Post("/request/generate", h.GenerateRequest)
 
 		bodyMissingHotelID := `{"raw_text": "Need towels"}`
@@ -633,15 +693,15 @@ func TestRequestHandler_Generate_Request(t *testing.T) {
 		assert.Contains(t, string(body), "hotel_id")
 	})
 
-	t.Run("returns 400 on invalid hotel_id uuid", func(t *testing.T) {
+	t.Run("returns 400 on empty raw_text", func(t *testing.T) {
 		t.Parallel()
 
 		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
-		h := NewRequestsHandler(&mockRequestRepository{}, &mockLLMService{})
+		h := NewRequestsHandler(&mockRequestRepository{}, &mockLLMService{}, nil)
 		app.Post("/request/generate", h.GenerateRequest)
 
-		bodyInvalidUUID := `{"hotel_id": "not-a-uuid", "raw_text": "Need towels"}`
-		req := httptest.NewRequest("POST", "/request/generate", bytes.NewBufferString(bodyInvalidUUID))
+		bodyEmptyText := `{"hotel_id": "org_550e8400-e29b-41d4-a716-446655440000", "raw_text": ""}`
+		req := httptest.NewRequest("POST", "/request/generate", bytes.NewBufferString(bodyEmptyText))
 		req.Header.Set("Content-Type", "application/json")
 		resp, err := app.Test(req)
 		require.NoError(t, err)
@@ -649,51 +709,50 @@ func TestRequestHandler_Generate_Request(t *testing.T) {
 		assert.Equal(t, 400, resp.StatusCode)
 
 		body, _ := io.ReadAll(resp.Body)
-		assert.Contains(t, string(body), "hotel_id")
+		assert.Contains(t, string(body), "raw_text")
 	})
 
-	t.Run("returns 400 on empty raw_text", func(t *testing.T) {
+	t.Run("returns 500 on LLM error", func(t *testing.T) {
 		t.Parallel()
 
+		repoMock := &mockRequestRepository{}
+
+		llmMock := &mockLLMService{
+			runGenerateRequestFunc: func(ctx context.Context, input aiflows.GenerateRequestInput) (aiflows.EnrichedGenerateRequestOutput, error) {
+				return aiflows.EnrichedGenerateRequestOutput{}, errors.New("LLM service unavailable")
+			},
+		}
+
 		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
-		h := NewRequestsHandler(&mockRequestRepository{}, &mockLLMService{})
+		h := NewRequestsHandler(repoMock, llmMock, nil)
 		app.Post("/request/generate", h.GenerateRequest)
 
-		bodyEmptyText := `{"hotel_id": "550e8400-e29b-41d4-a716-446655440000", "raw_text": ""}`
-		req := httptest.NewRequest("POST", "/request/generate", bytes.NewBufferString(bodyEmptyText))
+		req := httptest.NewRequest("POST", "/request/generate", bytes.NewBufferString(validBody))
 		req.Header.Set("Content-Type", "application/json")
 		resp, err := app.Test(req)
 		require.NoError(t, err)
 
-		assert.Equal(t, 400, resp.StatusCode)
-
-		body, _ := io.ReadAll(resp.Body)
-		assert.Contains(t, string(body), "raw_text")
+		assert.Equal(t, 500, resp.StatusCode)
 	})
 
-	t.Run("returns 400 when LLM output fails validation", func(t *testing.T) {
+	t.Run("returns 500 when LLM output fails validation", func(t *testing.T) {
 		t.Parallel()
 
-		repoMock := &mockRequestRepository{
-			makeRequestFunc: func(ctx context.Context, req *models.Request) (*models.Request, error) {
-				return req, nil
-			},
-		}
-
 		llmMock := &mockLLMService{
-			runGenerateRequestFunc: func(ctx context.Context, input aiflows.GenerateRequestInput) (aiflows.GenerateRequestOutput, error) {
-				// LLM returns invalid output - missing required fields
-				return aiflows.GenerateRequestOutput{
-					Name:        "", // Empty name should fail validation
-					RequestType: "",
-					Status:      "",
-					Priority:    "",
+			runGenerateRequestFunc: func(ctx context.Context, input aiflows.GenerateRequestInput) (aiflows.EnrichedGenerateRequestOutput, error) {
+				return aiflows.EnrichedGenerateRequestOutput{
+					GenerateRequestOutput: aiflows.GenerateRequestOutput{
+						Name:        "Towel Request",
+						RequestType: "one-time",
+						Status:      "pending",
+						Priority:    "urgent",
+					},
 				}, nil
 			},
 		}
 
 		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
-		h := NewRequestsHandler(repoMock, llmMock)
+		h := NewRequestsHandler(&mockRequestRepository{}, llmMock, nil)
 		app.Post("/request/generate", h.GenerateRequest)
 
 		req := httptest.NewRequest("POST", "/request/generate", bytes.NewBufferString(validBody))
@@ -701,57 +760,64 @@ func TestRequestHandler_Generate_Request(t *testing.T) {
 		resp, err := app.Test(req)
 		require.NoError(t, err)
 
-		assert.Equal(t, 400, resp.StatusCode)
-
-		body, _ := io.ReadAll(resp.Body)
-		assert.Contains(t, string(body), "name")
+		assert.Equal(t, 500, resp.StatusCode)
 	})
 
-	t.Run("returns 500 on LLM error", func(t *testing.T) {
+	t.Run("passes raw_text to LLM correctly", func(t *testing.T) {
 		t.Parallel()
 
-		repoMock := &mockRequestRepository{}
+		var capturedInput aiflows.GenerateRequestInput
 
 		llmMock := &mockLLMService{
-			runGenerateRequestFunc: func(ctx context.Context, input aiflows.GenerateRequestInput) (aiflows.GenerateRequestOutput, error) {
-				return aiflows.GenerateRequestOutput{}, errors.New("LLM service unavailable")
+			runGenerateRequestFunc: func(ctx context.Context, input aiflows.GenerateRequestInput) (aiflows.EnrichedGenerateRequestOutput, error) {
+				capturedInput = input
+				return aiflows.EnrichedGenerateRequestOutput{
+					GenerateRequestOutput: aiflows.GenerateRequestOutput{
+						Name:        "Test Request",
+						RequestType: "one-time",
+						Status:      "pending",
+						Priority:    "medium",
+					},
+				}, nil
 			},
 		}
 
-		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
-		h := NewRequestsHandler(repoMock, llmMock)
+		app := fiber.New()
+		h := NewRequestsHandler(&mockRequestRepository{}, llmMock, nil)
 		app.Post("/request/generate", h.GenerateRequest)
 
-		req := httptest.NewRequest("POST", "/request/generate", bytes.NewBufferString(validBody))
+		customBody := `{
+			"hotel_id": "org_550e8400-e29b-41d4-a716-446655440000",
+			"raw_text": "I need the AC fixed in room 101 ASAP"
+		}`
+		req := httptest.NewRequest("POST", "/request/generate", bytes.NewBufferString(customBody))
 		req.Header.Set("Content-Type", "application/json")
 		resp, err := app.Test(req)
 		require.NoError(t, err)
 
-		assert.Equal(t, 500, resp.StatusCode)
+		assert.Equal(t, 200, resp.StatusCode)
+		assert.Equal(t, "I need the AC fixed in room 101 ASAP", capturedInput.RawText)
+		assert.Equal(t, "org_550e8400-e29b-41d4-a716-446655440000", capturedInput.HotelID)
 	})
 
-	t.Run("returns 500 on db error", func(t *testing.T) {
+	t.Run("uses hotel_id from request body not LLM", func(t *testing.T) {
 		t.Parallel()
 
-		repoMock := &mockRequestRepository{
-			makeRequestFunc: func(ctx context.Context, req *models.Request) (*models.Request, error) {
-				return nil, errors.New("db connection failed")
-			},
-		}
-
 		llmMock := &mockLLMService{
-			runGenerateRequestFunc: func(ctx context.Context, input aiflows.GenerateRequestInput) (aiflows.GenerateRequestOutput, error) {
-				return aiflows.GenerateRequestOutput{
-					Name:        "Towel Request",
-					RequestType: "one-time",
-					Status:      "pending",
-					Priority:    "normal",
+			runGenerateRequestFunc: func(ctx context.Context, input aiflows.GenerateRequestInput) (aiflows.EnrichedGenerateRequestOutput, error) {
+				return aiflows.EnrichedGenerateRequestOutput{
+					GenerateRequestOutput: aiflows.GenerateRequestOutput{
+						Name:        "Test Request",
+						RequestType: "one-time",
+						Status:      "pending",
+						Priority:    "medium",
+					},
 				}, nil
 			},
 		}
 
-		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
-		h := NewRequestsHandler(repoMock, llmMock)
+		app := fiber.New()
+		h := NewRequestsHandler(&mockRequestRepository{}, llmMock, nil)
 		app.Post("/request/generate", h.GenerateRequest)
 
 		req := httptest.NewRequest("POST", "/request/generate", bytes.NewBufferString(validBody))
@@ -759,76 +825,66 @@ func TestRequestHandler_Generate_Request(t *testing.T) {
 		resp, err := app.Test(req)
 		require.NoError(t, err)
 
-		assert.Equal(t, 500, resp.StatusCode)
+		assert.Equal(t, 200, resp.StatusCode)
+		body, _ := io.ReadAll(resp.Body)
+		assert.Contains(t, string(body), "org_550e8400-e29b-41d4-a716-446655440000")
 	})
 
-	t.Run("passes raw_text to LLM correctly", func(t *testing.T) {
+	t.Run("defaults notes to empty string when LLM omits notes", func(t *testing.T) {
 		t.Parallel()
 
-		var capturedInput aiflows.GenerateRequestInput
-
-		repoMock := &mockRequestRepository{
-			makeRequestFunc: func(ctx context.Context, req *models.Request) (*models.Request, error) {
-				req.ID = "generated-uuid"
-				return req, nil
-			},
-		}
-
 		llmMock := &mockLLMService{
-			runGenerateRequestFunc: func(ctx context.Context, input aiflows.GenerateRequestInput) (aiflows.GenerateRequestOutput, error) {
-				capturedInput = input
-				return aiflows.GenerateRequestOutput{
-					Name:        "Test Request",
-					RequestType: "one-time",
-					Status:      "pending",
-					Priority:    "normal",
+			runGenerateRequestFunc: func(ctx context.Context, input aiflows.GenerateRequestInput) (aiflows.EnrichedGenerateRequestOutput, error) {
+				return aiflows.EnrichedGenerateRequestOutput{
+					GenerateRequestOutput: aiflows.GenerateRequestOutput{
+						Name:        "Test Request",
+						RequestType: "one-time",
+						Status:      "pending",
+						Priority:    "medium",
+						Notes:       nil,
+					},
 				}, nil
 			},
 		}
 
 		app := fiber.New()
-		h := NewRequestsHandler(repoMock, llmMock)
+		h := NewRequestsHandler(&mockRequestRepository{}, llmMock, nil)
 		app.Post("/request/generate", h.GenerateRequest)
 
-		customBody := `{
-			"hotel_id": "550e8400-e29b-41d4-a716-446655440000",
-			"raw_text": "I need the AC fixed in room 101 ASAP"
-		}`
-		req := httptest.NewRequest("POST", "/request/generate", bytes.NewBufferString(customBody))
+		req := httptest.NewRequest("POST", "/request/generate", bytes.NewBufferString(validBody))
 		req.Header.Set("Content-Type", "application/json")
 		resp, err := app.Test(req)
 		require.NoError(t, err)
 
 		assert.Equal(t, 200, resp.StatusCode)
-		assert.Equal(t, "I need the AC fixed in room 101 ASAP", capturedInput.RawText)
+		body, _ := io.ReadAll(resp.Body)
+		assert.Contains(t, string(body), `"notes":""`)
 	})
 
-	t.Run("uses hotel_id from request body not LLM", func(t *testing.T) {
+	t.Run("returns warning metadata when room lookup warning exists", func(t *testing.T) {
 		t.Parallel()
 
-		var capturedRequest *models.Request
-
-		repoMock := &mockRequestRepository{
-			makeRequestFunc: func(ctx context.Context, req *models.Request) (*models.Request, error) {
-				capturedRequest = req
-				req.ID = "generated-uuid"
-				return req, nil
-			},
-		}
+		warningMessage := "Room 301 could not be resolved for this hotel."
 
 		llmMock := &mockLLMService{
-			runGenerateRequestFunc: func(ctx context.Context, input aiflows.GenerateRequestInput) (aiflows.GenerateRequestOutput, error) {
-				return aiflows.GenerateRequestOutput{
-					Name:        "Test Request",
-					RequestType: "one-time",
-					Status:      "pending",
-					Priority:    "normal",
+			runGenerateRequestFunc: func(ctx context.Context, input aiflows.GenerateRequestInput) (aiflows.EnrichedGenerateRequestOutput, error) {
+				return aiflows.EnrichedGenerateRequestOutput{
+					GenerateRequestOutput: aiflows.GenerateRequestOutput{
+						Name:        "Soda Delivery",
+						RequestType: "one-time",
+						Status:      "pending",
+						Priority:    "medium",
+						Warning: &aiflows.GenerateRequestWarning{
+							Code:    "room_not_found",
+							Message: warningMessage,
+						},
+					},
 				}, nil
 			},
 		}
 
 		app := fiber.New()
-		h := NewRequestsHandler(repoMock, llmMock)
+		h := NewRequestsHandler(&mockRequestRepository{}, llmMock, nil)
 		app.Post("/request/generate", h.GenerateRequest)
 
 		req := httptest.NewRequest("POST", "/request/generate", bytes.NewBufferString(validBody))
@@ -837,169 +893,1081 @@ func TestRequestHandler_Generate_Request(t *testing.T) {
 		require.NoError(t, err)
 
 		assert.Equal(t, 200, resp.StatusCode)
-		assert.Equal(t, "550e8400-e29b-41d4-a716-446655440000", capturedRequest.HotelID)
+
+		body, _ := io.ReadAll(resp.Body)
+		assert.Contains(t, string(body), `"warning"`)
+		assert.Contains(t, string(body), `"room_not_found"`)
+		assert.Contains(t, string(body), warningMessage)
 	})
+
 }
 
-func TestRequestHandler_GetRequestByCursor(t *testing.T) {
+func TestRequestHandler_GetRequestsByGuest(t *testing.T) {
 	t.Parallel()
 
-	t.Run("returns 200 with requests and next cursor", func(t *testing.T) {
+	validGuestID := "530e8400-e458-41d4-a716-446655440000"
+	validHotelID := "org_521e8400-e458-41d4-a716-446655440000"
+
+	t.Run("returns 200 with guest requests", func(t *testing.T) {
 		t.Parallel()
 
+		description := "This is a very urgent request"
 		mock := &mockRequestRepository{
-			findRequestsByCursorFunc: func(ctx context.Context, cursor string, status string, hotelID string, pageSize int) ([]*models.Request, string, error) {
-				return []*models.Request{
-					{
-						ID:        "530e8400-e458-41d4-a716-446655440001",
-						CreatedAt: time.Now(),
-						UpdatedAt: time.Now(),
-						MakeRequest: models.MakeRequest{
-							HotelID:     "521e8400-e458-41d4-a716-446655440000",
-							Name:        "room cleaning",
-							RequestType: "recurring",
-							Status:      "pending",
-							Priority:    "urgent",
-						},
-					},
+			findRequestsByGuestIDFunc: func(ctx context.Context, guestID, hotelID, cursorID string, cursorVersion time.Time, limit int) ([]*models.GuestRequest, error) {
+				return []*models.GuestRequest{
 					{
-						ID:        "530e8400-e458-41d4-a716-446655440002",
-						CreatedAt: time.Now(),
-						UpdatedAt: time.Now(),
-						MakeRequest: models.MakeRequest{
-							HotelID:     "521e8400-e458-41d4-a716-446655440000",
-							Name:        "towel request",
-							RequestType: "one-time",
-							Status:      "pending",
-							Priority:    "normal",
-						},
+						ID:             "630e8400-e458-41d4-a716-446655440000",
+						Name:           "HELP HELP HELP",
+						Priority:       "high",
+						Status:         "pending",
+						Description:    &description,
+						RequestType:    "one-time",
+						CreatedAt:      time.Now(),
+						RequestVersion: time.Now(),
 					},
-				}, "530e8400-e458-41d4-a716-446655440002", nil
+				}, nil
 			},
 		}
 
 		app := fiber.New()
-		h := NewRequestsHandler(mock, nil)
-		app.Get("/request/cursor/:cursor", h.GetRequestByCursor)
+		h := NewRequestsHandler(mock, nil, nil)
+		app.Get("/request/guest/:id", h.GetRequestsByGuest)
+
+		req := httptest.NewRequest("GET", "/request/guest/"+validGuestID, nil)
+		req.Header.Set("X-Hotel-ID", validHotelID)
 
-		req := httptest.NewRequest("GET", "/request/cursor/530e8400-e458-41d4-a716-446655440000?status=pending&hotel_id=521e8400-e458-41d4-a716-446655440000", nil)
 		resp, err := app.Test(req)
 		require.NoError(t, err)
-
 		assert.Equal(t, 200, resp.StatusCode)
 
 		body, _ := io.ReadAll(resp.Body)
-		assert.Contains(t, string(body), "530e8400-e458-41d4-a716-446655440001")
-		assert.Contains(t, string(body), "530e8400-e458-41d4-a716-446655440002")
-		assert.Contains(t, string(body), "next_cursor")
+		assert.Contains(t, string(body), "HELP HELP HELP")
+		assert.Contains(t, string(body), "high")
+		assert.Contains(t, string(body), "630e8400-e458-41d4-a716-446655440000")
 	})
 
-	t.Run("returns 400 when cursor is not a valid UUID", func(t *testing.T) {
+	t.Run("returns 200 with empty list when no requests", func(t *testing.T) {
 		t.Parallel()
 
 		mock := &mockRequestRepository{
-			findRequestsByCursorFunc: func(ctx context.Context, cursor string, status string, hotelID string, pageSize int) ([]*models.Request, string, error) {
-				return nil, "", errors.New("should not be called")
+			findRequestsByGuestIDFunc: func(ctx context.Context, guestID, hotelID, cursorID string, cursorVersion time.Time, limit int) ([]*models.GuestRequest, error) {
+				return []*models.GuestRequest{}, nil
 			},
 		}
 
-		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
-		h := NewRequestsHandler(mock, nil)
-		app.Get("/request/cursor/:cursor", h.GetRequestByCursor)
+		app := fiber.New()
+		h := NewRequestsHandler(mock, nil, nil)
+		app.Get("/request/guest/:id", h.GetRequestsByGuest)
+
+		req := httptest.NewRequest("GET", "/request/guest/"+validGuestID, nil)
+		req.Header.Set("X-Hotel-ID", validHotelID)
 
-		req := httptest.NewRequest("GET", "/request/cursor/notaUUID?status=pending", nil)
 		resp, err := app.Test(req)
 		require.NoError(t, err)
-
-		assert.Equal(t, 400, resp.StatusCode)
+		assert.Equal(t, 200, resp.StatusCode)
 
 		body, _ := io.ReadAll(resp.Body)
-		assert.Contains(t, string(body), "cursor")
+		assert.Contains(t, string(body), "[]")
 	})
 
-	t.Run("returns 400 when status is invalid", func(t *testing.T) {
+	t.Run("passes correct guest_id and hotel_id to repository", func(t *testing.T) {
 		t.Parallel()
 
 		mock := &mockRequestRepository{
-			findRequestsByCursorFunc: func(ctx context.Context, cursor string, status string, hotelID string, pageSize int) ([]*models.Request, string, error) {
-				return nil, "", errors.New("should not be called")
+			findRequestsByGuestIDFunc: func(ctx context.Context, guestID, hotelID, cursorID string, cursorVersion time.Time, limit int) ([]*models.GuestRequest, error) {
+				assert.Equal(t, validGuestID, guestID)
+				assert.Equal(t, validHotelID, hotelID)
+				return []*models.GuestRequest{}, nil
 			},
 		}
 
+		app := fiber.New()
+		h := NewRequestsHandler(mock, nil, nil)
+		app.Get("/request/guest/:id", h.GetRequestsByGuest)
+
+		req := httptest.NewRequest("GET", "/request/guest/"+validGuestID, nil)
+		req.Header.Set("X-Hotel-ID", validHotelID)
+
+		resp, err := app.Test(req)
+		require.NoError(t, err)
+		assert.Equal(t, 200, resp.StatusCode)
+	})
+
+	t.Run("returns 400 when guest_id is invalid UUID", func(t *testing.T) {
+		t.Parallel()
+
+		mock := &mockRequestRepository{}
 		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
-		h := NewRequestsHandler(mock, nil)
-		app.Get("/request/cursor/:cursor", h.GetRequestByCursor)
+		h := NewRequestsHandler(mock, nil, nil)
+		app.Get("/request/guest/:id", h.GetRequestsByGuest)
+
+		req := httptest.NewRequest("GET", "/request/guest/not-a-uuid", nil)
+		req.Header.Set("X-Hotel-ID", validHotelID)
 
-		req := httptest.NewRequest("GET", "/request/cursor/530e8400-e458-41d4-a716-446655440000?status=invalid&hotel_id=521e8400-e458-41d4-a716-446655440000", nil)
 		resp, err := app.Test(req)
 		require.NoError(t, err)
+		assert.Equal(t, 400, resp.StatusCode)
 
+		body, _ := io.ReadAll(resp.Body)
+		assert.Contains(t, string(body), "guest_id")
+	})
+
+	t.Run("returns 400 when X-Hotel-ID header is missing", func(t *testing.T) {
+		t.Parallel()
+
+		mock := &mockRequestRepository{}
+		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
+		h := NewRequestsHandler(mock, nil, nil)
+		app.Get("/request/guest/:id", h.GetRequestsByGuest)
+
+		req := httptest.NewRequest("GET", "/request/guest/"+validGuestID, nil)
+
+		resp, err := app.Test(req)
+		require.NoError(t, err)
 		assert.Equal(t, 400, resp.StatusCode)
 
 		body, _ := io.ReadAll(resp.Body)
-		assert.Contains(t, string(body), "Status")
+		assert.Contains(t, string(body), "hotel_id")
 	})
 
-	t.Run("returns 400 when hotel_id is invalid", func(t *testing.T) {
+	t.Run("returns 500 on repository error", func(t *testing.T) {
 		t.Parallel()
 
 		mock := &mockRequestRepository{
-			findRequestsByCursorFunc: func(ctx context.Context, cursor string, status string, hotelID string, pageSize int) ([]*models.Request, string, error) {
-				return nil, "", errors.New("should not be called")
+			findRequestsByGuestIDFunc: func(ctx context.Context, guestID, hotelID, cursorID string, cursorVersion time.Time, limit int) ([]*models.GuestRequest, error) {
+				return nil, errors.New("db connection failed")
 			},
 		}
 
 		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
-		h := NewRequestsHandler(mock, nil)
-		app.Get("/request/cursor/:cursor", h.GetRequestByCursor)
+		h := NewRequestsHandler(mock, nil, nil)
+		app.Get("/request/guest/:id", h.GetRequestsByGuest)
+
+		req := httptest.NewRequest("GET", "/request/guest/"+validGuestID, nil)
+		req.Header.Set("X-Hotel-ID", validHotelID)
 
-		req := httptest.NewRequest("GET", "/request/cursor/530e8400-e458-41d4-a716-446655440000?status=pending&hotel_id=notaUUID", nil)
 		resp, err := app.Test(req)
 		require.NoError(t, err)
+		assert.Equal(t, 500, resp.StatusCode)
+	})
+}
 
-		assert.Equal(t, 400, resp.StatusCode)
+func TestRequestHandler_UpdateRequest(t *testing.T) {
+	t.Parallel()
 
-		body, _ := io.ReadAll(resp.Body)
-		assert.Contains(t, string(body), "hotel_id")
-	})
+	const validID = "530e8400-e458-41d4-a716-446655440000"
 
-	t.Run("returns 404 when not found in db", func(t *testing.T) {
+	t.Run("returns 200 when body is empty object (no fields to update)", func(t *testing.T) {
 		t.Parallel()
 
+		var gotUpdate *models.RequestUpdateInput
 		mock := &mockRequestRepository{
-			findRequestsByCursorFunc: func(ctx context.Context, cursor string, status string, hotelID string, pageSize int) ([]*models.Request, string, error) {
-				return nil, "", errs.ErrNotFoundInDB
+			updateRequestFunc: func(_ context.Context, id string, update *models.RequestUpdateInput, _ *string) (*models.Request, error) {
+				gotUpdate = update
+				return &models.Request{
+					ID:             id,
+					CreatedAt:      time.Now(),
+					RequestVersion: time.Now(),
+					MakeRequest: models.MakeRequest{
+						HotelID:     "521e8400-e458-41d4-a716-446655440000",
+						Name:        "room cleaning",
+						RequestType: "recurring",
+						Status:      "pending",
+						Priority:    "high",
+					},
+				}, nil
 			},
 		}
 
-		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
-		h := NewRequestsHandler(mock, nil)
-		app.Get("/request/cursor/:cursor", h.GetRequestByCursor)
+		app := fiber.New()
+		h := NewRequestsHandler(mock, nil, nil)
+		app.Put("/request/:id", h.UpdateRequest)
 
-		req := httptest.NewRequest("GET", "/request/cursor/530e8400-e458-41d4-a716-446655440000?status=pending&hotel_id=521e8400-e458-41d4-a716-446655440000", nil)
+		req := httptest.NewRequest("PUT", "/request/"+validID, bytes.NewBufferString(`{}`))
+		req.Header.Set("Content-Type", "application/json")
 		resp, err := app.Test(req)
 		require.NoError(t, err)
+		assert.Equal(t, 200, resp.StatusCode)
 
-		assert.Equal(t, 404, resp.StatusCode)
+		require.NotNil(t, gotUpdate)
+		assert.Nil(t, gotUpdate.UserID)
+		assert.Nil(t, gotUpdate.GuestID)
+		assert.Nil(t, gotUpdate.ReservationID)
+		assert.Nil(t, gotUpdate.Name)
+		assert.Nil(t, gotUpdate.Description)
+		assert.Nil(t, gotUpdate.RoomID)
+		assert.Nil(t, gotUpdate.RequestCategory)
+		assert.Nil(t, gotUpdate.RequestType)
+		assert.Nil(t, gotUpdate.Department)
+		assert.Nil(t, gotUpdate.Status)
+		assert.Nil(t, gotUpdate.Priority)
+		assert.Nil(t, gotUpdate.EstimatedCompletionTime)
+		assert.Nil(t, gotUpdate.ScheduledTime)
+		assert.Nil(t, gotUpdate.CompletedAt)
+		assert.Nil(t, gotUpdate.Notes)
 	})
 
-	t.Run("returns 500 on db error", func(t *testing.T) {
+	t.Run("returns 200 and updated request on success", func(t *testing.T) {
 		t.Parallel()
 
+		updated := "completed"
+		var gotUpdate *models.RequestUpdateInput
 		mock := &mockRequestRepository{
-			findRequestsByCursorFunc: func(ctx context.Context, cursor string, status string, hotelID string, pageSize int) ([]*models.Request, string, error) {
-				return nil, "", errors.New("db connection failed")
+			updateRequestFunc: func(_ context.Context, id string, update *models.RequestUpdateInput, _ *string) (*models.Request, error) {
+				gotUpdate = update
+				return &models.Request{
+					ID:             id,
+					CreatedAt:      time.Now(),
+					RequestVersion: time.Now(),
+					MakeRequest: models.MakeRequest{
+						HotelID:     "521e8400-e458-41d4-a716-446655440000",
+						Name:        "room cleaning",
+						RequestType: "recurring",
+						Status:      updated,
+						Priority:    "high",
+					},
+				}, nil
 			},
 		}
 
-		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
-		h := NewRequestsHandler(mock, nil)
-		app.Get("/request/cursor/:cursor", h.GetRequestByCursor)
+		app := fiber.New()
+		h := NewRequestsHandler(mock, nil, nil)
+		app.Put("/request/:id", h.UpdateRequest)
 
-		req := httptest.NewRequest("GET", "/request/cursor/530e8400-e458-41d4-a716-446655440000?status=pending&hotel_id=521e8400-e458-41d4-a716-446655440000", nil)
+		body := `{"status": "` + updated + `"}`
+		req := httptest.NewRequest("PUT", "/request/"+validID, bytes.NewBufferString(body))
+		req.Header.Set("Content-Type", "application/json")
 		resp, err := app.Test(req)
 		require.NoError(t, err)
 
-		assert.Equal(t, 500, resp.StatusCode)
+		assert.Equal(t, 200, resp.StatusCode)
+
+		b, _ := io.ReadAll(resp.Body)
+		assert.Contains(t, string(b), validID)
+		require.NotNil(t, gotUpdate)
+		require.NotNil(t, gotUpdate.Status)
+		assert.Equal(t, updated, *gotUpdate.Status)
+	})
+
+	t.Run("passes only provided fields to update", func(t *testing.T) {
+		t.Parallel()
+
+		var gotUpdate *models.RequestUpdateInput
+
+		mock := &mockRequestRepository{
+			updateRequestFunc: func(_ context.Context, id string, update *models.RequestUpdateInput, _ *string) (*models.Request, error) {
+				gotUpdate = update
+				return &models.Request{
+					ID:             id,
+					CreatedAt:      time.Now(),
+					RequestVersion: time.Now(),
+					MakeRequest: models.MakeRequest{
+						HotelID:     "521e8400-e458-41d4-a716-446655440000",
+						Name:        "new name",
+						Status:      "pending",
+						Priority:    "low",
+						RequestType: "one-time",
+					},
+				}, nil
+			},
+		}
+
+		app := fiber.New()
+		h := NewRequestsHandler(mock, nil, nil)
+		app.Put("/request/:id", h.UpdateRequest)
+
+		req := httptest.NewRequest("PUT", "/request/"+validID, bytes.NewBufferString(`{"name": "new name"}`))
+		req.Header.Set("Content-Type", "application/json")
+		resp, err := app.Test(req)
+		require.NoError(t, err)
+		assert.Equal(t, 200, resp.StatusCode)
+
+		require.NotNil(t, gotUpdate)
+		require.NotNil(t, gotUpdate.Name)
+		assert.Equal(t, "new name", *gotUpdate.Name)
+		assert.Nil(t, gotUpdate.Status)
+		assert.Nil(t, gotUpdate.Priority)
+	})
+
+	t.Run("returns 400 when id is not a valid UUID", func(t *testing.T) {
+		t.Parallel()
+
+		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
+		h := NewRequestsHandler(&mockRequestRepository{}, nil, nil)
+		app.Put("/request/:id", h.UpdateRequest)
+
+		req := httptest.NewRequest("PUT", "/request/not-a-uuid", bytes.NewBufferString(`{"status": "pending"}`))
+		req.Header.Set("Content-Type", "application/json")
+		resp, err := app.Test(req)
+		require.NoError(t, err)
+		assert.Equal(t, 400, resp.StatusCode)
+	})
+
+	t.Run("returns 400 on invalid JSON", func(t *testing.T) {
+		t.Parallel()
+
+		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
+		h := NewRequestsHandler(&mockRequestRepository{}, nil, nil)
+		app.Put("/request/:id", h.UpdateRequest)
+
+		req := httptest.NewRequest("PUT", "/request/"+validID, bytes.NewBufferString(`{invalid`))
+		req.Header.Set("Content-Type", "application/json")
+		resp, err := app.Test(req)
+		require.NoError(t, err)
+		assert.Equal(t, 400, resp.StatusCode)
+	})
+
+	t.Run("returns 400 on invalid status enum", func(t *testing.T) {
+		t.Parallel()
+
+		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
+		h := NewRequestsHandler(&mockRequestRepository{}, nil, nil)
+		app.Put("/request/:id", h.UpdateRequest)
+
+		req := httptest.NewRequest("PUT", "/request/"+validID, bytes.NewBufferString(`{"status": "invalid-status"}`))
+		req.Header.Set("Content-Type", "application/json")
+		resp, err := app.Test(req)
+		require.NoError(t, err)
+		assert.Equal(t, 400, resp.StatusCode)
+
+		b, _ := io.ReadAll(resp.Body)
+		assert.Contains(t, string(b), "status")
+	})
+
+	t.Run("accepts in progress status enum", func(t *testing.T) {
+		t.Parallel()
+
+		mock := &mockRequestRepository{
+			updateRequestFunc: func(_ context.Context, id string, update *models.RequestUpdateInput, _ *string) (*models.Request, error) {
+				require.NotNil(t, update.Status)
+				require.Equal(t, "in progress", *update.Status)
+				return &models.Request{
+					ID:             id,
+					CreatedAt:      time.Now(),
+					RequestVersion: time.Now(),
+					MakeRequest: models.MakeRequest{
+						HotelID:     "521e8400-e458-41d4-a716-446655440000",
+						Name:        "room cleaning",
+						RequestType: "recurring",
+						Status:      "in progress",
+						Priority:    "high",
+					},
+				}, nil
+			},
+		}
+
+		app := fiber.New()
+		h := NewRequestsHandler(mock, nil, nil)
+		app.Put("/request/:id", h.UpdateRequest)
+
+		req := httptest.NewRequest("PUT", "/request/"+validID, bytes.NewBufferString(`{"status":"in progress"}`))
+		req.Header.Set("Content-Type", "application/json")
+		resp, err := app.Test(req)
+		require.NoError(t, err)
+		assert.Equal(t, 200, resp.StatusCode)
+	})
+
+	t.Run("returns 400 on invalid priority enum", func(t *testing.T) {
+		t.Parallel()
+
+		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
+		h := NewRequestsHandler(&mockRequestRepository{}, nil, nil)
+		app.Put("/request/:id", h.UpdateRequest)
+
+		req := httptest.NewRequest("PUT", "/request/"+validID, bytes.NewBufferString(`{"priority": "urgent"}`))
+		req.Header.Set("Content-Type", "application/json")
+		resp, err := app.Test(req)
+		require.NoError(t, err)
+		assert.Equal(t, 400, resp.StatusCode)
+
+		b, _ := io.ReadAll(resp.Body)
+		assert.Contains(t, string(b), "priority")
+	})
+
+	t.Run("returns 400 when name is blank", func(t *testing.T) {
+		t.Parallel()
+
+		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
+		h := NewRequestsHandler(&mockRequestRepository{}, nil, nil)
+		app.Put("/request/:id", h.UpdateRequest)
+
+		req := httptest.NewRequest("PUT", "/request/"+validID, bytes.NewBufferString(`{"name": "   "}`))
+		req.Header.Set("Content-Type", "application/json")
+		resp, err := app.Test(req)
+		require.NoError(t, err)
+		assert.Equal(t, 400, resp.StatusCode)
+
+		b, _ := io.ReadAll(resp.Body)
+		assert.Contains(t, string(b), "name")
+	})
+
+	t.Run("returns 400 when request_type is blank", func(t *testing.T) {
+		t.Parallel()
+
+		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
+		h := NewRequestsHandler(&mockRequestRepository{}, nil, nil)
+		app.Put("/request/:id", h.UpdateRequest)
+
+		req := httptest.NewRequest("PUT", "/request/"+validID, bytes.NewBufferString(`{"request_type":"   "}`))
+		req.Header.Set("Content-Type", "application/json")
+		resp, err := app.Test(req)
+		require.NoError(t, err)
+		assert.Equal(t, 400, resp.StatusCode)
+
+		b, _ := io.ReadAll(resp.Body)
+		assert.Contains(t, string(b), "request_type")
+	})
+
+	t.Run("returns 404 when request not found", func(t *testing.T) {
+		t.Parallel()
+
+		mock := &mockRequestRepository{
+			updateRequestFunc: func(_ context.Context, _ string, _ *models.RequestUpdateInput, _ *string) (*models.Request, error) {
+				return nil, errs.ErrNotFoundInDB
+			},
+		}
+
+		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
+		h := NewRequestsHandler(mock, nil, nil)
+		app.Put("/request/:id", h.UpdateRequest)
+
+		req := httptest.NewRequest("PUT", "/request/"+validID, bytes.NewBufferString(`{"status": "pending"}`))
+		req.Header.Set("Content-Type", "application/json")
+		resp, err := app.Test(req)
+		require.NoError(t, err)
+		assert.Equal(t, 404, resp.StatusCode)
+	})
+
+	t.Run("returns 500 on db error", func(t *testing.T) {
+		t.Parallel()
+
+		mock := &mockRequestRepository{
+			updateRequestFunc: func(_ context.Context, _ string, _ *models.RequestUpdateInput, _ *string) (*models.Request, error) {
+				return nil, errors.New("db connection failed")
+			},
+		}
+
+		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
+		h := NewRequestsHandler(mock, nil, nil)
+		app.Put("/request/:id", h.UpdateRequest)
+
+		req := httptest.NewRequest("PUT", "/request/"+validID, bytes.NewBufferString(`{"status": "pending"}`))
+		req.Header.Set("Content-Type", "application/json")
+		resp, err := app.Test(req)
+		require.NoError(t, err)
+		assert.Equal(t, 500, resp.StatusCode)
+	})
+}
+
+func TestRequestHandler_AssignRequest(t *testing.T) {
+	t.Parallel()
+
+	const (
+		validRequestID = "530e8400-e458-41d4-a716-446655440000"
+		validHotelID   = "org_521e8400-e458-41d4-a716-446655440000"
+		otherHotelID   = "org_621e8400-e458-41d4-a716-446655440000"
+		callerID       = "user_caller"
+		otherUserID    = "user_other"
+	)
+
+	withAuth := func(app *fiber.App, userID string) {
+		app.Use(func(c *fiber.Ctx) error {
+			c.Locals("userId", userID)
+			return c.Next()
+		})
+	}
+
+	baseRequest := func() *models.Request {
+		return &models.Request{
+			ID:             validRequestID,
+			CreatedAt:      time.Now(),
+			RequestVersion: time.Now(),
+			MakeRequest: models.MakeRequest{
+				HotelID:     validHotelID,
+				Name:        "room cleaning",
+				RequestType: "one-time",
+				Status:      "pending",
+				Priority:    "high",
+			},
+		}
+	}
+
+	t.Run("returns 401 without authenticated user", func(t *testing.T) {
+		t.Parallel()
+
+		mock := &mockRequestRepository{}
+		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
+		h := NewRequestsHandler(mock, nil, nil)
+		app.Post("/request/:id/assign", h.AssignRequest)
+
+		req := httptest.NewRequest("POST", "/request/"+validRequestID+"/assign", bytes.NewBufferString(`{}`))
+		req.Header.Set("Content-Type", "application/json")
+		req.Header.Set("X-Hotel-ID", validHotelID)
+		resp, err := app.Test(req)
+		require.NoError(t, err)
+		assert.Equal(t, 401, resp.StatusCode)
+	})
+
+	t.Run("returns 400 when X-Hotel-ID header is missing", func(t *testing.T) {
+		t.Parallel()
+
+		mock := &mockRequestRepository{}
+		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
+		withAuth(app, callerID)
+		h := NewRequestsHandler(mock, nil, nil)
+		app.Post("/request/:id/assign", h.AssignRequest)
+
+		req := httptest.NewRequest("POST", "/request/"+validRequestID+"/assign", bytes.NewBufferString(`{}`))
+		req.Header.Set("Content-Type", "application/json")
+		resp, err := app.Test(req)
+		require.NoError(t, err)
+		assert.Equal(t, 400, resp.StatusCode)
+	})
+
+	t.Run("returns 404 when request hotel does not match X-Hotel-ID", func(t *testing.T) {
+		t.Parallel()
+
+		mock := &mockRequestRepository{
+			findRequestFunc: func(_ context.Context, id string) (*models.Request, error) {
+				assert.Equal(t, validRequestID, id)
+				return baseRequest(), nil
+			},
+		}
+
+		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
+		withAuth(app, callerID)
+		h := NewRequestsHandler(mock, nil, nil)
+		app.Post("/request/:id/assign", h.AssignRequest)
+
+		body := `{"user_id": "` + otherUserID + `"}`
+		req := httptest.NewRequest("POST", "/request/"+validRequestID+"/assign", bytes.NewBufferString(body))
+		req.Header.Set("Content-Type", "application/json")
+		req.Header.Set("X-Hotel-ID", otherHotelID)
+		resp, err := app.Test(req)
+		require.NoError(t, err)
+		assert.Equal(t, 404, resp.StatusCode)
+	})
+
+	t.Run("assigns to caller when assign_to_self is true", func(t *testing.T) {
+		t.Parallel()
+
+		var gotUpdate *models.RequestUpdateInput
+		mock := &mockRequestRepository{
+			findRequestFunc: func(_ context.Context, id string) (*models.Request, error) {
+				return baseRequest(), nil
+			},
+			updateRequestFunc: func(_ context.Context, id string, update *models.RequestUpdateInput, _ *string) (*models.Request, error) {
+				gotUpdate = update
+				return &models.Request{
+					ID:             id,
+					CreatedAt:      time.Now(),
+					RequestVersion: time.Now(),
+					MakeRequest: models.MakeRequest{
+						HotelID:     validHotelID,
+						UserID:      update.UserID,
+						Name:        "room cleaning",
+						RequestType: "one-time",
+						Status:      "pending",
+						Priority:    "high",
+					},
+				}, nil
+			},
+		}
+
+		app := fiber.New()
+		withAuth(app, callerID)
+		h := NewRequestsHandler(mock, nil, nil)
+		app.Post("/request/:id/assign", h.AssignRequest)
+
+		req := httptest.NewRequest("POST", "/request/"+validRequestID+"/assign", bytes.NewBufferString(`{"assign_to_self": true}`))
+		req.Header.Set("Content-Type", "application/json")
+		req.Header.Set("X-Hotel-ID", validHotelID)
+		resp, err := app.Test(req)
+		require.NoError(t, err)
+		assert.Equal(t, 200, resp.StatusCode)
+		require.NotNil(t, gotUpdate)
+		require.NotNil(t, gotUpdate.UserID)
+		assert.Equal(t, callerID, *gotUpdate.UserID)
+	})
+
+	t.Run("assigns to body user_id when assign_to_self is false", func(t *testing.T) {
+		t.Parallel()
+
+		var gotUpdate *models.RequestUpdateInput
+		mock := &mockRequestRepository{
+			findRequestFunc: func(_ context.Context, id string) (*models.Request, error) {
+				return baseRequest(), nil
+			},
+			updateRequestFunc: func(_ context.Context, id string, update *models.RequestUpdateInput, _ *string) (*models.Request, error) {
+				gotUpdate = update
+				return &models.Request{
+					ID:             id,
+					CreatedAt:      time.Now(),
+					RequestVersion: time.Now(),
+					MakeRequest: models.MakeRequest{
+						HotelID:     validHotelID,
+						UserID:      update.UserID,
+						Name:        "room cleaning",
+						RequestType: "one-time",
+						Status:      "pending",
+						Priority:    "high",
+					},
+				}, nil
+			},
+		}
+
+		app := fiber.New()
+		withAuth(app, callerID)
+		h := NewRequestsHandler(mock, nil, nil)
+		app.Post("/request/:id/assign", h.AssignRequest)
+
+		body := `{"assign_to_self": false, "user_id": "` + otherUserID + `"}`
+		req := httptest.NewRequest("POST", "/request/"+validRequestID+"/assign", bytes.NewBufferString(body))
+		req.Header.Set("Content-Type", "application/json")
+		req.Header.Set("X-Hotel-ID", validHotelID)
+		resp, err := app.Test(req)
+		require.NoError(t, err)
+		assert.Equal(t, 200, resp.StatusCode)
+		require.NotNil(t, gotUpdate)
+		require.NotNil(t, gotUpdate.UserID)
+		assert.Equal(t, otherUserID, *gotUpdate.UserID)
+	})
+
+	t.Run("assigns to body user_id when assign_to_self is omitted", func(t *testing.T) {
+		t.Parallel()
+
+		var gotUpdate *models.RequestUpdateInput
+		mock := &mockRequestRepository{
+			findRequestFunc: func(_ context.Context, id string) (*models.Request, error) {
+				return baseRequest(), nil
+			},
+			updateRequestFunc: func(_ context.Context, id string, update *models.RequestUpdateInput, _ *string) (*models.Request, error) {
+				gotUpdate = update
+				return &models.Request{
+					ID:             id,
+					CreatedAt:      time.Now(),
+					RequestVersion: time.Now(),
+					MakeRequest: models.MakeRequest{
+						HotelID:     validHotelID,
+						UserID:      update.UserID,
+						Name:        "room cleaning",
+						RequestType: "one-time",
+						Status:      "pending",
+						Priority:    "high",
+					},
+				}, nil
+			},
+		}
+
+		app := fiber.New()
+		withAuth(app, callerID)
+		h := NewRequestsHandler(mock, nil, nil)
+		app.Post("/request/:id/assign", h.AssignRequest)
+
+		body := `{"user_id": "` + otherUserID + `"}`
+		req := httptest.NewRequest("POST", "/request/"+validRequestID+"/assign", bytes.NewBufferString(body))
+		req.Header.Set("Content-Type", "application/json")
+		req.Header.Set("X-Hotel-ID", validHotelID)
+		resp, err := app.Test(req)
+		require.NoError(t, err)
+		assert.Equal(t, 200, resp.StatusCode)
+		require.NotNil(t, gotUpdate)
+		require.NotNil(t, gotUpdate.UserID)
+		assert.Equal(t, otherUserID, *gotUpdate.UserID)
+	})
+
+	t.Run("returns 400 when assign_to_self is omitted and user_id is not provided", func(t *testing.T) {
+		t.Parallel()
+
+		mock := &mockRequestRepository{}
+		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
+		withAuth(app, callerID)
+		h := NewRequestsHandler(mock, nil, nil)
+		app.Post("/request/:id/assign", h.AssignRequest)
+
+		req := httptest.NewRequest("POST", "/request/"+validRequestID+"/assign", bytes.NewBufferString(`{}`))
+		req.Header.Set("Content-Type", "application/json")
+		req.Header.Set("X-Hotel-ID", validHotelID)
+		resp, err := app.Test(req)
+		require.NoError(t, err)
+		assert.Equal(t, 400, resp.StatusCode)
+	})
+
+	t.Run("returns 400 when assign_to_self is false and user_id is not provided", func(t *testing.T) {
+		t.Parallel()
+
+		mock := &mockRequestRepository{}
+		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
+		withAuth(app, callerID)
+		h := NewRequestsHandler(mock, nil, nil)
+		app.Post("/request/:id/assign", h.AssignRequest)
+
+		req := httptest.NewRequest("POST", "/request/"+validRequestID+"/assign", bytes.NewBufferString(`{"assign_to_self": false}`))
+		req.Header.Set("Content-Type", "application/json")
+		req.Header.Set("X-Hotel-ID", validHotelID)
+		resp, err := app.Test(req)
+		require.NoError(t, err)
+		assert.Equal(t, 400, resp.StatusCode)
+	})
+
+	t.Run("returns 400 when user_id is explicitly empty", func(t *testing.T) {
+		t.Parallel()
+
+		mock := &mockRequestRepository{}
+		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
+		withAuth(app, callerID)
+		h := NewRequestsHandler(mock, nil, nil)
+		app.Post("/request/:id/assign", h.AssignRequest)
+
+		req := httptest.NewRequest("POST", "/request/"+validRequestID+"/assign", bytes.NewBufferString(`{"user_id":""}`))
+		req.Header.Set("Content-Type", "application/json")
+		req.Header.Set("X-Hotel-ID", validHotelID)
+		resp, err := app.Test(req)
+		require.NoError(t, err)
+		assert.Equal(t, 400, resp.StatusCode)
+	})
+}
+
+func TestRequestHandler_GetRequestsByRoomID(t *testing.T) {
+	t.Parallel()
+
+	const (
+		validRoomID  = "630e8400-e458-41d4-a716-446655440000"
+		validHotelID = "org_521e8400-e458-41d4-a716-446655440000"
+		validUserID  = "user_abc123"
+	)
+
+	// withAuth injects a userId local so the handler passes the auth check.
+	withAuth := func(app *fiber.App, userID string) {
+		app.Use(func(c *fiber.Ctx) error {
+			c.Locals("userId", userID)
+			return c.Next()
+		})
+	}
+
+	t.Run("returns 200 with mine and unassigned lists", func(t *testing.T) {
+		t.Parallel()
+
+		mock := &mockRequestRepository{
+			findRequestsByRoomIDAndUserIDFunc: func(_ context.Context, _, _, _, _ string, _ time.Time, _ int) ([]*models.GuestRequest, error) {
+				return []*models.GuestRequest{
+					{ID: "aaa00000-e458-41d4-a716-446655440000", Name: "Fix AC", Priority: "high", Status: "assigned", RequestType: "one-time", CreatedAt: time.Now(), RequestVersion: time.Now()},
+				}, nil
+			},
+			findUnassignedRequestsByRoomIDFunc: func(_ context.Context, _, _, _ string, _ time.Time, _ int) ([]*models.GuestRequest, error) {
+				return []*models.GuestRequest{
+					{ID: "bbb00000-e458-41d4-a716-446655440000", Name: "Extra towels", Priority: "low", Status: "pending", RequestType: "one-time", CreatedAt: time.Now(), RequestVersion: time.Now()},
+				}, nil
+			},
+		}
+
+		app := fiber.New()
+		withAuth(app, validUserID)
+		h := NewRequestsHandler(mock, nil, nil)
+		app.Get("/request/room/:id", h.GetRequestsByRoomID)
+
+		req := httptest.NewRequest("GET", "/request/room/"+validRoomID, nil)
+		req.Header.Set("X-Hotel-ID", validHotelID)
+
+		resp, err := app.Test(req)
+		require.NoError(t, err)
+		assert.Equal(t, 200, resp.StatusCode)
+
+		body, _ := io.ReadAll(resp.Body)
+		assert.Contains(t, string(body), `"assigned"`)
+		assert.Contains(t, string(body), `"unassigned"`)
+		assert.Contains(t, string(body), "Fix AC")
+		assert.Contains(t, string(body), "Extra towels")
+	})
+
+	t.Run("returns 200 with empty lists when no requests exist", func(t *testing.T) {
+		t.Parallel()
+
+		mock := &mockRequestRepository{
+			findRequestsByRoomIDAndUserIDFunc: func(_ context.Context, _, _, _, _ string, _ time.Time, _ int) ([]*models.GuestRequest, error) {
+				return []*models.GuestRequest{}, nil
+			},
+			findUnassignedRequestsByRoomIDFunc: func(_ context.Context, _, _, _ string, _ time.Time, _ int) ([]*models.GuestRequest, error) {
+				return []*models.GuestRequest{}, nil
+			},
+		}
+
+		app := fiber.New()
+		withAuth(app, validUserID)
+		h := NewRequestsHandler(mock, nil, nil)
+		app.Get("/request/room/:id", h.GetRequestsByRoomID)
+
+		req := httptest.NewRequest("GET", "/request/room/"+validRoomID, nil)
+		req.Header.Set("X-Hotel-ID", validHotelID)
+
+		resp, err := app.Test(req)
+		require.NoError(t, err)
+		assert.Equal(t, 200, resp.StatusCode)
+
+		body, _ := io.ReadAll(resp.Body)
+		assert.Contains(t, string(body), `"assigned":[]`)
+		assert.Contains(t, string(body), `"unassigned":[]`)
+	})
+
+	t.Run("passes correct room_id, hotel_id, and user_id to mine query", func(t *testing.T) {
+		t.Parallel()
+
+		mock := &mockRequestRepository{
+			findRequestsByRoomIDAndUserIDFunc: func(_ context.Context, roomID, hotelID, userID, _ string, _ time.Time, _ int) ([]*models.GuestRequest, error) {
+				assert.Equal(t, validRoomID, roomID)
+				assert.Equal(t, validHotelID, hotelID)
+				assert.Equal(t, validUserID, userID)
+				return []*models.GuestRequest{}, nil
+			},
+			findUnassignedRequestsByRoomIDFunc: func(_ context.Context, _, _, _ string, _ time.Time, _ int) ([]*models.GuestRequest, error) {
+				return []*models.GuestRequest{}, nil
+			},
+		}
+
+		app := fiber.New()
+		withAuth(app, validUserID)
+		h := NewRequestsHandler(mock, nil, nil)
+		app.Get("/request/room/:id", h.GetRequestsByRoomID)
+
+		req := httptest.NewRequest("GET", "/request/room/"+validRoomID, nil)
+		req.Header.Set("X-Hotel-ID", validHotelID)
+
+		resp, err := app.Test(req)
+		require.NoError(t, err)
+		assert.Equal(t, 200, resp.StatusCode)
+	})
+
+	t.Run("passes correct room_id and hotel_id to unassigned query", func(t *testing.T) {
+		t.Parallel()
+
+		mock := &mockRequestRepository{
+			findRequestsByRoomIDAndUserIDFunc: func(_ context.Context, _, _, _, _ string, _ time.Time, _ int) ([]*models.GuestRequest, error) {
+				return []*models.GuestRequest{}, nil
+			},
+			findUnassignedRequestsByRoomIDFunc: func(_ context.Context, roomID, hotelID, _ string, _ time.Time, _ int) ([]*models.GuestRequest, error) {
+				assert.Equal(t, validRoomID, roomID)
+				assert.Equal(t, validHotelID, hotelID)
+				return []*models.GuestRequest{}, nil
+			},
+		}
+
+		app := fiber.New()
+		withAuth(app, validUserID)
+		h := NewRequestsHandler(mock, nil, nil)
+		app.Get("/request/room/:id", h.GetRequestsByRoomID)
+
+		req := httptest.NewRequest("GET", "/request/room/"+validRoomID, nil)
+		req.Header.Set("X-Hotel-ID", validHotelID)
+
+		resp, err := app.Test(req)
+		require.NoError(t, err)
+		assert.Equal(t, 200, resp.StatusCode)
+	})
+
+	t.Run("returns 401 when user is not authenticated", func(t *testing.T) {
+		t.Parallel()
+
+		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
+		h := NewRequestsHandler(&mockRequestRepository{}, nil, nil)
+		app.Get("/request/room/:id", h.GetRequestsByRoomID)
+
+		req := httptest.NewRequest("GET", "/request/room/"+validRoomID, nil)
+		req.Header.Set("X-Hotel-ID", validHotelID)
+
+		resp, err := app.Test(req)
+		require.NoError(t, err)
+		assert.Equal(t, 401, resp.StatusCode)
+	})
+
+	t.Run("returns 400 when room_id is not a valid UUID", func(t *testing.T) {
+		t.Parallel()
+
+		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
+		withAuth(app, validUserID)
+		h := NewRequestsHandler(&mockRequestRepository{}, nil, nil)
+		app.Get("/request/room/:id", h.GetRequestsByRoomID)
+
+		req := httptest.NewRequest("GET", "/request/room/not-a-uuid", nil)
+		req.Header.Set("X-Hotel-ID", validHotelID)
+
+		resp, err := app.Test(req)
+		require.NoError(t, err)
+		assert.Equal(t, 400, resp.StatusCode)
+
+		body, _ := io.ReadAll(resp.Body)
+		assert.Contains(t, string(body), "room_id")
+	})
+
+	t.Run("returns 400 when X-Hotel-ID header is missing", func(t *testing.T) {
+		t.Parallel()
+
+		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
+		withAuth(app, validUserID)
+		h := NewRequestsHandler(&mockRequestRepository{}, nil, nil)
+		app.Get("/request/room/:id", h.GetRequestsByRoomID)
+
+		req := httptest.NewRequest("GET", "/request/room/"+validRoomID, nil)
+
+		resp, err := app.Test(req)
+		require.NoError(t, err)
+		assert.Equal(t, 400, resp.StatusCode)
+
+		body, _ := io.ReadAll(resp.Body)
+		assert.Contains(t, string(body), "hotel_id")
+	})
+
+	t.Run("returns 500 when mine query fails", func(t *testing.T) {
+		t.Parallel()
+
+		mock := &mockRequestRepository{
+			findRequestsByRoomIDAndUserIDFunc: func(_ context.Context, _, _, _, _ string, _ time.Time, _ int) ([]*models.GuestRequest, error) {
+				return nil, errors.New("db connection failed")
+			},
+		}
+
+		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
+		withAuth(app, validUserID)
+		h := NewRequestsHandler(mock, nil, nil)
+		app.Get("/request/room/:id", h.GetRequestsByRoomID)
+
+		req := httptest.NewRequest("GET", "/request/room/"+validRoomID, nil)
+		req.Header.Set("X-Hotel-ID", validHotelID)
+
+		resp, err := app.Test(req)
+		require.NoError(t, err)
+		assert.Equal(t, 500, resp.StatusCode)
+	})
+
+	t.Run("returns 500 when unassigned query fails", func(t *testing.T) {
+		t.Parallel()
+
+		mock := &mockRequestRepository{
+			findRequestsByRoomIDAndUserIDFunc: func(_ context.Context, _, _, _, _ string, _ time.Time, _ int) ([]*models.GuestRequest, error) {
+				return []*models.GuestRequest{}, nil
+			},
+			findUnassignedRequestsByRoomIDFunc: func(_ context.Context, _, _, _ string, _ time.Time, _ int) ([]*models.GuestRequest, error) {
+				return nil, errors.New("db connection failed")
+			},
+		}
+
+		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
+		withAuth(app, validUserID)
+		h := NewRequestsHandler(mock, nil, nil)
+		app.Get("/request/room/:id", h.GetRequestsByRoomID)
+
+		req := httptest.NewRequest("GET", "/request/room/"+validRoomID, nil)
+		req.Header.Set("X-Hotel-ID", validHotelID)
+
+		resp, err := app.Test(req)
+		require.NoError(t, err)
+		assert.Equal(t, 500, resp.StatusCode)
+	})
+}
+
+func TestRequestHandler_StartGenerateRequestAsync(t *testing.T) {
+	t.Parallel()
+
+	validBody := `{
+		"hotel_id": "org_550e8400-e29b-41d4-a716-446655440000",
+		"raw_text": "Room 302 needs extra towels urgently"
+	}`
+
+	t.Run("returns 202 with workflow id on success", func(t *testing.T) {
+		t.Parallel()
+
+		workflowClient := &mockWorkflowClient{
+			startGenerateRequestFunc: func(ctx context.Context, input aiflows.GenerateRequestInput) (string, error) {
+				assert.Equal(t, "Room 302 needs extra towels urgently", input.RawText)
+				return "generate-request-123", nil
+			},
+		}
+
+		app := fiber.New()
+		h := NewRequestsHandler(&mockRequestRepository{}, &mockLLMService{}, nil)
+		h.WorkflowClient = workflowClient
+		app.Post("/request/generate/async", h.StartGenerateRequestAsync)
+
+		req := httptest.NewRequest("POST", "/request/generate/async", bytes.NewBufferString(validBody))
+		req.Header.Set("Content-Type", "application/json")
+		resp, err := app.Test(req)
+		require.NoError(t, err)
+		assert.Equal(t, fiber.StatusAccepted, resp.StatusCode)
+
+		body, _ := io.ReadAll(resp.Body)
+		assert.Contains(t, string(body), "workflow_id")
+		assert.Contains(t, string(body), "generate-request-123")
+	})
+
+	t.Run("returns 503 when workflow client is unavailable", func(t *testing.T) {
+		t.Parallel()
+
+		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
+		h := NewRequestsHandler(&mockRequestRepository{}, &mockLLMService{}, nil)
+		app.Post("/request/generate/async", h.StartGenerateRequestAsync)
+
+		req := httptest.NewRequest("POST", "/request/generate/async", bytes.NewBufferString(validBody))
+		req.Header.Set("Content-Type", "application/json")
+		resp, err := app.Test(req)
+		require.NoError(t, err)
+		assert.Equal(t, fiber.StatusServiceUnavailable, resp.StatusCode)
+	})
+}
+
+func TestRequestHandler_GetGenerateRequestStatus(t *testing.T) {
+	t.Parallel()
+
+	t.Run("returns 202 while workflow is pending", func(t *testing.T) {
+		t.Parallel()
+		workflowClient := &mockWorkflowClient{
+			getGenerateRequestResultFn: func(ctx context.Context, workflowID string) (temporalclient.GenerateRequestResult, error) {
+				assert.Equal(t, "generate-request-123", workflowID)
+				return temporalclient.GenerateRequestResult{
+					Status: "pending",
+				}, nil
+			},
+		}
+
+		app := fiber.New()
+		h := NewRequestsHandler(&mockRequestRepository{}, &mockLLMService{}, nil)
+		h.WorkflowClient = workflowClient
+		app.Get("/request/generate/async/:workflowId", h.GetGenerateRequestStatus)
+
+		req := httptest.NewRequest("GET", "/request/generate/async/generate-request-123", nil)
+		resp, err := app.Test(req)
+		require.NoError(t, err)
+		assert.Equal(t, fiber.StatusAccepted, resp.StatusCode)
+	})
+
+	t.Run("returns completed result", func(t *testing.T) {
+		t.Parallel()
+		workflowClient := &mockWorkflowClient{
+			getGenerateRequestResultFn: func(ctx context.Context, workflowID string) (temporalclient.GenerateRequestResult, error) {
+				return temporalclient.GenerateRequestResult{
+					Status: "completed",
+					Output: &aiflows.EnrichedGenerateRequestOutput{
+						GenerateRequestOutput: aiflows.GenerateRequestOutput{
+							Name:        "Extra Towels Request",
+							RequestType: "one-time",
+							Status:      "pending",
+							Priority:    "high",
+						},
+					},
+				}, nil
+			},
+		}
+
+		app := fiber.New()
+		h := NewRequestsHandler(&mockRequestRepository{}, &mockLLMService{}, nil)
+		h.WorkflowClient = workflowClient
+		app.Get("/request/generate/async/:workflowId", h.GetGenerateRequestStatus)
+
+		req := httptest.NewRequest("GET", "/request/generate/async/generate-request-123", nil)
+		resp, err := app.Test(req)
+		require.NoError(t, err)
+		assert.Equal(t, fiber.StatusOK, resp.StatusCode)
+
+		body, _ := io.ReadAll(resp.Body)
+		assert.Contains(t, string(body), "completed")
+		assert.Contains(t, string(body), "Extra Towels Request")
 	})
 }
diff --git a/backend/internal/handler/rooms.go b/backend/internal/handler/rooms.go
index 010b017d1..08dda2ef4 100644
--- a/backend/internal/handler/rooms.go
+++ b/backend/internal/handler/rooms.go
@@ -2,17 +2,20 @@ package handler
 
 import (
 	"context"
+	"errors"
 	"strconv"
 
 	"github.com/generate/selfserve/internal/errs"
+	"github.com/generate/selfserve/internal/httpx"
 	"github.com/generate/selfserve/internal/models"
 	"github.com/generate/selfserve/internal/utils"
 	"github.com/gofiber/fiber/v2"
 )
 
 type RoomsRepository interface {
-	FindRoomsWithOptionalGuestBookingsByFloor(ctx context.Context, filter *models.RoomFilters, hotelID string, cursorRoomNumber int) ([]*models.RoomWithOptionalGuestBooking, error)
+	FindRoomsWithOptionalGuestBookingsByFloor(ctx context.Context, filter *models.FilterRoomsRequest, hotelID string, cursorRoomNumber int) ([]*models.RoomWithOptionalGuestBooking, error)
 	FindAllFloors(ctx context.Context, hotelID string) ([]int, error)
+	FindRoomByID(ctx context.Context, hotelID string, id string) (*models.RoomWithOptionalGuestBooking, error)
 }
 
 type RoomsHandler struct {
@@ -23,52 +26,85 @@ func NewRoomsHandler(repo RoomsRepository) *RoomsHandler {
 	return &RoomsHandler{repo: repo}
 }
 
-// GetRoomsByFloor godoc
-// @Summary      Get Rooms By Floor
-// @Description  Retrieves rooms optionally filtered by floor, with any active guest bookings
+// FilterRooms godoc
+// @Summary      List rooms with filters
+// @Description  Retrieves rooms with optional filters (status, attributes, advanced, sort) and cursor pagination. Occupancy is derived from active guest_bookings; open tasks from the latest request version per room.
 // @Tags         rooms
+// @Accept       json
 // @Produce      json
-// @Param        X-Hotel-ID  header    string  true   "Hotel ID (UUID)"
-// @Param        floors      query     []int   false  "floors"
-// @Param        cursor      query     string  false  "Opaque cursor for the next page"
-// @Param        limit       query     int     false  "Number of items per page (1-100, default 20)"
+// @Param        X-Hotel-ID  header    string                      true   "Hotel ID"
+// @Param        body        body      models.FilterRoomsRequest   false  "Filters and pagination"
 // @Success      200         {object}  utils.CursorPage[models.RoomWithOptionalGuestBooking]
 // @Failure      400         {object}  map[string]string
 // @Failure      500         {object}  map[string]string
 // @Security     BearerAuth
-// @Router       /rooms [get]
-func (h *RoomsHandler) GetRoomsByFloor(c *fiber.Ctx) error {
+// @Router       /rooms [post]
+func (h *RoomsHandler) FilterRooms(c *fiber.Ctx) error {
 	hotelID, err := hotelIDFromHeader(c)
 	if err != nil {
 		return err
 	}
 
-	filter := new(models.RoomFilters)
-	if err := c.QueryParser(filter); err != nil {
-		return errs.BadRequest("invalid filters")
+	var body models.FilterRoomsRequest
+	if err := httpx.BindAndValidate(c, &body); err != nil {
+		return err
 	}
 
-	cursor := c.Query("cursor", "")
 	cursorRoomNumber := 0
-	if cursor != "" {
-		cursorRoomNumber, err = strconv.Atoi(cursor)
+	if body.Cursor != "" {
+		cursorRoomNumber, err = strconv.Atoi(body.Cursor)
 		if err != nil {
 			return errs.BadRequest("invalid cursor")
 		}
 	}
 
-	rooms, err := h.repo.FindRoomsWithOptionalGuestBookingsByFloor(c.Context(), filter, hotelID, cursorRoomNumber)
+	rooms, err := h.repo.FindRoomsWithOptionalGuestBookingsByFloor(c.Context(), &body, hotelID, cursorRoomNumber)
 	if err != nil {
 		return errs.InternalServerError()
 	}
 
-	page := utils.BuildCursorPage(rooms, filter.Limit, func(r *models.RoomWithOptionalGuestBooking) string {
+	page := utils.BuildCursorPage(rooms, body.Limit, func(r *models.RoomWithOptionalGuestBooking) string {
 		return strconv.Itoa(r.RoomNumber)
 	})
 
 	return c.JSON(page)
 }
 
+// GetRoomByID godoc
+// @Summary      Get room by ID
+// @Description  Retrieves a single room by its UUID
+// @Tags         rooms
+// @Produce      json
+// @Param        X-Hotel-ID  header    string  true   "Hotel ID (UUID)"
+// @Param        id          path      string  true   "Room ID (UUID)"
+// @Success      200  {object}  models.RoomWithOptionalGuestBooking
+// @Failure      400  {object}  errs.HTTPError
+// @Failure      404  {object}  errs.HTTPError
+// @Failure      500  {object}  errs.HTTPError
+// @Security     BearerAuth
+// @Router       /rooms/{id} [get]
+func (h *RoomsHandler) GetRoomByID(c *fiber.Ctx) error {
+	hotelID, err := hotelIDFromHeader(c)
+	if err != nil {
+		return err
+	}
+
+	id := c.Params("id")
+	if id == "" {
+		return errs.BadRequest("id is required")
+	}
+
+	room, err := h.repo.FindRoomByID(c.Context(), hotelID, id)
+	if err != nil {
+		if errors.Is(err, errs.ErrNotFoundInDB) {
+			return errs.NotFound("room", "id", id)
+		}
+		return errs.InternalServerError()
+	}
+
+	return c.JSON(room)
+}
+
 // GetFloors godoc
 // @Summary      Get Floors
 // @Description  Retrieves all distinct floor numbers
diff --git a/backend/internal/handler/rooms_test.go b/backend/internal/handler/rooms_test.go
index 54ec2abb0..981073b2a 100644
--- a/backend/internal/handler/rooms_test.go
+++ b/backend/internal/handler/rooms_test.go
@@ -5,6 +5,7 @@ import (
 	"errors"
 	"io"
 	"net/http/httptest"
+	"strings"
 	"testing"
 
 	"github.com/generate/selfserve/internal/errs"
@@ -15,11 +16,12 @@ import (
 )
 
 type mockRoomsRepository struct {
-	findRoomsFunc  func(ctx context.Context, filter *models.RoomFilters, hotelID string, cursorRoomNumber int) ([]*models.RoomWithOptionalGuestBooking, error)
-	findFloorsFunc func(ctx context.Context, hotelID string) ([]int, error)
+	findRoomsFunc    func(ctx context.Context, filter *models.FilterRoomsRequest, hotelID string, cursorRoomNumber int) ([]*models.RoomWithOptionalGuestBooking, error)
+	findFloorsFunc   func(ctx context.Context, hotelID string) ([]int, error)
+	findRoomByIDFunc func(ctx context.Context, hotelID string, id string) (*models.RoomWithOptionalGuestBooking, error)
 }
 
-func (m *mockRoomsRepository) FindRoomsWithOptionalGuestBookingsByFloor(ctx context.Context, filter *models.RoomFilters, hotelID string, cursorRoomNumber int) ([]*models.RoomWithOptionalGuestBooking, error) {
+func (m *mockRoomsRepository) FindRoomsWithOptionalGuestBookingsByFloor(ctx context.Context, filter *models.FilterRoomsRequest, hotelID string, cursorRoomNumber int) ([]*models.RoomWithOptionalGuestBooking, error) {
 	return m.findRoomsFunc(ctx, filter, hotelID, cursorRoomNumber)
 }
 
@@ -27,21 +29,31 @@ func (m *mockRoomsRepository) FindAllFloors(ctx context.Context, hotelID string)
 	return m.findFloorsFunc(ctx, hotelID)
 }
 
+func (m *mockRoomsRepository) FindRoomByID(ctx context.Context, hotelID string, id string) (*models.RoomWithOptionalGuestBooking, error) {
+	return m.findRoomByIDFunc(ctx, hotelID, id)
+}
+
 var _ RoomsRepository = (*mockRoomsRepository)(nil)
 
-const testHotelID = "00000000-0000-0000-0000-000000000001"
+const testHotelID = "org_00000000000000000000000001"
 
-func TestRoomsHandler_GetRoomsByFloor(t *testing.T) {
+func TestRoomsHandler_FilterRooms(t *testing.T) {
 	t.Parallel()
 
 	t.Run("returns 200 with rooms and no guests when rooms are vacant", func(t *testing.T) {
 		t.Parallel()
 
 		mock := &mockRoomsRepository{
-			findRoomsFunc: func(ctx context.Context, filter *models.RoomFilters, hotelID string, cursorRoomNumber int) ([]*models.RoomWithOptionalGuestBooking, error) {
+			findRoomsFunc: func(ctx context.Context, filter *models.FilterRoomsRequest, hotelID string, cursorRoomNumber int) ([]*models.RoomWithOptionalGuestBooking, error) {
 				return []*models.RoomWithOptionalGuestBooking{
 					{
-						Room:   models.Room{RoomNumber: 101, Floor: 1, SuiteType: "standard", RoomStatus: "available"},
+						Room: models.Room{
+							ID:         "530e8400-e458-41d4-a716-446655440111",
+							RoomNumber: 101,
+							Floor:      1,
+							SuiteType:  "standard",
+							RoomStatus: "available",
+						},
 						Guests: nil,
 					},
 				}, nil
@@ -50,9 +62,10 @@ func TestRoomsHandler_GetRoomsByFloor(t *testing.T) {
 
 		app := fiber.New()
 		h := NewRoomsHandler(mock)
-		app.Get("/rooms", h.GetRoomsByFloor)
+		app.Post("/rooms", h.FilterRooms)
 
-		req := httptest.NewRequest("GET", "/rooms", nil)
+		req := httptest.NewRequest("POST", "/rooms", strings.NewReader(`{}`))
+		req.Header.Set("Content-Type", "application/json")
 		req.Header.Set(hotelIDHeader, testHotelID)
 		resp, err := app.Test(req)
 		require.NoError(t, err)
@@ -61,6 +74,7 @@ func TestRoomsHandler_GetRoomsByFloor(t *testing.T) {
 
 		body, _ := io.ReadAll(resp.Body)
 		assert.Contains(t, string(body), `"items"`)
+		assert.Contains(t, string(body), "530e8400-e458-41d4-a716-446655440111")
 		assert.Contains(t, string(body), "101")
 		assert.Contains(t, string(body), "standard")
 		assert.Contains(t, string(body), `"has_more":false`)
@@ -73,7 +87,7 @@ func TestRoomsHandler_GetRoomsByFloor(t *testing.T) {
 		doe := "Doe"
 		pic := "https://example.com/jane.jpg"
 		mock := &mockRoomsRepository{
-			findRoomsFunc: func(ctx context.Context, filter *models.RoomFilters, hotelID string, cursorRoomNumber int) ([]*models.RoomWithOptionalGuestBooking, error) {
+			findRoomsFunc: func(ctx context.Context, filter *models.FilterRoomsRequest, hotelID string, cursorRoomNumber int) ([]*models.RoomWithOptionalGuestBooking, error) {
 				return []*models.RoomWithOptionalGuestBooking{
 					{
 						Room: models.Room{RoomNumber: 202, Floor: 2, SuiteType: "deluxe", RoomStatus: "occupied"},
@@ -94,9 +108,10 @@ func TestRoomsHandler_GetRoomsByFloor(t *testing.T) {
 
 		app := fiber.New()
 		h := NewRoomsHandler(mock)
-		app.Get("/rooms", h.GetRoomsByFloor)
+		app.Post("/rooms", h.FilterRooms)
 
-		req := httptest.NewRequest("GET", "/rooms?floors=2", nil)
+		req := httptest.NewRequest("POST", "/rooms", strings.NewReader(`{"floors":[2]}`))
+		req.Header.Set("Content-Type", "application/json")
 		req.Header.Set(hotelIDHeader, testHotelID)
 		resp, err := app.Test(req)
 		require.NoError(t, err)
@@ -115,16 +130,17 @@ func TestRoomsHandler_GetRoomsByFloor(t *testing.T) {
 		t.Parallel()
 
 		mock := &mockRoomsRepository{
-			findRoomsFunc: func(ctx context.Context, filter *models.RoomFilters, hotelID string, cursorRoomNumber int) ([]*models.RoomWithOptionalGuestBooking, error) {
+			findRoomsFunc: func(ctx context.Context, filter *models.FilterRoomsRequest, hotelID string, cursorRoomNumber int) ([]*models.RoomWithOptionalGuestBooking, error) {
 				return []*models.RoomWithOptionalGuestBooking{}, nil
 			},
 		}
 
 		app := fiber.New()
 		h := NewRoomsHandler(mock)
-		app.Get("/rooms", h.GetRoomsByFloor)
+		app.Post("/rooms", h.FilterRooms)
 
-		req := httptest.NewRequest("GET", "/rooms?floors=99", nil)
+		req := httptest.NewRequest("POST", "/rooms", strings.NewReader(`{"floors":[99]}`))
+		req.Header.Set("Content-Type", "application/json")
 		req.Header.Set(hotelIDHeader, testHotelID)
 		resp, err := app.Test(req)
 		require.NoError(t, err)
@@ -147,16 +163,17 @@ func TestRoomsHandler_GetRoomsByFloor(t *testing.T) {
 		}
 
 		mock := &mockRoomsRepository{
-			findRoomsFunc: func(ctx context.Context, filter *models.RoomFilters, hotelID string, cursorRoomNumber int) ([]*models.RoomWithOptionalGuestBooking, error) {
+			findRoomsFunc: func(ctx context.Context, filter *models.FilterRoomsRequest, hotelID string, cursorRoomNumber int) ([]*models.RoomWithOptionalGuestBooking, error) {
 				return rooms, nil
 			},
 		}
 
 		app := fiber.New()
 		h := NewRoomsHandler(mock)
-		app.Get("/rooms", h.GetRoomsByFloor)
+		app.Post("/rooms", h.FilterRooms)
 
-		req := httptest.NewRequest("GET", "/rooms?limit=5", nil)
+		req := httptest.NewRequest("POST", "/rooms", strings.NewReader(`{"limit":5}`))
+		req.Header.Set("Content-Type", "application/json")
 		req.Header.Set(hotelIDHeader, testHotelID)
 		resp, err := app.Test(req)
 		require.NoError(t, err)
@@ -171,13 +188,11 @@ func TestRoomsHandler_GetRoomsByFloor(t *testing.T) {
 	t.Run("passes cursor, filter, and hotelID to repository", func(t *testing.T) {
 		t.Parallel()
 
-		cursor := "200"
-
-		var capturedFilter *models.RoomFilters
+		var capturedFilter *models.FilterRoomsRequest
 		var capturedHotelID string
 		var capturedCursor int
 		mock := &mockRoomsRepository{
-			findRoomsFunc: func(ctx context.Context, filter *models.RoomFilters, hotelID string, cursorRoomNumber int) ([]*models.RoomWithOptionalGuestBooking, error) {
+			findRoomsFunc: func(ctx context.Context, filter *models.FilterRoomsRequest, hotelID string, cursorRoomNumber int) ([]*models.RoomWithOptionalGuestBooking, error) {
 				capturedFilter = filter
 				capturedHotelID = hotelID
 				capturedCursor = cursorRoomNumber
@@ -187,9 +202,10 @@ func TestRoomsHandler_GetRoomsByFloor(t *testing.T) {
 
 		app := fiber.New()
 		h := NewRoomsHandler(mock)
-		app.Get("/rooms", h.GetRoomsByFloor)
+		app.Post("/rooms", h.FilterRooms)
 
-		req := httptest.NewRequest("GET", "/rooms?cursor="+cursor+"&limit=10", nil)
+		req := httptest.NewRequest("POST", "/rooms", strings.NewReader(`{"cursor":"200","limit":10}`))
+		req.Header.Set("Content-Type", "application/json")
 		req.Header.Set(hotelIDHeader, testHotelID)
 		resp, err := app.Test(req)
 		require.NoError(t, err)
@@ -205,64 +221,67 @@ func TestRoomsHandler_GetRoomsByFloor(t *testing.T) {
 		t.Parallel()
 
 		mock := &mockRoomsRepository{
-			findRoomsFunc: func(ctx context.Context, filter *models.RoomFilters, hotelID string, cursorRoomNumber int) ([]*models.RoomWithOptionalGuestBooking, error) {
+			findRoomsFunc: func(ctx context.Context, filter *models.FilterRoomsRequest, hotelID string, cursorRoomNumber int) ([]*models.RoomWithOptionalGuestBooking, error) {
 				return nil, nil
 			},
 		}
 
 		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
 		h := NewRoomsHandler(mock)
-		app.Get("/rooms", h.GetRoomsByFloor)
+		app.Post("/rooms", h.FilterRooms)
 
-		req := httptest.NewRequest("GET", "/rooms", nil)
+		req := httptest.NewRequest("POST", "/rooms", strings.NewReader(`{}`))
+		req.Header.Set("Content-Type", "application/json")
 		resp, err := app.Test(req)
 		require.NoError(t, err)
 
 		assert.Equal(t, 400, resp.StatusCode)
 	})
 
-	t.Run("returns 400 when hotel_id header is invalid", func(t *testing.T) {
+	// invalid cursor is handled in repository now; handler does not validate cursor
+
+	t.Run("returns 500 when repository fails", func(t *testing.T) {
 		t.Parallel()
 
 		mock := &mockRoomsRepository{
-			findRoomsFunc: func(ctx context.Context, filter *models.RoomFilters, hotelID string, cursorRoomNumber int) ([]*models.RoomWithOptionalGuestBooking, error) {
-				return nil, nil
+			findRoomsFunc: func(ctx context.Context, filter *models.FilterRoomsRequest, hotelID string, cursorRoomNumber int) ([]*models.RoomWithOptionalGuestBooking, error) {
+				return nil, errors.New("db error")
 			},
 		}
 
 		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
 		h := NewRoomsHandler(mock)
-		app.Get("/rooms", h.GetRoomsByFloor)
+		app.Post("/rooms", h.FilterRooms)
 
-		req := httptest.NewRequest("GET", "/rooms", nil)
-		req.Header.Set(hotelIDHeader, "not-a-uuid")
+		req := httptest.NewRequest("POST", "/rooms", strings.NewReader(`{}`))
+		req.Header.Set("Content-Type", "application/json")
+		req.Header.Set(hotelIDHeader, testHotelID)
 		resp, err := app.Test(req)
 		require.NoError(t, err)
 
-		assert.Equal(t, 400, resp.StatusCode)
+		assert.Equal(t, 500, resp.StatusCode)
 	})
 
-	// invalid cursor is handled in repository now; handler does not validate cursor
-
-	t.Run("returns 500 when repository fails", func(t *testing.T) {
+	t.Run("returns 400 when request body is invalid json", func(t *testing.T) {
 		t.Parallel()
 
 		mock := &mockRoomsRepository{
-			findRoomsFunc: func(ctx context.Context, filter *models.RoomFilters, hotelID string, cursorRoomNumber int) ([]*models.RoomWithOptionalGuestBooking, error) {
-				return nil, errors.New("db error")
+			findRoomsFunc: func(ctx context.Context, filter *models.FilterRoomsRequest, hotelID string, cursorRoomNumber int) ([]*models.RoomWithOptionalGuestBooking, error) {
+				return nil, nil
 			},
 		}
 
 		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
 		h := NewRoomsHandler(mock)
-		app.Get("/rooms", h.GetRoomsByFloor)
+		app.Post("/rooms", h.FilterRooms)
 
-		req := httptest.NewRequest("GET", "/rooms", nil)
+		req := httptest.NewRequest("POST", "/rooms", strings.NewReader(`{`))
+		req.Header.Set("Content-Type", "application/json")
 		req.Header.Set(hotelIDHeader, testHotelID)
 		resp, err := app.Test(req)
 		require.NoError(t, err)
 
-		assert.Equal(t, 500, resp.StatusCode)
+		assert.Equal(t, 400, resp.StatusCode)
 	})
 }
 
@@ -314,27 +333,6 @@ func TestRoomsHandler_GetFloors(t *testing.T) {
 		assert.Equal(t, 400, resp.StatusCode)
 	})
 
-	t.Run("returns 400 when hotel_id header is invalid", func(t *testing.T) {
-		t.Parallel()
-
-		mock := &mockRoomsRepository{
-			findFloorsFunc: func(ctx context.Context, hotelID string) ([]int, error) {
-				return []int{}, nil
-			},
-		}
-
-		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
-		h := NewRoomsHandler(mock)
-		app.Get("/rooms/floors", h.GetFloors)
-
-		req := httptest.NewRequest("GET", "/rooms/floors", nil)
-		req.Header.Set(hotelIDHeader, "not-a-uuid")
-		resp, err := app.Test(req)
-		require.NoError(t, err)
-
-		assert.Equal(t, 400, resp.StatusCode)
-	})
-
 	t.Run("returns 500 when repository fails", func(t *testing.T) {
 		t.Parallel()
 
diff --git a/backend/internal/handler/s3.go b/backend/internal/handler/s3.go
index 7cbea75cb..fa13299e5 100644
--- a/backend/internal/handler/s3.go
+++ b/backend/internal/handler/s3.go
@@ -1,14 +1,23 @@
 package handler
 
 import (
+	"fmt"
 	"time"
 
 	"github.com/generate/selfserve/internal/errs"
+	"github.com/generate/selfserve/internal/models"
 	s3storage "github.com/generate/selfserve/internal/service/s3"
 	"github.com/gofiber/fiber/v2"
 )
 
-const expirationTime = 5 * time.Minute // Moved to a package level constant for reusability
+const expirationTime = 5 * time.Minute
+
+var allowedProfilePictureExts = map[string]struct{}{
+	"jpg":  {},
+	"jpeg": {},
+	"png":  {},
+	"webp": {},
+}
 
 type S3Handler struct {
 	S3Storage *s3storage.Storage
@@ -18,28 +27,92 @@ func NewS3Handler(s3Storage *s3storage.Storage) *S3Handler {
 	return &S3Handler{S3Storage: s3Storage}
 }
 
-// GeneratePresignedURL godoc
+// GeneratePresignedUploadURL godoc
 // @Summary      Generate a presigned URL for a file
-// @Description  Generates a presigned URL for a file
+// @Description  Generates a presigned URL for a file. The key is the full S3 path (e.g., profile-pictures/user123/image.jpg)
 // @Tags         s3
 // @Accept       json
 // @Produce      json
-// @Param        key  path  string  true  "File key"
-// @Success      200  {object}  map[string]string  "Presigned URL response"
+// @Param        key  path  string  true  "File key (full path after /presigned-url/)"
+// @Success      200  {string}  string  "Presigned URL"
 // @Failure      400  {object}  map[string]string
 // @Failure      500  {object}  map[string]string
-// @Security     BearerAuth
 // @Router       /s3/presigned-url/{key} [get]
+func (h *S3Handler) GeneratePresignedUploadURL(c *fiber.Ctx) error {
+	key := c.Params("*")
+	if key == "" {
+		return errs.BadRequest("key is required")
+	}
+
+	presignedURL, err := h.S3Storage.GeneratePresignedUploadURL(c.Context(), models.PresignedURLInput{
+		Key:        key,
+		Expiration: expirationTime,
+	})
+	if err != nil {
+		return err
+	}
+
+	return c.JSON(fiber.Map{
+		"presigned_url": presignedURL,
+	})
+}
+
+// GetUploadURL godoc
+// @Summary      Get presigned URL for profile picture upload
+// @Description  Generates a presigned S3 URL and unique key for uploading a profile picture. After uploading to S3, use PUT /users/{userId}/profile-picture to save the key.
+// @Tags         s3
+// @Produce      json
+// @Param        userId  path   string  true   "User ID"
+// @Param        ext     query  string  false  "File extension (jpg, jpeg, png, webp)" default(jpg)
+// @Success      200  {object}  map[string]string  "Returns presigned_url and key"
+// @Failure      400  {object}  map[string]string
+// @Failure      500  {object}  map[string]string
+// @Router       /s3/upload-url/{userId} [get]
+func (h *S3Handler) GetUploadURL(c *fiber.Ctx) error {
+	userId := c.Params("userId")
+	ext := c.Query("ext", "jpg")
+	if _, ok := allowedProfilePictureExts[ext]; !ok {
+		return errs.BadRequest("invalid extension")
+	}
+
+	key := fmt.Sprintf("profile-pictures/%s/%d.%s", userId, time.Now().Unix(), ext)
+	presignedURL, err := h.S3Storage.GeneratePresignedUploadURL(c.Context(), models.PresignedURLInput{
+		Key:        key,
+		Expiration: expirationTime,
+	})
+	if err != nil {
+		return err
+	}
+
+	return c.JSON(fiber.Map{
+		"presigned_url": presignedURL,
+		"key":           key,
+	})
+}
 
-func (h *S3Handler) GeneratePresignedURL(c *fiber.Ctx) error {
-	key := c.Params("key")
+// GeneratePresignedGetURL godoc
+// @Summary      Generate a presigned URL for a file
+// @Description  Generates a presigned URL for a file. The key is the full S3 path (e.g., profile-pictures/user123/image.jpg)
+// @Tags         s3
+// @Accept       json
+// @Produce      json
+// @Param        key  path  string  true  "File key (full path after /presigned-url/)"
+// @Success      200  {string}  string  "Presigned URL"
+// @Failure      400  {object}  map[string]string
+// @Failure      500  {object}  map[string]string
+// @Router       /s3/presigned-get-url/{key} [get]
+func (h *S3Handler) GeneratePresignedGetURL(c *fiber.Ctx) error {
+	key := c.Params("*")
 	if key == "" {
 		return errs.BadRequest("key is required")
 	}
 
-	presignedURL, err := h.S3Storage.GeneratePresignedURL(c.Context(), key, expirationTime)
+	presignedURL, err := h.S3Storage.GeneratePresignedGetURL(c.Context(), models.PresignedURLInput{
+		Key:        key,
+		Expiration: expirationTime,
+	})
 	if err != nil {
-		return errs.InternalServerError()
+		return err
 	}
 
 	return c.JSON(fiber.Map{
diff --git a/backend/internal/handler/users.go b/backend/internal/handler/users.go
index 5cde2789e..3bd3a8a42 100644
--- a/backend/internal/handler/users.go
+++ b/backend/internal/handler/users.go
@@ -1,27 +1,38 @@
 package handler
 
 import (
-	"context"
 	"errors"
 	"log/slog"
+	"time"
 
 	"github.com/generate/selfserve/internal/errs"
 	"github.com/generate/selfserve/internal/httpx"
 	"github.com/generate/selfserve/internal/models"
+	storage "github.com/generate/selfserve/internal/service/storage/postgres"
 	"github.com/gofiber/fiber/v2"
 )
 
-type UsersRepository interface {
-	FindUser(ctx context.Context, id string) (*models.User, error)
-	InsertUser(ctx context.Context, user *models.CreateUser) (*models.User, error)
+// UpdateProfilePictureRequest represents the request body for updating a profile picture
+// @Description Request body containing the S3 key after uploading
+type UpdateProfilePictureRequest struct {
+	Key string `json:"key" validate:"notblank" example:"profile-pictures/user123/1706540000.jpg"`
 }
 
+type SearchUsersBody struct {
+	HotelID string `json:"hotel_id" validate:"notblank"`
+	Cursor  string `json:"cursor"`
+	Query   string `json:"q"`
+}
+
+const defaultUsersPageSize = 20
+
 type UsersHandler struct {
-	repo UsersRepository
+	UsersRepository storage.UsersRepository
+	S3Storage       storage.S3Storage
 }
 
-func NewUsersHandler(repo UsersRepository) *UsersHandler {
-	return &UsersHandler{repo: repo}
+func NewUsersHandler(repo storage.UsersRepository, s3 storage.S3Storage) *UsersHandler {
+	return &UsersHandler{UsersRepository: repo, S3Storage: s3}
 }
 
 // GetUserByID godoc
@@ -41,7 +52,7 @@ func (h *UsersHandler) GetUserByID(c *fiber.Ctx) error {
 	if id == "" {
 		return errs.BadRequest("id is required")
 	}
-	user, err := h.repo.FindUser(c.Context(), id)
+	user, err := h.UsersRepository.FindUser(c.Context(), id)
 	if err != nil {
 		if errors.Is(err, errs.ErrNotFoundInDB) {
 			return errs.NotFound("user", "id", id)
@@ -52,6 +63,36 @@ func (h *UsersHandler) GetUserByID(c *fiber.Ctx) error {
 	return c.JSON(user)
 }
 
+// SearchUsers godoc
+// @Summary      Search users by hotel
+// @Description  Returns a paginated list of users for a hotel, optionally filtered by name. Cursor is the last seen user ID.
+// @Tags         users
+// @Accept       json
+// @Produce      json
+// @Param        request  body      SearchUsersBody  true  "Search params"
+// @Success      200      {object}  models.UserPage
+// @Failure      400      {object}  errs.HTTPError
+// @Failure      500      {object}  errs.HTTPError
+// @Security     BearerAuth
+// @Router       /users/search [post]
+func (h *UsersHandler) SearchUsers(c *fiber.Ctx) error {
+	var body SearchUsersBody
+	if err := httpx.BindAndValidate(c, &body); err != nil {
+		return err
+	}
+
+	users, nextCursor, err := h.UsersRepository.SearchUsersByHotel(c.Context(), body.HotelID, body.Cursor, body.Query, defaultUsersPageSize)
+	if err != nil {
+		slog.Error("failed to search users", "hotel_id", body.HotelID, "err", err)
+		return errs.InternalServerError()
+	}
+
+	return c.JSON(models.UserPage{
+		Users:      users,
+		NextCursor: nextCursor,
+	})
+}
+
 // CreateUser godoc
 // @Summary      Creates a user
 // @Description  Creates a user with the given data
@@ -66,18 +107,253 @@ func (h *UsersHandler) GetUserByID(c *fiber.Ctx) error {
 // @Router       /users [post]
 func (h *UsersHandler) CreateUser(c *fiber.Ctx) error {
 	var CreateUserRequest models.CreateUser
-	if err := c.BodyParser(&CreateUserRequest); err != nil {
-		return errs.InvalidJSON()
-	}
-
 	if err := httpx.BindAndValidate(c, &CreateUserRequest); err != nil {
 		return err
 	}
 
-	res, err := h.repo.InsertUser(c.Context(), &CreateUserRequest)
+	res, err := h.UsersRepository.InsertUser(c.Context(), &CreateUserRequest)
 	if err != nil {
 		return errs.InternalServerError()
 	}
 
 	return c.JSON(res)
 }
+
+// UpdateUser godoc
+// @Summary      Update user
+// @Description  Updates allowed fields on a user
+// @Tags         users
+// @Accept       json
+// @Produce      json
+// @Param        id       path      string              true  "User ID"
+// @Param        request  body      models.UpdateUser   true  "Fields to update"
+// @Success      200      {object}  models.User
+// @Failure      400      {object}  map[string]string
+// @Failure      404      {object}  map[string]string
+// @Failure      500      {object}  map[string]string
+// @Security     BearerAuth
+// @Router       /users/{id} [put]
+func (h *UsersHandler) UpdateUser(c *fiber.Ctx) error {
+	id := c.Params("id")
+	if id == "" {
+		return errs.BadRequest("id is required")
+	}
+	var req models.UpdateUser
+	if err := httpx.BindAndValidate(c, &req); err != nil {
+		return err
+	}
+	user, err := h.UsersRepository.UpdateUser(c.Context(), id, &req)
+	if err != nil {
+		if errors.Is(err, errs.ErrNotFoundInDB) {
+			return errs.NotFound("user", "id", id)
+		}
+		slog.Error(err.Error())
+		return errs.InternalServerError()
+	}
+	return c.JSON(user)
+}
+
+type AddEmployeeDepartmentBody struct {
+	DepartmentID string `json:"department_id" validate:"notblank"`
+}
+
+// AddEmployeeDepartment godoc
+// @Summary      Add department to employee
+// @Description  Creates a row in employee_departments linking the user to a department
+// @Tags         users
+// @Accept       json
+// @Produce      json
+// @Param        id       path      string                       true  "User ID"
+// @Param        request  body      AddEmployeeDepartmentBody    true  "Department to add"
+// @Success      204
+// @Failure      400  {object}  errs.HTTPError
+// @Failure      500  {object}  errs.HTTPError
+// @Security     BearerAuth
+// @Router       /users/{id}/departments [post]
+func (h *UsersHandler) AddEmployeeDepartment(c *fiber.Ctx) error {
+	id := c.Params("id")
+	if id == "" {
+		return errs.BadRequest("id is required")
+	}
+	var body AddEmployeeDepartmentBody
+	if err := httpx.BindAndValidate(c, &body); err != nil {
+		return err
+	}
+	if err := h.UsersRepository.AddEmployeeDepartment(c.Context(), id, body.DepartmentID); err != nil {
+		slog.Error("failed to add employee department", "employee_id", id, "department_id", body.DepartmentID, "err", err)
+		return errs.InternalServerError()
+	}
+	return c.SendStatus(fiber.StatusNoContent)
+}
+
+// RemoveEmployeeDepartment godoc
+// @Summary      Remove department from employee
+// @Description  Deletes a row from employee_departments unlinking the user from a department
+// @Tags         users
+// @Accept       json
+// @Produce      json
+// @Param        id      path      string  true  "User ID"
+// @Param        deptId  path      string  true  "Department ID"
+// @Success      204
+// @Failure      400  {object}  errs.HTTPError
+// @Failure      500  {object}  errs.HTTPError
+// @Security     BearerAuth
+// @Router       /users/{id}/departments/{deptId} [delete]
+func (h *UsersHandler) RemoveEmployeeDepartment(c *fiber.Ctx) error {
+	id := c.Params("id")
+	deptId := c.Params("deptId")
+	if id == "" || deptId == "" {
+		return errs.BadRequest("id and deptId are required")
+	}
+	if err := h.UsersRepository.RemoveEmployeeDepartment(c.Context(), id, deptId); err != nil {
+		slog.Error("failed to remove employee department", "employee_id", id, "department_id", deptId, "err", err)
+		return errs.InternalServerError()
+	}
+	return c.SendStatus(fiber.StatusNoContent)
+}
+
+// GetProfilePicture godoc
+// @Summary      Get user's profile picture
+// @Description  Retrieves the user's profile picture key and returns a presigned URL for display
+// @Tags         users
+// @Accept       json
+// @Produce      json
+// @Param        userId   path      string                        true  "User ID"
+// @Success      200      {object}  map[string]string  "Returns key and presigned_url if profile picture exists"
+// @Failure      400      {object}  map[string]string
+// @Failure      404      {object}  map[string]string  "No profile picture found"
+// @Failure      500      {object}  map[string]string
+// @Router       /users/{userId}/profile-picture [get]
+func (h *UsersHandler) GetProfilePicture(c *fiber.Ctx) error {
+	userId := c.Params("userId")
+	if userId == "" {
+		return errs.BadRequest("userId is required")
+	}
+
+	key, err := h.UsersRepository.GetKey(c.Context(), userId)
+	if err != nil {
+		return errs.InternalServerError()
+	}
+
+	if key == "" {
+		return c.Status(fiber.StatusNotFound).JSON(fiber.Map{
+			"message": "No profile picture found",
+		})
+	}
+
+	// Generate presigned URL for displaying the image
+	presignedURL, err := h.S3Storage.GeneratePresignedGetURL(c.Context(), models.PresignedURLInput{
+		Key:        key,
+		Expiration: 5 * time.Minute,
+	})
+	if err != nil {
+		return err
+	}
+
+	return c.JSON(fiber.Map{
+		"key":           key,
+		"presigned_url": presignedURL,
+	})
+}
+
+// UpdateProfilePicture godoc
+// @Summary      Update user's profile picture
+// @Description  Saves the S3 key to the user's profile after the image has been uploaded to S3
+// @Tags         users
+// @Accept       json
+// @Produce      json
+// @Param        userId   path      string                        true  "User ID"
+// @Param        request  body      UpdateProfilePictureRequest   true  "S3 key from upload"
+// @Success      200      {object}  map[string]string
+// @Failure      400      {object}  map[string]string
+// @Failure      500      {object}  map[string]string
+// @Router       /users/{userId}/profile-picture [put]
+func (h *UsersHandler) UpdateProfilePicture(c *fiber.Ctx) error {
+	userId := c.Params("userId")
+	if userId == "" {
+		return errs.BadRequest("userId is required")
+	}
+	var req UpdateProfilePictureRequest
+	if err := httpx.BindAndValidate(c, &req); err != nil {
+		return err
+	}
+	if err := h.UsersRepository.UpdateProfilePicture(c.Context(), userId, req.Key); err != nil {
+		return errs.InternalServerError()
+	}
+	return c.JSON(fiber.Map{
+		"message": "Profile picture updated successfully",
+	})
+}
+
+// DeleteProfilePicture godoc
+// @Summary      Delete user's profile picture
+// @Description  Deletes the user's profile picture from the database
+// @Tags         users
+// @Accept       json
+// @Produce      json
+// @Param        userId   path      string                        true  "User ID"
+// @Success      200      {object}  map[string]string
+// @Failure      400      {object}  map[string]string
+// @Failure      500      {object}  map[string]string
+// @Router       /users/{userId}/profile-picture [delete]
+func (h *UsersHandler) DeleteProfilePicture(c *fiber.Ctx) error {
+	userId := c.Params("userId")
+	if userId == "" {
+		return errs.BadRequest("userId is required")
+	}
+	key, err := h.UsersRepository.GetKey(c.Context(), userId)
+	if err != nil {
+		return errs.InternalServerError()
+	}
+
+	if key != "" {
+		if err := h.S3Storage.DeleteFile(c.Context(), key); err != nil {
+			return errs.InternalServerError()
+		}
+	}
+
+	if err := h.UsersRepository.DeleteProfilePicture(c.Context(), userId); err != nil {
+		return errs.InternalServerError()
+	}
+
+	return c.JSON(fiber.Map{
+		"message": "Profile picture deleted successfully",
+	})
+}
+
+// CompleteOnboarding godoc
+// @Summary      Complete user onboarding
+// @Description  Saves onboarding data and marks a user as onboarded
+// @Tags         users
+// @Accept       json
+// @Produce      json
+// @Param        id       path  string              true  "User ID"
+// @Param        request  body  models.OnboardUser  true  "Onboarding data"
+// @Success      200  {object}  models.User
+// @Failure      400  {object}  map[string]string
+// @Failure      404  {object}  map[string]string
+// @Failure      500  {object}  map[string]string
+// @Security     BearerAuth
+// @Router       /users/{id}/onboard [put]
+func (h *UsersHandler) CompleteOnboarding(c *fiber.Ctx) error {
+	id := c.Params("id")
+	if id == "" {
+		return errs.BadRequest("id is required")
+	}
+
+	var req models.OnboardUser
+	if err := httpx.BindAndValidate(c, &req); err != nil {
+		return err
+	}
+
+	user, err := h.UsersRepository.CompleteOnboarding(c.Context(), id, &req)
+	if err != nil {
+		if errors.Is(err, errs.ErrNotFoundInDB) {
+			return errs.NotFound("user", "id", id)
+		}
+		slog.Error("failed to complete onboarding", "id", id, "err", err.Error())
+		return errs.InternalServerError()
+	}
+
+	return c.JSON(user)
+}
diff --git a/backend/internal/handler/users_test.go b/backend/internal/handler/users_test.go
index 5e6158a83..e1c77f507 100644
--- a/backend/internal/handler/users_test.go
+++ b/backend/internal/handler/users_test.go
@@ -11,18 +11,22 @@ import (
 
 	"github.com/generate/selfserve/internal/errs"
 	"github.com/generate/selfserve/internal/models"
+	storage "github.com/generate/selfserve/internal/service/storage/postgres"
 	"github.com/gofiber/fiber/v2"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
-// Mock repository - allows us to control what the "database" returns in tests
 type mockUsersRepository struct {
-	findUserByIdFunc func(ctx context.Context, id string) (*models.User, error)
-	insertUserFunc   func(ctx context.Context, user *models.CreateUser) (*models.User, error)
+	findUserByIdFunc       func(ctx context.Context, id string) (*models.User, error)
+	insertUserFunc         func(ctx context.Context, user *models.CreateUser) (*models.User, error)
+	searchUsersByHotelFunc func(ctx context.Context, hotelID, cursor, query string, limit int) ([]*models.User, string, error)
+	updateProfilePicFunc   func(ctx context.Context, userId string, key string) error
+	deleteProfilePicFunc   func(ctx context.Context, userId string) error
+	getKeyFunc             func(ctx context.Context, userId string) (string, error)
+	bulkInsertUsersFunc    func(ctx context.Context, users []*models.CreateUser) error
 }
 
-// Implement the interface - calls our controllable function
 func (m *mockUsersRepository) FindUser(ctx context.Context, id string) (*models.User, error) {
 	if m.findUserByIdFunc != nil {
 		return m.findUserByIdFunc(ctx, id)
@@ -30,13 +34,110 @@ func (m *mockUsersRepository) FindUser(ctx context.Context, id string) (*models.
 	return nil, nil
 }
 
-func (m *mockUsersRepository) InsertUser(ctx context.Context, user *models.CreateUser) (*models.User, error) {
+func (m *mockUsersRepository) InsertUser(
+	ctx context.Context,
+	user *models.CreateUser,
+) (*models.User, error) {
 	if m.insertUserFunc != nil {
 		return m.insertUserFunc(ctx, user)
 	}
 	return nil, nil
 }
 
+func (m *mockUsersRepository) UpdateProfilePicture(
+	ctx context.Context,
+	userId string,
+	key string,
+) error {
+	if m.updateProfilePicFunc != nil {
+		return m.updateProfilePicFunc(ctx, userId, key)
+	}
+	return nil
+}
+
+func (m *mockUsersRepository) DeleteProfilePicture(
+	ctx context.Context,
+	userId string,
+) error {
+	if m.deleteProfilePicFunc != nil {
+		return m.deleteProfilePicFunc(ctx, userId)
+	}
+	return nil
+}
+
+func (m *mockUsersRepository) GetKey(
+	ctx context.Context,
+	userId string,
+) (string, error) {
+	if m.getKeyFunc != nil {
+		return m.getKeyFunc(ctx, userId)
+	}
+	return "", nil
+}
+
+func (m *mockUsersRepository) BulkInsertUsers(
+	ctx context.Context,
+	users []*models.CreateUser,
+) error {
+	if m.bulkInsertUsersFunc != nil {
+		return m.bulkInsertUsersFunc(ctx, users)
+	}
+	return nil
+}
+
+func (m *mockUsersRepository) UpdateUser(ctx context.Context, id string, update *models.UpdateUser) (*models.User, error) {
+	return nil, nil
+}
+
+func (m *mockUsersRepository) SearchUsersByHotel(ctx context.Context, hotelID, cursor, query string, limit int) ([]*models.User, string, error) {
+	if m.searchUsersByHotelFunc != nil {
+		return m.searchUsersByHotelFunc(ctx, hotelID, cursor, query, limit)
+	}
+	return nil, "", nil
+}
+
+func (m *mockUsersRepository) GetUsersByHotel(ctx context.Context, hotelID, cursor string, limit int) ([]*models.User, string, error) {
+	return nil, "", nil
+}
+
+func (m *mockUsersRepository) AddEmployeeDepartment(ctx context.Context, employeeID, departmentID string) error {
+	return nil
+}
+
+func (m *mockUsersRepository) RemoveEmployeeDepartment(ctx context.Context, employeeID, departmentID string) error {
+	return nil
+}
+
+func (m *mockUsersRepository) CompleteOnboarding(ctx context.Context, id string, data *models.OnboardUser) (*models.User, error) {
+	return nil, nil
+}
+
+// Makes the compiler verify the mock
+var _ storage.UsersRepository = (*mockUsersRepository)(nil)
+
+// Mock S3 Storage for testing
+type mockS3Storage struct {
+	deleteFileFunc func(ctx context.Context, key string) error
+}
+
+func (m *mockS3Storage) GeneratePresignedUploadURL(ctx context.Context, in models.PresignedURLInput) (string, error) {
+	return "", nil
+}
+
+func (m *mockS3Storage) GeneratePresignedGetURL(ctx context.Context, in models.PresignedURLInput) (string, error) {
+	return "", nil
+}
+
+func (m *mockS3Storage) DeleteFile(ctx context.Context, key string) error {
+	if m.deleteFileFunc != nil {
+		return m.deleteFileFunc(ctx, key)
+	}
+	return nil
+}
+
+// Makes the compiler verify the S3 mock implements the interface
+var _ storage.S3Storage = (*mockS3Storage)(nil)
+
 func TestUsersHandler_GetUserByID(t *testing.T) {
 	t.Parallel()
 
@@ -58,7 +159,7 @@ func TestUsersHandler_GetUserByID(t *testing.T) {
 		}
 
 		app := fiber.New()
-		h := NewUsersHandler(mock)
+		h := NewUsersHandler(mock, &mockS3Storage{})
 		app.Get("/users/:id", h.GetUserByID)
 
 		req := httptest.NewRequest("GET", "/users/550e8400-e29b-41d4-a716-446655440000", nil)
@@ -82,7 +183,7 @@ func TestUsersHandler_GetUserByID(t *testing.T) {
 		}
 
 		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
-		h := NewUsersHandler(mock)
+		h := NewUsersHandler(mock, &mockS3Storage{})
 		app.Get("/users/:id", h.GetUserByID)
 
 		req := httptest.NewRequest("GET", "/users/nonexistent-id", nil)
@@ -102,7 +203,7 @@ func TestUsersHandler_GetUserByID(t *testing.T) {
 		}
 
 		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
-		h := NewUsersHandler(mock)
+		h := NewUsersHandler(mock, &mockS3Storage{})
 		app.Get("/users/:id", h.GetUserByID)
 
 		req := httptest.NewRequest("GET", "/users/some-id", nil)
@@ -128,7 +229,7 @@ func TestUsersHandler_GetUserByID_InvalidMethods(t *testing.T) {
 	}
 
 	app := fiber.New()
-	h := NewUsersHandler(mock)
+	h := NewUsersHandler(mock, &mockS3Storage{})
 	app.Get("/users/:id", h.GetUserByID)
 
 	tests := []struct {
@@ -157,10 +258,11 @@ func TestUsersHandler_GetUserByID_InvalidMethods(t *testing.T) {
 func TestUsersHandler_CreateUser(t *testing.T) {
 	t.Parallel()
 	validBody := `{
+		"id": "user_123",
 		"first_name": "John",
 		"last_name": "Doe",
 		"role": "Receptionist",
-		"id": "user_123"
+		"hotel_id": "550e8400-e29b-41d4-a716-446655440000"
 	}`
 
 	t.Run("returns 200 on valid user creation", func(t *testing.T) {
@@ -177,7 +279,7 @@ func TestUsersHandler_CreateUser(t *testing.T) {
 		}
 
 		app := fiber.New()
-		h := NewUsersHandler(mock)
+		h := NewUsersHandler(mock, &mockS3Storage{})
 		app.Post("/users", h.CreateUser)
 
 		req := httptest.NewRequest("POST", "/users", bytes.NewBufferString(validBody))
@@ -208,17 +310,18 @@ func TestUsersHandler_CreateUser(t *testing.T) {
 		}
 
 		app := fiber.New()
-		h := NewUsersHandler(mock)
+		h := NewUsersHandler(mock, &mockS3Storage{})
 		app.Post("/users", h.CreateUser)
 
 		bodyWithOptionals := `{
+			"id": "user_456",
 			"first_name": "Jane",
 			"last_name": "Dow",
 			"role": "Manager",
 			"employee_id": "EMP-67",
 			"department": "Front Desk",
 			"timezone": "America/New_York",
-			"id": "user_123"
+			"hotel_id": "550e8400-e29b-41d4-a716-446655440000"
 		}`
 
 		req := httptest.NewRequest("POST", "/users", bytes.NewBufferString(bodyWithOptionals))
@@ -240,7 +343,7 @@ func TestUsersHandler_CreateUser(t *testing.T) {
 		mock := &mockUsersRepository{}
 
 		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
-		h := NewUsersHandler(mock)
+		h := NewUsersHandler(mock, &mockS3Storage{})
 		app.Post("/users", h.CreateUser)
 
 		req := httptest.NewRequest("POST", "/users", bytes.NewBufferString(`{invalid json`))
@@ -258,7 +361,7 @@ func TestUsersHandler_CreateUser(t *testing.T) {
 		mock := &mockUsersRepository{}
 
 		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
-		h := NewUsersHandler(mock)
+		h := NewUsersHandler(mock, &mockS3Storage{})
 		app.Post("/users", h.CreateUser)
 
 		req := httptest.NewRequest("POST", "/users", bytes.NewBufferString(`{}`))
@@ -281,15 +384,16 @@ func TestUsersHandler_CreateUser(t *testing.T) {
 		mock := &mockUsersRepository{}
 
 		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
-		h := NewUsersHandler(mock)
+		h := NewUsersHandler(mock, &mockS3Storage{})
 		app.Post("/users", h.CreateUser)
 
 		invalidTimezoneBody := `{
+			"id": "user_789",
 			"first_name": "John",
 			"last_name": "Doe",
 			"role": "Receptionist",
-			"id": "user_123",
-			"timezone": "Invalid/Not_A_Timezone"
+			"timezone": "Invalid/Not_A_Timezone",
+			"hotel_id": "550e8400-e29b-41d4-a716-446655440000"
 		}`
 
 		req := httptest.NewRequest("POST", "/users", bytes.NewBufferString(invalidTimezoneBody))
@@ -314,7 +418,7 @@ func TestUsersHandler_CreateUser(t *testing.T) {
 		}
 
 		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
-		h := NewUsersHandler(mock)
+		h := NewUsersHandler(mock, &mockS3Storage{})
 		app.Post("/users", h.CreateUser)
 
 		req := httptest.NewRequest("POST", "/users", bytes.NewBufferString(validBody))
@@ -325,33 +429,253 @@ func TestUsersHandler_CreateUser(t *testing.T) {
 
 		assert.Equal(t, 500, resp.StatusCode)
 	})
+}
 
-	t.Run("returns_400_when_id_is_missing", func(t *testing.T) {
-		body := `{
-		"first_name": "John",
-		"last_name": "Doe",
-		"role": "Receptionist"
-	}`
+func TestUsersHandler_UpdateProfilePicture(t *testing.T) {
+	t.Parallel()
+
+	t.Run("returns 200 on valid update", func(t *testing.T) {
+		t.Parallel()
 
 		mock := &mockUsersRepository{
-			insertUserFunc: func(ctx context.Context, user *models.CreateUser) (*models.User, error) {
-				return nil, nil
+			updateProfilePicFunc: func(ctx context.Context, userId string, key string) error {
+				return nil
 			},
 		}
 
+		app := fiber.New()
+		h := NewUsersHandler(mock, &mockS3Storage{})
+		app.Put("/users/:userId/profile-picture", h.UpdateProfilePicture)
+
+		body := `{"key": "profile-pictures/user123/1706540000.jpg"}`
+		req := httptest.NewRequest("PUT", "/users/user123/profile-picture", bytes.NewBufferString(body))
+		req.Header.Set("Content-Type", "application/json")
+
+		resp, err := app.Test(req)
+		require.NoError(t, err)
+
+		assert.Equal(t, 200, resp.StatusCode)
+
+		respBody, _ := io.ReadAll(resp.Body)
+		assert.Contains(t, string(respBody), "successfully")
+	})
+
+	t.Run("returns 400 when key is missing", func(t *testing.T) {
+		t.Parallel()
+
+		mock := &mockUsersRepository{}
+
 		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
-		h := NewUsersHandler(mock)
-		app.Post("/users", h.CreateUser)
+		h := NewUsersHandler(mock, &mockS3Storage{})
+		app.Put("/users/:userId/profile-picture", h.UpdateProfilePicture)
 
-		req := httptest.NewRequest("POST", "/users", bytes.NewBufferString(body))
+		req := httptest.NewRequest("PUT", "/users/user123/profile-picture", bytes.NewBufferString(`{}`))
 		req.Header.Set("Content-Type", "application/json")
 
 		resp, err := app.Test(req)
 		require.NoError(t, err)
 
 		assert.Equal(t, 400, resp.StatusCode)
-		respBody, _ := io.ReadAll(resp.Body)
-		assert.Contains(t, string(respBody), "id")
 
+		body, _ := io.ReadAll(resp.Body)
+		assert.Contains(t, string(body), "key")
+	})
+
+	t.Run("returns 400 when key is empty string", func(t *testing.T) {
+		t.Parallel()
+
+		mock := &mockUsersRepository{}
+
+		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
+		h := NewUsersHandler(mock, &mockS3Storage{})
+		app.Put("/users/:userId/profile-picture", h.UpdateProfilePicture)
+
+		req := httptest.NewRequest("PUT", "/users/user123/profile-picture", bytes.NewBufferString(`{"key": ""}`))
+		req.Header.Set("Content-Type", "application/json")
+
+		resp, err := app.Test(req)
+		require.NoError(t, err)
+
+		assert.Equal(t, 400, resp.StatusCode)
+	})
+
+	t.Run("returns 400 on invalid JSON", func(t *testing.T) {
+		t.Parallel()
+
+		mock := &mockUsersRepository{}
+
+		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
+		h := NewUsersHandler(mock, &mockS3Storage{})
+		app.Put("/users/:userId/profile-picture", h.UpdateProfilePicture)
+
+		req := httptest.NewRequest("PUT", "/users/user123/profile-picture", bytes.NewBufferString(`{invalid`))
+		req.Header.Set("Content-Type", "application/json")
+
+		resp, err := app.Test(req)
+		require.NoError(t, err)
+
+		assert.Equal(t, 400, resp.StatusCode)
+	})
+
+	t.Run("returns 500 when repository fails", func(t *testing.T) {
+		t.Parallel()
+
+		mock := &mockUsersRepository{
+			updateProfilePicFunc: func(ctx context.Context, userId string, key string) error {
+				return errors.New("db error")
+			},
+		}
+
+		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
+		h := NewUsersHandler(mock, &mockS3Storage{})
+		app.Put("/users/:userId/profile-picture", h.UpdateProfilePicture)
+
+		body := `{"key": "profile-pictures/user123/1706540000.jpg"}`
+		req := httptest.NewRequest("PUT", "/users/user123/profile-picture", bytes.NewBufferString(body))
+		req.Header.Set("Content-Type", "application/json")
+
+		resp, err := app.Test(req)
+		require.NoError(t, err)
+
+		assert.Equal(t, 500, resp.StatusCode)
+	})
+}
+
+func TestUsersHandler_DeleteProfilePicture(t *testing.T) {
+	t.Parallel()
+
+	t.Run("returns 200 on successful delete", func(t *testing.T) {
+		t.Parallel()
+
+		mockRepo := &mockUsersRepository{
+			getKeyFunc: func(ctx context.Context, userId string) (string, error) {
+				return "profile-pictures/user123/1706540000.jpg", nil
+			},
+			deleteProfilePicFunc: func(ctx context.Context, userId string) error {
+				return nil
+			},
+		}
+
+		mockS3 := &mockS3Storage{
+			deleteFileFunc: func(ctx context.Context, key string) error {
+				return nil
+			},
+		}
+
+		app := fiber.New()
+		h := &UsersHandler{UsersRepository: mockRepo, S3Storage: mockS3}
+		app.Delete("/users/:userId/profile-picture", h.DeleteProfilePicture)
+
+		req := httptest.NewRequest("DELETE", "/users/user123/profile-picture", nil)
+
+		resp, err := app.Test(req)
+		require.NoError(t, err)
+
+		assert.Equal(t, 200, resp.StatusCode)
+
+		body, _ := io.ReadAll(resp.Body)
+		assert.Contains(t, string(body), "deleted successfully")
+	})
+
+	t.Run("returns 200 when user has no profile picture", func(t *testing.T) {
+		t.Parallel()
+
+		mockRepo := &mockUsersRepository{
+			getKeyFunc: func(ctx context.Context, userId string) (string, error) {
+				return "", nil // No existing profile picture
+			},
+			deleteProfilePicFunc: func(ctx context.Context, userId string) error {
+				return nil
+			},
+		}
+
+		app := fiber.New()
+		h := &UsersHandler{UsersRepository: mockRepo, S3Storage: &mockS3Storage{}}
+		app.Delete("/users/:userId/profile-picture", h.DeleteProfilePicture)
+
+		req := httptest.NewRequest("DELETE", "/users/user123/profile-picture", nil)
+
+		resp, err := app.Test(req)
+		require.NoError(t, err)
+
+		assert.Equal(t, 200, resp.StatusCode)
+	})
+
+	t.Run("returns 500 when GetKey fails", func(t *testing.T) {
+		t.Parallel()
+
+		mockRepo := &mockUsersRepository{
+			getKeyFunc: func(ctx context.Context, userId string) (string, error) {
+				return "", errors.New("db error")
+			},
+		}
+
+		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
+		h := &UsersHandler{UsersRepository: mockRepo, S3Storage: &mockS3Storage{}}
+		app.Delete("/users/:userId/profile-picture", h.DeleteProfilePicture)
+
+		req := httptest.NewRequest("DELETE", "/users/user123/profile-picture", nil)
+
+		resp, err := app.Test(req)
+		require.NoError(t, err)
+
+		assert.Equal(t, 500, resp.StatusCode)
+	})
+
+	t.Run("returns 500 when S3 delete fails", func(t *testing.T) {
+		t.Parallel()
+
+		mockRepo := &mockUsersRepository{
+			getKeyFunc: func(ctx context.Context, userId string) (string, error) {
+				return "profile-pictures/user123/1706540000.jpg", nil
+			},
+		}
+
+		mockS3 := &mockS3Storage{
+			deleteFileFunc: func(ctx context.Context, key string) error {
+				return errors.New("s3 error")
+			},
+		}
+
+		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
+		h := &UsersHandler{UsersRepository: mockRepo, S3Storage: mockS3}
+		app.Delete("/users/:userId/profile-picture", h.DeleteProfilePicture)
+
+		req := httptest.NewRequest("DELETE", "/users/user123/profile-picture", nil)
+
+		resp, err := app.Test(req)
+		require.NoError(t, err)
+
+		assert.Equal(t, 500, resp.StatusCode)
+	})
+
+	t.Run("returns 500 when DB delete fails", func(t *testing.T) {
+		t.Parallel()
+
+		mockRepo := &mockUsersRepository{
+			getKeyFunc: func(ctx context.Context, userId string) (string, error) {
+				return "profile-pictures/user123/1706540000.jpg", nil
+			},
+			deleteProfilePicFunc: func(ctx context.Context, userId string) error {
+				return errors.New("db error")
+			},
+		}
+
+		mockS3 := &mockS3Storage{
+			deleteFileFunc: func(ctx context.Context, key string) error {
+				return nil
+			},
+		}
+
+		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
+		h := &UsersHandler{UsersRepository: mockRepo, S3Storage: mockS3}
+		app.Delete("/users/:userId/profile-picture", h.DeleteProfilePicture)
+
+		req := httptest.NewRequest("DELETE", "/users/user123/profile-picture", nil)
+
+		resp, err := app.Test(req)
+		require.NoError(t, err)
+
+		assert.Equal(t, 500, resp.StatusCode)
 	})
 }
diff --git a/backend/internal/handler/utils.go b/backend/internal/handler/utils.go
index fcb121641..e278ca3b3 100644
--- a/backend/internal/handler/utils.go
+++ b/backend/internal/handler/utils.go
@@ -6,11 +6,13 @@ import (
 
 	"github.com/generate/selfserve/internal/errs"
 	"github.com/generate/selfserve/internal/models"
+	storage "github.com/generate/selfserve/internal/service/storage/postgres"
 	"github.com/gofiber/fiber/v2"
 	"github.com/google/uuid"
 )
 
 const hotelIDHeader = "X-Hotel-ID"
+const roleAdmin = "admin"
 
 func validUUID(s string) bool {
 	_, err := uuid.Parse(s)
@@ -22,12 +24,29 @@ func hotelIDFromHeader(c *fiber.Ctx) (string, error) {
 	if hotelID == "" {
 		return "", errs.BadRequest("hotel_id header is required")
 	}
-	if !validUUID(hotelID) {
-		return "", errs.BadRequest("hotel_id header must be a valid uuid")
+	if !strings.HasPrefix(hotelID, "org_") {
+		return "", errs.BadRequest("hotel_id header is invalid")
 	}
 	return hotelID, nil
 }
 
+func AdminMiddleware(usersRepo storage.UsersRepository) fiber.Handler {
+	return func(c *fiber.Ctx) error {
+		userID, ok := c.Locals("userId").(string)
+		if !ok || userID == "" {
+			return errs.Unauthorized()
+		}
+		user, err := usersRepo.FindUser(c.Context(), userID)
+		if err != nil {
+			return errs.Forbidden()
+		}
+		if user.Role == nil || *user.Role != roleAdmin {
+			return errs.Forbidden()
+		}
+		return c.Next()
+	}
+}
+
 func AggregateErrors(errors map[string]string) error {
 	if len(errors) > 0 {
 		var keys []string
@@ -75,3 +94,16 @@ func ReformatUserData(CreateUserRequest *models.ClerkUser) *models.CreateUser {
 	}
 	return result
 }
+
+func ReformatOrgMembershipUserData(userData *models.OrgMembershipUserData, hotelID string) *models.CreateUser {
+	result := &models.CreateUser{
+		ID:        userData.UserID,
+		FirstName: userData.FirstName,
+		LastName:  userData.LastName,
+		HotelID:   hotelID,
+	}
+	if userData.HasImage {
+		result.ProfilePicture = userData.ImageUrl
+	}
+	return result
+}
diff --git a/backend/internal/handler/views.go b/backend/internal/handler/views.go
new file mode 100644
index 000000000..d18935ca3
--- /dev/null
+++ b/backend/internal/handler/views.go
@@ -0,0 +1,156 @@
+package handler
+
+import (
+	"context"
+	"errors"
+	"log/slog"
+
+	"github.com/generate/selfserve/internal/errs"
+	"github.com/generate/selfserve/internal/httpx"
+	"github.com/generate/selfserve/internal/models"
+	"github.com/gofiber/fiber/v2"
+)
+
+type ViewsRepository interface {
+	FindAllByUserAndSlug(ctx context.Context, userID string, slug models.ViewSlug) ([]*models.View, error)
+	Insert(ctx context.Context, userID string, input models.CreateViewInput) (*models.View, error)
+	Update(ctx context.Context, id, userID string, input models.UpdateViewInput) (*models.View, error)
+	Delete(ctx context.Context, id, userID string) error
+}
+
+type ViewsHandler struct {
+	repo ViewsRepository
+}
+
+func NewViewsHandler(repo ViewsRepository) *ViewsHandler {
+	return &ViewsHandler{repo: repo}
+}
+
+// GetAllViews godoc
+// @Summary      List views
+// @Description  Returns all saved filter views for the authenticated user scoped to a page slug
+// @Tags         views
+// @Produce      json
+// @Param        slug  query     string  true  "Page slug (e.g. requests_web)"
+// @Success      200   {array}   models.View
+// @Failure      400   {object}  errs.HTTPError
+// @Failure      500   {object}  errs.HTTPError
+// @Security     BearerAuth
+// @Router       /views [get]
+func (h *ViewsHandler) GetAllViews(c *fiber.Ctx) error {
+	slug := c.Query("slug")
+	if !models.IsValidViewSlug(slug) {
+		return errs.BadRequest("invalid slug")
+	}
+
+	userID := c.Locals("userId").(string)
+
+	views, err := h.repo.FindAllByUserAndSlug(c.Context(), userID, models.ViewSlug(slug))
+	if err != nil {
+		slog.Error("failed to list views", "err", err)
+		return errs.InternalServerError()
+	}
+
+	if views == nil {
+		views = []*models.View{}
+	}
+
+	return c.JSON(views)
+}
+
+// CreateView godoc
+// @Summary      Create view
+// @Description  Saves the current filter state as a named view for the authenticated user
+// @Tags         views
+// @Accept       json
+// @Produce      json
+// @Param        request  body      models.CreateViewInput  true  "View payload"
+// @Success      201      {object}  models.View
+// @Failure      400      {object}  errs.HTTPError
+// @Failure      500      {object}  errs.HTTPError
+// @Security     BearerAuth
+// @Router       /views [post]
+func (h *ViewsHandler) CreateView(c *fiber.Ctx) error {
+	var input models.CreateViewInput
+	if err := httpx.BindAndValidate(c, &input); err != nil {
+		return err
+	}
+
+	userID := c.Locals("userId").(string)
+
+	view, err := h.repo.Insert(c.Context(), userID, input)
+	if err != nil {
+		slog.Error("failed to create view", "err", err)
+		return errs.InternalServerError()
+	}
+
+	return c.Status(fiber.StatusCreated).JSON(view)
+}
+
+// UpdateView godoc
+// @Summary      Update view
+// @Description  Updates the filters of a saved view owned by the authenticated user
+// @Tags         views
+// @Accept       json
+// @Produce      json
+// @Param        id       path      string                   true  "View ID"
+// @Param        request  body      models.UpdateViewInput   true  "Update payload"
+// @Success      200      {object}  models.View
+// @Failure      400      {object}  errs.HTTPError
+// @Failure      404      {object}  errs.HTTPError
+// @Failure      500      {object}  errs.HTTPError
+// @Security     BearerAuth
+// @Router       /views/{id} [post]
+func (h *ViewsHandler) UpdateView(c *fiber.Ctx) error {
+	id := c.Params("id")
+	if id == "" {
+		return errs.BadRequest("id is required")
+	}
+
+	var input models.UpdateViewInput
+	if err := httpx.BindAndValidate(c, &input); err != nil {
+		return err
+	}
+
+	userID := c.Locals("userId").(string)
+
+	view, err := h.repo.Update(c.Context(), id, userID, input)
+	if err != nil {
+		if errors.Is(err, errs.ErrNotFoundInDB) {
+			return errs.NotFound("view", "id", id)
+		}
+		slog.Error("failed to update view", "err", err)
+		return errs.InternalServerError()
+	}
+
+	return c.JSON(view)
+}
+
+// DeleteView godoc
+// @Summary      Delete view
+// @Description  Deletes a saved filter view owned by the authenticated user
+// @Tags         views
+// @Param        id  path  string  true  "View ID"
+// @Success      204
+// @Failure      404  {object}  errs.HTTPError
+// @Failure      500  {object}  errs.HTTPError
+// @Security     BearerAuth
+// @Router       /views/{id} [delete]
+func (h *ViewsHandler) DeleteView(c *fiber.Ctx) error {
+	id := c.Params("id")
+	if id == "" {
+		return errs.BadRequest("id is required")
+	}
+
+	userID := c.Locals("userId").(string)
+
+	if err := h.repo.Delete(c.Context(), id, userID); err != nil {
+		if errors.Is(err, errs.ErrNotFoundInDB) {
+			return errs.NotFound("view", "id", id)
+		}
+		slog.Error("failed to delete view", "err", err)
+		return errs.InternalServerError()
+	}
+
+	return c.SendStatus(fiber.StatusNoContent)
+}
diff --git a/backend/internal/httpx/bind.go b/backend/internal/httpx/bind.go
index e01ffe6ea..3fa98245d 100644
--- a/backend/internal/httpx/bind.go
+++ b/backend/internal/httpx/bind.go
@@ -22,3 +22,19 @@ func BindAndValidate[T any](context *fiber.Ctx, output *T) error {
 
 	return nil
 }
+
+// Validate validates a struct that has already been populated from non-body sources
+// (path params, query strings, headers). Use this instead of BindAndValidate for
+// GET endpoints where there is no request body to parse.
+func Validate[T any](output *T) error {
+	if validation.Validate == nil {
+		return errs.InternalServerError()
+	}
+
+	if err := validation.Validate.Struct(*output); err != nil {
+		fieldErrors := validation.ToFieldErrors(err)
+		return errs.BadRequest(validation.DeterministicErrorString(fieldErrors))
+	}
+
+	return nil
+}
diff --git a/backend/internal/models/clerk.go b/backend/internal/models/clerk.go
new file mode 100644
index 000000000..babb1a199
--- /dev/null
+++ b/backend/internal/models/clerk.go
@@ -0,0 +1,31 @@
+package models
+
+// CreateUserOrgMembershipWebhook is the payload for Clerk's organizationMembership.created event.
+// Clerk fires this when a user accepts an invitation to join an organization (hotel).
+type CreateUserOrgMembershipWebhook struct {
+	Data OrgMembershipData `json:"data"`
+}
+
+type OrgMembershipData struct {
+	Organization   ClerkOrganization     `json:"organization"`
+	PublicUserData OrgMembershipUserData `json:"public_user_data"`
+}
+
+type ClerkOrganization struct {
+	ID   string `json:"id"`
+	Name string `json:"name"`
+}
+
+type CreateOrgWebhook struct {
+	Data ClerkOrganization `json:"data"`
+}
+
+// OrgMembershipUserData is the limited user snapshot Clerk includes in org membership events.
+// Note: the user ID field is "user_id" here, unlike ClerkUser which uses "id".
+type OrgMembershipUserData struct {
+	UserID    string  `json:"user_id"`
+	FirstName string  `json:"first_name"`
+	LastName  string  `json:"last_name"`
+	ImageUrl  *string `json:"image_url"`
+	HasImage  bool    `json:"has_image"`
+}
diff --git a/backend/internal/models/departments.go b/backend/internal/models/departments.go
new file mode 100644
index 000000000..646d8876e
--- /dev/null
+++ b/backend/internal/models/departments.go
@@ -0,0 +1,35 @@
+package models
+
+import "time"
+
+type DepartmentName string
+
+const (
+	DepartmentFrontDesk    DepartmentName = "Front Desk"
+	DepartmentHousekeeping DepartmentName = "Housekeeping"
+	DepartmentMaintenance  DepartmentName = "Maintenance"
+	DepartmentFoodBeverage DepartmentName = "Food & Beverage"
+)
+
+var DefaultDepartments = []DepartmentName{
+	DepartmentFrontDesk,
+	DepartmentHousekeeping,
+	DepartmentMaintenance,
+	DepartmentFoodBeverage,
+}
+
+type Department struct {
+	ID        string    `json:"id" example:"550e8400-e29b-41d4-a716-446655440000"`
+	HotelID   string    `json:"hotel_id" example:"org_2abc123"`
+	Name      string    `json:"name" example:"Housekeeping"`
+	CreatedAt time.Time `json:"created_at"`
+	UpdatedAt time.Time `json:"updated_at"`
+} //@name Department
+
+type CreateDepartment struct {
+	Name string `json:"name" validate:"notblank"`
+}
+
+type UpdateDepartment struct {
+	Name string `json:"name" validate:"notblank"`
+}
diff --git a/backend/internal/models/guest_bookings.go b/backend/internal/models/guest_bookings.go
index ab514d8d4..8cf22300d 100644
--- a/backend/internal/models/guest_bookings.go
+++ b/backend/internal/models/guest_bookings.go
@@ -1,5 +1,7 @@
 package models
 
+import "time"
+
 type BookingStatus string
 
 const (
@@ -9,10 +11,10 @@ const (
 
 type GuestBooking struct {
 	ID            string        `json:"id" example:"f353ca91-4fc5-49f2-9b9e-304f83d11914"`
-	HotelID       string        `json:"hotel_id" example:"521e8400-e458-41d4-a716-446655440000"`
+	HotelID       string        `json:"hotel_id" example:"org_521e8400-e458-41d4-a716-446655440000"`
 	Guest         Guest         `json:"guest"`
 	Room          Room          `json:"room"`
 	Status        BookingStatus `json:"status"`
-	ArrivalDate   string        `json:"arrival_date"`
-	DepartureDate string        `json:"departure_date"`
+	ArrivalDate   time.Time     `json:"arrival_date" example:"2024-01-02T00:00:00Z"`
+	DepartureDate time.Time     `json:"departure_date" example:"2024-01-05T00:00:00Z"`
 } //@name GuestBooking
diff --git a/backend/internal/models/guests.go b/backend/internal/models/guests.go
index 10a043ad6..b5b6a7775 100644
--- a/backend/internal/models/guests.go
+++ b/backend/internal/models/guests.go
@@ -1,60 +1,170 @@
 package models
 
-import "time"
+import (
+	"encoding/json"
+	"fmt"
+	"time"
+)
+
+type GuestDocument struct {
+	ID            string      `json:"id"`
+	HotelID       string      `json:"hotel_id"`
+	FullName      string      `json:"full_name"`
+	FirstName     string      `json:"first_name"`
+	LastName      string      `json:"last_name"`
+	PreferredName string      `json:"preferred_name"`
+	Email         *string     `json:"email,omitempty"`
+	Phone         *string     `json:"phone,omitempty"`
+	Preferences   *string     `json:"preferences,omitempty"`
+	Notes         *string     `json:"notes,omitempty"`
+	Assistance    *Assistance `json:"assistance,omitempty"`
+	Floor         int         `json:"floor"`
+	RoomNumber    int         `json:"room_number"`
+	GroupSize     *int        `json:"group_size,omitempty"`
+	BookingStatus string      `json:"booking_status"`
+	ArrivalDate   time.Time   `json:"arrival_date"`
+	DepartureDate time.Time   `json:"departure_date"`
+	RequestCount  int         `json:"request_count"`
+	HasUrgent     bool        `json:"has_urgent"`
+} //@name GuestDocument
 
 type CreateGuest struct {
 	FirstName      string  `json:"first_name" validate:"notblank" example:"Jane"`
 	LastName       string  `json:"last_name" validate:"notblank" example:"Doe"`
 	ProfilePicture *string `json:"profile_picture,omitempty" validate:"omitempty,url" example:"https://example.com/john.jpg"`
 	Timezone       *string `json:"timezone,omitempty" validate:"omitempty,timezone" example:"America/New_York"`
-	Phone          *string `json:"phone,omitempty" example:"+1 (617) 012-3456"`
-	Email          *string `json:"email,omitempty" validate:"omitempty,email" example:"jane.doe@example.com"`
-	Preferences    *string `json:"preferences,omitempty" example:"extra pillows"`
-	Notes          *string `json:"notes,omitempty" example:"VIP"`
-} //@name CreateGuest
+} // @name CreateGuest
 
 type UpdateGuest struct {
-	FirstName      string  `json:"first_name" validate:"notblank" example:"Jane"`
-	LastName       string  `json:"last_name" validate:"notblank" example:"Doe"`
+	FirstName      *string `json:"first_name,omitempty" validate:"omitempty,notblank" example:"Jane"`
+	LastName       *string `json:"last_name,omitempty" validate:"omitempty,notblank" example:"Doe"`
 	ProfilePicture *string `json:"profile_picture,omitempty" validate:"omitempty,url" example:"https://example.com/john.jpg"`
 	Timezone       *string `json:"timezone,omitempty" validate:"omitempty,timezone" example:"America/New_York"`
+	Notes          *string `json:"notes,omitempty" validate:"omitempty,max=1000" example:"VIP guest"`
 } //@name UpdateGuest
 
 type Guest struct {
 	ID        string    `json:"id" example:"530e8400-e458-41d4-a716-446655440000"`
 	CreatedAt time.Time `json:"created_at" example:"2024-01-02T00:00:00Z"`
 	UpdatedAt time.Time `json:"updated_at" example:"2024-01-02T00:00:00Z"`
+	Notes     *string   `json:"notes,omitempty" example:"VIP guest"`
 	CreateGuest
 } //@name Guest
 
+type RequestSortOrder string
+
+const (
+	RequestSortHighToLow RequestSortOrder = "high_to_low"
+	RequestSortLowToHigh RequestSortOrder = "low_to_high"
+	RequestSortUrgent    RequestSortOrder = "urgent"
+)
+
+type FloorSortOrder string
+
+const (
+	FloorSortAscending  FloorSortOrder = "ascending"
+	FloorSortDescending FloorSortOrder = "descending"
+)
+
+type AssistanceFilter string
+
+const (
+	AssistanceAccessibility AssistanceFilter = "accessibility"
+	AssistanceDietary       AssistanceFilter = "dietary"
+	AssistanceMedical       AssistanceFilter = "medical"
+)
+
 type GuestFilters struct {
-	HotelID string
-	Floors  *[]int `query:"floors"`
-} //@name GuestFilters
+	HotelID     string             `json:"hotel_id"     validate:"required,startswith=org_" swaggerignore:"true"`
+	Status      []BookingStatus    `json:"status"       validate:"omitempty,dive,oneof=active inactive"`
+	RequestSort RequestSortOrder   `json:"request_sort" validate:"omitempty,oneof=high_to_low low_to_high urgent"`
+	FloorSort   FloorSortOrder     `json:"floor_sort"   validate:"omitempty,oneof=ascending descending"`
+	Floors      []int              `json:"floors"`
+	GroupSize   []int              `json:"group_size"`
+	Search      string             `json:"search"`
+	Cursor      string             `json:"cursor"`
+	CursorName  string             `json:"-"`
+	CursorID    string             `json:"-"`
+	Limit       int                `json:"limit"        validate:"omitempty,min=1,max=100"`
+	Assistance  []AssistanceFilter `json:"assistance" validate:"omitempty,dive,oneof=accessibility dietary medical"`
+} // @name GuestFilters
+
+type GuestPage struct {
+	Data       []*GuestWithBooking `json:"data"`
+	NextCursor *string             `json:"next_cursor"`
+} // @name GuestPage
+
+type ActiveBooking struct {
+	Floor      int `json:"floor"`
+	RoomNumber int `json:"room_number"`
+} //@name ActiveBooking
+
+type ActiveBookings []ActiveBooking
+
+func (a *ActiveBookings) Scan(src any) error {
+	if src == nil {
+		*a = []ActiveBooking{}
+		return nil
+	}
+	rawBytes, ok := src.([]byte)
+	if !ok {
+		return fmt.Errorf("ActiveBookings.Scan: expected []byte from JSON column, got %T", src)
+	}
+	return json.Unmarshal(rawBytes, a)
+}
 
 type GuestWithBooking struct {
-	ID         string `json:"id"`
-	FirstName  string `json:"first_name"`
-	LastName   string `json:"last_name"`
-	Floor      int    `json:"floor"`
-	RoomNumber int    `json:"room_number"`
+	ID             string         `json:"id"`
+	FirstName      string         `json:"first_name"`
+	LastName       string         `json:"last_name"`
+	PreferredName  string         `json:"preferred_name"`
+	RequestCount   int            `json:"request_count"`
+	HasUrgent      bool           `json:"has_urgent"`
+	Assistance     *Assistance    `json:"assistance,omitempty"`
+	ActiveBookings ActiveBookings `json:"active_bookings"`
 } //@name GuestWithBooking
 
 type GuestWithStays struct {
-	ID           string  `json:"id" validate:"required" example:"530e8400-e458-41d4-a716-446655440000"`
-	FirstName    string  `json:"first_name" validate:"required" example:"Jane"`
-	LastName     string  `json:"last_name" validate:"required" example:"Doe"`
-	Phone        *string `json:"phone,omitempty" example:"+1 (617) 012-3456"`
-	Email        *string `json:"email,omitempty" validate:"omitempty,email" example:"jane.doe@example.com"`
-	Preferences  *string `json:"preferences,omitempty" example:"extra pillows"`
-	Notes        *string `json:"notes,omitempty" example:"VIP"`
-	CurrentStays []Stay  `json:"current_stays"`
-	PastStays    []Stay  `json:"past_stays"`
+	ID                  string      `json:"id" validate:"required" example:"530e8400-e458-41d4-a716-446655440000"`
+	FirstName           string      `json:"first_name" validate:"required" example:"Jane"`
+	LastName            string      `json:"last_name" validate:"required" example:"Doe"`
+	Phone               *string     `json:"phone,omitempty" example:"+1 (617) 012-3456"`
+	Email               *string     `json:"email,omitempty" validate:"omitempty,email" example:"jane.doe@example.com"`
+	Preferences         *string     `json:"preferences,omitempty" example:"extra pillows"`
+	Notes               *string     `json:"notes,omitempty" example:"VIP"`
+	Pronouns            *string     `json:"pronouns,omitempty" example:"she/her"`
+	DoNotDisturbStart   *string     `json:"do_not_disturb_start,omitempty" example:"17:00:00"`
+	DoNotDisturbEnd     *string     `json:"do_not_disturb_end,omitempty" example:"07:00:00"`
+	HousekeepingCadence *string     `json:"housekeeping_cadence,omitempty" example:"daily"`
+	Assistance          *Assistance `json:"assistance,omitempty"`
+	CurrentStays        []Stay      `json:"current_stays" validate:"required"`
+	PastStays           []Stay      `json:"past_stays" validate:"required"`
 } //@name GuestWithStays
 
 type Stay struct {
-	ArrivalDate   string        `json:"arrival_date" validate:"required" example:"2024-01-02"`
-	DepartureDate string        `json:"departure_date" validate:"required" example:"2024-01-05"`
+	ArrivalDate   time.Time     `json:"arrival_date" validate:"required" example:"2024-01-02"`
+	DepartureDate time.Time     `json:"departure_date" validate:"required" example:"2024-01-05"`
 	RoomNumber    int           `json:"room_number" validate:"required" example:"101"`
+	GroupSize     *int          `json:"group_size,omitempty"`
 	Status        BookingStatus `json:"status" validate:"required"`
 } //@name Stay
+
+type Assistance struct {
+	Accessibility []string `json:"accessibility"`
+	Dietary       []string `json:"dietary"`
+	Medical       []string `json:"medical"`
+} //@name Assistance
+
+func (a *Assistance) Scan(src any) error {
+	if src == nil {
+		return nil
+	}
+	rawBytes, ok := src.([]byte)
+	if !ok {
+		return fmt.Errorf("Assistance.Scan: expected []byte from JSONB column, got %T", src)
+	}
+	if err := json.Unmarshal(rawBytes, a); err != nil {
+		return fmt.Errorf("Assistance.Scan: failed to unmarshal JSONB into Assistance: %w", err)
+	}
+	return nil
+}
diff --git a/backend/internal/models/hotels.go b/backend/internal/models/hotels.go
index b8d2c6c20..412cf04d7 100644
--- a/backend/internal/models/hotels.go
+++ b/backend/internal/models/hotels.go
@@ -3,12 +3,12 @@ package models
 import "time"
 
 type CreateHotelRequest struct {
+	ID     string `json:"id" validate:"notblank" example:"org_2abc123"`
 	Name   string `json:"name" validate:"notblank" example:"Hotel California"`
-	Floors int    `json:"floors" validate:"gte=1" example:"10"`
+	Floors *int   `json:"floors,omitempty" validate:"omitempty,gte=1" example:"10"`
 } //@name CreateHotelRequest
 
 type Hotel struct {
-	ID        string    `json:"id" example:"550e8400-e29b-41d4-a	716-446655440000"`
 	CreatedAt time.Time `json:"created_at" example:"2024-01-01T00:00:00Z"`
 	UpdatedAt time.Time `json:"updated_at" example:"2024-01-01T00:00:00Z"`
 	CreateHotelRequest
diff --git a/backend/internal/models/notifications.go b/backend/internal/models/notifications.go
new file mode 100644
index 000000000..a87de5463
--- /dev/null
+++ b/backend/internal/models/notifications.go
@@ -0,0 +1,29 @@
+package models
+
+import (
+	"encoding/json"
+	"time"
+)
+
+type NotificationType string
+
+const (
+	TypeTaskAssigned     NotificationType = "task_assigned"
+	TypeHighPriorityTask NotificationType = "high_priority_task"
+)
+
+type Notification struct {
+	ID        string           `json:"id"`
+	UserID    string           `json:"user_id"`
+	Type      NotificationType `json:"type"`
+	Title     string           `json:"title"`
+	Body      string           `json:"body"`
+	Data      json.RawMessage  `json:"data,omitempty"`
+	ReadAt    *time.Time       `json:"read_at,omitempty"`
+	CreatedAt time.Time        `json:"created_at"`
+} //@name Notification
+
+type RegisterDeviceTokenInput struct {
+	Token    string `json:"token" validate:"notblank"`
+	Platform string `json:"platform" validate:"oneof=ios android"`
+} //@name RegisterDeviceTokenInput
diff --git a/backend/internal/models/requests.go b/backend/internal/models/requests.go
index ccefbf31f..55e0c6dd1 100644
--- a/backend/internal/models/requests.go
+++ b/backend/internal/models/requests.go
@@ -2,18 +2,50 @@ package models
 
 import "time"
 
+type RequestFeedSort string
+
+const (
+	SortByPriority RequestFeedSort = "priority"
+	SortByNewest   RequestFeedSort = "newest"
+	SortByOldest   RequestFeedSort = "oldest"
+)
+
+func (s RequestFeedSort) IsValid() bool {
+	switch s {
+	case SortByPriority, SortByNewest, SortByOldest:
+		return true
+	}
+	return false
+}
+
 type RequestStatus string
 
 const (
 	StatusPending    RequestStatus = "pending"
-	StatusAssigned   RequestStatus = "assigned"
 	StatusInProgress RequestStatus = "in progress"
 	StatusCompleted  RequestStatus = "completed"
+	StatusArchived   RequestStatus = "archived"
 )
 
 func (s RequestStatus) IsValid() bool {
 	switch s {
-	case StatusPending, StatusAssigned, StatusInProgress, StatusCompleted:
+	case StatusPending, StatusInProgress, StatusCompleted, StatusArchived:
+		return true
+	}
+	return false
+}
+
+type RequestPriority string
+
+const (
+	PriorityLow    RequestPriority = "low"
+	PriorityMedium RequestPriority = "medium"
+	PriorityHigh   RequestPriority = "high"
+)
+
+func (p RequestPriority) IsValid() bool {
+	switch p {
+	case PriorityLow, PriorityMedium, PriorityHigh:
 		return true
 	}
 	return false
@@ -23,8 +55,8 @@ func (s RequestStatus) IsValid() bool {
 
 // for post because the ID and timestamps should always be generated
 type MakeRequest struct {
-	HotelID                 string     `json:"hotel_id" validate:"notblank" example:"521e8400-e458-41d4-a716-446655440000"`
-	GuestID                 *string    `json:"guest_id" example:"521e8417-e458-41d4-a716-446655440990"`
+	HotelID                 string     `json:"hotel_id" validate:"notblank,startswith=org_" example:"org_521e8400-e458-41d4-a716-446655440000"`
+	GuestID                 *string    `json:"guest_id" validate:"omitempty,uuid" example:"521e8417-e458-41d4-a716-446655440990"`
 	UserID                  *string    `json:"user_id" example:"521ee400-e458-41d4-a716-446655440000"`
 	ReservationID           *string    `json:"reservation_id" example:"521e8400-e458-41d4-a716-498655440000"`
 	Name                    string     `json:"name" validate:"notblank" example:"room cleaning"`
@@ -33,22 +65,151 @@ type MakeRequest struct {
 	RequestCategory         *string    `json:"request_category" example:"Cleaning"`
 	RequestType             string     `json:"request_type" validate:"notblank" example:"recurring"`
 	Department              *string    `json:"department" example:"maintenance"`
-	Status                  string     `json:"status"  validate:"notblank" example:"assigned"`
-	Priority                string     `json:"priority" validate:"notblank" example:"urgent"`
+	Status                  string     `json:"status" validate:"oneof='pending' 'in progress' 'completed' 'archived'" example:"pending"`
+	Priority                string     `json:"priority" validate:"oneof=low medium high" example:"high"`
 	EstimatedCompletionTime *int       `json:"estimated_completion_time" example:"30"`
 	ScheduledTime           *time.Time `json:"scheduled_time" example:"2024-01-01T00:00:00Z"`
 	CompletedAt             *time.Time `json:"completed_at" example:"2024-01-01T00:30:00Z"`
 	Notes                   *string    `json:"notes" example:"No special requests"`
 } //@name MakeRequest
 
+// RequestUpdateInput is the body for PUT /request/:id — all fields are optional.
+// Only non-nil fields are applied; the rest are copied from the current version.
+type RequestUpdateInput struct {
+	Unassign                bool       `json:"unassign"`
+	UserID                  *string    `json:"user_id"`
+	GuestID                 *string    `json:"guest_id"`
+	ReservationID           *string    `json:"reservation_id"`
+	Name                    *string    `json:"name" validate:"omitempty,notblank"`
+	Description             *string    `json:"description"`
+	RoomID                  *string    `json:"room_id"`
+	RequestCategory         *string    `json:"request_category"`
+	RequestType             *string    `json:"request_type" validate:"omitempty,notblank"`
+	Department              *string    `json:"department"`
+	Status                  *string    `json:"status" validate:"omitempty,oneof='pending' 'in progress' 'completed' 'archived'"`
+	Priority                *string    `json:"priority" validate:"omitempty,oneof=low medium high"`
+	EstimatedCompletionTime *int       `json:"estimated_completion_time"`
+	ScheduledTime           *time.Time `json:"scheduled_time"`
+	CompletedAt             *time.Time `json:"completed_at"`
+	Notes                   *string    `json:"notes"`
+} //@name RequestUpdateInput
+
+// AssignRequestInput is the body for POST /request/:id/assign.
+// Set assign_to_self to true to assign to the authenticated caller.
+// Omit assign_to_self (or set to false) and provide user_id to assign to another user.
+type AssignRequestInput struct {
+	AssignToSelf *bool   `json:"assign_to_self"`
+	UserID       *string `json:"user_id"`
+} //@name AssignRequestInput
+
+type GetRequestsByStatusInput struct {
+	HotelID    string  `json:"-"           label:"X-Hotel-ID" validate:"notblank"`
+	Status     string  `json:"status"      label:"Status"     validate:"oneof='pending' 'in progress' 'completed' 'archived'"`
+	CursorTime *int64  `json:"cursor_time"`
+	CursorID   *string `json:"cursor_id"`
+} //@name GetRequestsByStatusInput
+
 type GenerateRequestInput struct {
 	RawText string `json:"raw_text" example:"Guest in room 504 needs extra towels urgently"`
-	HotelID string `json:"hotel_id" example:"521e8400-e458-41d4-a716-446655440000"`
+	HotelID string `json:"hotel_id" validate:"notblank,startswith=org_" example:"org_521e8400-e458-41d4-a716-446655440000"`
 } //@name GenerateRequestInput
 
+type GenerateRequestWarning struct {
+	Code    string `json:"code" example:"room_not_found"`
+	Message string `json:"message" example:"Room 301 could not be resolved for this hotel."`
+} //@name GenerateRequestWarning
+
+type GenerateRequestResponse struct {
+	Request Request                 `json:"request"`
+	Warning *GenerateRequestWarning `json:"warning,omitempty"`
+} //@name GenerateRequestResponse
+
 type Request struct {
-	ID        string    `json:"id" example:"530e8400-e458-41d4-a716-446655440000"`
-	CreatedAt time.Time `json:"created_at" example:"2024-01-02T00:00:00Z"`
-	UpdatedAt time.Time `json:"updated_at" example:"2024-01-02T00:00:00Z"`
+	ID             string    `json:"id" example:"530e8400-e458-41d4-a716-446655440000"`
+	CreatedAt      time.Time `json:"created_at" example:"2024-01-02T00:00:00Z"`
+	RequestVersion time.Time `json:"request_version" example:"2024-01-02T00:00:00Z"`
+	ChangedBy      *string   `json:"changed_by,omitempty"`
 	MakeRequest
 } //@name Request
+
+type RequestActivityType string
+
+const (
+	ActivityCreated            RequestActivityType = "created"
+	ActivityStatusChanged      RequestActivityType = "status_changed"
+	ActivityPriorityChanged    RequestActivityType = "priority_changed"
+	ActivityAssigned           RequestActivityType = "assigned"
+	ActivityUnassigned         RequestActivityType = "unassigned"
+	ActivityNameChanged        RequestActivityType = "name_changed"
+	ActivityDepartmentChanged  RequestActivityType = "department_changed"
+	ActivityRoomChanged        RequestActivityType = "room_changed"
+	ActivityDescriptionChanged RequestActivityType = "description_changed"
+)
+
+type RequestActivityItem struct {
+	Type      RequestActivityType `json:"type"`
+	ChangedBy *string             `json:"changed_by"`
+	OldValue  *string             `json:"old_value,omitempty"`
+	NewValue  *string             `json:"new_value,omitempty"`
+	Timestamp time.Time           `json:"timestamp"`
+} //@name RequestActivityItem
+
+type RequestActivityPage struct {
+	Items      []*RequestActivityItem `json:"items"`
+	NextCursor *string                `json:"next_cursor,omitempty"`
+} //@name RequestActivityPage
+
+// RequestsFeedInput is the body for POST /requests/feed.
+type RequestsFeedInput struct {
+	HotelID     string          `json:"hotel_id" validate:"notblank,startswith=org_"`
+	Cursor      string          `json:"cursor"`
+	Limit       int             `json:"limit"       validate:"omitempty,min=1,max=100"`
+	UserID      string          `json:"user_id"`
+	Unassigned  bool            `json:"unassigned"`
+	Status      string          `json:"status"      validate:"omitempty,oneof='pending' 'in progress' 'completed' 'archived'"`
+	Priorities  []string        `json:"priorities"  validate:"omitempty,dive,oneof=low medium high"`
+	Departments []string        `json:"departments"`
+	Floors      []int           `json:"floors"`
+	Sort        RequestFeedSort `json:"sort"        validate:"omitempty,oneof=priority newest oldest"`
+	Search      string          `json:"search"`
+} //@name RequestsFeedInput
+
+type GetRequestsByGuestInput struct {
+	GuestID string `json:"guest_id" validate:"required,uuid"`
+	HotelID string `json:"hotel_id" validate:"required"`
+	Cursor  string `json:"cursor"`
+	Limit   int    `json:"limit" validate:"omitempty,min=1,max=100"`
+} //@name GetRequestsByGuestInput
+
+type GuestRequestPage struct {
+	Data       []*GuestRequest `json:"data"`
+	NextCursor *string         `json:"next_cursor"`
+} //@name GuestRequestPage
+
+type GetRequestsByRoomInput struct {
+	RoomID  string `json:"room_id" validate:"required,uuid"`
+	HotelID string `json:"hotel_id" validate:"required"`
+} //@name GetRequestsByRoomInput
+
+type RoomRequestsResponse struct {
+	Assigned   []*GuestRequest `json:"assigned"`
+	Unassigned []*GuestRequest `json:"unassigned"`
+} //@name RoomRequestsResponse
+
+type GuestRequest struct {
+	ID              string    `json:"id"`
+	Name            string    `json:"name"`
+	Priority        string    `json:"priority"`
+	Status          string    `json:"status"`
+	Description     *string   `json:"description,omitempty"`
+	Notes           *string   `json:"notes,omitempty"`
+	RoomNumber      *int      `json:"room_number,omitempty"`
+	Floor           *int      `json:"floor,omitempty"`
+	RequestType     string    `json:"request_type"`
+	RequestCategory *string   `json:"request_category,omitempty"`
+	DepartmentID    *string   `json:"department_id,omitempty"`
+	DepartmentName  *string   `json:"department_name,omitempty"`
+	UserID          *string   `json:"user_id,omitempty"`
+	CreatedAt       time.Time `json:"created_at"`
+	RequestVersion  time.Time `json:"request_version"`
+} //@name GuestRequest
diff --git a/backend/internal/models/rooms.go b/backend/internal/models/rooms.go
index 2de88ba05..265e61460 100644
--- a/backend/internal/models/rooms.go
+++ b/backend/internal/models/rooms.go
@@ -1,20 +1,37 @@
 package models
 
 type Room struct {
-	RoomNumber int    `json:"room_number"`
-	Floor      int    `json:"floor"`
-	SuiteType  string `json:"suite_type"`
-	RoomStatus string `json:"room_status"`
+	ID           string `json:"id"`
+	RoomNumber   int    `json:"room_number"`
+	Floor        int    `json:"floor"`
+	SuiteType    string `json:"suite_type"`
+	RoomStatus   string `json:"room_status"`
+	IsAccessible bool   `json:"is_accessible"`
 } //@name Room
 
-type RoomFilters struct {
-	Floors *[]int `query:"floors"`
-	Limit  int    `query:"limit"`
-}
+type RoomSortOption string
+
+const (
+	RoomSortAscending  RoomSortOption = "ascending"
+	RoomSortDescending RoomSortOption = "descending"
+	RoomSortUrgency    RoomSortOption = "urgency"
+)
+
+type FilterRoomsRequest struct {
+	Floors     *[]int         `json:"floors,omitempty"     validate:"omitempty,dive,min=1"`
+	Limit      int            `json:"limit,omitempty"      validate:"min=0"`
+	Cursor     string         `json:"cursor,omitempty"     validate:"omitempty"`
+	Status     []string       `json:"status,omitempty"`     // occupied | vacant | open-tasks
+	Attributes []string       `json:"attributes,omitempty"` // standard | deluxe | suite | accessible
+	Advanced   []string       `json:"advanced,omitempty"`   // arrivals-today | departures-today
+	Sort       RoomSortOption `json:"sort,omitempty"`
+} //@name FilterRoomsRequest
 
 // Read model for rooms page on the frontend
 type RoomWithOptionalGuestBooking struct {
 	Room
-	Guests        []Guest       `json:"guests"`
-	BookingStatus BookingStatus `json:"booking_status"`
+	Guests             []Guest         `json:"guests"`
+	BookingStatus      BookingStatus   `json:"booking_status"`
+	Priority           RequestPriority `json:"priority"`
+	HasUnassignedTasks bool            `json:"has_unassigned_tasks"`
 } //@name RoomWithOptionalGuestBooking
diff --git a/backend/internal/models/s3.go b/backend/internal/models/s3.go
new file mode 100644
index 000000000..7a63240aa
--- /dev/null
+++ b/backend/internal/models/s3.go
@@ -0,0 +1,9 @@
+package models
+
+import "time"
+
+// PresignedURLInput is the input for generating S3 presigned upload/get URLs.
+type PresignedURLInput struct {
+	Key        string        `json:"key" validate:"notblank" example:"profile-pictures/user123/1706540000.jpg"`
+	Expiration time.Duration `json:"expiration" validate:"gt=0" swaggertype:"integer" example:"300000000000"`
+} //@name PresignedURLInput
diff --git a/backend/internal/models/users.go b/backend/internal/models/users.go
index ed34f2165..e7200682c 100644
--- a/backend/internal/models/users.go
+++ b/backend/internal/models/users.go
@@ -6,28 +6,48 @@ type CreateUser struct {
 	ID             string  `json:"id" validate:"notblank" example:"user_123"`
 	FirstName      string  `json:"first_name" validate:"notblank" example:"John"`
 	LastName       string  `json:"last_name" validate:"notblank" example:"Doe"`
-	HotelID        *string `json:"hotel_id,omitempty" validate:"omitempty" example:"hotel_123"`
+	HotelID        string  `json:"hotel_id" validate:"notblank" example:"org_550e8400-e29b-41d4-a716-446655440000"`
 	EmployeeID     *string `json:"employee_id,omitempty" validate:"omitempty" example:"EMP-1234"`
 	ProfilePicture *string `json:"profile_picture,omitempty" validate:"omitempty,url" example:"https://example.com/john.jpg"`
 	Role           *string `json:"role,omitempty" validate:"omitempty" example:"Receptionist"`
 	Department     *string `json:"department,omitempty" validate:"omitempty" example:"Housekeeping"`
 	Timezone       *string `json:"timezone,omitempty" validate:"omitempty,timezone" example:"America/New_York"`
+	PhoneNumber    *string `json:"phone_number,omitempty" validate:"omitempty" example:"+11234567890"`
+	PrimaryEmail   *string `json:"primary_email,omitempty" validate:"omitempty,email" example:"john@example.com"`
 } //@name CreateUser
 
+// UpdateUser is the request body for PATCH/PUT user updates (partial fields).
+type UpdateUser struct {
+	PhoneNumber *string `json:"phone_number,omitempty" validate:"omitempty" example:"+11234567890"`
+} //@name UpdateUser
+
+type OnboardUser struct {
+	Role       string  `json:"role" validate:"notblank" example:"manager"`
+	Department *string `json:"department,omitempty" example:"front_desk"`
+	HotelName  *string `json:"hotel_name,omitempty" example:"Hotel California"`
+} //@name OnboardUser
+
 type CreateUserWebhook struct {
 	ClerkUser `json:"data"`
 }
 
 type ClerkUser struct {
-	ID        string  `json:"id" example:"user123402"`
-	FirstName string  `json:"first_name" example:"John"`
-	LastName  string  `json:"last_name" example:"Doe"`
-	ImageUrl  *string `json:"image_url" example:"https://photo.com/john.jpg"`
-	HasImage  bool    `json:"has_image" example:"true"`
+	ID        string  `json:"id"`
+	FirstName string  `json:"first_name"`
+	LastName  string  `json:"last_name"`
+	ImageUrl  *string `json:"image_url"`
+	HasImage  bool    `json:"has_image"`
 }
 
 type User struct {
 	CreateUser
-	CreatedAt time.Time `json:"created_at" example:"2024-01-01T00:00:00Z"`
-	UpdatedAt time.Time `json:"updated_at" example:"2024-01-01T00:00:00Z"`
+	IsOnboarded bool      `json:"is_onboarded" example:"false"`
+	Departments []string  `json:"departments,omitempty"`
+	CreatedAt   time.Time `json:"created_at" example:"2024-01-01T00:00:00Z"`
+	UpdatedAt   time.Time `json:"updated_at" example:"2024-01-01T00:00:00Z"`
 } //@name User
+
+type UserPage struct {
+	Users      []*User `json:"users"`
+	NextCursor string  `json:"next_cursor"`
+} //@name UserPage
diff --git a/backend/internal/models/views.go b/backend/internal/models/views.go
new file mode 100644
index 000000000..ea2073377
--- /dev/null
+++ b/backend/internal/models/views.go
@@ -0,0 +1,42 @@
+package models
+
+import (
+	"encoding/json"
+	"time"
+)
+
+type ViewSlug string
+
+const (
+	ViewSlugRequestsWeb ViewSlug = "requests_web"
+	ViewSlugRoomsWeb    ViewSlug = "rooms_web"
+	ViewSlugGuestsWeb   ViewSlug = "guests_web"
+)
+
+func IsValidViewSlug(s string) bool {
+	switch ViewSlug(s) {
+	case ViewSlugRequestsWeb, ViewSlugRoomsWeb, ViewSlugGuestsWeb:
+		return true
+	}
+	return false
+}
+
+type View struct {
+	ID          string          `json:"id"`
+	UserID      string          `json:"user_id"`
+	Slug        ViewSlug        `json:"slug"`
+	DisplayName string          `json:"display_name"`
+	Filters     json.RawMessage `json:"filters"`
+	CreatedAt   time.Time       `json:"created_at"`
+	UpdatedAt   time.Time       `json:"updated_at"`
+} //@name View
+
+type CreateViewInput struct {
+	Slug        ViewSlug        `json:"slug"         validate:"required,oneof=requests_web rooms_web guests_web"`
+	DisplayName string          `json:"display_name" validate:"notblank"`
+	Filters     json.RawMessage `json:"filters"      validate:"required"`
+} //@name CreateViewInput
+
+type UpdateViewInput struct {
+	Filters json.RawMessage `json:"filters" validate:"required"`
+} //@name UpdateViewInput
diff --git a/backend/internal/repository/guest-bookings.go b/backend/internal/repository/guest-bookings.go
new file mode 100644
index 000000000..1084c3645
--- /dev/null
+++ b/backend/internal/repository/guest-bookings.go
@@ -0,0 +1,49 @@
+package repository
+
+import (
+	"context"
+	"time"
+
+	"github.com/jackc/pgx/v5/pgxpool"
+)
+
+type GuestBookingsRepository struct {
+	db *pgxpool.Pool
+}
+
+func NewGuestBookingsRepository(db *pgxpool.Pool) *GuestBookingsRepository {
+	return &GuestBookingsRepository{db: db}
+}
+
+func (r *GuestBookingsRepository) FindGroupSizeOptions(ctx context.Context, hotelID string) ([]int, error) {
+	rows, err := r.db.Query(ctx, `
+        SELECT DISTINCT group_size
+        FROM guest_bookings
+        WHERE hotel_id = $1
+          AND group_size IS NOT NULL
+        ORDER BY group_size ASC
+    `, hotelID)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+
+	var sizes []int
+	for rows.Next() {
+		var size int
+		if err := rows.Scan(&size); err != nil {
+			return nil, err
+		}
+		sizes = append(sizes, size)
+	}
+
+	return sizes, rows.Err()
+}
+
+func (r *GuestBookingsRepository) InsertGuestBooking(ctx context.Context, guestID, roomID, hotelID string, arrivalDate, departureDate time.Time) error {
+	_, err := r.db.Exec(ctx, `
+		INSERT INTO guest_bookings (guest_id, room_id, hotel_id, arrival_date, departure_date, status)
+		VALUES ($1, $2, $3, $4, $5, 'active')
+	`, guestID, roomID, hotelID, arrivalDate, departureDate)
+	return err
+}
diff --git a/backend/internal/repository/guests.go b/backend/internal/repository/guests.go
index 4d9025727..fe916e60b 100644
--- a/backend/internal/repository/guests.go
+++ b/backend/internal/repository/guests.go
@@ -2,12 +2,19 @@ package repository
 
 import (
 	"context"
+	"encoding/json"
 	"errors"
+	"fmt"
+	"iter"
+	"sort"
+	"strings"
+	"time"
 
 	"github.com/generate/selfserve/internal/errs"
 	"github.com/generate/selfserve/internal/models"
 	"github.com/jackc/pgx/v5"
 	"github.com/jackc/pgx/v5/pgconn"
+	"github.com/jackc/pgx/v5/pgtype"
 	"github.com/jackc/pgx/v5/pgxpool"
 )
 
@@ -82,70 +89,143 @@ func (r *GuestsRepository) FindGuest(ctx context.Context, id string) (*models.Gu
 }
 
 func (r *GuestsRepository) FindGuestWithStayHistory(ctx context.Context, id string) (*models.GuestWithStays, error) {
+	guest := &models.GuestWithStays{
+		CurrentStays: []models.Stay{},
+		PastStays:    []models.Stay{},
+	}
+	var doNotDisturbStart, doNotDisturbEnd pgtype.Time
+	var assistanceRaw []byte
+
+	err := r.db.QueryRow(ctx, `
+		SELECT
+			g.id, g.first_name, g.last_name, g.phone, g.email,
+			g.preferences, g.notes, g.pronouns, g.do_not_disturb_start,
+			g.do_not_disturb_end, g.housekeeping_cadence, g.assistance
+		FROM public.guests g
+		WHERE g.id = $1
+	`, id).Scan(
+		&guest.ID, &guest.FirstName, &guest.LastName, &guest.Phone, &guest.Email,
+		&guest.Preferences, &guest.Notes, &guest.Pronouns, &doNotDisturbStart,
+		&doNotDisturbEnd, &guest.HousekeepingCadence, &assistanceRaw,
+	)
+	if err != nil {
+		if errors.Is(err, pgx.ErrNoRows) {
+			return nil, errs.ErrNotFoundInDB
+		}
+		return nil, err
+	}
+
+	guest.DoNotDisturbStart = formatPGTime(doNotDisturbStart)
+	guest.DoNotDisturbEnd = formatPGTime(doNotDisturbEnd)
+
+	if len(assistanceRaw) > 0 {
+		var assistance *models.Assistance
+		if err := json.Unmarshal(assistanceRaw, &assistance); err != nil {
+			return nil, err
+		}
+		guest.Assistance = assistance
+	}
 
 	rows, err := r.db.Query(ctx, `
-		SELECT guests.id, guests.first_name, guests.last_name, guests.phone, guests.email,
-			guests.preferences, guests.notes, guest_bookings.arrival_date, guest_bookings.departure_date, 
-			rooms.room_number, guest_bookings.status
-		FROM public.guests
-		LEFT JOIN guest_bookings ON guests.id = guest_bookings.guest_id
-		LEFT JOIN rooms ON rooms.id = guest_bookings.room_id
-		WHERE guests.id = $1
+		SELECT gb.arrival_date, gb.departure_date, rm.room_number, gb.status, gb.group_size
+		FROM guest_bookings gb
+		LEFT JOIN rooms rm ON rm.id = gb.room_id
+		WHERE gb.guest_id = $1
 	`, id)
-
 	if err != nil {
 		return nil, err
 	}
 	defer rows.Close()
 
-	var guest *models.GuestWithStays
+	if err := loadGuestStayHistory(guest, rows); err != nil {
+		return nil, err
+	}
+
+	sortGuestStays(guest)
+
+	return guest, rows.Err()
+}
+
+func loadGuestStayHistory(guest *models.GuestWithStays, rows pgx.Rows) error {
 	for rows.Next() {
-		var stay models.Stay
-		var arrivalDate *string
-		var departureDate *string
-		var roomNumber *int
-		var status *models.BookingStatus
-
-		if guest == nil {
-			guest = &models.GuestWithStays{}
-		}
+		var arrivalDate, departureDate pgtype.Date
+		var roomNumber, groupSize pgtype.Int4
+		var status string
 
-		err := rows.Scan(
-			&guest.ID, &guest.FirstName, &guest.LastName, &guest.Phone, &guest.Email, &guest.Preferences, &guest.Notes,
-			&arrivalDate, &departureDate, &roomNumber, &status,
-		)
-		if err != nil {
-			return nil, err
+		if err := rows.Scan(&arrivalDate, &departureDate, &roomNumber, &status, &groupSize); err != nil {
+			return err
 		}
 
-		if arrivalDate == nil {
+		if !arrivalDate.Valid || !departureDate.Valid || !roomNumber.Valid || status == "" {
 			continue
 		}
 
-		stay.ArrivalDate = *arrivalDate
-		stay.DepartureDate = *departureDate
-		stay.RoomNumber = *roomNumber
-		stay.Status = *status
-
-		switch *status {
-		case models.BookingStatusActive:
-			guest.CurrentStays = append(guest.CurrentStays, stay)
-		case models.BookingStatusInactive:
-			guest.PastStays = append(guest.PastStays, stay)
-		default:
-			return nil, errs.InternalServerError()
-		}
+		stayStatus := models.BookingStatus(status)
+		stay := buildStay(arrivalDate, departureDate, roomNumber, groupSize, stayStatus)
+		appendStay(guest, stay, stayStatus)
 	}
 
-	if err := rows.Err(); err != nil {
-		return nil, err
+	return rows.Err()
+}
+
+func buildStay(
+	arrival pgtype.Date,
+	departure pgtype.Date,
+	roomNumber pgtype.Int4,
+	groupSize pgtype.Int4,
+	status models.BookingStatus,
+) models.Stay {
+	stay := models.Stay{
+		ArrivalDate:   arrival.Time,
+		DepartureDate: departure.Time,
+		RoomNumber:    int(roomNumber.Int32),
+		Status:        status,
 	}
+	if groupSize.Valid {
+		value := int(groupSize.Int32)
+		stay.GroupSize = &value
+	}
+	return stay
+}
+
+func appendStay(guest *models.GuestWithStays, stay models.Stay, status models.BookingStatus) *models.GuestWithStays {
+	switch status {
+	case models.BookingStatusActive:
+		guest.CurrentStays = append(guest.CurrentStays, stay)
+	default:
+		guest.PastStays = append(guest.PastStays, stay)
+	}
+	return guest
+}
+
+func sortGuestStays(guest *models.GuestWithStays) {
+	sort.Slice(guest.CurrentStays, func(currentStayIndex, otherCurrentStayIndex int) bool {
+		return guest.CurrentStays[currentStayIndex].ArrivalDate.After(
+			guest.CurrentStays[otherCurrentStayIndex].ArrivalDate,
+		)
+	})
+
+	sort.Slice(guest.PastStays, func(pastStayIndex, otherPastStayIndex int) bool {
+		return guest.PastStays[pastStayIndex].DepartureDate.After(
+			guest.PastStays[otherPastStayIndex].DepartureDate,
+		)
+	})
+}
 
-	if guest == nil {
-		return nil, errs.ErrNotFoundInDB
+func formatPGTime(value pgtype.Time) *string {
+	if !value.Valid {
+		return nil
 	}
 
-	return guest, nil
+	duration := time.Duration(value.Microseconds) * time.Microsecond
+	hours := int(duration / time.Hour)
+	duration -= time.Duration(hours) * time.Hour
+	minutes := int(duration / time.Minute)
+	duration -= time.Duration(minutes) * time.Minute
+	seconds := int(duration / time.Second)
+
+	formatted := fmt.Sprintf("%02d:%02d:%02d", hours, minutes, seconds)
+	return &formatted
 }
 
 func (r *GuestsRepository) UpdateGuest(ctx context.Context, id string, update *models.UpdateGuest) (*models.Guest, error) {
@@ -154,20 +234,22 @@ func (r *GuestsRepository) UpdateGuest(ctx context.Context, id string, update *m
 	row := r.db.QueryRow(ctx, `
 		UPDATE guests
 		SET
-			first_name = $2,
-			last_name = $3,
-			profile_picture = $4,
-			timezone = $5,
+			first_name = COALESCE($2, first_name),
+			last_name = COALESCE($3, last_name),
+			profile_picture = COALESCE($4, profile_picture),
+			timezone = COALESCE($5, timezone),
+			notes = COALESCE($6, notes),
 			updated_at = NOW()
 		WHERE id = $1
 		RETURNING
 			id, created_at, updated_at,
-			first_name, last_name, profile_picture, timezone`,
+			first_name, last_name, profile_picture, timezone, notes`,
 		id,
 		update.FirstName,
 		update.LastName,
 		update.ProfilePicture,
 		update.Timezone,
+		update.Notes,
 	)
 
 	err := row.Scan(
@@ -178,6 +260,7 @@ func (r *GuestsRepository) UpdateGuest(ctx context.Context, id string, update *m
 		&guest.LastName,
 		&guest.ProfilePicture,
 		&guest.Timezone,
+		&guest.Notes,
 	)
 
 	if err != nil {
@@ -190,38 +273,265 @@ func (r *GuestsRepository) UpdateGuest(ctx context.Context, id string, update *m
 	return &guest, nil
 }
 
-func (r *GuestsRepository) FindGuestsWithActiveBooking(ctx context.Context, filters *models.GuestFilters) ([]*models.GuestWithBooking, error) {
-	floors := []int{}
-	if filters.Floors != nil {
-		floors = *filters.Floors
+const fetchAllGuestDocumentsPageSize = 100
+
+// AllGuestDocuments returns a paginated iterator over every guest document in the
+// database. It yields one *models.GuestDocument at a time, fetching the next page
+// only when the previous one is exhausted. Stop iterating early by returning false
+// from the yield function; the first non-nil error stops iteration and is yielded
+// as the second value.
+func (r *GuestsRepository) AllGuestDocuments(ctx context.Context) iter.Seq2[*models.GuestDocument, error] {
+	return func(yield func(*models.GuestDocument, error) bool) {
+		var cursorName, cursorID string
+
+		for {
+			rows, err := r.db.Query(ctx, `
+				SELECT
+					g.id,
+					gb.hotel_id,
+					CONCAT_WS(' ', g.first_name, g.last_name) AS full_name,
+					g.first_name,
+					g.last_name,
+					COALESCE(g.preferences, g.first_name) AS preferred_name,
+					g.email,
+					g.phone,
+					g.preferences,
+					g.notes,
+					g.assistance,
+					r.floor,
+					r.room_number,
+					gb.group_size,
+					gb.status,
+					gb.arrival_date,
+					gb.departure_date,
+					COALESCE(ra.request_count, 0) AS request_count,
+					COALESCE(ra.has_urgent, false) AS has_urgent
+				FROM guest_bookings gb
+				JOIN guests g ON g.id = gb.guest_id
+				JOIN rooms r ON r.id = gb.room_id
+				LEFT JOIN (
+					SELECT guest_id, hotel_id, COUNT(*) AS request_count, BOOL_OR(priority = 'high') AS has_urgent
+					FROM requests
+					GROUP BY guest_id, hotel_id
+				) ra ON ra.guest_id = g.id AND ra.hotel_id = gb.hotel_id
+				WHERE (
+					$1::text = ''
+					OR (CONCAT_WS(' ', g.first_name, g.last_name), g.id::text) > ($1::text, $2::text)
+				)
+				ORDER BY CONCAT_WS(' ', g.first_name, g.last_name) ASC, g.id ASC
+				LIMIT $3
+			`, cursorName, cursorID, fetchAllGuestDocumentsPageSize)
+			if err != nil {
+				yield(nil, err)
+				return
+			}
+
+			var page []*models.GuestDocument
+			for rows.Next() {
+				var doc models.GuestDocument
+				if err := rows.Scan(
+					&doc.ID, &doc.HotelID, &doc.FullName,
+					&doc.FirstName, &doc.LastName, &doc.PreferredName,
+					&doc.Email, &doc.Phone, &doc.Preferences, &doc.Notes,
+					&doc.Assistance,
+					&doc.Floor, &doc.RoomNumber, &doc.GroupSize,
+					&doc.BookingStatus, &doc.ArrivalDate, &doc.DepartureDate,
+					&doc.RequestCount, &doc.HasUrgent,
+				); err != nil {
+					rows.Close()
+					yield(nil, err)
+					return
+				}
+				page = append(page, &doc)
+			}
+			rows.Close()
+
+			if err := rows.Err(); err != nil {
+				yield(nil, err)
+				return
+			}
+
+			for _, doc := range page {
+				if !yield(doc, nil) {
+					return
+				}
+			}
+
+			if len(page) < fetchAllGuestDocumentsPageSize {
+				return // last page
+			}
+
+			last := page[len(page)-1]
+			cursorName = last.FullName
+			cursorID = last.ID
+		}
+	}
+}
+
+func scanGuests(rows pgx.Rows) ([]*models.GuestWithBooking, error) {
+	var guests []*models.GuestWithBooking
+	for rows.Next() {
+		var g models.GuestWithBooking
+		err := rows.Scan(&g.ID, &g.FirstName, &g.LastName, &g.PreferredName, &g.RequestCount, &g.HasUrgent, &g.Assistance, &g.ActiveBookings)
+		if err != nil {
+			return nil, err
+		}
+		guests = append(guests, &g)
+	}
+	return guests, rows.Err()
+}
+
+func buildNextCursor(guests []*models.GuestWithBooking, limit int) ([]*models.GuestWithBooking, *string) {
+	if len(guests) <= limit {
+		return guests, nil
 	}
+	guests = guests[:limit]
+	last := guests[limit-1]
+	encoded := last.FirstName + " " + last.LastName + "|" + last.ID
+	return guests, &encoded
+}
+
+func (r *GuestsRepository) FindGuestByName(ctx context.Context, hotelID, name string) ([]string, error) {
 	rows, err := r.db.Query(ctx, `
-	SELECT 
-		guests.id, guests.first_name, guests.last_name, rooms.room_number, rooms.floor
-	FROM guests
-	JOIN guest_bookings ON guests.id = guest_bookings.guest_id
-		AND guest_bookings.status = 'active'
-	JOIN rooms ON rooms.id = guest_bookings.room_id
-	WHERE guest_bookings.hotel_id = $1 
-	AND ($2::int[] = '{}' OR rooms.floor = ANY($2))`, filters.HotelID, floors)
+		SELECT DISTINCT g.id
+		FROM guests g
+		JOIN guest_bookings gb ON gb.guest_id = g.id
+		WHERE gb.hotel_id = $1
+		  AND gb.status = 'active'
+		  AND CONCAT_WS(' ', g.first_name, g.last_name) ILIKE '%' || $2 || '%'
+	`, hotelID, name)
 	if err != nil {
 		return nil, err
 	}
 	defer rows.Close()
 
-	var guests []*models.GuestWithBooking
+	var ids []string
 	for rows.Next() {
-		var g models.GuestWithBooking
-		err := rows.Scan(&g.ID, &g.FirstName, &g.LastName, &g.RoomNumber, &g.Floor)
-		if err != nil {
+		var id string
+		if err := rows.Scan(&id); err != nil {
 			return nil, err
 		}
-		guests = append(guests, &g)
+		ids = append(ids, id)
+	}
+	return ids, rows.Err()
+}
+
+func (r *GuestsRepository) FindGuestsWithActiveBooking(ctx context.Context, filters *models.GuestFilters) (*models.GuestPage, error) {
+	orderBy := buildGuestOrderBy(filters)
+
+	rows, err := r.db.Query(ctx, `
+	WITH requests_agg AS (
+		SELECT
+			guest_id,
+			COUNT(*) AS request_count,
+			BOOL_OR(priority = 'high') AS has_urgent
+		FROM requests
+		WHERE hotel_id = $1
+		GROUP BY guest_id
+	),
+	guest_data AS (
+		SELECT
+			g.id,
+			g.first_name,
+			g.last_name,
+			CONCAT_WS(' ', g.first_name, g.last_name) AS full_name,
+			COALESCE(g.preferences, g.first_name) AS preferred_name,
+			g.assistance,
+			COALESCE(ra.request_count, 0) AS request_count,
+			COALESCE(ra.has_urgent, false) AS has_urgent,
+			COALESCE(
+				json_agg(
+					json_build_object('floor', r.floor, 'room_number', r.room_number)
+					ORDER BY r.floor, r.room_number
+				) FILTER (WHERE gb.status = 'active'),
+				'[]'::json
+			) AS active_bookings,
+			BOOL_OR(gb.status = 'active') AS has_active_booking,
+			ARRAY_AGG(DISTINCT r.floor) FILTER (WHERE gb.status = 'active') AS active_floors,
+			ARRAY_AGG(DISTINCT gb.group_size) FILTER (WHERE gb.status = 'active') AS active_group_sizes,
+			MIN(r.floor) FILTER (WHERE gb.status = 'active') AS min_floor
+		FROM guest_bookings gb
+		JOIN guests g ON g.id = gb.guest_id
+		JOIN rooms r ON r.id = gb.room_id
+		LEFT JOIN requests_agg ra ON ra.guest_id = g.id
+		WHERE gb.hotel_id = $1
+		GROUP BY g.id, g.first_name, g.last_name, g.preferences, g.assistance, ra.request_count, ra.has_urgent
+	)
+	SELECT id, first_name, last_name, preferred_name, request_count, has_urgent, assistance, active_bookings
+	FROM guest_data
+	WHERE (
+		$2::text[] IS NULL
+		OR ('active' = ANY($2) AND has_active_booking)
+		OR ('inactive' = ANY($2) AND NOT has_active_booking)
+	)
+	AND ($3::int[] IS NULL OR active_floors && $3::int[])
+	AND ($4::int[] IS NULL OR active_group_sizes && $4::int[])
+	AND (
+		$5::text = ''
+		OR full_name ILIKE '%' || $5 || '%'
+	)
+	AND (
+		$6::text = ''
+		OR (full_name, id::text) > ($6::text, $7::text)
+	)
+	AND (
+		$8::text[] IS NULL
+		OR (
+			('accessibility' = ANY($8) AND jsonb_array_length(COALESCE(assistance->'accessibility', '[]'::jsonb)) > 0)
+			OR ('dietary' = ANY($8) AND jsonb_array_length(COALESCE(assistance->'dietary', '[]'::jsonb)) > 0)
+			OR ('medical' = ANY($8) AND jsonb_array_length(COALESCE(assistance->'medical', '[]'::jsonb)) > 0)
+		)
+	)
+	ORDER BY `+orderBy+`
+	LIMIT $9`,
+		filters.HotelID,
+		filters.Status,
+		filters.Floors,
+		filters.GroupSize,
+		filters.Search,
+		filters.CursorName,
+		filters.CursorID,
+		filters.Assistance,
+		filters.Limit+1,
+	)
+	if err != nil {
+		return nil, err
 	}
+	defer rows.Close()
 
-	if err := rows.Err(); err != nil {
+	guests, err := scanGuests(rows)
+	if err != nil {
 		return nil, err
 	}
 
-	return guests, nil
+	guests, nextCursor := buildNextCursor(guests, filters.Limit)
+
+	return &models.GuestPage{
+		Data:       guests,
+		NextCursor: nextCursor,
+	}, nil
+}
+
+func buildGuestOrderBy(filters *models.GuestFilters) string {
+	var parts []string
+
+	switch filters.RequestSort {
+	case models.RequestSortUrgent:
+		parts = append(parts, "has_urgent DESC")
+	case models.RequestSortHighToLow:
+		parts = append(parts, "request_count DESC")
+	case models.RequestSortLowToHigh:
+		parts = append(parts, "request_count ASC")
+	}
+
+	switch filters.FloorSort {
+	case models.FloorSortAscending:
+		parts = append(parts, "min_floor ASC")
+	case models.FloorSortDescending:
+		parts = append(parts, "min_floor DESC")
+	}
+
+	parts = append(parts, "full_name ASC", "id ASC")
+
+	return strings.Join(parts, ", ")
 }
diff --git a/backend/internal/repository/guests_opensearch.go b/backend/internal/repository/guests_opensearch.go
new file mode 100644
index 000000000..f9a2dd539
--- /dev/null
+++ b/backend/internal/repository/guests_opensearch.go
@@ -0,0 +1,256 @@
+package repository
+
+import (
+	"bytes"
+	"context"
+	"encoding/json"
+	"fmt"
+	"strings"
+
+	"github.com/generate/selfserve/internal/models"
+	opensearchstorage "github.com/generate/selfserve/internal/service/storage/opensearch"
+	opensearch "github.com/opensearch-project/opensearch-go/v2"
+	"github.com/opensearch-project/opensearch-go/v2/opensearchapi"
+)
+
+type OpenSearchGuestsRepository struct {
+	client *opensearch.Client
+}
+
+func NewOpenSearchGuestsRepository(client *opensearch.Client) *OpenSearchGuestsRepository {
+	return &OpenSearchGuestsRepository{client: client}
+}
+
+func (r *OpenSearchGuestsRepository) IndexGuest(ctx context.Context, doc *models.GuestDocument) error {
+	serializedDoc, err := json.Marshal(doc)
+	if err != nil {
+		return err
+	}
+
+	indexResponse, err := opensearchapi.IndexRequest{
+		Index:      opensearchstorage.GuestsIndex,
+		DocumentID: doc.ID,
+		Body:       bytes.NewReader(serializedDoc),
+	}.Do(ctx, r.client)
+	if err != nil {
+		return fmt.Errorf("indexing guest %s: %w", doc.ID, err)
+	}
+	defer indexResponse.Body.Close()
+
+	if indexResponse.IsError() {
+		return fmt.Errorf("indexing guest %s failed: %s", doc.ID, indexResponse.String())
+	}
+	return nil
+}
+
+func (r *OpenSearchGuestsRepository) BulkIndexGuests(ctx context.Context, docs []*models.GuestDocument) error {
+	if len(docs) == 0 {
+		return nil
+	}
+
+	var body bytes.Buffer
+	for _, doc := range docs {
+		meta := fmt.Sprintf(`{"index":{"_index":%q,"_id":%q}}`, opensearchstorage.GuestsIndex, doc.ID)
+		body.WriteString(meta)
+		body.WriteByte('\n')
+		serialized, err := json.Marshal(doc)
+		if err != nil {
+			return fmt.Errorf("marshaling guest %s: %w", doc.ID, err)
+		}
+		body.Write(serialized)
+		body.WriteByte('\n')
+	}
+
+	res, err := opensearchapi.BulkRequest{
+		Body: &body,
+	}.Do(ctx, r.client)
+	if err != nil {
+		return fmt.Errorf("bulk indexing guests: %w", err)
+	}
+	defer res.Body.Close()
+
+	if res.IsError() {
+		return fmt.Errorf("bulk index failed: %s", res.String())
+	}
+
+	var result struct {
+		Errors bool `json:"errors"`
+		Items  []map[string]struct {
+			ID     string `json:"_id"`
+			Status int    `json:"status"`
+			Error  *struct {
+				Reason string `json:"reason"`
+			} `json:"error,omitempty"`
+		} `json:"items"`
+	}
+	if err := json.NewDecoder(res.Body).Decode(&result); err != nil {
+		return fmt.Errorf("decoding bulk response: %w", err)
+	}
+
+	if result.Errors {
+		var errs []string
+		for _, item := range result.Items {
+			for _, op := range item {
+				if op.Error != nil {
+					errs = append(errs, fmt.Sprintf("id=%s: %s", op.ID, op.Error.Reason))
+				}
+			}
+		}
+		return fmt.Errorf("bulk index partial failure: %s", strings.Join(errs, "; "))
+	}
+
+	return nil
+}
+
+func (r *OpenSearchGuestsRepository) DeleteGuest(ctx context.Context, id string) error {
+	deleteResponse, err := opensearchapi.DeleteRequest{
+		Index:      opensearchstorage.GuestsIndex,
+		DocumentID: id,
+	}.Do(ctx, r.client)
+	if err != nil {
+		return fmt.Errorf("deleting guest %s from index: %w", id, err)
+	}
+	defer deleteResponse.Body.Close()
+
+	if deleteResponse.IsError() && deleteResponse.StatusCode != 404 {
+		return fmt.Errorf("deleting guest %s failed: %s", id, deleteResponse.String())
+	}
+	return nil
+}
+
+func (r *OpenSearchGuestsRepository) SearchGuests(ctx context.Context, filters *models.GuestFilters) (*models.GuestPage, error) {
+	searchQuery := buildGuestSearchQuery(filters)
+	serializedQuery, err := json.Marshal(searchQuery)
+	if err != nil {
+		return nil, err
+	}
+
+	searchResponse, err := opensearchapi.SearchRequest{
+		Index: []string{opensearchstorage.GuestsIndex},
+		Body:  bytes.NewReader(serializedQuery),
+	}.Do(ctx, r.client)
+	if err != nil {
+		return nil, fmt.Errorf("searching guests: %w", err)
+	}
+	defer searchResponse.Body.Close()
+
+	if searchResponse.IsError() {
+		return nil, fmt.Errorf("guest search failed: %s", searchResponse.String())
+	}
+
+	var decodedSearchResult struct {
+		Hits struct {
+			Hits []struct {
+				GuestDocument models.GuestDocument `json:"_source"`
+				SortValues    []any                `json:"sort"`
+			} `json:"hits"`
+		} `json:"hits"`
+	}
+	if err := json.NewDecoder(searchResponse.Body).Decode(&decodedSearchResult); err != nil {
+		return nil, fmt.Errorf("decoding search response: %w", err)
+	}
+
+	// Group hits by guest ID — a guest with multiple active bookings produces multiple OpenSearch documents.
+	// We deduplicate here, aggregating all active booking rooms and taking stats from the first hit.
+	type guestEntry struct {
+		guest    *models.GuestWithBooking
+		sortVals []any
+	}
+	guestMap := make(map[string]*guestEntry)
+	var orderedIDs []string
+
+	for _, hit := range decodedSearchResult.Hits.Hits {
+		doc := hit.GuestDocument
+		if _, exists := guestMap[doc.ID]; !exists {
+			guestMap[doc.ID] = &guestEntry{
+				guest: &models.GuestWithBooking{
+					ID:             doc.ID,
+					FirstName:      doc.FirstName,
+					LastName:       doc.LastName,
+					PreferredName:  doc.PreferredName,
+					Assistance:     doc.Assistance,
+					RequestCount:   doc.RequestCount,
+					HasUrgent:      doc.HasUrgent,
+					ActiveBookings: models.ActiveBookings{},
+				},
+				sortVals: hit.SortValues,
+			}
+			orderedIDs = append(orderedIDs, doc.ID)
+		}
+		guestMap[doc.ID].guest.ActiveBookings = append(
+			guestMap[doc.ID].guest.ActiveBookings,
+			models.ActiveBooking{Floor: doc.Floor, RoomNumber: doc.RoomNumber},
+		)
+	}
+
+	var nextCursor *string
+	resultIDs := orderedIDs
+	if len(orderedIDs) == filters.Limit+1 {
+		resultIDs = orderedIDs[:filters.Limit]
+		lastEntry := guestMap[orderedIDs[filters.Limit-1]]
+		if len(lastEntry.sortVals) >= 2 {
+			encodedCursor := fmt.Sprintf("%v|%v", lastEntry.sortVals[0], lastEntry.sortVals[1])
+			nextCursor = &encodedCursor
+		}
+	}
+
+	guestResults := make([]*models.GuestWithBooking, 0, len(resultIDs))
+	for _, id := range resultIDs {
+		guestResults = append(guestResults, guestMap[id].guest)
+	}
+
+	return &models.GuestPage{
+		Data:       guestResults,
+		NextCursor: nextCursor,
+	}, nil
+}
+
+// buildGuestSearchQuery constructs the OpenSearch bool query from GuestFilters.
+// Sort is by full_name.keyword ASC, id ASC — matching the Postgres query order
+// and keeping cursor format compatible ("FirstName LastName|UUID").
+func buildGuestSearchQuery(filters *models.GuestFilters) map[string]any {
+	mustClauses := []any{
+		map[string]any{"term": map[string]any{"hotel_id": filters.HotelID}},
+		map[string]any{"term": map[string]any{"booking_status": "active"}},
+	}
+
+	var filterClauses []any
+	if len(filters.Floors) > 0 {
+		filterClauses = append(filterClauses, map[string]any{
+			"terms": map[string]any{"floor": filters.Floors},
+		})
+	}
+	if len(filters.GroupSize) > 0 {
+		filterClauses = append(filterClauses, map[string]any{
+			"terms": map[string]any{"group_size": filters.GroupSize},
+		})
+	}
+
+	boolQuery := map[string]any{
+		"must":   mustClauses,
+		"filter": filterClauses,
+	}
+
+	if filters.Search != "" {
+		boolQuery["should"] = []any{
+			map[string]any{"match": map[string]any{"full_name": filters.Search}},
+			map[string]any{"term": map[string]any{"room_number": filters.Search}},
+		}
+		boolQuery["minimum_should_match"] = 1
+	}
+
+	openSearchQuery := map[string]any{
+		"query": map[string]any{"bool": boolQuery},
+		"sort": []any{
+			map[string]any{"full_name.keyword": "asc"},
+			map[string]any{"id": "asc"},
+		},
+		"size": filters.Limit + 1,
+	}
+
+	if filters.CursorName != "" && filters.CursorID != "" {
+		openSearchQuery["search_after"] = []any{filters.CursorName, filters.CursorID}
+	}
+
+	return openSearchQuery
+}
diff --git a/backend/internal/repository/guests_test.go b/backend/internal/repository/guests_test.go
new file mode 100644
index 000000000..f403ad75c
--- /dev/null
+++ b/backend/internal/repository/guests_test.go
@@ -0,0 +1,52 @@
+package repository
+
+import (
+	"testing"
+	"time"
+
+	"github.com/generate/selfserve/internal/models"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestSortGuestStays(t *testing.T) {
+	t.Parallel()
+
+	base := time.Date(2026, time.April, 4, 12, 0, 0, 0, time.UTC)
+	guest := &models.GuestWithStays{
+		CurrentStays: []models.Stay{
+			{
+				ArrivalDate:   base.Add(-48 * time.Hour),
+				DepartureDate: base.Add(24 * time.Hour),
+				RoomNumber:    101,
+				Status:        models.BookingStatusActive,
+			},
+			{
+				ArrivalDate:   base.Add(-24 * time.Hour),
+				DepartureDate: base.Add(48 * time.Hour),
+				RoomNumber:    202,
+				Status:        models.BookingStatusActive,
+			},
+		},
+		PastStays: []models.Stay{
+			{
+				ArrivalDate:   base.Add(-240 * time.Hour),
+				DepartureDate: base.Add(-168 * time.Hour),
+				RoomNumber:    303,
+				Status:        models.BookingStatusInactive,
+			},
+			{
+				ArrivalDate:   base.Add(-120 * time.Hour),
+				DepartureDate: base.Add(-72 * time.Hour),
+				RoomNumber:    404,
+				Status:        models.BookingStatusInactive,
+			},
+		},
+	}
+
+	sortGuestStays(guest)
+
+	assert.Equal(t, 202, guest.CurrentStays[0].RoomNumber)
+	assert.Equal(t, 101, guest.CurrentStays[1].RoomNumber)
+	assert.Equal(t, 404, guest.PastStays[0].RoomNumber)
+	assert.Equal(t, 303, guest.PastStays[1].RoomNumber)
+}
diff --git a/backend/internal/repository/hotels.go b/backend/internal/repository/hotels.go
index a404998b4..c6bf147d5 100644
--- a/backend/internal/repository/hotels.go
+++ b/backend/internal/repository/hotels.go
@@ -3,6 +3,8 @@ package repository
 import (
 	"context"
 	"errors"
+	"fmt"
+	"iter"
 
 	"github.com/generate/selfserve/internal/errs"
 	"github.com/generate/selfserve/internal/models"
@@ -21,7 +23,7 @@ func NewHotelsRepository(db *pgxpool.Pool) *HotelsRepository {
 func (r *HotelsRepository) FindByID(ctx context.Context, id string) (*models.Hotel, error) {
 	row := r.db.QueryRow(ctx, `
 		SELECT id, name, floors, created_at, updated_at
-		FROM hotels 
+		FROM hotels
 		WHERE id = $1
 	`, id)
 
@@ -38,23 +40,187 @@ func (r *HotelsRepository) FindByID(ctx context.Context, id string) (*models.Hot
 }
 
 func (r *HotelsRepository) InsertHotel(ctx context.Context, hotel *models.CreateHotelRequest) (*models.Hotel, error) {
+	tx, err := r.db.Begin(ctx)
+	if err != nil {
+		return nil, err
+	}
+	defer func() { _ = tx.Rollback(ctx) }()
+
 	createdHotel := &models.Hotel{CreateHotelRequest: *hotel}
+	err = tx.QueryRow(ctx, `
+        INSERT INTO hotels (id, name, floors)
+        VALUES ($1, $2, $3)
+        ON CONFLICT (id) DO NOTHING
+        RETURNING created_at, updated_at
+    `, hotel.ID, hotel.Name, hotel.Floors).Scan(
+		&createdHotel.CreatedAt, &createdHotel.UpdatedAt,
+	)
+	if err != nil {
+		if errors.Is(err, pgx.ErrNoRows) {
+			return nil, errs.ErrAlreadyExistsInDB
+		}
+		return nil, err
+	}
+
+	_, err = tx.Exec(ctx, `
+		INSERT INTO departments (hotel_id, name)
+		SELECT $1, unnest($2::text[])
+	`, hotel.ID, models.DefaultDepartments)
+	if err != nil {
+		return nil, fmt.Errorf("%w: %w", errs.ErrDefaultDepartmentInsertDB, err)
+	}
+
+	if err = tx.Commit(ctx); err != nil {
+		return nil, err
+	}
+
+	return createdHotel, nil
+}
+
+const allHotelsWithoutDepartmentsPageSize = 100
+
+// AllHotelsWithoutDepartments returns a paginated iterator over hotels that have
+// no departments. Yields one *models.Hotel at a time; the first non-nil error
+// stops iteration and is yielded as the second value.
+func (r *HotelsRepository) AllHotelsWithoutDepartments(ctx context.Context) iter.Seq2[*models.Hotel, error] {
+	return func(yield func(*models.Hotel, error) bool) {
+		var cursor string
+
+		for {
+			rows, err := r.db.Query(ctx, `
+				SELECT h.id, h.name, h.floors, h.created_at, h.updated_at
+				FROM hotels h
+				LEFT JOIN departments d ON d.hotel_id = h.id
+				WHERE d.id IS NULL
+				AND ($1::text = '' OR h.id > $1)
+				ORDER BY h.id ASC
+				LIMIT $2
+			`, cursor, allHotelsWithoutDepartmentsPageSize)
+			if err != nil {
+				yield(nil, err)
+				return
+			}
+
+			var page []*models.Hotel
+			for rows.Next() {
+				var h models.Hotel
+				if err := rows.Scan(&h.ID, &h.Name, &h.Floors, &h.CreatedAt, &h.UpdatedAt); err != nil {
+					rows.Close()
+					yield(nil, err)
+					return
+				}
+				page = append(page, &h)
+			}
+			rows.Close()
+
+			if err := rows.Err(); err != nil {
+				yield(nil, err)
+				return
+			}
+
+			for _, h := range page {
+				if !yield(h, nil) {
+					return
+				}
+			}
+
+			if len(page) < allHotelsWithoutDepartmentsPageSize {
+				return
+			}
+
+			cursor = page[len(page)-1].ID
+		}
+	}
+}
 
+// GetDepartmentsByHotelID returns all departments for a given hotel.
+func (r *HotelsRepository) GetDepartmentsByHotelID(ctx context.Context, hotelID string) ([]*models.Department, error) {
+	rows, err := r.db.Query(ctx, `
+		SELECT id, hotel_id, name, created_at, updated_at
+		FROM departments
+		WHERE hotel_id = $1
+		ORDER BY name ASC
+	`, hotelID)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+
+	var departments []*models.Department
+	for rows.Next() {
+		var d models.Department
+		if err := rows.Scan(&d.ID, &d.HotelID, &d.Name, &d.CreatedAt, &d.UpdatedAt); err != nil {
+			return nil, err
+		}
+		departments = append(departments, &d)
+	}
+	if err := rows.Err(); err != nil {
+		return nil, err
+	}
+	return departments, nil
+}
+
+// InsertDepartment creates a new department for a hotel.
+func (r *HotelsRepository) InsertDepartment(ctx context.Context, hotelID, name string) (*models.Department, error) {
+	var d models.Department
 	err := r.db.QueryRow(ctx, `
-		INSERT INTO hotels (
-			name, floors
-		) VALUES (
-			$1, $2
-		)
-		RETURNING id, created_at, updated_at
-	`,
-		hotel.Name,
-		hotel.Floors,
-	).Scan(&createdHotel.ID, &createdHotel.CreatedAt, &createdHotel.UpdatedAt)
+		INSERT INTO departments (hotel_id, name)
+		VALUES ($1, $2)
+		RETURNING id, hotel_id, name, created_at, updated_at
+	`, hotelID, name).Scan(&d.ID, &d.HotelID, &d.Name, &d.CreatedAt, &d.UpdatedAt)
+	if err != nil {
+		if errors.Is(err, pgx.ErrNoRows) {
+			return nil, errs.ErrAlreadyExistsInDB
+		}
+		return nil, err
+	}
+	return &d, nil
+}
 
+// UpdateDepartment renames a department.
+func (r *HotelsRepository) UpdateDepartment(ctx context.Context, id, hotelID, name string) (*models.Department, error) {
+	var d models.Department
+	err := r.db.QueryRow(ctx, `
+		UPDATE departments
+		SET name = $1, updated_at = NOW()
+		WHERE id = $2 AND hotel_id = $3
+		RETURNING id, hotel_id, name, created_at, updated_at
+	`, name, id, hotelID).Scan(&d.ID, &d.HotelID, &d.Name, &d.CreatedAt, &d.UpdatedAt)
 	if err != nil {
+		if errors.Is(err, pgx.ErrNoRows) {
+			return nil, errs.ErrNotFoundInDB
+		}
 		return nil, err
 	}
+	return &d, nil
+}
 
-	return createdHotel, nil
+// DeleteDepartment removes a department by id, scoped to the hotel.
+func (r *HotelsRepository) DeleteDepartment(ctx context.Context, id, hotelID string) error {
+	tag, err := r.db.Exec(ctx, `
+		DELETE FROM departments
+		WHERE id = $1 AND hotel_id = $2
+	`, id, hotelID)
+	if err != nil {
+		return err
+	}
+	if tag.RowsAffected() == 0 {
+		return errs.ErrNotFoundInDB
+	}
+	return nil
+}
+
+// InsertDefaultDepartments seeds the default departments for a hotel.
+// Uses ON CONFLICT DO NOTHING so it is safe to call on hotels that already
+// have some (but not all) defaults.
+func (r *HotelsRepository) InsertDefaultDepartments(ctx context.Context, hotelID string) error {
+	_, err := r.db.Exec(ctx, `
+		INSERT INTO departments (hotel_id, name)
+		SELECT $1, unnest($2::text[])
+		ON CONFLICT (hotel_id, name) DO NOTHING
+	`, hotelID, models.DefaultDepartments)
+	if err != nil {
+		return fmt.Errorf("%w: %w", errs.ErrDefaultDepartmentInsertDB, err)
+	}
+	return nil
 }
diff --git a/backend/internal/repository/notifications.go b/backend/internal/repository/notifications.go
new file mode 100644
index 000000000..c29f728b4
--- /dev/null
+++ b/backend/internal/repository/notifications.go
@@ -0,0 +1,115 @@
+package repository
+
+import (
+	"context"
+	"encoding/json"
+
+	"github.com/generate/selfserve/internal/errs"
+	"github.com/generate/selfserve/internal/models"
+	"github.com/google/uuid"
+	"github.com/jackc/pgx/v5/pgxpool"
+)
+
+type NotificationsRepository struct {
+	db *pgxpool.Pool
+}
+
+func NewNotificationsRepository(db *pgxpool.Pool) *NotificationsRepository {
+	return &NotificationsRepository{db: db}
+}
+
+func (r *NotificationsRepository) InsertNotification(ctx context.Context, userID string, notifType models.NotificationType, title, body string) (*models.Notification, error) {
+	n := &models.Notification{
+		ID:     uuid.New().String(),
+		UserID: userID,
+		Type:   notifType,
+		Title:  title,
+		Body:   body,
+	}
+	err := r.db.QueryRow(ctx, `
+		INSERT INTO public.notifications (id, user_id, type, title, body)
+		VALUES ($1, $2, $3, $4, $5)
+		RETURNING created_at
+	`, n.ID, n.UserID, n.Type, n.Title, n.Body).Scan(&n.CreatedAt)
+	if err != nil {
+		return nil, err
+	}
+	return n, nil
+}
+
+func (r *NotificationsRepository) FindByUserID(ctx context.Context, userID string) ([]*models.Notification, error) {
+	rows, err := r.db.Query(ctx, `
+		SELECT id, user_id, type, title, body, data, read_at, created_at
+		FROM public.notifications
+		WHERE user_id = $1
+		ORDER BY created_at DESC
+		LIMIT 50
+	`, userID)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+
+	var notifications []*models.Notification
+	for rows.Next() {
+		n := &models.Notification{}
+		var data []byte
+		if err := rows.Scan(&n.ID, &n.UserID, &n.Type, &n.Title, &n.Body, &data, &n.ReadAt, &n.CreatedAt); err != nil {
+			return nil, err
+		}
+		if data != nil {
+			n.Data = json.RawMessage(data)
+		}
+		notifications = append(notifications, n)
+	}
+	return notifications, rows.Err()
+}
+
+func (r *NotificationsRepository) MarkRead(ctx context.Context, id, userID string) error {
+	result, err := r.db.Exec(ctx, `
+		UPDATE public.notifications SET read_at = NOW() WHERE id = $1 AND user_id = $2 AND read_at IS NULL
+	`, id, userID)
+	if err != nil {
+		return err
+	}
+	if result.RowsAffected() == 0 {
+		return errs.ErrNotFoundInDB
+	}
+	return nil
+}
+
+func (r *NotificationsRepository) MarkAllRead(ctx context.Context, userID string) error {
+	_, err := r.db.Exec(ctx, `
+		UPDATE public.notifications SET read_at = NOW() WHERE user_id = $1 AND read_at IS NULL
+	`, userID)
+	return err
+}
+
+func (r *NotificationsRepository) UpsertDeviceToken(ctx context.Context, userID, token, platform string) error {
+	_, err := r.db.Exec(ctx, `
+		INSERT INTO public.device_tokens (user_id, token, platform)
+		VALUES ($1, $2, $3)
+		ON CONFLICT (user_id, token) DO NOTHING
+	`, userID, token, platform)
+	return err
+}
+
+func (r *NotificationsRepository) FindDeviceTokensByUserID(ctx context.Context, userID string) ([]string, error) {
+	rows, err := r.db.Query(ctx, `
+		SELECT token FROM public.device_tokens WHERE user_id = $1
+	`, userID)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+
+	var tokens []string
+	for rows.Next() {
+		var token string
+		if err := rows.Scan(&token); err != nil {
+			return nil, err
+		}
+		tokens = append(tokens, token)
+	}
+	return tokens, rows.Err()
+}
diff --git a/backend/internal/repository/requests.go b/backend/internal/repository/requests.go
index 45c12b654..92fd3ff74 100644
--- a/backend/internal/repository/requests.go
+++ b/backend/internal/repository/requests.go
@@ -3,6 +3,7 @@ package repository
 import (
 	"context"
 	"errors"
+	"time"
 
 	"github.com/generate/selfserve/internal/errs"
 	"github.com/generate/selfserve/internal/models"
@@ -19,16 +20,27 @@ func NewRequestsRepo(db *pgxpool.Pool) *RequestsRepository {
 }
 
 func (r *RequestsRepository) InsertRequest(ctx context.Context, req *models.Request) (*models.Request, error) {
-	err := r.db.QueryRow(ctx, `INSERT INTO requests (
-	hotel_id, guest_id, user_id, reservation_id, name, description,
-	room_id, request_category, request_type, department, status,
-	priority, estimated_completion_time, scheduled_time, notes
-	) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15)
-		RETURNING id, created_at, updated_at
-	`, req.HotelID, req.GuestID, req.UserID, req.ReservationID, req.Name,
+	if req.ID == "" {
+		return nil, errors.New("request ID must be provided by the caller")
+	}
+
+	err := r.db.QueryRow(ctx, `
+		INSERT INTO requests (
+			id, hotel_id, guest_id, user_id, reservation_id, name, description,
+			room_id, request_category, request_type, department, status,
+			priority, estimated_completion_time, scheduled_time, notes,
+			request_version, created_at, changed_by
+		) VALUES (
+			$1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16,
+			NOW(),
+			COALESCE((SELECT MIN(created_at) FROM requests WHERE id = $1), NOW()),
+			$17
+		)
+		RETURNING id, created_at, request_version
+	`, req.ID, req.HotelID, req.GuestID, req.UserID, req.ReservationID, req.Name,
 		req.Description, req.RoomID, req.RequestCategory, req.RequestType, req.Department,
 		req.Status, req.Priority, req.EstimatedCompletionTime,
-		req.ScheduledTime, req.Notes).Scan(&req.ID, &req.CreatedAt, &req.UpdatedAt)
+		req.ScheduledTime, req.Notes, req.ChangedBy).Scan(&req.ID, &req.CreatedAt, &req.RequestVersion)
 
 	if err != nil {
 		return nil, err
@@ -37,21 +49,91 @@ func (r *RequestsRepository) InsertRequest(ctx context.Context, req *models.Requ
 	return req, nil
 }
 
+func (r *RequestsRepository) UpdateRequest(ctx context.Context, id string, update *models.RequestUpdateInput, changedBy *string) (*models.Request, error) {
+	row := r.db.QueryRow(ctx, `
+		WITH current AS (
+			SELECT *
+			FROM requests
+			WHERE id = $1
+			ORDER BY request_version DESC
+			LIMIT 1
+		)
+		INSERT INTO requests (
+			id, hotel_id, guest_id, user_id, reservation_id, name, description,
+			room_id, request_category, request_type, department, status,
+			priority, estimated_completion_time, scheduled_time, completed_at, notes,
+			request_version, created_at, changed_by
+		)
+		SELECT
+			current.id,
+			current.hotel_id,
+			COALESCE($2, current.guest_id),
+			CASE WHEN $17 THEN NULL ELSE COALESCE($3, current.user_id) END,
+			COALESCE($4, current.reservation_id),
+			COALESCE($5, current.name),
+			COALESCE($6, current.description),
+			COALESCE($7, current.room_id),
+			COALESCE($8, current.request_category),
+			COALESCE($9, current.request_type),
+			COALESCE($10, current.department),
+			COALESCE($11, current.status),
+			COALESCE($12, current.priority),
+			COALESCE($13, current.estimated_completion_time),
+			COALESCE($14, current.scheduled_time),
+			COALESCE($15, current.completed_at),
+			COALESCE($16, current.notes),
+			NOW(),
+			current.created_at,
+			$18
+		FROM current
+		RETURNING id, created_at, request_version
+	`, id,
+		update.GuestID,
+		update.UserID,
+		update.ReservationID,
+		update.Name,
+		update.Description,
+		update.RoomID,
+		update.RequestCategory,
+		update.RequestType,
+		update.Department,
+		update.Status,
+		update.Priority,
+		update.EstimatedCompletionTime,
+		update.ScheduledTime,
+		update.CompletedAt,
+		update.Notes,
+		update.Unassign,
+		changedBy,
+	)
+
+	var req models.Request
+	if err := row.Scan(&req.ID, &req.CreatedAt, &req.RequestVersion); err != nil {
+		if errors.Is(err, pgx.ErrNoRows) {
+			return nil, errs.ErrNotFoundInDB
+		}
+		return nil, err
+	}
+
+	return r.FindRequest(ctx, id)
+}
+
 func (r *RequestsRepository) FindRequest(ctx context.Context, id string) (*models.Request, error) {
 
 	row := r.db.QueryRow(ctx, `
-        SELECT *
-        FROM requests
-        WHERE id = $1
-    `, id)
+		WITH latest AS (
+			SELECT * FROM requests WHERE id = $1 ORDER BY request_version DESC LIMIT 1
+		)
+		SELECT * FROM latest WHERE status != 'archived'
+	`, id)
 
 	var request models.Request
 
 	err := row.Scan(&request.ID, &request.HotelID, &request.GuestID,
-		&request.UserID, &request.ReservationID, &request.Name, &request.Description,
+		&request.ReservationID, &request.Name, &request.Description,
 		&request.RoomID, &request.RequestCategory, &request.RequestType, &request.Department, &request.Status,
 		&request.Priority, &request.EstimatedCompletionTime, &request.ScheduledTime, &request.CompletedAt, &request.Notes,
-		&request.CreatedAt, &request.UpdatedAt)
+		&request.CreatedAt, &request.UserID, &request.RequestVersion, &request.ChangedBy)
 
 	if err != nil {
 		if errors.Is(err, pgx.ErrNoRows) {
@@ -63,70 +145,267 @@ func (r *RequestsRepository) FindRequest(ctx context.Context, id string) (*model
 	return &request, nil
 }
 
-func (r *RequestsRepository) FindRequestsByStatusPaginated(ctx context.Context, cursor string, status string, hotelID string, pageSize int) ([]*models.Request, string, error) {
+func (r *RequestsRepository) FindRequests(ctx context.Context) ([]models.Request, error) {
 	rows, err := r.db.Query(ctx, `
-			SELECT *
-			FROM requests
-			WHERE id > $1 AND status = $2 AND hotel_id = $3
-			ORDER BY id
-			LIMIT $4
-		`, cursor, status, hotelID, pageSize+1)
-
+		SELECT * FROM (
+			SELECT DISTINCT ON (id) * FROM requests ORDER BY id, request_version DESC
+		) latest
+		WHERE status != 'archived'
+		ORDER BY created_at DESC
+	`)
 	if err != nil {
-		return nil, "", err
+		return nil, err
 	}
-
 	defer rows.Close()
 
-	var requests []*models.Request
+	var requests []models.Request
 	for rows.Next() {
 		var request models.Request
 		err := rows.Scan(&request.ID, &request.HotelID, &request.GuestID,
-			&request.UserID, &request.ReservationID, &request.Name, &request.Description,
+			&request.ReservationID, &request.Name, &request.Description,
 			&request.RoomID, &request.RequestCategory, &request.RequestType, &request.Department, &request.Status,
 			&request.Priority, &request.EstimatedCompletionTime, &request.ScheduledTime, &request.CompletedAt, &request.Notes,
-			&request.CreatedAt, &request.UpdatedAt)
+			&request.CreatedAt, &request.UserID, &request.RequestVersion, &request.ChangedBy)
 		if err != nil {
-			return nil, "", err
+			return nil, err
 		}
-		requests = append(requests, &request)
+		requests = append(requests, request)
 	}
 
 	if err := rows.Err(); err != nil {
-		return nil, "", errs.ErrNotFoundInDB
+		return nil, err
 	}
 
-	if len(requests) == pageSize+1 {
-		return requests[:pageSize], requests[pageSize-1].ID, nil
+	return requests, nil
+}
+
+func (r *RequestsRepository) FindRequestsByGuestID(ctx context.Context, guestID, hotelID, cursorID string, cursorVersion time.Time, limit int) ([]*models.GuestRequest, error) {
+	rows, err := r.db.Query(ctx, `
+		WITH latest AS (
+			SELECT DISTINCT ON (r.id)
+				r.id, r.name, r.priority, r.status, r.description, r.notes,
+				rm.room_number, r.request_type, r.request_category, r.created_at,
+				r.request_version, r.department, r.user_id, rm.floor
+			FROM public.requests r
+			LEFT JOIN public.rooms rm ON rm.id::text = r.room_id
+			WHERE r.guest_id = $1
+			  AND r.hotel_id = $2
+			ORDER BY r.id ASC, r.request_version DESC
+		)
+		SELECT * FROM latest
+		WHERE status != 'archived'
+		  AND ($3::text = '' OR (id::text, request_version) > ($3, $4))
+		ORDER BY id ASC
+		LIMIT $5
+	`, guestID, hotelID, cursorID, cursorVersion, limit)
+	if err != nil {
+		return nil, err
 	}
+	defer rows.Close()
 
-	return requests, "", nil
+	return scanGuestRequests(rows)
 }
 
-func (r *RequestsRepository) FindRequests(ctx context.Context) ([]models.Request, error) {
-	rows, err := r.db.Query(ctx, `SELECT * FROM requests ORDER BY created_at DESC`)
+func (r *RequestsRepository) FindRequestsByRoomIDAndUserID(ctx context.Context, roomID, hotelID, userID, cursorID string, cursorVersion time.Time, limit int) ([]*models.GuestRequest, error) {
+	rows, err := r.db.Query(ctx, `
+		WITH latest AS (
+			SELECT DISTINCT ON (r.id)
+				r.id, r.name, r.priority, r.status, r.description, r.notes,
+				rm.room_number, r.request_type, r.request_category, r.created_at,
+				r.request_version, r.department AS department_id, d.name AS department_name, r.user_id, rm.floor
+			FROM public.requests r
+			LEFT JOIN public.rooms rm ON rm.id::text = r.room_id
+			LEFT JOIN public.departments d ON d.id::text = r.department
+			WHERE r.room_id = $1
+			  AND r.hotel_id = $2
+			ORDER BY r.id ASC, r.request_version DESC
+		)
+		SELECT id, name, priority, status, description, notes, room_number,
+		       request_type, request_category, created_at, request_version,
+		       department_id, department_name, user_id, floor
+		FROM latest
+		WHERE status != 'archived'
+		  AND user_id = $3
+		  AND ($4::text = '' OR (id::text, request_version) > ($4, $5))
+		ORDER BY id ASC
+		LIMIT $6
+	`, roomID, hotelID, userID, cursorID, cursorVersion, limit)
 	if err != nil {
 		return nil, err
 	}
 	defer rows.Close()
 
-	var requests []models.Request
+	return scanGuestRequests(rows)
+}
+
+func (r *RequestsRepository) FindUnassignedRequestsByRoomIDAndUserID(ctx context.Context, roomID, hotelID, cursorID string, cursorVersion time.Time, limit int) ([]*models.GuestRequest, error) {
+	rows, err := r.db.Query(ctx, `
+		WITH latest AS (
+			SELECT DISTINCT ON (r.id)
+				r.id, r.name, r.priority, r.status, r.description, r.notes,
+				rm.room_number, r.request_type, r.request_category, r.created_at,
+				r.request_version, r.department AS department_id, d.name AS department_name, r.user_id, rm.floor
+			FROM public.requests r
+			LEFT JOIN public.rooms rm ON rm.id::text = r.room_id
+			LEFT JOIN public.departments d ON d.id::text = r.department
+			WHERE r.room_id = $1
+			  AND r.hotel_id = $2
+			ORDER BY r.id ASC, r.request_version DESC
+		)
+		SELECT id, name, priority, status, description, notes, room_number,
+		       request_type, request_category, created_at, request_version,
+		       department_id, department_name, user_id, floor
+		FROM latest
+		WHERE status != 'archived'
+		  AND user_id IS NULL
+		  AND ($3::text = '' OR (id::text, request_version) > ($3, $4))
+		ORDER BY id ASC
+		LIMIT $5
+	`, roomID, hotelID, cursorID, cursorVersion, limit)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+
+	return scanGuestRequests(rows)
+}
+
+func (r *RequestsRepository) FindRequestsPaginated(
+	ctx context.Context,
+	input *models.RequestsFeedInput,
+	cursorID string,
+	cursorCreatedAt time.Time,
+	cursorPriorityRank int,
+	limit int,
+) ([]*models.GuestRequest, error) {
+	priorities := input.Priorities
+	if priorities == nil {
+		priorities = []string{}
+	}
+	departments := input.Departments
+	if departments == nil {
+		departments = []string{}
+	}
+	floors := input.Floors
+	if floors == nil {
+		floors = []int{}
+	}
+	const baseFilter = `
+		WITH latest AS (
+			SELECT DISTINCT ON (r.id)
+				r.id, r.name, r.priority, r.status, r.description, r.notes,
+				rm.room_number, r.request_type, r.request_category, r.created_at,
+				r.request_version, r.department AS department_id, d.name AS department_name, r.user_id, rm.floor,
+				CASE r.priority WHEN 'high' THEN 1 WHEN 'medium' THEN 2 ELSE 3 END AS priority_rank
+			FROM public.requests r
+			LEFT JOIN public.rooms rm ON rm.id::text = r.room_id
+			LEFT JOIN public.departments d ON d.id::text = r.department
+			WHERE r.hotel_id = $1
+			  AND ($4::text = '' OR r.status = $4)
+			  AND (cardinality($5::text[]) = 0 OR r.priority = ANY($5))
+			  AND (cardinality($7::int[]) = 0 OR rm.floor = ANY($7))
+			  AND ($8::text = '' OR r.name ILIKE '%' || $8 || '%' OR r.description ILIKE '%' || $8 || '%')
+			ORDER BY r.id ASC, r.request_version DESC
+		)
+		SELECT id, name, priority, status, description, notes, room_number,
+		       request_type, request_category, created_at, request_version,
+		       department_id, department_name, user_id, floor
+		FROM latest
+		WHERE status != 'archived'
+		  AND (
+		    ($3::bool AND user_id IS NULL)
+		    OR (NOT $3::bool AND ($2::text = '' OR user_id = $2))
+		)
+		  AND (cardinality($6::text[]) = 0 OR department_id = ANY($6))
+	`
+
+	var (
+		rows pgx.Rows
+		err  error
+	)
+
+	switch input.Sort {
+	case models.SortByNewest:
+		rows, err = r.db.Query(ctx, baseFilter+`
+			AND ($9::text = '' OR (created_at, id::text) < ($10, $9))
+			ORDER BY created_at DESC, id DESC
+			LIMIT $11
+		`, input.HotelID, input.UserID, input.Unassigned, input.Status, priorities, departments, floors, input.Search, cursorID, cursorCreatedAt, limit)
+
+	case models.SortByOldest:
+		rows, err = r.db.Query(ctx, baseFilter+`
+			AND ($9::text = '' OR (created_at, id::text) > ($10, $9))
+			ORDER BY created_at ASC, id ASC
+			LIMIT $11
+		`, input.HotelID, input.UserID, input.Unassigned, input.Status, priorities, departments, floors, input.Search, cursorID, cursorCreatedAt, limit)
+
+	default: // SortByPriority
+		rows, err = r.db.Query(ctx, baseFilter+`
+			AND ($9::text = '' OR (priority_rank, id::text) > ($10::int, $9))
+			ORDER BY priority_rank ASC, id ASC
+			LIMIT $11
+		`, input.HotelID, input.UserID, input.Unassigned, input.Status, priorities, departments, floors, input.Search, cursorID, cursorPriorityRank, limit)
+	}
+
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+
+	return scanGuestRequests(rows)
+}
+
+func (r *RequestsRepository) FindRequestVersions(ctx context.Context, id string) ([]*models.Request, error) {
+	rows, err := r.db.Query(ctx, `
+		SELECT id, hotel_id, guest_id, reservation_id, name, description,
+		       room_id, request_category, request_type, department, status,
+		       priority, estimated_completion_time, scheduled_time, completed_at, notes,
+		       created_at, user_id, request_version, changed_by
+		FROM requests
+		WHERE id = $1
+		ORDER BY request_version ASC
+	`, id)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+
+	var versions []*models.Request
 	for rows.Next() {
-		var request models.Request
-		err := rows.Scan(&request.ID, &request.HotelID, &request.GuestID,
-			&request.UserID, &request.ReservationID, &request.Name, &request.Description,
-			&request.RoomID, &request.RequestCategory, &request.RequestType, &request.Department, &request.Status,
-			&request.Priority, &request.EstimatedCompletionTime, &request.ScheduledTime, &request.CompletedAt, &request.Notes,
-			&request.CreatedAt, &request.UpdatedAt)
-		if err != nil {
+		var req models.Request
+		if err := rows.Scan(
+			&req.ID, &req.HotelID, &req.GuestID,
+			&req.ReservationID, &req.Name, &req.Description,
+			&req.RoomID, &req.RequestCategory, &req.RequestType, &req.Department, &req.Status,
+			&req.Priority, &req.EstimatedCompletionTime, &req.ScheduledTime, &req.CompletedAt, &req.Notes,
+			&req.CreatedAt, &req.UserID, &req.RequestVersion, &req.ChangedBy,
+		); err != nil {
 			return nil, err
 		}
-		requests = append(requests, request)
+		versions = append(versions, &req)
 	}
-
 	if err := rows.Err(); err != nil {
 		return nil, err
 	}
+	if len(versions) == 0 {
+		return nil, errs.ErrNotFoundInDB
+	}
+	return versions, nil
+}
 
-	return requests, nil
+func scanGuestRequests(rows pgx.Rows) ([]*models.GuestRequest, error) {
+	requests := make([]*models.GuestRequest, 0)
+	for rows.Next() {
+		var req models.GuestRequest
+		if err := rows.Scan(
+			&req.ID, &req.Name, &req.Priority, &req.Status,
+			&req.Description, &req.Notes, &req.RoomNumber,
+			&req.RequestType, &req.RequestCategory, &req.CreatedAt,
+			&req.RequestVersion, &req.DepartmentID, &req.DepartmentName, &req.UserID, &req.Floor,
+		); err != nil {
+			return nil, err
+		}
+		requests = append(requests, &req)
+	}
+	return requests, rows.Err()
 }
diff --git a/backend/internal/repository/rooms.go b/backend/internal/repository/rooms.go
index fac0359db..9da41c03a 100644
--- a/backend/internal/repository/rooms.go
+++ b/backend/internal/repository/rooms.go
@@ -3,9 +3,12 @@ package repository
 import (
 	"context"
 	"encoding/json"
+	"errors"
 
+	"github.com/generate/selfserve/internal/errs"
 	"github.com/generate/selfserve/internal/models"
 	"github.com/generate/selfserve/internal/utils"
+	"github.com/jackc/pgx/v5"
 	"github.com/jackc/pgx/v5/pgxpool"
 )
 
@@ -17,38 +20,131 @@ func NewRoomsRepository(pool *pgxpool.Pool) *RoomsRepository {
 	return &RoomsRepository{db: pool}
 }
 
-func (r *RoomsRepository) FindRoomsWithOptionalGuestBookingsByFloor(ctx context.Context, filters *models.RoomFilters, hotelID string, cursorRoomNumber int) ([]*models.RoomWithOptionalGuestBooking, error) {
+func (r *RoomsRepository) FindRoomsWithOptionalGuestBookingsByFloor(ctx context.Context, filters *models.FilterRoomsRequest, hotelID string, cursorRoomNumber int) ([]*models.RoomWithOptionalGuestBooking, error) {
 	limit := utils.ResolveLimit(filters.Limit)
 
-	// Paginate before joining with guests
-	rows, err := r.db.Query(ctx, `
-		WITH paginated_rooms AS (
-			SELECT id, room_number, floor, suite_type, room_status
-			FROM rooms
-			WHERE hotel_id = $4
-				AND ($1::int[] IS NULL OR floor = ANY($1))
-				AND room_number > $2
-			ORDER BY room_number ASC
-			LIMIT $3
+	statusFilters := filters.Status
+	if statusFilters == nil {
+		statusFilters = []string{}
+	}
+	attrFilters := filters.Attributes
+	if attrFilters == nil {
+		attrFilters = []string{}
+	}
+	advFilters := filters.Advanced
+	if advFilters == nil {
+		advFilters = []string{}
+	}
+
+	// $1 = hotelID, $2 = floors, $3 = status filters, $4 = attribute filters,
+	// $5 = advanced filters, $6 = cursorRoomNumber, $7 = limit+1
+	const base = `
+		WITH room_task_info AS (
+			SELECT
+				room_id::uuid AS room_id,
+				COALESCE(
+					CASE
+						WHEN BOOL_OR(priority = 'high') THEN 'high'
+						WHEN BOOL_OR(priority = 'medium') THEN 'medium'
+						ELSE 'low'
+					END,
+					'low'
+				) AS priority,
+				BOOL_OR(user_id IS NULL) AS has_unassigned_tasks
+			FROM (
+				SELECT DISTINCT ON (id) id, room_id, status, priority, user_id
+				FROM requests
+				WHERE hotel_id = $1 AND room_id IS NOT NULL
+				ORDER BY id, request_version DESC
+			) latest
+			WHERE status NOT IN ('completed', 'archived')
+			GROUP BY room_id
+		),
+		room_enriched AS (
+			SELECT
+				r.id, r.room_number, r.floor, r.suite_type, r.room_status, r.is_accessible,
+				CASE WHEN COUNT(gb_active.id) > 0 THEN 'active' ELSE 'inactive' END AS booking_status,
+				BOOL_OR(gb_arrive.id IS NOT NULL) AS has_arrivals_today,
+				BOOL_OR(gb_depart.id IS NOT NULL) AS has_departures_today,
+				json_agg(
+					json_build_object(
+						'id',              g.id,
+						'first_name',      g.first_name,
+						'last_name',       g.last_name,
+						'profile_picture', g.profile_picture
+					)
+				) FILTER (WHERE g.id IS NOT NULL) AS guests,
+				COALESCE(MAX(rti.priority), 'low') AS priority,
+				COALESCE(BOOL_OR(rti.has_unassigned_tasks), FALSE) AS has_unassigned_tasks
+			FROM rooms r
+			LEFT JOIN guest_bookings gb_active ON r.id = gb_active.room_id
+				AND gb_active.status = 'active'
+				AND gb_active.hotel_id = $1
+			LEFT JOIN guests g ON g.id = gb_active.guest_id
+			LEFT JOIN guest_bookings gb_arrive ON r.id = gb_arrive.room_id
+				AND gb_arrive.hotel_id = $1
+				AND gb_arrive.arrival_date = CURRENT_DATE
+			LEFT JOIN guest_bookings gb_depart ON r.id = gb_depart.room_id
+				AND gb_depart.hotel_id = $1
+				AND gb_depart.departure_date = CURRENT_DATE
+			LEFT JOIN room_task_info rti ON r.id = rti.room_id
+			WHERE r.hotel_id = $1
+				AND ($2::int[] IS NULL OR r.floor = ANY($2))
+			GROUP BY r.id, r.room_number, r.floor, r.suite_type, r.room_status, r.is_accessible
 		)
-		SELECT
-			pr.room_number, pr.floor, pr.suite_type, pr.room_status,
-			json_agg(
-				json_build_object(
-					'id',              guests.id,
-					'first_name',      guests.first_name,
-					'last_name',       guests.last_name,
-					'profile_picture', guests.profile_picture
-				)
-			) FILTER (WHERE guests.id IS NOT NULL) AS guests
-		FROM paginated_rooms pr
-		LEFT JOIN guest_bookings ON pr.id = guest_bookings.room_id
-			AND guest_bookings.status = 'active'
-			AND guest_bookings.hotel_id = $4
-		LEFT JOIN guests ON guests.id = guest_bookings.guest_id
-		GROUP BY pr.id, pr.room_number, pr.floor, pr.suite_type, pr.room_status
-		ORDER BY pr.room_number ASC`,
-		filters.Floors, cursorRoomNumber, limit+1, hotelID)
+		SELECT id, room_number, floor, suite_type, room_status, is_accessible, booking_status, guests, priority, has_unassigned_tasks
+		FROM room_enriched
+		WHERE (cardinality($3::text[]) = 0 OR (
+				('occupied'   = ANY($3) AND booking_status = 'active')
+			 OR ('vacant'     = ANY($3) AND booking_status = 'inactive')
+			 OR ('open-tasks' = ANY($3) AND has_unassigned_tasks)
+		))
+		  AND (cardinality($4::text[]) = 0 OR (
+				('standard'   = ANY($4) AND LOWER(suite_type) = 'standard')
+			 OR ('deluxe'     = ANY($4) AND LOWER(suite_type) = 'deluxe')
+			 OR ('suite'      = ANY($4) AND LOWER(suite_type) LIKE '%suite%')
+			 OR ('accessible' = ANY($4) AND is_accessible)
+		))
+		  AND (cardinality($5::text[]) = 0 OR (
+				('arrivals-today'   = ANY($5) AND has_arrivals_today)
+			 OR ('departures-today' = ANY($5) AND has_departures_today)
+		))
+	`
+
+	var (
+		rows pgx.Rows
+		err  error
+	)
+
+	switch filters.Sort {
+	case models.RoomSortDescending:
+		rows, err = r.db.Query(ctx, base+`
+			AND ($6::int = 0 OR room_number < $6)
+			ORDER BY room_number DESC
+			LIMIT $7
+		`, hotelID, filters.Floors, statusFilters, attrFilters, advFilters, cursorRoomNumber, limit+1)
+
+	case models.RoomSortUrgency:
+		rows, err = r.db.Query(ctx, base+`
+			AND ($6::int = 0 OR room_number > $6)
+			ORDER BY
+				CASE priority
+					WHEN 'high' THEN 3
+					WHEN 'medium' THEN 2
+					ELSE 1
+				END DESC,
+				has_unassigned_tasks DESC,
+				room_number ASC
+			LIMIT $7
+		`, hotelID, filters.Floors, statusFilters, attrFilters, advFilters, cursorRoomNumber, limit+1)
+
+	default: // ascending
+		rows, err = r.db.Query(ctx, base+`
+			AND ($6::int = 0 OR room_number > $6)
+			ORDER BY room_number ASC
+			LIMIT $7
+		`, hotelID, filters.Floors, statusFilters, attrFilters, advFilters, cursorRoomNumber, limit+1)
+	}
 
 	if err != nil {
 		return nil, err
@@ -59,11 +155,13 @@ func (r *RoomsRepository) FindRoomsWithOptionalGuestBookingsByFloor(ctx context.
 	for rows.Next() {
 		var rb models.RoomWithOptionalGuestBooking
 		var guestsJSON json.RawMessage
-		err := rows.Scan(
-			&rb.RoomNumber, &rb.Floor, &rb.SuiteType, &rb.RoomStatus,
+		if err := rows.Scan(
+			&rb.ID, &rb.RoomNumber, &rb.Floor, &rb.SuiteType, &rb.RoomStatus, &rb.IsAccessible,
+			&rb.BookingStatus,
 			&guestsJSON,
-		)
-		if err != nil {
+			&rb.Priority,
+			&rb.HasUnassignedTasks,
+		); err != nil {
 			return nil, err
 		}
 		if guestsJSON != nil {
@@ -102,3 +200,112 @@ func (r *RoomsRepository) FindAllFloors(ctx context.Context, hotelID string) ([]
 
 	return floors, nil
 }
+
+func (r *RoomsRepository) FindRoomByID(ctx context.Context, hotelID string, id string) (*models.RoomWithOptionalGuestBooking, error) {
+	row := r.db.QueryRow(ctx, `
+		WITH latest_requests AS (
+			SELECT DISTINCT ON (r.id)
+				r.id,
+				r.room_id,
+				r.user_id,
+				r.priority,
+				r.status
+			FROM public.requests r
+			WHERE r.hotel_id = $2
+			ORDER BY r.id ASC, r.request_version DESC
+		)
+		SELECT
+			r.id, r.room_number, r.floor, r.suite_type, r.room_status, r.is_accessible,
+			CASE WHEN COUNT(gb.id) > 0 THEN 'active' ELSE 'inactive' END AS booking_status,
+			json_agg(
+				json_build_object(
+					'id',              g.id,
+					'first_name',      g.first_name,
+					'last_name',       g.last_name,
+					'profile_picture', g.profile_picture
+				)
+			) FILTER (WHERE g.id IS NOT NULL) AS guests,
+			COALESCE(
+				CASE
+					WHEN BOOL_OR(lr.status != 'completed' AND lr.priority = 'high') THEN 'high'
+					WHEN BOOL_OR(lr.status != 'completed' AND lr.priority = 'medium') THEN 'medium'
+					WHEN BOOL_OR(lr.status != 'completed' AND lr.priority = 'low') THEN 'low'
+					ELSE 'low'
+				END,
+				'low'
+			) AS priority,
+			COALESCE(BOOL_OR(lr.status != 'completed' AND lr.user_id IS NULL), FALSE) AS has_unassigned_tasks
+		FROM rooms r
+		LEFT JOIN guest_bookings gb ON r.id = gb.room_id
+			AND gb.status = 'active'
+			AND gb.hotel_id = $2
+		LEFT JOIN guests g ON g.id = gb.guest_id
+		LEFT JOIN latest_requests lr ON lr.room_id = r.id::text
+		WHERE r.id = $1 AND r.hotel_id = $2
+		GROUP BY r.id, r.room_number, r.floor, r.suite_type, r.room_status, r.is_accessible`,
+		id, hotelID)
+
+	var rb models.RoomWithOptionalGuestBooking
+	var guestsJSON json.RawMessage
+	err := row.Scan(&rb.ID, &rb.RoomNumber, &rb.Floor, &rb.SuiteType, &rb.RoomStatus, &rb.IsAccessible, &rb.BookingStatus, &guestsJSON, &rb.Priority, &rb.HasUnassignedTasks)
+	if err != nil {
+		if errors.Is(err, pgx.ErrNoRows) {
+			return nil, errs.ErrNotFoundInDB
+		}
+		return nil, err
+	}
+	if guestsJSON != nil {
+		if err := json.Unmarshal(guestsJSON, &rb.Guests); err != nil {
+			return nil, err
+		}
+	}
+	return &rb, nil
+}
+
+func (r *RoomsRepository) InsertRoom(ctx context.Context, hotelID string, roomNumber, floor int, suiteType, roomStatus string, isAccessible bool, features []string) (*models.Room, error) {
+	var room models.Room
+	err := r.db.QueryRow(ctx, `
+		INSERT INTO rooms (hotel_id, room_number, floor, suite_type, room_status, is_accessible, features)
+		VALUES ($1, $2, $3, $4, $5, $6, $7)
+		RETURNING id, room_number, floor, suite_type, room_status, is_accessible
+	`, hotelID, roomNumber, floor, suiteType, roomStatus, isAccessible, features).
+		Scan(&room.ID, &room.RoomNumber, &room.Floor, &room.SuiteType, &room.RoomStatus, &room.IsAccessible)
+	if err != nil {
+		return nil, err
+	}
+	return &room, nil
+}
+
+func (r *RoomsRepository) FindRoomByNumber(ctx context.Context, hotelID string, roomReference string) (*models.Room, error) {
+	rows, err := r.db.Query(ctx, `
+		SELECT id, room_number, floor, suite_type, room_status, is_accessible
+		FROM rooms
+		WHERE hotel_id = $1
+			AND room_number::text = $2
+		LIMIT 2`,
+		hotelID, roomReference)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+
+	var rooms []*models.Room
+	for rows.Next() {
+		var room models.Room
+		if err := rows.Scan(&room.ID, &room.RoomNumber, &room.Floor, &room.SuiteType, &room.RoomStatus, &room.IsAccessible); err != nil {
+			return nil, err
+		}
+		rooms = append(rooms, &room)
+	}
+	if err := rows.Err(); err != nil {
+		return nil, err
+	}
+
+	if len(rooms) == 0 {
+		return nil, errs.ErrNotFoundInDB
+	}
+	if len(rooms) > 1 {
+		return nil, errs.ErrAlreadyExistsInDB
+	}
+	return rooms[0], nil
+}
diff --git a/backend/internal/repository/users.go b/backend/internal/repository/users.go
index 95f7c40a7..785fa2811 100644
--- a/backend/internal/repository/users.go
+++ b/backend/internal/repository/users.go
@@ -18,20 +18,52 @@ func NewUsersRepository(db *pgxpool.Pool) *UsersRepository {
 	return &UsersRepository{db: db}
 }
 
+// userCols is the SELECT list shared by all user queries.
+// Departments is populated via a LEFT JOIN on employee_departments + departments.
+const userCols = `
+	u.id, u.first_name, u.last_name, u.hotel_id, u.employee_id, u.profile_picture,
+	u.role, u.department, u.timezone, u.phone_number, u.primary_email,
+	u.created_at, u.updated_at,
+	COALESCE(array_agg(d.name ORDER BY d.name) FILTER (WHERE d.name IS NOT NULL), '{}') AS departments
+`
+
+// userGroupBy is the GROUP BY clause matching userCols (excluding the aggregated departments).
+const userGroupBy = `
+	u.id, u.first_name, u.last_name, u.hotel_id, u.employee_id, u.profile_picture,
+	u.role, u.department, u.timezone, u.phone_number, u.primary_email,
+	u.created_at, u.updated_at
+`
+
+func scanUser(row pgx.Row) (*models.User, error) {
+	var user models.User
+	err := row.Scan(
+		&user.ID, &user.FirstName, &user.LastName, &user.HotelID, &user.EmployeeID,
+		&user.ProfilePicture, &user.Role, &user.Department, &user.Timezone,
+		&user.PhoneNumber, &user.PrimaryEmail, &user.CreatedAt, &user.UpdatedAt,
+		&user.Departments,
+	)
+	return &user, err
+}
+
 func (r *UsersRepository) FindUser(ctx context.Context, id string) (*models.User, error) {
 	row := r.db.QueryRow(ctx, `
-		SELECT id, first_name, last_name, hotel_id, employee_id, profile_picture, role, department, timezone, created_at, updated_at FROM users where id = $1
-		`, id)
+		SELECT `+userCols+`
+		FROM users u
+		LEFT JOIN employee_departments ed ON u.id = ed.employee_id
+		LEFT JOIN departments d ON ed.department_id = d.id
+		WHERE u.id = $1
+		GROUP BY `+userGroupBy,
+		id,
+	)
 
-	var user models.User
-	err := row.Scan(&user.ID, &user.FirstName, &user.LastName, &user.HotelID, &user.EmployeeID, &user.ProfilePicture, &user.Role, &user.Department, &user.Timezone, &user.CreatedAt, &user.UpdatedAt)
+	user, err := scanUser(row)
 	if err != nil {
 		if errors.Is(err, pgx.ErrNoRows) {
 			return nil, errs.ErrNotFoundInDB
 		}
 		return nil, err
 	}
-	return &user, nil
+	return user, nil
 }
 
 func (r *UsersRepository) InsertUser(ctx context.Context, user *models.CreateUser) (*models.User, error) {
@@ -41,9 +73,9 @@ func (r *UsersRepository) InsertUser(ctx context.Context, user *models.CreateUse
 
 	err := r.db.QueryRow(ctx, `
 		INSERT INTO public.users (
-			id, first_name, last_name, hotel_id, employee_id, profile_picture, role, department, timezone
+			id, first_name, last_name, hotel_id, employee_id, profile_picture, role, department, timezone, phone_number, primary_email
 		) VALUES (
-			$1, $2, $3, $4, $5, $6, $7, $8, COALESCE($9, 'UTC')
+			$1, $2, $3, $4, $5, $6, $7, $8, COALESCE($9, 'UTC'), $10, $11
 		)
 		RETURNING id, created_at, updated_at
 	`,
@@ -56,6 +88,38 @@ func (r *UsersRepository) InsertUser(ctx context.Context, user *models.CreateUse
 		user.Role,
 		user.Department,
 		user.Timezone,
+		user.PhoneNumber,
+		user.PrimaryEmail,
+	).Scan(&createdUser.ID, &createdUser.CreatedAt, &createdUser.UpdatedAt)
+
+	if err != nil {
+		return nil, err
+	}
+
+	return createdUser, nil
+}
+
+func (r *UsersRepository) UpsertUser(ctx context.Context, user *models.ClerkUser, hotelID string) (*models.User, error) {
+	createdUser := &models.User{}
+
+	err := r.db.QueryRow(ctx, `
+		INSERT INTO public.users (
+			id, first_name, last_name, hotel_id, profile_picture
+		) VALUES (
+			$1, $2, $3, $4, $5
+		)
+		ON CONFLICT (id) DO UPDATE SET
+			first_name      = EXCLUDED.first_name,
+			last_name       = EXCLUDED.last_name,
+			profile_picture = COALESCE(EXCLUDED.profile_picture, users.profile_picture),
+			hotel_id        = EXCLUDED.hotel_id
+		RETURNING id, created_at, updated_at
+	`,
+		user.ID,
+		user.FirstName,
+		user.LastName,
+		hotelID,
+		user.ImageUrl,
 	).Scan(&createdUser.ID, &createdUser.CreatedAt, &createdUser.UpdatedAt)
 
 	if err != nil {
@@ -65,6 +129,228 @@ func (r *UsersRepository) InsertUser(ctx context.Context, user *models.CreateUse
 	return createdUser, nil
 }
 
+func (r *UsersRepository) UpdateProfilePicture(ctx context.Context, userId string, key string) error {
+	_, err := r.db.Exec(ctx, `
+		UPDATE users SET profile_picture = $1 WHERE id = $2
+	`, key, userId)
+	return err
+}
+
+func (r *UsersRepository) GetKey(ctx context.Context, userId string) (string, error) {
+	var key string
+	err := r.db.QueryRow(ctx, `SELECT profile_picture FROM users WHERE id=$1`, userId).Scan(&key)
+	if err != nil {
+		return "", err
+	}
+	return key, nil
+}
+
+func (r *UsersRepository) DeleteProfilePicture(ctx context.Context, userId string) error {
+	_, err := r.db.Exec(ctx, `UPDATE users SET profile_picture = NULL WHERE id=$1`, userId)
+	return err
+}
+
+func (r *UsersRepository) UpdateUser(ctx context.Context, id string, update *models.UpdateUser) (*models.User, error) {
+	row := r.db.QueryRow(ctx, `
+		WITH updated AS (
+			UPDATE users
+			SET phone_number = COALESCE($2, phone_number), updated_at = NOW()
+			WHERE id = $1
+			RETURNING id, first_name, last_name, hotel_id, employee_id, profile_picture,
+			          role, department, timezone, phone_number, primary_email, created_at, updated_at
+		)
+		SELECT `+userCols+`
+		FROM updated u
+		LEFT JOIN employee_departments ed ON u.id = ed.employee_id
+		LEFT JOIN departments d ON ed.department_id = d.id
+		GROUP BY `+userGroupBy,
+		id, update.PhoneNumber,
+	)
+
+	user, err := scanUser(row)
+	if err != nil {
+		if errors.Is(err, pgx.ErrNoRows) {
+			return nil, errs.ErrNotFoundInDB
+		}
+		return nil, err
+	}
+	return user, nil
+}
+
+func (r *UsersRepository) GetUsersByHotel(ctx context.Context, hotelID, cursor string, limit int) ([]*models.User, string, error) {
+	rows, err := r.db.Query(ctx, `
+		SELECT `+userCols+`
+		FROM users u
+		LEFT JOIN employee_departments ed ON u.id = ed.employee_id
+		LEFT JOIN departments d ON ed.department_id = d.id
+		WHERE u.hotel_id = $1
+		  AND ($2 = '' OR u.id > $2)
+		GROUP BY `+userGroupBy+`
+		ORDER BY u.id
+		LIMIT $3
+	`, hotelID, cursor, limit+1)
+	if err != nil {
+		return nil, "", err
+	}
+	defer rows.Close()
+
+	var users []*models.User
+	for rows.Next() {
+		var u models.User
+		if err := rows.Scan(
+			&u.ID, &u.FirstName, &u.LastName, &u.HotelID, &u.EmployeeID,
+			&u.ProfilePicture, &u.Role, &u.Department, &u.Timezone,
+			&u.PhoneNumber, &u.PrimaryEmail, &u.CreatedAt, &u.UpdatedAt,
+			&u.Departments,
+		); err != nil {
+			return nil, "", err
+		}
+		users = append(users, &u)
+	}
+	if err := rows.Err(); err != nil {
+		return nil, "", err
+	}
+
+	if len(users) == limit+1 {
+		return users[:limit], users[limit-1].ID, nil
+	}
+	return users, "", nil
+}
+
+func (r *UsersRepository) SearchUsersByHotel(ctx context.Context, hotelID, cursor, query string, limit int) ([]*models.User, string, error) {
+	rows, err := r.db.Query(ctx, `
+		SELECT `+userCols+`
+		FROM users u
+		LEFT JOIN employee_departments ed ON u.id = ed.employee_id
+		LEFT JOIN departments d ON ed.department_id = d.id
+		WHERE u.hotel_id = $1
+		  AND ($2 = '' OR LOWER(u.first_name || ' ' || u.last_name) LIKE '%' || LOWER($2) || '%')
+		  AND ($3 = '' OR u.id > $3)
+		GROUP BY `+userGroupBy+`
+		ORDER BY u.id
+		LIMIT $4
+	`, hotelID, query, cursor, limit+1)
+	if err != nil {
+		return nil, "", err
+	}
+	defer rows.Close()
+
+	var users []*models.User
+	for rows.Next() {
+		var u models.User
+		if err := rows.Scan(
+			&u.ID, &u.FirstName, &u.LastName, &u.HotelID, &u.EmployeeID,
+			&u.ProfilePicture, &u.Role, &u.Department, &u.Timezone,
+			&u.PhoneNumber, &u.PrimaryEmail, &u.CreatedAt, &u.UpdatedAt,
+			&u.Departments,
+		); err != nil {
+			return nil, "", err
+		}
+		users = append(users, &u)
+	}
+	if err := rows.Err(); err != nil {
+		return nil, "", err
+	}
+
+	if len(users) == limit+1 {
+		return users[:limit], users[limit-1].ID, nil
+	}
+	return users, "", nil
+}
+
+func (r *UsersRepository) AddEmployeeDepartment(ctx context.Context, employeeID, departmentID string) error {
+	_, err := r.db.Exec(ctx, `
+		INSERT INTO employee_departments (employee_id, department_id)
+		VALUES ($1, $2)
+		ON CONFLICT DO NOTHING
+	`, employeeID, departmentID)
+	return err
+}
+
+func (r *UsersRepository) RemoveEmployeeDepartment(ctx context.Context, employeeID, departmentID string) error {
+	_, err := r.db.Exec(ctx, `
+		DELETE FROM employee_departments
+		WHERE employee_id = $1 AND department_id = $2
+	`, employeeID, departmentID)
+	return err
+}
+
+func (r *UsersRepository) CompleteOnboarding(ctx context.Context, id string, data *models.OnboardUser) (*models.User, error) {
+	tx, err := r.db.Begin(ctx)
+	if err != nil {
+		return nil, err
+	}
+	defer func() { _ = tx.Rollback(ctx) }()
+
+	var hotelID *string
+
+	if data.Role == "manager" {
+		if data.HotelName == nil {
+			return nil, errs.BadRequest("hotel_name is required for managers")
+		}
+		var newHotelID string
+		err = tx.QueryRow(ctx, `
+			INSERT INTO hotels (name) VALUES ($1) RETURNING id
+		`, data.HotelName).Scan(&newHotelID)
+		if err != nil {
+			return nil, err
+		}
+		hotelID = &newHotelID
+	}
+
+	var user models.User
+	err = tx.QueryRow(ctx, `
+		UPDATE users
+		SET
+			role         = $2,
+			department   = $3,
+			hotel_id     = COALESCE($4, hotel_id),
+			is_onboarded = TRUE,
+			updated_at   = NOW()
+		WHERE id = $1
+		RETURNING id, first_name, last_name, hotel_id, employee_id, profile_picture, role, department, timezone, phone_number, primary_email, is_onboarded, created_at, updated_at
+	`, id, data.Role, data.Department, hotelID).Scan(
+		&user.ID, &user.FirstName, &user.LastName, &user.HotelID, &user.EmployeeID,
+		&user.ProfilePicture, &user.Role, &user.Department, &user.Timezone,
+		&user.PhoneNumber, &user.PrimaryEmail, &user.IsOnboarded, &user.CreatedAt, &user.UpdatedAt,
+	)
+	if err != nil {
+		if errors.Is(err, pgx.ErrNoRows) {
+			return nil, errs.ErrNotFoundInDB
+		}
+		return nil, err
+	}
+
+	if err = tx.Commit(ctx); err != nil {
+		return nil, err
+	}
+
+	return &user, nil
+}
+
+func (r *UsersRepository) FindUserByName(ctx context.Context, hotelID, name string) ([]string, error) {
+	rows, err := r.db.Query(ctx, `
+		SELECT DISTINCT u.id
+		FROM users u
+		WHERE u.hotel_id = $1
+		  AND CONCAT_WS(' ', u.first_name, u.last_name) ILIKE '%' || $2 || '%'
+	`, hotelID, name)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+
+	var ids []string
+	for rows.Next() {
+		var id string
+		if err := rows.Scan(&id); err != nil {
+			return nil, err
+		}
+		ids = append(ids, id)
+	}
+	return ids, rows.Err()
+}
+
 func (r *UsersRepository) BulkInsertUsers(ctx context.Context, users []*models.CreateUser) error {
 	batch := &pgx.Batch{}
 
@@ -73,6 +359,9 @@ func (r *UsersRepository) BulkInsertUsers(ctx context.Context, users []*models.C
             INSERT INTO users (id, first_name, last_name, profile_picture)
             VALUES ($1, $2, $3, $4)
             ON CONFLICT (id) DO UPDATE
+            SET first_name = EXCLUDED.first_name,
+                last_name = EXCLUDED.last_name,
+                profile_picture = EXCLUDED.profile_picture
         `, u.ID, u.FirstName, u.LastName, u.ProfilePicture)
 	}
 
diff --git a/backend/internal/repository/views.go b/backend/internal/repository/views.go
new file mode 100644
index 000000000..d26bf55f1
--- /dev/null
+++ b/backend/internal/repository/views.go
@@ -0,0 +1,89 @@
+package repository
+
+import (
+	"context"
+
+	"github.com/generate/selfserve/internal/errs"
+	"github.com/generate/selfserve/internal/models"
+	"github.com/google/uuid"
+	"github.com/jackc/pgx/v5/pgxpool"
+)
+
+type ViewsRepository struct {
+	db *pgxpool.Pool
+}
+
+func NewViewsRepository(db *pgxpool.Pool) *ViewsRepository {
+	return &ViewsRepository{db: db}
+}
+
+func (r *ViewsRepository) FindAllByUserAndSlug(ctx context.Context, userID string, slug models.ViewSlug) ([]*models.View, error) {
+	rows, err := r.db.Query(ctx, `
+		SELECT id, user_id, slug, display_name, filters, created_at, updated_at
+		FROM public.views
+		WHERE user_id = $1 AND slug = $2
+		ORDER BY created_at ASC
+	`, userID, slug)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+
+	var views []*models.View
+	for rows.Next() {
+		v := &models.View{}
+		var filters []byte
+		if err := rows.Scan(&v.ID, &v.UserID, &v.Slug, &v.DisplayName, &filters, &v.CreatedAt, &v.UpdatedAt); err != nil {
+			return nil, err
+		}
+		v.Filters = filters
+		views = append(views, v)
+	}
+	return views, rows.Err()
+}
+
+func (r *ViewsRepository) Insert(ctx context.Context, userID string, input models.CreateViewInput) (*models.View, error) {
+	v := &models.View{
+		ID:          uuid.New().String(),
+		UserID:      userID,
+		Slug:        input.Slug,
+		DisplayName: input.DisplayName,
+		Filters:     input.Filters,
+	}
+	err := r.db.QueryRow(ctx, `
+		INSERT INTO public.views (id, user_id, slug, display_name, filters)
+		VALUES ($1, $2, $3, $4, $5)
+		RETURNING created_at, updated_at
+	`, v.ID, v.UserID, v.Slug, v.DisplayName, []byte(v.Filters)).Scan(&v.CreatedAt, &v.UpdatedAt)
+	if err != nil {
+		return nil, err
+	}
+	return v, nil
+}
+
+func (r *ViewsRepository) Update(ctx context.Context, id, userID string, input models.UpdateViewInput) (*models.View, error) {
+	v := &models.View{ID: id, UserID: userID}
+	err := r.db.QueryRow(ctx, `
+		UPDATE public.views
+		SET filters = $3, updated_at = NOW()
+		WHERE id = $1 AND user_id = $2
+		RETURNING slug, display_name, filters, created_at, updated_at
+	`, id, userID, []byte(input.Filters)).Scan(&v.Slug, &v.DisplayName, &v.Filters, &v.CreatedAt, &v.UpdatedAt)
+	if err != nil {
+		return nil, err
+	}
+	return v, nil
+}
+
+func (r *ViewsRepository) Delete(ctx context.Context, id, userID string) error {
+	result, err := r.db.Exec(ctx, `
+		DELETE FROM public.views WHERE id = $1 AND user_id = $2
+	`, id, userID)
+	if err != nil {
+		return err
+	}
+	if result.RowsAffected() == 0 {
+		return errs.ErrNotFoundInDB
+	}
+	return nil
+}
diff --git a/backend/internal/service/clerk/organizations.go b/backend/internal/service/clerk/organizations.go
new file mode 100644
index 000000000..0eb58027b
--- /dev/null
+++ b/backend/internal/service/clerk/organizations.go
@@ -0,0 +1,20 @@
+package clerk
+
+import (
+	"context"
+
+	clerksdk "github.com/clerk/clerk-sdk-go/v2"
+	"github.com/clerk/clerk-sdk-go/v2/organization"
+)
+
+func CreateClerkOrg(ctx context.Context, name string, createdByUserID string) (string, error) {
+	org, err := organization.Create(ctx, &organization.CreateParams{
+		Name:      clerksdk.String(name),
+		CreatedBy: clerksdk.String(createdByUserID),
+	})
+	if err != nil {
+		return "", err
+	}
+
+	return org.ID, nil
+}
diff --git a/backend/internal/service/clerk/sync-users.go b/backend/internal/service/clerk/sync-users.go
index f7f7f8ee9..0f92d689b 100644
--- a/backend/internal/service/clerk/sync-users.go
+++ b/backend/internal/service/clerk/sync-users.go
@@ -2,25 +2,14 @@ package clerk
 
 import (
 	"encoding/json"
+
 	"net/http"
 
-	"github.com/generate/selfserve/internal/handler"
 	"github.com/generate/selfserve/internal/models"
 )
 
-func ValidateAndReformatUserData(users []models.ClerkUser) ([]*models.CreateUser, error) {
-	var reformatedUsers []*models.CreateUser
-	for _, user := range users {
-		if err := handler.ValidateCreateUserClerk(&user); err != nil {
-			return nil, err
-		}
-		reformatedUsers = append(reformatedUsers, handler.ReformatUserData(&user))
-	}
-	return reformatedUsers, nil
-}
-
 func FetchUsersFromClerk(clerkApiUrl string, clerkSecret string) ([]models.ClerkUser, error) {
-	req, err := http.NewRequest("GET", clerkApiUrl, nil)
+	req, err := http.NewRequest("GET", clerkApiUrl+"/users?with_organization_memberships=true&limit=100", nil)
 	if err != nil {
 		return nil, err
 	}
@@ -38,3 +27,33 @@ func FetchUsersFromClerk(clerkApiUrl string, clerkSecret string) ([]models.Clerk
 	}
 	return users, nil
 }
+
+func FetchUserOrgID(clerkApiUrl string, clerkSecret string, userID string) (string, error) {
+	req, err := http.NewRequest("GET", clerkApiUrl+"/users/"+userID+"/organization_memberships", nil)
+	if err != nil {
+		return "", err
+	}
+	req.Header.Set("Authorization", "Bearer "+clerkSecret)
+	client := &http.Client{}
+	resp, err := client.Do(req)
+	if err != nil {
+		return "", err
+	}
+	defer resp.Body.Close()
+
+	var result struct {
+		Data []struct {
+			Organization struct {
+				ID   string `json:"id"`
+				Name string `json:"name"`
+			} `json:"organization"`
+		} `json:"data"`
+	}
+	if err := json.NewDecoder(resp.Body).Decode(&result); err != nil {
+		return "", err
+	}
+	if len(result.Data) == 0 {
+		return "", nil
+	}
+	return result.Data[0].Organization.ID, nil
+}
diff --git a/backend/internal/service/notifications/service.go b/backend/internal/service/notifications/service.go
new file mode 100644
index 000000000..0ec2f2239
--- /dev/null
+++ b/backend/internal/service/notifications/service.go
@@ -0,0 +1,90 @@
+package notifications
+
+import (
+	"bytes"
+	"context"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"log/slog"
+	"net/http"
+	"time"
+
+	"github.com/generate/selfserve/internal/models"
+	storage "github.com/generate/selfserve/internal/service/storage/postgres"
+)
+
+const expoPushURL = "https://exp.host/--/exponent-push-api/v2/push/send"
+
+var (
+	ErrExpoPushFailed   = errors.New("expo push request failed")
+	ErrExpoPushRejected = errors.New("expo push rejected by server")
+)
+
+// NotificationSender is implemented by Service. Handlers that trigger
+// notifications depend on this interface for testability.
+type NotificationSender interface {
+	Notify(ctx context.Context, userID string, notifType models.NotificationType, title, body string) error
+}
+
+type Service struct {
+	repo   storage.NotificationsRepository
+	client *http.Client
+}
+
+func NewService(repo storage.NotificationsRepository) *Service {
+	return &Service{
+		repo:   repo,
+		client: &http.Client{Timeout: 10 * time.Second},
+	}
+}
+
+// Notify persists an in-app notification and fires an Expo push to any
+// registered device tokens (fire-and-forget — push errors are logged only).
+func (s *Service) Notify(ctx context.Context, userID string, notifType models.NotificationType, title, body string) error {
+	if _, err := s.repo.InsertNotification(ctx, userID, notifType, title, body); err != nil {
+		return err
+	}
+
+	tokens, err := s.repo.FindDeviceTokensByUserID(ctx, userID)
+	if err != nil {
+		slog.Error("notifications: failed to fetch device tokens", "user_id", userID, "err", err)
+		return nil
+	}
+
+	if len(tokens) > 0 {
+		go s.sendExpoPush(tokens, title, body)
+	}
+
+	return nil
+}
+
+type expoMessage struct {
+	To    string `json:"to"`
+	Title string `json:"title"`
+	Body  string `json:"body"`
+}
+
+func (s *Service) sendExpoPush(tokens []string, title, body string) {
+	msgs := make([]expoMessage, len(tokens))
+	for i, t := range tokens {
+		msgs[i] = expoMessage{To: t, Title: title, Body: body}
+	}
+
+	payload, err := json.Marshal(msgs)
+	if err != nil {
+		slog.Error("notifications: failed to marshal expo payload", "err", err)
+		return
+	}
+
+	resp, err := s.client.Post(expoPushURL, "application/json", bytes.NewReader(payload))
+	if err != nil {
+		slog.Error("notifications: expo push failed", "err", fmt.Errorf("%w: %w", ErrExpoPushFailed, err))
+		return
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode >= 400 {
+		slog.Error("notifications: expo push rejected", "err", fmt.Errorf("%w: status %d", ErrExpoPushRejected, resp.StatusCode))
+	}
+}
diff --git a/backend/internal/service/s3/s3storage.go b/backend/internal/service/s3/s3storage.go
index 9f6a4b68e..c75fd7d67 100644
--- a/backend/internal/service/s3/s3storage.go
+++ b/backend/internal/service/s3/s3storage.go
@@ -3,13 +3,14 @@ package s3
 import (
 	"context"
 	"fmt"
-	"time"
 
 	"github.com/aws/aws-sdk-go-v2/aws"
 	awsConfig "github.com/aws/aws-sdk-go-v2/config"
 	"github.com/aws/aws-sdk-go-v2/credentials"
 	"github.com/aws/aws-sdk-go-v2/service/s3"
 	"github.com/generate/selfserve/config"
+	"github.com/generate/selfserve/internal/httpx"
+	"github.com/generate/selfserve/internal/models"
 )
 
 type Storage struct {
@@ -19,7 +20,6 @@ type Storage struct {
 }
 
 func NewS3Storage(cfg config.S3) (*Storage, error) {
-	// Create AWS config with your credentials
 	awsCfg, err := awsConfig.LoadDefaultConfig(context.Background(),
 		awsConfig.WithRegion(cfg.Region),
 		awsConfig.WithCredentialsProvider(credentials.NewStaticCredentialsProvider(
@@ -32,9 +32,7 @@ func NewS3Storage(cfg config.S3) (*Storage, error) {
 		return nil, fmt.Errorf("failed to create AWS config: %w", err)
 	}
 
-	// Create S3 client
 	client := s3.NewFromConfig(awsCfg)
-
 	return &Storage{
 		Client:     client,
 		BucketName: cfg.BucketName,
@@ -42,25 +40,37 @@ func NewS3Storage(cfg config.S3) (*Storage, error) {
 	}, nil
 }
 
-func (s *Storage) GeneratePresignedURL(ctx context.Context, key string, expiration time.Duration) (string, error) {
-	if key == "" {
-		return "", fmt.Errorf("key is required")
-	}
-	if expiration <= 0 {
-		return "", fmt.Errorf("expiration must be greater than 0")
+func (s *Storage) GeneratePresignedUploadURL(ctx context.Context, in models.PresignedURLInput) (string, error) {
+	if err := httpx.Validate(&in); err != nil {
+		return "", err
 	}
+
 	presignedURL, err := s.URL.PresignPutObject(ctx, &s3.PutObjectInput{
 		Bucket: aws.String(s.BucketName),
-		Key:    aws.String(key),
+		Key:    aws.String(in.Key),
 	}, func(opts *s3.PresignOptions) {
-		opts.Expires = expiration
-	},
-	)
-
+		opts.Expires = in.Expiration
+	})
 	if err != nil {
-		return "", fmt.Errorf("failed to generate presigned URL with key %s: %w", key, err)
+		return "", fmt.Errorf("failed to generate presigned URL with key %s: %w", in.Key, err)
 	}
+	return presignedURL.URL, nil
+}
 
+func (s *Storage) GeneratePresignedGetURL(ctx context.Context, in models.PresignedURLInput) (string, error) {
+	if err := httpx.Validate(&in); err != nil {
+		return "", err
+	}
+
+	presignedURL, err := s.URL.PresignGetObject(ctx, &s3.GetObjectInput{
+		Bucket: aws.String(s.BucketName),
+		Key:    aws.String(in.Key),
+	}, func(opts *s3.PresignOptions) {
+		opts.Expires = in.Expiration
+	})
+	if err != nil {
+		return "", fmt.Errorf("failed to generate presigned get URL with key %s: %w", in.Key, err)
+	}
 	return presignedURL.URL, nil
 }
 
@@ -68,6 +78,7 @@ func (s *Storage) DeleteFile(ctx context.Context, key string) error {
 	if key == "" {
 		return fmt.Errorf("key is required")
 	}
+
 	_, err := s.Client.DeleteObject(ctx, &s3.DeleteObjectInput{
 		Bucket: aws.String(s.BucketName),
 		Key:    aws.String(key),
@@ -75,6 +86,5 @@ func (s *Storage) DeleteFile(ctx context.Context, key string) error {
 	if err != nil {
 		return fmt.Errorf("failed to delete file with key %s: %w", key, err)
 	}
-
 	return nil
 }
diff --git a/backend/internal/service/server.go b/backend/internal/service/server.go
index d67de6dc8..32f0ad157 100644
--- a/backend/internal/service/server.go
+++ b/backend/internal/service/server.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"log"
 	"net/http"
 	"os"
 
@@ -13,9 +14,14 @@ import (
 	"github.com/generate/selfserve/internal/errs"
 	"github.com/generate/selfserve/internal/handler"
 	"github.com/generate/selfserve/internal/repository"
+	temporalservice "github.com/generate/selfserve/internal/temporal"
 
 	"github.com/generate/selfserve/internal/service/clerk"
+	notificationssvc "github.com/generate/selfserve/internal/service/notifications"
+	"github.com/generate/selfserve/internal/storage/redis"
+
 	s3storage "github.com/generate/selfserve/internal/service/s3"
+	opensearchstorage "github.com/generate/selfserve/internal/service/storage/opensearch"
 	storage "github.com/generate/selfserve/internal/service/storage/postgres"
 	"github.com/generate/selfserve/internal/validation"
 	"github.com/goccy/go-json"
@@ -26,12 +32,18 @@ import (
 	"github.com/gofiber/fiber/v2/middleware/logger"
 	"github.com/gofiber/fiber/v2/middleware/recover"
 	"github.com/gofiber/fiber/v2/middleware/requestid"
+	goredis "github.com/redis/go-redis/v9"
+	"go.temporal.io/sdk/client"
+	"go.temporal.io/sdk/worker"
 )
 
 type App struct {
-	Server    *fiber.App
-	Repo      *storage.Repository
-	S3Storage *s3storage.Storage
+	Server         *fiber.App
+	Repo           *storage.Repository
+	S3Storage      *s3storage.Storage
+	RedisClient    *goredis.Client
+	TemporalClient client.Client
+	TemporalWorker worker.Worker
 }
 
 func InitApp(cfg *config.Config) (*App, error) {
@@ -44,6 +56,8 @@ func InitApp(cfg *config.Config) (*App, error) {
 		return nil, err
 	}
 
+	redisClient := tryInitRedis()
+
 	s3Store, err := s3storage.NewS3Storage(cfg.S3)
 	if err != nil {
 		if e := repo.Close(); e != nil {
@@ -52,28 +66,85 @@ func InitApp(cfg *config.Config) (*App, error) {
 		return nil, err
 	}
 
-	genkitInstance := aiflows.InitGenkit(context.Background(), &cfg.LLM)
+	openSearchRepos := tryInitOpenSearchRepositories(cfg)
 
+	roomsRepo := repository.NewRoomsRepository(repo.DB)
+	guestsRepo := repository.NewGuestsRepository(repo.DB)
+	usersLookupRepo := repository.NewUsersRepository(repo.DB)
+	hotelsLookupRepo := repository.NewHotelsRepository(repo.DB)
+	genkitInstance := aiflows.InitGenkit(context.Background(), &cfg.LLM, roomsRepo, guestsRepo, usersLookupRepo, hotelsLookupRepo)
+	workflowClient, temporalClient, temporalWorker := tryInitTemporal(cfg, genkitInstance)
 	app := setupApp()
 	setupClerk(cfg)
 
-	if err = setupRoutes(app, repo, genkitInstance, cfg, s3Store); err != nil {
+	if err = setupRoutes(app, repo, genkitInstance, workflowClient, cfg, s3Store, openSearchRepos); err != nil { //nolint:wsl
 		if e := repo.Close(); e != nil {
 			return nil, errors.Join(err, e)
 		}
+		if temporalClient != nil {
+			temporalClient.Close()
+		}
 		return nil, err
 	}
 
 	return &App{
-		Server:    app,
-		Repo:      repo,
-		S3Storage: s3Store,
+		Server:         app,
+		Repo:           repo,
+		RedisClient:    redisClient,
+		S3Storage:      s3Store,
+		TemporalClient: temporalClient,
+		TemporalWorker: temporalWorker,
 	}, nil
+}
+
+type openSearchRepositories struct {
+	Guests storage.GuestsSearchRepository
+}
 
+func tryInitOpenSearchRepositories(cfg *config.Config) openSearchRepositories {
+	client, err := opensearchstorage.NewClient(cfg.OpenSearch)
+	if err != nil {
+		log.Printf("Warning: OpenSearch not available: %v", err)
+		return openSearchRepositories{}
+	}
+	if err := opensearchstorage.EnsureGuestsIndex(context.Background(), client); err != nil {
+		log.Printf("Warning: failed to ensure OpenSearch guests index: %v", err)
+		return openSearchRepositories{}
+	}
+	return openSearchRepositories{
+		Guests: repository.NewOpenSearchGuestsRepository(client),
+	}
+}
+
+func tryInitRedis() *goredis.Client {
+	redisClient, err := redis.InitRedis()
+	if err != nil {
+		log.Printf("Warning: Redis not available: %v", err)
+		return nil
+	}
+	return redisClient
+}
+
+func tryInitTemporal(cfg *config.Config, genkitService aiflows.GenerateRequestService) (temporalservice.GenerateRequestWorkflowClient, client.Client, worker.Worker) {
+	temporalClient, err := temporalservice.NewClient(cfg.Temporal)
+	if err != nil {
+		log.Printf("Warning: Temporal not available: %v", err)
+		return nil, nil, nil
+	}
+
+	workflowClient := temporalservice.NewService(temporalClient)
+	temporalWorker := temporalservice.NewWorker(temporalClient, genkitService)
+	if err := temporalWorker.Start(); err != nil {
+		log.Printf("Warning: failed to start Temporal worker: %v", err)
+		temporalClient.Close()
+		return nil, nil, nil
+	}
+
+	return workflowClient, temporalClient, temporalWorker
 }
 
 func setupRoutes(app *fiber.App, repo *storage.Repository, genkitInstance *aiflows.GenkitService,
-	cfg *config.Config, s3Store *s3storage.Storage) error {
+	workflowClient temporalservice.GenerateRequestWorkflowClient, cfg *config.Config, s3Store *s3storage.Storage, openSearchRepos openSearchRepositories) error {
 	// Swagger documentation
 	app.Get("/swagger/*", handler.ServeSwagger)
 
@@ -87,36 +158,48 @@ func setupRoutes(app *fiber.App, repo *storage.Repository, genkitInstance *aiflo
 		return c.SendStatus(http.StatusOK)
 	})
 
-	// initialize users repo
+	// initialize users and hotels repos for clerk webhook handler
 	usersRepo := repository.NewUsersRepository(repo.DB)
+	hotelsRepo := repository.NewHotelsRepository(repo.DB)
+
+	// initialize notifications
+	notifRepo := repository.NewNotificationsRepository(repo.DB)
+	notifService := notificationssvc.NewService(notifRepo)
+	notifHandler := handler.NewNotificationsHandler(notifRepo)
 
 	// initialize handler(s)
 	helloHandler := handler.NewHelloHandler()
 	devsHandler := handler.NewDevsHandler(repository.NewDevsRepository(repo.DB))
-	usersHandler := handler.NewUsersHandler(repository.NewUsersRepository(repo.DB))
-	guestsHandler := handler.NewGuestsHandler(repository.NewGuestsRepository(repo.DB))
-	reqsHandler := handler.NewRequestsHandler(repository.NewRequestsRepo(repo.DB), genkitInstance)
-	hotelsHandler := handler.NewHotelsHandler(repository.NewHotelsRepository(repo.DB))
+	usersHandler := handler.NewUsersHandler(repository.NewUsersRepository(repo.DB), s3Store)
+	guestsHandler := handler.NewGuestsHandler(repository.NewGuestsRepository(repo.DB), repository.NewUsersRepository(repo.DB), openSearchRepos.Guests)
+	reqsHandler := handler.NewRequestsHandler(repository.NewRequestsRepo(repo.DB), genkitInstance, notifService)
+	reqsHandler.WorkflowClient = workflowClient
+	hotelsHandler := handler.NewHotelsHandler(repository.NewHotelsRepository(repo.DB), repository.NewUsersRepository(repo.DB))
 	s3Handler := handler.NewS3Handler(s3Store)
 	roomsHandler := handler.NewRoomsHandler(repository.NewRoomsRepository(repo.DB))
+	guestBookingsHandler := handler.NewGuestBookingsHandler(repository.NewGuestBookingsRepository(repo.DB))
+	viewsHandler := handler.NewViewsHandler(repository.NewViewsRepository(repo.DB))
 
 	clerkWhSignatureVerifier, err := handler.NewWebhookVerifier(cfg)
 	if err != nil {
 		return err
 	}
-	clerkWebhookHandler := handler.NewClerkWebHookHandler(usersRepo, clerkWhSignatureVerifier)
+	clerkWebhookHandler := handler.NewClerkWebHookHandler(usersRepo, hotelsRepo, clerkWhSignatureVerifier)
 
 	// API v1 routes
 	api := app.Group("/api/v1")
 
-	// clerk webhook route
+	// clerk webhook routes
 	api.Route("/clerk", func(r fiber.Router) {
-		r.Post("/user", clerkWebhookHandler.CreateUser)
+		r.Post("/org-membership", clerkWebhookHandler.CreateOrgMembership)
+		r.Post("/org", clerkWebhookHandler.OrgCreated)
 	})
 
 	verifier := clerk.NewClerkJWTVerifier()
 	app.Use(clerk.NewAuthMiddleware(verifier))
 
+	adminOnly := handler.AdminMiddleware(repository.NewUsersRepository(repo.DB))
+
 	// Hello routes
 	api.Route("/hello", func(r fiber.Router) {
 		r.Get("/", helloHandler.GetHello)
@@ -130,42 +213,90 @@ func setupRoutes(app *fiber.App, repo *storage.Repository, genkitInstance *aiflo
 
 	// users routes
 	api.Route("/users", func(r fiber.Router) {
+		r.Post("/search", usersHandler.SearchUsers)
 		r.Get("/:id", usersHandler.GetUserByID)
 		r.Post("/", usersHandler.CreateUser)
+		r.Get("/:userId/profile-picture", usersHandler.GetProfilePicture)
+		r.Put("/:userId/profile-picture", usersHandler.UpdateProfilePicture)
+		r.Delete("/:userId/profile-picture", usersHandler.DeleteProfilePicture)
+		r.Put("/:id", usersHandler.UpdateUser)
+		r.Post("/:id/departments", usersHandler.AddEmployeeDepartment)
+		r.Delete("/:id/departments/:deptId", usersHandler.RemoveEmployeeDepartment)
+		r.Put("/:id/onboard", usersHandler.CompleteOnboarding)
 	})
 
 	// Guest Routes
 	api.Route("/guests", func(r fiber.Router) {
-		r.Post("/", guestsHandler.CreateGuest)
-		r.Get("/:id", guestsHandler.GetGuest)
-		r.Put("/:id", guestsHandler.UpdateGuest)
-		r.Get("/", guestsHandler.GetGuests)
+		r.Post("/", adminOnly, guestsHandler.CreateGuest)
+		r.Post("/search", guestsHandler.GetGuests)
 		r.Get("/stays/:id", guestsHandler.GetGuestWithStays)
+		r.Get("/:id", guestsHandler.GetGuest)
+		r.Put("/:id", adminOnly, guestsHandler.UpdateGuest)
 	})
 
 	// Request routes
+	api.Post("/requests/feed", reqsHandler.GetRequestsFeed)
 	api.Route("/request", func(r fiber.Router) {
 		r.Post("/", reqsHandler.CreateRequest)
 		r.Post("/generate", reqsHandler.GenerateRequest)
+		r.Post("/generate/async", reqsHandler.StartGenerateRequestAsync)
+		r.Get("/generate/async/:workflowId", reqsHandler.GetGenerateRequestStatus)
+		r.Put("/:id", reqsHandler.UpdateRequest)
 		r.Get("/:id", reqsHandler.GetRequest)
-		r.Get("/cursor/:cursor", reqsHandler.GetRequestByCursor)
+		r.Get("/guest/:id", reqsHandler.GetRequestsByGuest)
+		r.Get("/room/:id", reqsHandler.GetRequestsByRoomID)
+		r.Post("/:id/assign", reqsHandler.AssignRequest)
+		r.Get("/:id/activity", reqsHandler.GetRequestActivity)
 	})
 
 	// Hotel routes
 	api.Route("/hotels", func(r fiber.Router) {
 		r.Get("/:id", hotelsHandler.GetHotelByID)
 		r.Post("/", hotelsHandler.CreateHotel)
+		r.Get("/:id/users", hotelsHandler.GetHotelUsers)
+		r.Get("/:id/departments", hotelsHandler.GetDepartmentsByHotelID)
+		r.Post("/:id/departments", adminOnly, hotelsHandler.CreateDepartment)
+		r.Put("/:id/departments/:deptId", adminOnly, hotelsHandler.UpdateDepartment)
+		r.Delete("/:id/departments/:deptId", adminOnly, hotelsHandler.DeleteDepartment)
+	})
+
+	// s3 routes
+	api.Route("/s3", func(r fiber.Router) {
+		r.Get("/presigned-url/*", s3Handler.GeneratePresignedUploadURL)
+		r.Get("/upload-url/:userId", s3Handler.GetUploadURL)
+		r.Get("/presigned-get-url/*", s3Handler.GeneratePresignedGetURL)
 	})
 
 	// rooms routes
 	api.Route("/rooms", func(r fiber.Router) {
-		r.Get("/", roomsHandler.GetRoomsByFloor)
+		r.Post("/", roomsHandler.FilterRooms)
 		r.Get("/floors", roomsHandler.GetFloors)
+		r.Get("/:id", roomsHandler.GetRoomByID)
 	})
 
-	// s3 routes
-	api.Route("/s3", func(r fiber.Router) {
-		r.Get("/presigned-url/:key", s3Handler.GeneratePresignedURL)
+	// guest booking routes
+	api.Route("/guest_bookings", func(r fiber.Router) {
+		r.Get("/group_sizes", guestBookingsHandler.GetGroupSizeOptions)
+	})
+
+	// views routes
+	api.Route("/views", func(r fiber.Router) {
+		r.Get("/", viewsHandler.GetAllViews)
+		r.Post("/", viewsHandler.CreateView)
+		r.Post("/:id", viewsHandler.UpdateView)
+		r.Delete("/:id", viewsHandler.DeleteView)
+	})
+
+	// notification routes
+	api.Route("/notifications", func(r fiber.Router) {
+		r.Get("/", notifHandler.ListNotifications)
+		r.Put("/read-all", notifHandler.MarkAllRead)
+		r.Put("/:id/read", notifHandler.MarkRead)
+	})
+
+	// device token routes
+	api.Route("/device-tokens", func(r fiber.Router) {
+		r.Post("/", notifHandler.RegisterDeviceToken)
 	})
 
 	return nil
diff --git a/backend/internal/service/storage/opensearch/client.go b/backend/internal/service/storage/opensearch/client.go
new file mode 100644
index 000000000..8a6ad3eb6
--- /dev/null
+++ b/backend/internal/service/storage/opensearch/client.go
@@ -0,0 +1,64 @@
+package opensearchstorage
+
+import (
+	"bytes"
+	"context"
+	"crypto/tls"
+	"encoding/json"
+	"fmt"
+	"net/http"
+
+	"github.com/generate/selfserve/config"
+	opensearch "github.com/opensearch-project/opensearch-go/v2"
+	"github.com/opensearch-project/opensearch-go/v2/opensearchapi"
+)
+
+func NewClient(cfg config.OpenSearch) (*opensearch.Client, error) {
+	transport := &http.Transport{}
+	if cfg.InsecureSkipTLS {
+		transport.TLSClientConfig = &tls.Config{InsecureSkipVerify: true} //nolint:gosec // dev-only, controlled by config
+	}
+
+	client, err := opensearch.NewClient(opensearch.Config{
+		Transport: transport,
+		Addresses: []string{cfg.URL},
+		Username:  cfg.Username,
+		Password:  cfg.Password,
+	})
+	if err != nil {
+		return nil, fmt.Errorf("creating opensearch client: %w", err)
+	}
+	return client, nil
+}
+
+// EnsureGuestsIndex creates the guests index with its mapping if it doesn't already exist.
+func EnsureGuestsIndex(ctx context.Context, client *opensearch.Client) error {
+	res, err := opensearchapi.IndicesExistsRequest{Index: []string{GuestsIndex}}.Do(ctx, client)
+	if err != nil {
+		return fmt.Errorf("checking guests index: %w", err)
+	}
+	defer res.Body.Close()
+
+	if res.StatusCode == http.StatusOK {
+		return nil
+	}
+
+	body, err := json.Marshal(GuestsIndexMapping)
+	if err != nil {
+		return err
+	}
+
+	createRes, err := opensearchapi.IndicesCreateRequest{
+		Index: GuestsIndex,
+		Body:  bytes.NewReader(body),
+	}.Do(ctx, client)
+	if err != nil {
+		return fmt.Errorf("creating guests index: %w", err)
+	}
+	defer createRes.Body.Close()
+
+	if createRes.IsError() {
+		return fmt.Errorf("guests index creation failed: %s", createRes.String())
+	}
+	return nil
+}
diff --git a/backend/internal/service/storage/opensearch/indices.go b/backend/internal/service/storage/opensearch/indices.go
new file mode 100644
index 000000000..bd522f896
--- /dev/null
+++ b/backend/internal/service/storage/opensearch/indices.go
@@ -0,0 +1,46 @@
+package opensearchstorage
+
+// Index name constants and their mappings. Each entity gets a name constant
+// and a mapping var here — both are used together in EnsureIndex calls.
+
+const GuestsIndex = "guests"
+
+// GuestsIndexMapping defines the guests index schema. Fields are denormalized from
+// guests + guest_bookings + rooms so all filtering can happen in one query.
+var GuestsIndexMapping = map[string]interface{}{
+	"mappings": map[string]interface{}{
+		"properties": map[string]interface{}{
+			"id":       map[string]string{"type": "keyword"},
+			"hotel_id": map[string]string{"type": "keyword"},
+			"full_name": map[string]interface{}{
+				"type": "text",
+				"fields": map[string]interface{}{
+					"keyword": map[string]string{"type": "keyword"},
+				},
+			},
+			"first_name": map[string]interface{}{
+				"type": "text",
+				"fields": map[string]interface{}{
+					"keyword": map[string]string{"type": "keyword"},
+				},
+			},
+			"last_name": map[string]interface{}{
+				"type": "text",
+				"fields": map[string]interface{}{
+					"keyword": map[string]string{"type": "keyword"},
+				},
+			},
+			"preferred_name": map[string]interface{}{"type": "text"},
+			"email":          map[string]interface{}{"type": "text"},
+			"phone":          map[string]string{"type": "keyword"},
+			"preferences":    map[string]interface{}{"type": "text"},
+			"notes":          map[string]interface{}{"type": "text"},
+			"floor":          map[string]string{"type": "integer"},
+			"room_number":    map[string]string{"type": "integer"},
+			"group_size":     map[string]string{"type": "integer"},
+			"booking_status": map[string]string{"type": "keyword"},
+			"arrival_date":   map[string]interface{}{"type": "date", "format": "strict_date_optional_time"},
+			"departure_date": map[string]interface{}{"type": "date", "format": "strict_date_optional_time"},
+		},
+	},
+}
diff --git a/backend/internal/service/storage/postgres/repo_types.go b/backend/internal/service/storage/postgres/repo_types.go
index c5eeb076d..0f5b96a3f 100644
--- a/backend/internal/service/storage/postgres/repo_types.go
+++ b/backend/internal/service/storage/postgres/repo_types.go
@@ -2,36 +2,85 @@ package storage
 
 import (
 	"context"
+	"time"
 
 	"github.com/generate/selfserve/internal/models"
 )
 
+type NotificationsRepository interface {
+	InsertNotification(ctx context.Context, userID string, notifType models.NotificationType, title, body string) (*models.Notification, error)
+	FindByUserID(ctx context.Context, userID string) ([]*models.Notification, error)
+	MarkRead(ctx context.Context, id, userID string) error
+	MarkAllRead(ctx context.Context, userID string) error
+	UpsertDeviceToken(ctx context.Context, userID, token, platform string) error
+	FindDeviceTokensByUserID(ctx context.Context, userID string) ([]string, error)
+}
+
 type UsersRepository interface {
+	FindUser(ctx context.Context, id string) (*models.User, error)
 	InsertUser(ctx context.Context, user *models.CreateUser) (*models.User, error)
+	UpdateUser(ctx context.Context, id string, update *models.UpdateUser) (*models.User, error)
+	UpdateProfilePicture(ctx context.Context, userId string, key string) error
+	DeleteProfilePicture(ctx context.Context, userId string) error
+	GetKey(ctx context.Context, userId string) (string, error)
 	BulkInsertUsers(ctx context.Context, users []*models.CreateUser) error
+	GetUsersByHotel(ctx context.Context, hotelID, cursor string, limit int) ([]*models.User, string, error)
+	SearchUsersByHotel(ctx context.Context, hotelID, cursor, query string, limit int) ([]*models.User, string, error)
+	AddEmployeeDepartment(ctx context.Context, employeeID, departmentID string) error
+	RemoveEmployeeDepartment(ctx context.Context, employeeID, departmentID string) error
+	CompleteOnboarding(ctx context.Context, id string, data *models.OnboardUser) (*models.User, error)
 }
 
 type GuestsRepository interface {
 	InsertGuest(ctx context.Context, guest *models.CreateGuest) (*models.Guest, error)
 	FindGuest(ctx context.Context, id string) (*models.Guest, error)
 	UpdateGuest(ctx context.Context, id string, update *models.UpdateGuest) (*models.Guest, error)
-	FindGuestsWithActiveBooking(ctx context.Context, filters *models.GuestFilters) ([]*models.GuestWithBooking, error)
+	FindGuestsWithActiveBooking(ctx context.Context, filters *models.GuestFilters) (*models.GuestPage, error)
 	FindGuestWithStayHistory(ctx context.Context, id string) (*models.GuestWithStays, error)
 }
 
+// GuestsSearchRepository is implemented by OpenSearch. It handles
+// indexing and searching the denormalized GuestDocument.
+type GuestsSearchRepository interface {
+	IndexGuest(ctx context.Context, doc *models.GuestDocument) error
+	SearchGuests(ctx context.Context, filters *models.GuestFilters) (*models.GuestPage, error)
+	DeleteGuest(ctx context.Context, id string) error
+}
+
 type RequestsRepository interface {
 	InsertRequest(ctx context.Context, req *models.Request) (*models.Request, error)
+	UpdateRequest(ctx context.Context, id string, patch *models.RequestUpdateInput, changedBy *string) (*models.Request, error)
 	FindRequest(ctx context.Context, id string) (*models.Request, error)
 	FindRequests(ctx context.Context) ([]models.Request, error)
-	FindRequestsByStatusPaginated(ctx context.Context, cursor string, status string, hotelID string, pageSize int) ([]*models.Request, string, error)
+	FindRequestsByGuestID(ctx context.Context, guestID, hotelID, cursorID string, cursorVersion time.Time, limit int) ([]*models.GuestRequest, error)
+	FindRequestsByRoomIDAndUserID(ctx context.Context, roomID, hotelID, userID, cursorID string, cursorVersion time.Time, limit int) ([]*models.GuestRequest, error)
+	FindUnassignedRequestsByRoomIDAndUserID(ctx context.Context, roomID, hotelID, cursorID string, cursorVersion time.Time, limit int) ([]*models.GuestRequest, error)
+	FindRequestsPaginated(ctx context.Context, input *models.RequestsFeedInput, cursorID string, cursorCreatedAt time.Time, cursorPriorityRank int, limit int) ([]*models.GuestRequest, error)
+	FindRequestVersions(ctx context.Context, id string) ([]*models.Request, error)
 }
 
 type HotelsRepository interface {
 	FindByID(ctx context.Context, id string) (*models.Hotel, error)
 	InsertHotel(ctx context.Context, hotel *models.CreateHotelRequest) (*models.Hotel, error)
+	GetDepartmentsByHotelID(ctx context.Context, hotelID string) ([]*models.Department, error)
+	InsertDepartment(ctx context.Context, hotelID, name string) (*models.Department, error)
+	UpdateDepartment(ctx context.Context, id, hotelID, name string) (*models.Department, error)
+	DeleteDepartment(ctx context.Context, id, hotelID string) error
 }
 
+// S3Storage defines the interface for S3 operations
+type S3Storage interface {
+	GeneratePresignedUploadURL(ctx context.Context, in models.PresignedURLInput) (string, error)
+	GeneratePresignedGetURL(ctx context.Context, in models.PresignedURLInput) (string, error)
+	DeleteFile(ctx context.Context, key string) error
+}
 type RoomsRepository interface {
-	FindRoomsWithOptionalGuestBookingsByFloor(ctx context.Context, filter *models.RoomFilters, hotelID string, cursorRoomNumber int) ([]*models.RoomWithOptionalGuestBooking, error)
+	FindRoomsWithOptionalGuestBookingsByFloor(ctx context.Context, filter *models.FilterRoomsRequest, hotelID string, cursorRoomNumber int) ([]*models.RoomWithOptionalGuestBooking, error)
 	FindAllFloors(ctx context.Context, hotelID string) ([]int, error)
+	FindRoomByNumber(ctx context.Context, hotelID string, roomReference string) (*models.Room, error)
+}
+
+type GuestBookingsRepository interface {
+	FindGroupSizeOptions(ctx context.Context, hotelID string) ([]int, error)
+	InsertGuestBooking(ctx context.Context, guestID, roomID, hotelID string, arrivalDate, departureDate time.Time) error
 }
diff --git a/backend/internal/storage/redis/client.go b/backend/internal/storage/redis/client.go
new file mode 100644
index 000000000..bb749b039
--- /dev/null
+++ b/backend/internal/storage/redis/client.go
@@ -0,0 +1,45 @@
+package redis
+
+import (
+	"context"
+	"fmt"
+	"os"
+
+	"github.com/redis/go-redis/v9"
+)
+
+// InitRedis initializes and returns a Redis client
+func InitRedis() (*redis.Client, error) {
+	client := redis.NewClient(&redis.Options{
+		Addr:     getRedisAddr(),
+		Password: getRedisPassword(),
+		DB:       0,
+	})
+
+	ctx := context.Background()
+	if err := client.Ping(ctx).Err(); err != nil {
+		return nil, fmt.Errorf("failed to connect to Redis: %w", err)
+	}
+
+	return client, nil
+}
+
+// Close closes the Redis connection
+func Close(client *redis.Client) error {
+	if client != nil {
+		return client.Close()
+	}
+	return nil
+}
+
+func getRedisAddr() string {
+	addr := os.Getenv("REDIS_ADDR")
+	if addr == "" {
+		return "localhost:6379"
+	}
+	return addr
+}
+
+func getRedisPassword() string {
+	return os.Getenv("REDIS_PASSWORD")
+}
diff --git a/backend/internal/storage/redis/client_test.go b/backend/internal/storage/redis/client_test.go
new file mode 100644
index 000000000..a171e6ea6
--- /dev/null
+++ b/backend/internal/storage/redis/client_test.go
@@ -0,0 +1,34 @@
+package redis
+
+import (
+	"context"
+	"testing"
+)
+
+func TestRedisConnection(t *testing.T) {
+	client, err := InitRedis()
+	if err != nil {
+		t.Skipf("Skipping test: Redis not available: %v", err)
+	}
+	defer func() {
+		_ = Close(client)
+	}()
+
+	ctx := context.Background()
+
+	// Test Set
+	err = client.Set(ctx, "test_key", "test_value", 0).Err()
+	if err != nil {
+		t.Fatalf("Failed to set value: %v", err)
+	}
+	defer client.Del(ctx, "test_key")
+
+	// Test Get
+	val, err := client.Get(ctx, "test_key").Result()
+	if err != nil {
+		t.Fatalf("Failed to get value: %v", err)
+	}
+	if val != "test_value" {
+		t.Errorf("Expected 'test_value', got '%s'", val)
+	}
+}
diff --git a/backend/internal/temporal/activities/generate_request.go b/backend/internal/temporal/activities/generate_request.go
new file mode 100644
index 000000000..9ef3dec2e
--- /dev/null
+++ b/backend/internal/temporal/activities/generate_request.go
@@ -0,0 +1,15 @@
+package activities
+
+import (
+	"context"
+
+	"github.com/generate/selfserve/internal/aiflows"
+)
+
+type Activities struct {
+	Service aiflows.GenerateRequestService
+}
+
+func (a *Activities) RunGenerateRequest(ctx context.Context, input aiflows.GenerateRequestInput) (aiflows.EnrichedGenerateRequestOutput, error) {
+	return a.Service.RunGenerateRequest(ctx, input)
+}
diff --git a/backend/internal/temporal/activities/generate_request_test.go b/backend/internal/temporal/activities/generate_request_test.go
new file mode 100644
index 000000000..af6bbd1a8
--- /dev/null
+++ b/backend/internal/temporal/activities/generate_request_test.go
@@ -0,0 +1,46 @@
+package activities
+
+import (
+	"context"
+	"testing"
+
+	"github.com/generate/selfserve/internal/aiflows"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+type mockGenerateRequestService struct {
+	runGenerateRequestFunc func(ctx context.Context, input aiflows.GenerateRequestInput) (aiflows.EnrichedGenerateRequestOutput, error)
+}
+
+func (m *mockGenerateRequestService) RunGenerateRequest(ctx context.Context, input aiflows.GenerateRequestInput) (aiflows.EnrichedGenerateRequestOutput, error) {
+	return m.runGenerateRequestFunc(ctx, input)
+}
+
+func TestActivities_RunGenerateRequest(t *testing.T) {
+	t.Parallel()
+
+	input := aiflows.GenerateRequestInput{
+		RawText: "room 301 needs towels",
+		HotelID: "org_1",
+	}
+	mockService := &mockGenerateRequestService{
+		runGenerateRequestFunc: func(ctx context.Context, gotInput aiflows.GenerateRequestInput) (aiflows.EnrichedGenerateRequestOutput, error) {
+			assert.Equal(t, input, gotInput)
+			return aiflows.EnrichedGenerateRequestOutput{
+				GenerateRequestOutput: aiflows.GenerateRequestOutput{
+					Name:        "Towels",
+					RequestType: "one-time",
+					Status:      "pending",
+					Priority:    "medium",
+				},
+			}, nil
+		},
+	}
+
+	acts := &Activities{Service: mockService}
+	out, err := acts.RunGenerateRequest(context.Background(), input)
+	require.NoError(t, err)
+	assert.Equal(t, "Towels", out.Name)
+	assert.Equal(t, "one-time", out.RequestType)
+}
diff --git a/backend/internal/temporal/client.go b/backend/internal/temporal/client.go
new file mode 100644
index 000000000..74decba25
--- /dev/null
+++ b/backend/internal/temporal/client.go
@@ -0,0 +1,19 @@
+package temporal
+
+import (
+	"crypto/tls"
+
+	"github.com/generate/selfserve/config"
+	"go.temporal.io/sdk/client"
+)
+
+func NewClient(cfg config.Temporal) (client.Client, error) {
+	return client.Dial(client.Options{
+		HostPort:    cfg.HostPort,
+		Namespace:   cfg.Namespace,
+		Credentials: client.NewAPIKeyStaticCredentials(cfg.APIKey),
+		ConnectionOptions: client.ConnectionOptions{
+			TLS: &tls.Config{},
+		},
+	})
+}
diff --git a/backend/internal/temporal/service.go b/backend/internal/temporal/service.go
new file mode 100644
index 000000000..43f6bfc9c
--- /dev/null
+++ b/backend/internal/temporal/service.go
@@ -0,0 +1,80 @@
+package temporal
+
+import (
+	"context"
+	"errors"
+
+	"github.com/generate/selfserve/internal/aiflows"
+	"github.com/generate/selfserve/internal/temporal/workflows"
+	"github.com/google/uuid"
+	enumspb "go.temporal.io/api/enums/v1"
+	"go.temporal.io/api/serviceerror"
+	"go.temporal.io/sdk/client"
+)
+
+type GenerateRequestResult struct {
+	Status string                                 `json:"status"`
+	Output *aiflows.EnrichedGenerateRequestOutput `json:"output,omitempty"`
+	Error  *string                                `json:"error,omitempty"`
+}
+
+type GenerateRequestWorkflowClient interface {
+	StartGenerateRequest(ctx context.Context, input aiflows.GenerateRequestInput) (workflowID string, err error)
+	GetGenerateRequestResult(ctx context.Context, workflowID string) (GenerateRequestResult, error)
+}
+
+type Service struct {
+	client client.Client
+}
+
+func NewService(c client.Client) *Service {
+	return &Service{client: c}
+}
+
+func (s *Service) StartGenerateRequest(ctx context.Context, input aiflows.GenerateRequestInput) (string, error) {
+	workflowID := "generate-request-" + uuid.NewString()
+	_, err := s.client.ExecuteWorkflow(ctx, client.StartWorkflowOptions{
+		ID:        workflowID,
+		TaskQueue: workflows.GenerateRequestTaskQueue,
+	}, workflows.GenerateRequestWorkflow, input)
+	if err != nil {
+		return "", err
+	}
+	return workflowID, nil
+}
+
+func (s *Service) GetGenerateRequestResult(ctx context.Context, workflowID string) (GenerateRequestResult, error) {
+	description, err := s.client.DescribeWorkflowExecution(ctx, workflowID, "")
+	if err != nil {
+		return GenerateRequestResult{}, err
+	}
+
+	status := description.WorkflowExecutionInfo.GetStatus()
+	switch status {
+	case enumspb.WORKFLOW_EXECUTION_STATUS_RUNNING:
+		return GenerateRequestResult{Status: "pending"}, nil
+	case enumspb.WORKFLOW_EXECUTION_STATUS_COMPLETED:
+		var output aiflows.EnrichedGenerateRequestOutput
+		getErr := s.client.GetWorkflow(ctx, workflowID, "").Get(ctx, &output)
+		if getErr != nil {
+			return GenerateRequestResult{}, getErr
+		}
+		return GenerateRequestResult{Status: "completed", Output: &output}, nil
+	case enumspb.WORKFLOW_EXECUTION_STATUS_FAILED, enumspb.WORKFLOW_EXECUTION_STATUS_TERMINATED, enumspb.WORKFLOW_EXECUTION_STATUS_TIMED_OUT:
+		var output aiflows.EnrichedGenerateRequestOutput
+		getErr := s.client.GetWorkflow(ctx, workflowID, "").Get(ctx, &output)
+		msg := "workflow failed"
+		if getErr != nil {
+			msg = getErr.Error()
+		}
+		return GenerateRequestResult{Status: "failed", Error: &msg}, nil
+	default:
+		msg := "workflow status unknown"
+		return GenerateRequestResult{Status: "failed", Error: &msg}, nil
+	}
+}
+
+func IsWorkflowNotFound(err error) bool {
+	var notFoundErr *serviceerror.NotFound
+	return errors.As(err, &notFoundErr)
+}
diff --git a/backend/internal/temporal/worker.go b/backend/internal/temporal/worker.go
new file mode 100644
index 000000000..2fde10a19
--- /dev/null
+++ b/backend/internal/temporal/worker.go
@@ -0,0 +1,22 @@
+package temporal
+
+import (
+	"github.com/generate/selfserve/internal/aiflows"
+	"github.com/generate/selfserve/internal/temporal/activities"
+	"github.com/generate/selfserve/internal/temporal/workflows"
+	"go.temporal.io/sdk/activity"
+	"go.temporal.io/sdk/client"
+	"go.temporal.io/sdk/worker"
+)
+
+func NewWorker(c client.Client, genkitSvc aiflows.GenerateRequestService) worker.Worker {
+	w := worker.New(c, workflows.GenerateRequestTaskQueue, worker.Options{})
+	acts := &activities.Activities{Service: genkitSvc}
+
+	w.RegisterWorkflow(workflows.GenerateRequestWorkflow)
+	w.RegisterActivityWithOptions(acts.RunGenerateRequest, activity.RegisterOptions{
+		Name: "RunGenerateRequest",
+	})
+
+	return w
+}
diff --git a/backend/internal/temporal/workflows/generate_request.go b/backend/internal/temporal/workflows/generate_request.go
new file mode 100644
index 000000000..731f327aa
--- /dev/null
+++ b/backend/internal/temporal/workflows/generate_request.go
@@ -0,0 +1,33 @@
+package workflows
+
+import (
+	"time"
+
+	"github.com/generate/selfserve/internal/aiflows"
+	"go.temporal.io/sdk/temporal"
+	"go.temporal.io/sdk/workflow"
+)
+
+const GenerateRequestTaskQueue = "generate-request-queue"
+const runGenerateRequestActivityName = "RunGenerateRequest"
+
+func GenerateRequestWorkflow(ctx workflow.Context, input aiflows.GenerateRequestInput) (aiflows.EnrichedGenerateRequestOutput, error) {
+	activityOptions := workflow.ActivityOptions{
+		StartToCloseTimeout: 2 * time.Minute,
+		RetryPolicy: &temporal.RetryPolicy{
+			InitialInterval:    2 * time.Second,
+			BackoffCoefficient: 2.0,
+			MaximumAttempts:    3,
+		},
+	}
+
+	ctx = workflow.WithActivityOptions(ctx, activityOptions)
+
+	var output aiflows.EnrichedGenerateRequestOutput
+	err := workflow.ExecuteActivity(ctx, runGenerateRequestActivityName, input).Get(ctx, &output)
+	if err != nil {
+		return aiflows.EnrichedGenerateRequestOutput{}, err
+	}
+
+	return output, nil
+}
diff --git a/backend/internal/temporal/workflows/generate_request_test.go b/backend/internal/temporal/workflows/generate_request_test.go
new file mode 100644
index 000000000..61386b156
--- /dev/null
+++ b/backend/internal/temporal/workflows/generate_request_test.go
@@ -0,0 +1,81 @@
+package workflows
+
+import (
+	"context"
+	"errors"
+	"testing"
+
+	"github.com/generate/selfserve/internal/aiflows"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+	"github.com/stretchr/testify/suite"
+	"go.temporal.io/sdk/activity"
+	"go.temporal.io/sdk/testsuite"
+)
+
+type workflowTestSuite struct {
+	suite.Suite
+	testsuite.WorkflowTestSuite
+	env *testsuite.TestWorkflowEnvironment
+}
+
+func (s *workflowTestSuite) SetupTest() {
+	s.env = s.NewTestWorkflowEnvironment()
+}
+
+func (s *workflowTestSuite) AfterTest(_, _ string) {
+	s.env.AssertExpectations(s.T())
+}
+
+func (s *workflowTestSuite) TestSuccess() {
+	input := aiflows.GenerateRequestInput{
+		RawText: "need towels",
+		HotelID: "org_1",
+	}
+	expected := aiflows.GenerateRequestOutput{
+		Name:        "Towels",
+		RequestType: "one-time",
+		Status:      "pending",
+		Priority:    "low",
+	}
+
+	s.env.RegisterActivityWithOptions(
+		func(ctx context.Context, gotInput aiflows.GenerateRequestInput) (aiflows.GenerateRequestOutput, error) {
+			assert.Equal(s.T(), input, gotInput)
+			return expected, nil
+		},
+		activity.RegisterOptions{Name: "RunGenerateRequest"},
+	)
+	s.env.ExecuteWorkflow(GenerateRequestWorkflow, input)
+
+	require.True(s.T(), s.env.IsWorkflowCompleted())
+	require.NoError(s.T(), s.env.GetWorkflowError())
+
+	var output aiflows.GenerateRequestOutput
+	require.NoError(s.T(), s.env.GetWorkflowResult(&output))
+	assert.Equal(s.T(), expected, output)
+}
+
+func (s *workflowTestSuite) TestActivityFailure() {
+	input := aiflows.GenerateRequestInput{
+		RawText: "need towels",
+		HotelID: "org_1",
+	}
+
+	s.env.RegisterActivityWithOptions(
+		func(ctx context.Context, gotInput aiflows.GenerateRequestInput) (aiflows.GenerateRequestOutput, error) {
+			assert.Equal(s.T(), input, gotInput)
+			return aiflows.GenerateRequestOutput{}, errors.New("llm unavailable")
+		},
+		activity.RegisterOptions{Name: "RunGenerateRequest"},
+	)
+	s.env.ExecuteWorkflow(GenerateRequestWorkflow, input)
+
+	require.True(s.T(), s.env.IsWorkflowCompleted())
+	require.Error(s.T(), s.env.GetWorkflowError())
+}
+
+func TestGenerateRequestWorkflowSuite(t *testing.T) {
+	t.Parallel()
+	suite.Run(t, new(workflowTestSuite))
+}
diff --git a/backend/internal/tests/clerk_test.go b/backend/internal/tests/clerk_test.go
index 120510958..3e6427da9 100644
--- a/backend/internal/tests/clerk_test.go
+++ b/backend/internal/tests/clerk_test.go
@@ -12,6 +12,7 @@ import (
 	"github.com/generate/selfserve/internal/errs"
 	"github.com/generate/selfserve/internal/handler"
 	"github.com/generate/selfserve/internal/models"
+	storage "github.com/generate/selfserve/internal/service/storage/postgres"
 	"github.com/gofiber/fiber/v2"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -32,63 +33,260 @@ type mockUsersRepositoryClerk struct {
 func (m *mockUsersRepositoryClerk) InsertUser(ctx context.Context, user *models.CreateUser) (*models.User, error) {
 	return m.insertUserFunc(ctx, user)
 }
-
 func (m *mockUsersRepositoryClerk) BulkInsertUsers(ctx context.Context, users []*models.CreateUser) error {
 	return nil
 }
+func (m *mockUsersRepositoryClerk) FindUser(ctx context.Context, id string) (*models.User, error) {
+	return nil, nil
+}
+func (m *mockUsersRepositoryClerk) UpdateProfilePicture(ctx context.Context, userId string, key string) error {
+	return nil
+}
+func (m *mockUsersRepositoryClerk) DeleteProfilePicture(ctx context.Context, userId string) error {
+	return nil
+}
+func (m *mockUsersRepositoryClerk) GetKey(ctx context.Context, userId string) (string, error) {
+	return "", nil
+}
+func (m *mockUsersRepositoryClerk) UpdateUser(ctx context.Context, id string, update *models.UpdateUser) (*models.User, error) {
+	return nil, nil
+}
+func (m *mockUsersRepositoryClerk) SearchUsersByHotel(ctx context.Context, hotelID, cursor, query string, limit int) ([]*models.User, string, error) {
+	return nil, "", nil
+}
+
+func (m *mockUsersRepositoryClerk) GetUsersByHotel(ctx context.Context, hotelID, cursor string, limit int) ([]*models.User, string, error) {
+	return nil, "", nil
+}
+
+func (m *mockUsersRepositoryClerk) AddEmployeeDepartment(ctx context.Context, employeeID, departmentID string) error {
+	return nil
+}
+
+func (m *mockUsersRepositoryClerk) RemoveEmployeeDepartment(ctx context.Context, employeeID, departmentID string) error {
+	return nil
+}
+
+func (m *mockUsersRepositoryClerk) CompleteOnboarding(ctx context.Context, id string, data *models.OnboardUser) (*models.User, error) {
+	return nil, nil
+}
+
+var _ storage.UsersRepository = (*mockUsersRepositoryClerk)(nil)
+
+type mockHotelsRepositoryClerk struct {
+	findByIDFunc    func(ctx context.Context, id string) (*models.Hotel, error)
+	insertHotelFunc func(ctx context.Context, hotel *models.CreateHotelRequest) (*models.Hotel, error)
+}
+
+func (m *mockHotelsRepositoryClerk) FindByID(ctx context.Context, id string) (*models.Hotel, error) {
+	if m.findByIDFunc != nil {
+		return m.findByIDFunc(ctx, id)
+	}
+	return nil, nil
+}
+func (m *mockHotelsRepositoryClerk) InsertHotel(ctx context.Context, hotel *models.CreateHotelRequest) (*models.Hotel, error) {
+	if m.insertHotelFunc != nil {
+		return m.insertHotelFunc(ctx, hotel)
+	}
+	return nil, nil
+}
+
+func (m *mockHotelsRepositoryClerk) GetDepartmentsByHotelID(ctx context.Context, hotelID string) ([]*models.Department, error) {
+	return nil, nil
+}
+
+func (m *mockHotelsRepositoryClerk) InsertDepartment(ctx context.Context, hotelID, name string) (*models.Department, error) {
+	return nil, nil
+}
+
+func (m *mockHotelsRepositoryClerk) UpdateDepartment(ctx context.Context, id, hotelID, name string) (*models.Department, error) {
+	return nil, nil
+}
+
+func (m *mockHotelsRepositoryClerk) DeleteDepartment(ctx context.Context, id, hotelID string) error {
+	return nil
+}
+
+var _ storage.HotelsRepository = (*mockHotelsRepositoryClerk)(nil)
+
+func validVerifier() *mockWebhookVerifier {
+	return &mockWebhookVerifier{
+		verifyFunc: func(payload []byte, headers http.Header) error { return nil },
+	}
+}
+
+func invalidVerifier() *mockWebhookVerifier {
+	return &mockWebhookVerifier{
+		verifyFunc: func(payload []byte, headers http.Header) error {
+			return errors.New("invalid signature")
+		},
+	}
+}
+
+func svixHeaders(req *http.Request) {
+	req.Header.Set("Content-Type", "application/json")
+	req.Header.Set("svix-id", "msg_123")
+	req.Header.Set("svix-timestamp", "1614265330")
+	req.Header.Set("svix-signature", "v1,valid")
+}
 
-func TestClerkHandler_CreateUser(t *testing.T) {
+func TestClerkHandler_OrgCreated(t *testing.T) {
 	t.Parallel()
 
 	validPayload := `{
 		"data": {
-			"id": "user_123",
-			"first_name": "John",
-			"last_name": "Doe",
-			"has_image": false,
-			"image_url": ""
+			"id": "org_123",
+			"name": "Hotel California"
 		}
 	}`
 
 	t.Run("returns 401 when signature verification fails", func(t *testing.T) {
 		t.Parallel()
 
-		webhookMock := &mockWebhookVerifier{
-			verifyFunc: func(payload []byte, headers http.Header) error {
-				return errors.New("invalid signature")
+		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
+		h := handler.NewClerkWebHookHandler(&mockUsersRepositoryClerk{}, &mockHotelsRepositoryClerk{}, invalidVerifier())
+		app.Post("/webhook", h.OrgCreated)
+
+		req := httptest.NewRequest("POST", "/webhook", bytes.NewBufferString(validPayload))
+		svixHeaders(req)
+
+		resp, err := app.Test(req)
+		require.NoError(t, err)
+		assert.Equal(t, 401, resp.StatusCode)
+	})
+
+	t.Run("returns 200 and creates hotel when org is created", func(t *testing.T) {
+		t.Parallel()
+
+		var capturedReq *models.CreateHotelRequest
+		hotelMock := &mockHotelsRepositoryClerk{
+			insertHotelFunc: func(ctx context.Context, hotel *models.CreateHotelRequest) (*models.Hotel, error) {
+				capturedReq = hotel
+				return &models.Hotel{CreateHotelRequest: *hotel}, nil
 			},
 		}
 
-		userMock := &mockUsersRepositoryClerk{
-			insertUserFunc: func(ctx context.Context, user *models.CreateUser) (*models.User, error) {
-				return nil, nil
+		app := fiber.New()
+		h := handler.NewClerkWebHookHandler(&mockUsersRepositoryClerk{}, hotelMock, validVerifier())
+		app.Post("/webhook", h.OrgCreated)
+
+		req := httptest.NewRequest("POST", "/webhook", bytes.NewBufferString(validPayload))
+		svixHeaders(req)
+
+		resp, err := app.Test(req)
+		require.NoError(t, err)
+		assert.Equal(t, 200, resp.StatusCode)
+		assert.Equal(t, "org_123", capturedReq.ID)
+		assert.Equal(t, "Hotel California", capturedReq.Name)
+	})
+
+	t.Run("returns 200 when hotel already exists (idempotent)", func(t *testing.T) {
+		t.Parallel()
+
+		hotelMock := &mockHotelsRepositoryClerk{
+			insertHotelFunc: func(ctx context.Context, hotel *models.CreateHotelRequest) (*models.Hotel, error) {
+				return nil, errs.ErrAlreadyExistsInDB
 			},
 		}
 
 		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
-		h := handler.NewClerkWebHookHandler(userMock, webhookMock)
-		app.Post("/webhook", h.CreateUser)
+		h := handler.NewClerkWebHookHandler(&mockUsersRepositoryClerk{}, hotelMock, validVerifier())
+		app.Post("/webhook", h.OrgCreated)
 
 		req := httptest.NewRequest("POST", "/webhook", bytes.NewBufferString(validPayload))
-		req.Header.Set("Content-Type", "application/json")
-		req.Header.Set("svix-id", "msg_123")
-		req.Header.Set("svix-timestamp", "1614265330")
-		req.Header.Set("svix-signature", "invalid")
+		svixHeaders(req)
 
 		resp, err := app.Test(req)
 		require.NoError(t, err)
+		assert.Equal(t, 200, resp.StatusCode)
+	})
+
+	t.Run("returns 400 when payload is invalid JSON", func(t *testing.T) {
+		t.Parallel()
+
+		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
+		h := handler.NewClerkWebHookHandler(&mockUsersRepositoryClerk{}, &mockHotelsRepositoryClerk{}, validVerifier())
+		app.Post("/webhook", h.OrgCreated)
+
+		req := httptest.NewRequest("POST", "/webhook", bytes.NewBufferString(`{invalid`))
+		svixHeaders(req)
+
+		resp, err := app.Test(req)
+		require.NoError(t, err)
+		assert.Equal(t, 400, resp.StatusCode)
+	})
+
+	t.Run("returns 500 on db error", func(t *testing.T) {
+		t.Parallel()
+
+		hotelMock := &mockHotelsRepositoryClerk{
+			insertHotelFunc: func(ctx context.Context, hotel *models.CreateHotelRequest) (*models.Hotel, error) {
+				return nil, errors.New("db error")
+			},
+		}
+
+		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
+		h := handler.NewClerkWebHookHandler(&mockUsersRepositoryClerk{}, hotelMock, validVerifier())
+		app.Post("/webhook", h.OrgCreated)
+
+		req := httptest.NewRequest("POST", "/webhook", bytes.NewBufferString(validPayload))
+		svixHeaders(req)
+
+		resp, err := app.Test(req)
+		require.NoError(t, err)
+		assert.Equal(t, 500, resp.StatusCode)
+	})
+}
+
+func TestClerkHandler_CreateOrgMembership(t *testing.T) {
+	t.Parallel()
+
+	validPayload := `{
+		"data": {
+			"organization": {
+				"id": "org_123",
+				"name": "Hotel California"
+			},
+			"public_user_data": {
+				"user_id": "user_123",
+				"first_name": "John",
+				"last_name": "Doe",
+				"has_image": false,
+				"image_url": null
+			}
+		}
+	}`
 
+	hotelID := "org_123"
+
+	t.Run("returns 401 when signature verification fails", func(t *testing.T) {
+		t.Parallel()
+
+		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
+		h := handler.NewClerkWebHookHandler(&mockUsersRepositoryClerk{}, &mockHotelsRepositoryClerk{}, invalidVerifier())
+		app.Post("/webhook", h.CreateOrgMembership)
+
+		req := httptest.NewRequest("POST", "/webhook", bytes.NewBufferString(validPayload))
+		svixHeaders(req)
+
+		resp, err := app.Test(req)
+		require.NoError(t, err)
 		assert.Equal(t, 401, resp.StatusCode)
 	})
 
-	t.Run("returns 200 and creates user when signature is valid", func(t *testing.T) {
+	t.Run("returns 200 and creates user when membership is created", func(t *testing.T) {
 		t.Parallel()
 
 		var capturedUser *models.CreateUser
 
-		webhookMock := &mockWebhookVerifier{
-			verifyFunc: func(payload []byte, headers http.Header) error {
-				return nil
+		hotelMock := &mockHotelsRepositoryClerk{
+			findByIDFunc: func(ctx context.Context, id string) (*models.Hotel, error) {
+				return &models.Hotel{
+					CreateHotelRequest: models.CreateHotelRequest{
+						ID:   hotelID,
+						Name: "Hotel California",
+					},
+				}, nil
 			},
 		}
 
@@ -104,101 +302,63 @@ func TestClerkHandler_CreateUser(t *testing.T) {
 		}
 
 		app := fiber.New()
-		h := handler.NewClerkWebHookHandler(userMock, webhookMock)
-		app.Post("/webhook", h.CreateUser)
+		h := handler.NewClerkWebHookHandler(userMock, hotelMock, validVerifier())
+		app.Post("/webhook", h.CreateOrgMembership)
 
 		req := httptest.NewRequest("POST", "/webhook", bytes.NewBufferString(validPayload))
-		req.Header.Set("Content-Type", "application/json")
-		req.Header.Set("svix-id", "msg_123")
-		req.Header.Set("svix-timestamp", "1614265330")
-		req.Header.Set("svix-signature", "v1,valid")
+		svixHeaders(req)
 
 		resp, err := app.Test(req)
 		require.NoError(t, err)
-
 		assert.Equal(t, 200, resp.StatusCode)
 		assert.Equal(t, "user_123", capturedUser.ID)
 		assert.Equal(t, "John", capturedUser.FirstName)
 		assert.Equal(t, "Doe", capturedUser.LastName)
+		assert.Equal(t, hotelID, capturedUser.HotelID)
 	})
 
-	t.Run("returns 400 when payload JSON is invalid", func(t *testing.T) {
+	t.Run("returns 404 when hotel not found", func(t *testing.T) {
 		t.Parallel()
 
-		webhookMock := &mockWebhookVerifier{
-			verifyFunc: func(payload []byte, headers http.Header) error {
-				return nil
-			},
-		}
-
-		userMock := &mockUsersRepositoryClerk{
-			insertUserFunc: func(ctx context.Context, user *models.CreateUser) (*models.User, error) {
-				return nil, nil
+		hotelMock := &mockHotelsRepositoryClerk{
+			findByIDFunc: func(ctx context.Context, id string) (*models.Hotel, error) {
+				return nil, errs.ErrNotFoundInDB
 			},
 		}
 
 		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
-		h := handler.NewClerkWebHookHandler(userMock, webhookMock)
-		app.Post("/webhook", h.CreateUser)
+		h := handler.NewClerkWebHookHandler(&mockUsersRepositoryClerk{}, hotelMock, validVerifier())
+		app.Post("/webhook", h.CreateOrgMembership)
 
-		req := httptest.NewRequest("POST", "/webhook", bytes.NewBufferString(`{invalid`))
-		req.Header.Set("Content-Type", "application/json")
-		req.Header.Set("svix-id", "msg_123")
-		req.Header.Set("svix-timestamp", "1614265330")
-		req.Header.Set("svix-signature", "v1,valid")
+		req := httptest.NewRequest("POST", "/webhook", bytes.NewBufferString(validPayload))
+		svixHeaders(req)
 
 		resp, err := app.Test(req)
 		require.NoError(t, err)
-
-		assert.Equal(t, 400, resp.StatusCode)
+		assert.Equal(t, 404, resp.StatusCode)
 	})
 
-	t.Run("returns 400 when required fields are missing", func(t *testing.T) {
+	t.Run("returns 400 when payload is invalid JSON", func(t *testing.T) {
 		t.Parallel()
 
-		webhookMock := &mockWebhookVerifier{
-			verifyFunc: func(payload []byte, headers http.Header) error {
-				return nil
-			},
-		}
-
-		userMock := &mockUsersRepositoryClerk{
-			insertUserFunc: func(ctx context.Context, user *models.CreateUser) (*models.User, error) {
-				return nil, nil
-			},
-		}
-
 		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
-		h := handler.NewClerkWebHookHandler(userMock, webhookMock)
-		app.Post("/webhook", h.CreateUser)
-
-		invalidPayload := `{
-			"type": "user.created",
-			"data": {
-				"id": "",
-				"first_name": "",
-				"last_name": ""
-			}
-		}`
+		h := handler.NewClerkWebHookHandler(&mockUsersRepositoryClerk{}, &mockHotelsRepositoryClerk{}, validVerifier())
+		app.Post("/webhook", h.CreateOrgMembership)
 
-		req := httptest.NewRequest("POST", "/webhook", bytes.NewBufferString(invalidPayload))
-		req.Header.Set("Content-Type", "application/json")
-		req.Header.Set("svix-id", "msg_123")
-		req.Header.Set("svix-timestamp", "1614265330")
-		req.Header.Set("svix-signature", "v1,valid")
+		req := httptest.NewRequest("POST", "/webhook", bytes.NewBufferString(`{invalid`))
+		svixHeaders(req)
 
 		resp, err := app.Test(req)
 		require.NoError(t, err)
-
 		assert.Equal(t, 400, resp.StatusCode)
 	})
 
-	t.Run("returns 500 when user creation fails", func(t *testing.T) {
+	t.Run("returns 500 when user insertion fails", func(t *testing.T) {
 		t.Parallel()
 
-		webhookMock := &mockWebhookVerifier{
-			verifyFunc: func(payload []byte, headers http.Header) error {
-				return nil
+		hotelMock := &mockHotelsRepositoryClerk{
+			findByIDFunc: func(ctx context.Context, id string) (*models.Hotel, error) {
+				return &models.Hotel{CreateHotelRequest: models.CreateHotelRequest{ID: hotelID}}, nil
 			},
 		}
 
@@ -209,107 +369,102 @@ func TestClerkHandler_CreateUser(t *testing.T) {
 		}
 
 		app := fiber.New(fiber.Config{ErrorHandler: errs.ErrorHandler})
-		h := handler.NewClerkWebHookHandler(userMock, webhookMock)
-		app.Post("/webhook", h.CreateUser)
+		h := handler.NewClerkWebHookHandler(userMock, hotelMock, validVerifier())
+		app.Post("/webhook", h.CreateOrgMembership)
 
 		req := httptest.NewRequest("POST", "/webhook", bytes.NewBufferString(validPayload))
-		req.Header.Set("Content-Type", "application/json")
-		req.Header.Set("svix-id", "msg_123")
-		req.Header.Set("svix-timestamp", "1614265330")
-		req.Header.Set("svix-signature", "v1,valid")
+		svixHeaders(req)
 
 		resp, err := app.Test(req)
 		require.NoError(t, err)
-
 		assert.Equal(t, 500, resp.StatusCode)
 	})
 
-	t.Run("passes correct headers to verifier", func(t *testing.T) {
+	t.Run("sets profile picture when has_image is true", func(t *testing.T) {
 		t.Parallel()
 
-		var capturedHeaders http.Header
+		var capturedUser *models.CreateUser
 
-		webhookMock := &mockWebhookVerifier{
-			verifyFunc: func(payload []byte, headers http.Header) error {
-				capturedHeaders = headers
-				return nil
+		hotelMock := &mockHotelsRepositoryClerk{
+			findByIDFunc: func(ctx context.Context, id string) (*models.Hotel, error) {
+				return &models.Hotel{CreateHotelRequest: models.CreateHotelRequest{ID: hotelID}}, nil
 			},
 		}
 
 		userMock := &mockUsersRepositoryClerk{
 			insertUserFunc: func(ctx context.Context, user *models.CreateUser) (*models.User, error) {
-				return &models.User{
-					CreatedAt:  time.Now(),
-					UpdatedAt:  time.Now(),
-					CreateUser: *user,
-				}, nil
+				capturedUser = user
+				return &models.User{CreatedAt: time.Now(), UpdatedAt: time.Now(), CreateUser: *user}, nil
 			},
 		}
 
 		app := fiber.New()
-		h := handler.NewClerkWebHookHandler(userMock, webhookMock)
-		app.Post("/webhook", h.CreateUser)
+		h := handler.NewClerkWebHookHandler(userMock, hotelMock, validVerifier())
+		app.Post("/webhook", h.CreateOrgMembership)
 
-		req := httptest.NewRequest("POST", "/webhook", bytes.NewBufferString(validPayload))
-		req.Header.Set("Content-Type", "application/json")
-		req.Header.Set("svix-id", "msg_abc")
-		req.Header.Set("svix-timestamp", "1234567890")
-		req.Header.Set("svix-signature", "v1,signature123")
+		payloadWithImage := `{
+			"data": {
+				"organization": {
+					"id": "org_123",
+					"name": "Hotel California"
+				},
+				"public_user_data": {
+					"user_id": "user_123",
+					"first_name": "John",
+					"last_name": "Doe",
+					"has_image": true,
+					"image_url": "https://example.com/photo.jpg"
+				}
+			}
+		}`
+
+		req := httptest.NewRequest("POST", "/webhook", bytes.NewBufferString(payloadWithImage))
+		svixHeaders(req)
 
 		_, err := app.Test(req)
 		require.NoError(t, err)
-
-		assert.Equal(t, "msg_abc", capturedHeaders.Get("svix-id"))
-		assert.Equal(t, "1234567890", capturedHeaders.Get("svix-timestamp"))
-		assert.Equal(t, "v1,signature123", capturedHeaders.Get("svix-signature"))
+		assert.Equal(t, "https://example.com/photo.jpg", *capturedUser.ProfilePicture)
 	})
 
-	t.Run("sets profile picture when has_image is true", func(t *testing.T) {
+	t.Run("passes correct headers to verifier", func(t *testing.T) {
 		t.Parallel()
 
-		var capturedUser *models.CreateUser
+		var capturedHeaders http.Header
 
-		webhookMock := &mockWebhookVerifier{
+		verifierMock := &mockWebhookVerifier{
 			verifyFunc: func(payload []byte, headers http.Header) error {
+				capturedHeaders = headers
 				return nil
 			},
 		}
 
+		hotelMock := &mockHotelsRepositoryClerk{
+			findByIDFunc: func(ctx context.Context, id string) (*models.Hotel, error) {
+				return &models.Hotel{CreateHotelRequest: models.CreateHotelRequest{ID: hotelID}}, nil
+			},
+		}
+
 		userMock := &mockUsersRepositoryClerk{
 			insertUserFunc: func(ctx context.Context, user *models.CreateUser) (*models.User, error) {
-				capturedUser = user
-				return &models.User{
-					CreatedAt:  time.Now(),
-					UpdatedAt:  time.Now(),
-					CreateUser: *user,
-				}, nil
+				return &models.User{CreatedAt: time.Now(), UpdatedAt: time.Now(), CreateUser: *user}, nil
 			},
 		}
 
 		app := fiber.New()
-		h := handler.NewClerkWebHookHandler(userMock, webhookMock)
-		app.Post("/webhook", h.CreateUser)
-
-		payloadWithImage := `{
-			"type": "user.created",
-			"data": {
-				"id": "user_123",
-				"first_name": "John",
-				"last_name": "Doe",
-				"has_image": true,
-				"image_url": "https://example.com/photo.jpg"
-			}
-		}`
+		h := handler.NewClerkWebHookHandler(userMock, hotelMock, verifierMock)
+		app.Post("/webhook", h.CreateOrgMembership)
 
-		req := httptest.NewRequest("POST", "/webhook", bytes.NewBufferString(payloadWithImage))
+		req := httptest.NewRequest("POST", "/webhook", bytes.NewBufferString(validPayload))
 		req.Header.Set("Content-Type", "application/json")
-		req.Header.Set("svix-id", "msg_123")
-		req.Header.Set("svix-timestamp", "1614265330")
-		req.Header.Set("svix-signature", "v1,valid")
+		req.Header.Set("svix-id", "msg_abc")
+		req.Header.Set("svix-timestamp", "1234567890")
+		req.Header.Set("svix-signature", "v1,signature123")
 
 		_, err := app.Test(req)
 		require.NoError(t, err)
 
-		assert.Equal(t, "https://example.com/photo.jpg", *capturedUser.ProfilePicture)
+		assert.Equal(t, "msg_abc", capturedHeaders.Get("svix-id"))
+		assert.Equal(t, "1234567890", capturedHeaders.Get("svix-timestamp"))
+		assert.Equal(t, "v1,signature123", capturedHeaders.Get("svix-signature"))
 	})
 }
diff --git a/backend/internal/validation/errors.go b/backend/internal/validation/errors.go
index 5af5e9c81..2255d84c8 100644
--- a/backend/internal/validation/errors.go
+++ b/backend/internal/validation/errors.go
@@ -33,6 +33,16 @@ func ToFieldErrors(err error) map[string]string {
 			fieldErrors[fieldName] = "invalid uuid"
 		case "timezone":
 			fieldErrors[fieldName] = "invalid IANA timezone"
+		case "oneof":
+			if strings.EqualFold(fieldName, "priority") {
+				fieldErrors[fieldName] = "must be one of: low, medium, high"
+				continue
+			}
+			if strings.EqualFold(fieldName, "status") {
+				fieldErrors[fieldName] = "must be one of: pending, assigned, in progress, completed"
+				continue
+			}
+			fieldErrors[fieldName] = fmt.Sprintf("failed validation: %s", fieldError.Tag())
 		default:
 			fieldErrors[fieldName] = fmt.Sprintf("failed validation: %s", fieldError.Tag())
 		}
diff --git a/backend/internal/validation/validator.go b/backend/internal/validation/validator.go
index 7289f1977..538643cab 100644
--- a/backend/internal/validation/validator.go
+++ b/backend/internal/validation/validator.go
@@ -14,6 +14,10 @@ func Init() {
 	validatorInstance := validator.New(validator.WithRequiredStructEnabled())
 
 	validatorInstance.RegisterTagNameFunc(func(field reflect.StructField) string {
+		if label := field.Tag.Get("label"); label != "" {
+			return label
+		}
+
 		jsonTag := field.Tag.Get("json")
 		jsonName := strings.SplitN(jsonTag, ",", 2)[0]
 
@@ -21,7 +25,7 @@ func Init() {
 			return field.Name
 		}
 		if jsonName == "-" {
-			return ""
+			return field.Name
 		}
 		return jsonName
 	})
diff --git a/backend/scripts/rooms-list-seed.sql b/backend/scripts/rooms-list-seed.sql
deleted file mode 100644
index d8f938273..000000000
--- a/backend/scripts/rooms-list-seed.sql
+++ /dev/null
@@ -1,139 +0,0 @@
--- =============================================================================
--- Seed: hotel · rooms (floors 1–3) · guests · guest_bookings
--- =============================================================================
--- Run with:
---   psql postgresql://postgres:postgres@localhost:54322/postgres -f scripts/seed.sql
---
--- All INSERTs are idempotent (ON CONFLICT DO NOTHING with fixed UUIDs).
--- The postgres superuser bypasses RLS, so no policy changes are needed.
--- =============================================================================
-
-BEGIN;
-
--- -----------------------------------------------------------------------------
--- Hotel
--- -----------------------------------------------------------------------------
-INSERT INTO public.hotels (id, name, floors)
-VALUES ('a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11', 'Grand Hotel', 5)
-ON CONFLICT (id) DO NOTHING;
-
--- -----------------------------------------------------------------------------
--- Rooms  (3 per floor, floors 1–3)
--- Naming convention: 1XXXXXXXXXXX0<floor><room_within_floor>
--- -----------------------------------------------------------------------------
-INSERT INTO public.rooms (id, room_number, floor, suite_type, room_status, features, hotel_id)
-VALUES
-  -- Floor 1
-  ('10000000-0000-0000-0000-000000000101', 101, 1, 'standard',  'available',
-   ARRAY['wifi','tv'],                           'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11'),
-  ('10000000-0000-0000-0000-000000000102', 102, 1, 'deluxe',    'occupied',
-   ARRAY['wifi','tv','minibar'],                 'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11'),
-  ('10000000-0000-0000-0000-000000000103', 103, 1, 'suite',     'available',
-   ARRAY['wifi','tv','jacuzzi','minibar'],        'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11'),
-
-  -- Floor 2
-  ('10000000-0000-0000-0000-000000000201', 201, 2, 'standard',  'available',
-   ARRAY['wifi','tv'],                           'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11'),
-  ('10000000-0000-0000-0000-000000000202', 202, 2, 'deluxe',    'occupied',
-   ARRAY['wifi','tv','balcony'],                 'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11'),
-  ('10000000-0000-0000-0000-000000000203', 203, 2, 'penthouse', 'maintenance',
-   ARRAY['wifi','tv','kitchen','jacuzzi'],        'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11'),
-
-  -- Floor 3
-  ('10000000-0000-0000-0000-000000000301', 301, 3, 'standard',  'available',
-   ARRAY['wifi','tv'],                           'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11'),
-  ('10000000-0000-0000-0000-000000000302', 302, 3, 'deluxe',    'available',
-   ARRAY['wifi','tv','balcony'],                 'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11'),
-  ('10000000-0000-0000-0000-000000000303', 303, 3, 'suite',     'occupied',
-   ARRAY['wifi','tv','jacuzzi','minibar','balcony'], 'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11')
-ON CONFLICT (id) DO NOTHING;
-
--- If these rows already existed from an earlier seed, ensure they point at the
--- new hardcoded hotel id (keeps the seed idempotent across schema/data tweaks).
-UPDATE public.rooms
-SET hotel_id = 'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11'
-WHERE id IN (
-  '10000000-0000-0000-0000-000000000101',
-  '10000000-0000-0000-0000-000000000102',
-  '10000000-0000-0000-0000-000000000103',
-  '10000000-0000-0000-0000-000000000201',
-  '10000000-0000-0000-0000-000000000202',
-  '10000000-0000-0000-0000-000000000203',
-  '10000000-0000-0000-0000-000000000301',
-  '10000000-0000-0000-0000-000000000302',
-  '10000000-0000-0000-0000-000000000303'
-);
-
--- -----------------------------------------------------------------------------
--- Guests
--- -----------------------------------------------------------------------------
-INSERT INTO public.guests (id, first_name, last_name, profile_picture, timezone)
-VALUES
-  ('a0000000-0000-0000-0000-000000000001', 'Alice', 'Johnson',  NULL, 'America/New_York'),
-  ('a0000000-0000-0000-0000-000000000002', 'Bob',   'Smith',    NULL, 'America/Chicago'),
-  ('a0000000-0000-0000-0000-000000000003', 'Carol', 'Williams', NULL, 'America/Los_Angeles'),
-  ('a0000000-0000-0000-0000-000000000004', 'David', 'Brown',    NULL, 'Europe/London')
-ON CONFLICT (id) DO NOTHING;
-
--- -----------------------------------------------------------------------------
--- Guest bookings
---   active   → guest appears on the room in GET /api/v1/rooms
---   inactive → filtered out (verifies the LEFT JOIN WHERE status = 'active')
---
--- Note: `guest_bookings.hotel_id` was added later; this seed remains compatible
--- with databases that haven't applied that migration yet.
--- -----------------------------------------------------------------------------
-INSERT INTO public.guest_bookings (id, guest_id, room_id, arrival_date, departure_date, notes, status)
-VALUES
-  -- Alice in room 102 (floor 1) — active
-  ('b0000000-0000-0000-0000-000000000001',
-   'a0000000-0000-0000-0000-000000000001',
-   '10000000-0000-0000-0000-000000000102',
-   '2026-03-10', '2026-03-17', 'Early check-in requested', 'active'),
-
-  -- Bob in room 202 (floor 2) — active
-  ('b0000000-0000-0000-0000-000000000002',
-   'a0000000-0000-0000-0000-000000000002',
-   '10000000-0000-0000-0000-000000000202',
-   '2026-03-12', '2026-03-15', NULL, 'active'),
-
-  -- Carol in room 303 (floor 3) — active
-  ('b0000000-0000-0000-0000-000000000003',
-   'a0000000-0000-0000-0000-000000000003',
-   '10000000-0000-0000-0000-000000000303',
-   '2026-03-13', '2026-03-20', 'No feather pillows please', 'active'),
-
-  -- David in room 101 (floor 1) — inactive; must NOT appear in the rooms response
-  ('b0000000-0000-0000-0000-000000000004',
-   'a0000000-0000-0000-0000-000000000004',
-   '10000000-0000-0000-0000-000000000101',
-   '2026-03-01', '2026-03-07', NULL, 'inactive')
-ON CONFLICT (id) DO NOTHING;
-
-DO $$
-BEGIN
-  IF EXISTS (
-    SELECT 1
-    FROM information_schema.columns
-    WHERE table_schema = 'public'
-      AND table_name = 'guest_bookings'
-      AND column_name = 'hotel_id'
-  ) THEN
-    UPDATE public.guest_bookings gb
-    SET hotel_id = 'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11'
-    WHERE gb.id::text LIKE 'b0000000%'
-      AND gb.hotel_id IS NULL;
-  END IF;
-END
-$$;
-
-COMMIT;
-
--- Quick sanity-check (printed after the transaction commits)
-SELECT 'hotels'        AS "table", COUNT(*) FROM public.hotels        WHERE id  = 'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11'
-UNION ALL
-SELECT 'rooms',                    COUNT(*) FROM public.rooms          WHERE hotel_id = 'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11'
-UNION ALL
-SELECT 'guests',                   COUNT(*) FROM public.guests         WHERE id::text LIKE 'a0000000%'
-UNION ALL
-SELECT 'guest_bookings',           COUNT(*) FROM public.guest_bookings WHERE id::text LIKE 'b0000000%';
diff --git a/backend/scripts/rooms-list-seed.sh b/backend/scripts/seed.sh
old mode 100755
new mode 100644
similarity index 57%
rename from backend/scripts/rooms-list-seed.sh
rename to backend/scripts/seed.sh
index 2af94b865..3c545a209
--- a/backend/scripts/rooms-list-seed.sh
+++ b/backend/scripts/seed.sh
@@ -1,15 +1,16 @@
 #!/usr/bin/env bash
 # =============================================================================
-# rooms-list-seed.sh — seed the local Supabase DB with a hotel, rooms, guests, and bookings
-# meant to seed the rooms list page with data
+# seed.sh — seed the local Supabase DB with a hotel, rooms, guests, and bookings
 # =============================================================================
 # Usage:
-#   cd backend && bash scripts/rooms-list-seed.sh
+#   cd backend && bash scripts/seed.sh
 #   — or —
-#   make rooms-list-seed
+#   make seed
 #
 # Prerequisites:
 #   - Local Supabase running (make db-start)
+#
+# Note: supabase/seed.sql is also run automatically by `supabase db reset`.
 # =============================================================================
 
 set -euo pipefail
@@ -17,7 +18,7 @@ set -euo pipefail
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 BACKEND_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
 ENV_FILE="$BACKEND_DIR/config/.env"
-SEED_SQL="$SCRIPT_DIR/rooms-list-seed.sql"
+SEED_SQL="$BACKEND_DIR/supabase/seed.sql"
 
 # Load .env
 if [[ -f "$ENV_FILE" ]]; then
@@ -37,18 +38,18 @@ APP_PORT="${APP_PORT:-8080}"
 echo "Seeding database at ${DB_HOST}:${DB_PORT}/${DB_NAME}..."
 PGPASSWORD="$DB_PASSWORD" psql -h "$DB_HOST" -p "$DB_PORT" -U "$DB_USER" -d "$DB_NAME" -f "$SEED_SQL"
 echo ""
-echo "Done. curl commands to test GET /api/v1/rooms:"
+echo "Done. curl commands to test:"
 echo ""
 echo "  export HOTEL_ID='a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11'"
 echo ""
 echo "  # All rooms:"
-echo "  curl -s -H \"X-Hotel-ID: \$HOTEL_ID\" 'http://localhost:${APP_PORT}/api/v1/rooms' | jq"
+echo "  curl -s -X POST -H \"Content-Type: application/json\" -H \"X-Hotel-ID: \$HOTEL_ID\" -d '{}' 'http://localhost:${APP_PORT}/api/v1/rooms' | jq"
 echo ""
 echo "  # Floor 1 only:"
-echo "  curl -s -H \"X-Hotel-ID: \$HOTEL_ID\" 'http://localhost:${APP_PORT}/api/v1/rooms?floors=1' | jq"
+echo "  curl -s -X POST -H \"Content-Type: application/json\" -H \"X-Hotel-ID: \$HOTEL_ID\" -d '{\"floors\":[1]}' 'http://localhost:${APP_PORT}/api/v1/rooms' | jq"
 echo ""
-echo "  # Floors 1 and 3:"
-echo "  curl -s -H \"X-Hotel-ID: \$HOTEL_ID\" 'http://localhost:${APP_PORT}/api/v1/rooms?floors=1&floors=3' | jq"
+echo "  # All guests:"
+echo "  curl -s -H \"X-Hotel-ID: \$HOTEL_ID\" 'http://localhost:${APP_PORT}/api/v1/guests' | jq"
 echo ""
-echo "  # Page size 3 (shows cursor pagination):"
-echo "  curl -s -H \"X-Hotel-ID: \$HOTEL_ID\" 'http://localhost:${APP_PORT}/api/v1/rooms?limit=3' | jq"
+echo "  # Requests for room 102:"
+echo "  curl -s -X POST -H \"Content-Type: application/json\" -H \"X-Hotel-ID: \$HOTEL_ID\" -d '{\"room_id\":\"10000000-0000-0000-0000-000000000102\"}' 'http://localhost:${APP_PORT}/api/v1/requests/room' | jq"
diff --git a/backend/supabase/migrations/20260217134812_add-request-version-column.sql b/backend/supabase/migrations/20260217134812_add-request-version-column.sql
index 30fdaad33..bad2830e6 100644
--- a/backend/supabase/migrations/20260217134812_add-request-version-column.sql
+++ b/backend/supabase/migrations/20260217134812_add-request-version-column.sql
@@ -10,4 +10,4 @@ SET request_version = created_at;
 ALTER TABLE public.requests
 ALTER COLUMN request_version DROP DEFAULT;
 
-ALTER TABLE public.requests DROP COLUMN updated_at
\ No newline at end of file
+ALTER TABLE public.requests DROP COLUMN updated_at
diff --git a/backend/supabase/migrations/20260317000000_requests-composite-pk.sql b/backend/supabase/migrations/20260317000000_requests-composite-pk.sql
index dafed940e..8af0d1126 100644
--- a/backend/supabase/migrations/20260317000000_requests-composite-pk.sql
+++ b/backend/supabase/migrations/20260317000000_requests-composite-pk.sql
@@ -1,3 +1,3 @@
 ALTER TABLE public.requests DROP CONSTRAINT requests_pkey;
 
-ALTER TABLE public.requests ADD CONSTRAINT requests_pkey PRIMARY KEY (id, request_version);
\ No newline at end of file
+ALTER TABLE public.requests ADD CONSTRAINT requests_pkey PRIMARY KEY (id, request_version);
diff --git a/backend/supabase/migrations/20260325030124_create_users_table.sql b/backend/supabase/migrations/20260325030124_create_users_table.sql
new file mode 100644
index 000000000..3c45b12ad
--- /dev/null
+++ b/backend/supabase/migrations/20260325030124_create_users_table.sql
@@ -0,0 +1,3 @@
+ALTER TABLE users
+    ADD COLUMN IF NOT EXISTS phone_number TEXT,
+    ADD COLUMN IF NOT EXISTS primary_email TEXT;
\ No newline at end of file
diff --git a/backend/supabase/migrations/20260325065920_add_group_size_to_bookings.sql b/backend/supabase/migrations/20260325065920_add_group_size_to_bookings.sql
new file mode 100644
index 000000000..0005c2e1f
--- /dev/null
+++ b/backend/supabase/migrations/20260325065920_add_group_size_to_bookings.sql
@@ -0,0 +1,2 @@
+ALTER TABLE public.guest_bookings
+ADD COLUMN group_size INT;
diff --git a/backend/supabase/migrations/20260326050118_guest-bookings-hotel-id-active-index.sql b/backend/supabase/migrations/20260326050118_guest-bookings-hotel-id-active-index.sql
new file mode 100644
index 000000000..64001299e
--- /dev/null
+++ b/backend/supabase/migrations/20260326050118_guest-bookings-hotel-id-active-index.sql
@@ -0,0 +1,3 @@
+-- index on guest_bookings for hotel_id and status
+create index if not exists idx_guest_bookings_hotel_id_status
+  on public.guest_bookings(hotel_id, status);
diff --git a/backend/supabase/migrations/20260402181236_added-profile-info-guests.sql b/backend/supabase/migrations/20260402181236_added-profile-info-guests.sql
new file mode 100644
index 000000000..32db84a2b
--- /dev/null
+++ b/backend/supabase/migrations/20260402181236_added-profile-info-guests.sql
@@ -0,0 +1,6 @@
+ALTER TABLE public.guests
+    ADD COLUMN IF NOT EXISTS pronouns TEXT,
+    ADD COLUMN IF NOT EXISTS do_not_disturb_start TIME,
+    ADD COLUMN IF NOT EXISTS do_not_disturb_end TIME,
+    ADD COLUMN IF NOT EXISTS housekeeping_cadence TEXT,
+    ADD COLUMN IF NOT EXISTS assistance JSONB DEFAULT '{}';
\ No newline at end of file
diff --git a/backend/supabase/migrations/20260404000001_create-notifications-table.sql b/backend/supabase/migrations/20260404000001_create-notifications-table.sql
new file mode 100644
index 000000000..92d91487e
--- /dev/null
+++ b/backend/supabase/migrations/20260404000001_create-notifications-table.sql
@@ -0,0 +1,20 @@
+-- Create notifications table
+create table if not exists public.notifications (
+    id         uuid        primary key default gen_random_uuid(),
+    user_id    text        not null references public.users(id) on delete cascade,
+    type       text        not null,
+    title      text        not null,
+    body       text        not null,
+    data       jsonb,
+    read_at     timestamptz,
+    is_archived boolean     not null default false,
+    archived_at timestamptz,
+    created_at  timestamptz default now()
+);
+
+create index if not exists idx_notifications_user_id_created_at
+    on public.notifications (user_id, created_at desc)
+    where is_archived = false;
+
+-- Enable RLS
+alter table public.notifications enable row level security;
diff --git a/backend/supabase/migrations/20260404000002_create-device-tokens-table.sql b/backend/supabase/migrations/20260404000002_create-device-tokens-table.sql
new file mode 100644
index 000000000..0da71949e
--- /dev/null
+++ b/backend/supabase/migrations/20260404000002_create-device-tokens-table.sql
@@ -0,0 +1,12 @@
+-- Create device_tokens table for mobile push notifications
+create table if not exists public.device_tokens (
+    id         uuid        primary key default gen_random_uuid(),
+    user_id    text        not null references public.users(id) on delete cascade,
+    token      text        not null,
+    platform   text        not null, -- 'ios' | 'android'
+    created_at timestamptz default now(),
+    unique (user_id, token)
+);
+
+-- Enable RLS
+alter table public.device_tokens enable row level security;
diff --git a/backend/supabase/migrations/20260404000003_create-views-table.sql b/backend/supabase/migrations/20260404000003_create-views-table.sql
new file mode 100644
index 000000000..56bf87c3c
--- /dev/null
+++ b/backend/supabase/migrations/20260404000003_create-views-table.sql
@@ -0,0 +1,15 @@
+-- Create views table (saved filter sets per user)
+create table if not exists public.views (
+    id         uuid        primary key default gen_random_uuid(),
+    user_id    text        not null references public.users(id) on delete cascade,
+    slug       text        not null,
+    filters    jsonb       not null default '{}',
+    created_at timestamptz default now(),
+    updated_at timestamptz default now()
+);
+
+create index if not exists idx_views_user_id
+    on public.views (user_id);
+
+-- Enable RLS
+alter table public.views enable row level security;
diff --git a/backend/supabase/migrations/20260404000004_add-is-onboarded-to-users.sql b/backend/supabase/migrations/20260404000004_add-is-onboarded-to-users.sql
new file mode 100644
index 000000000..c955f94fb
--- /dev/null
+++ b/backend/supabase/migrations/20260404000004_add-is-onboarded-to-users.sql
@@ -0,0 +1 @@
+ALTER TABLE users ADD COLUMN is_onboarded BOOLEAN NOT NULL DEFAULT FALSE;
diff --git a/backend/supabase/migrations/20260407181147_hotel-id-clerk.sql b/backend/supabase/migrations/20260407181147_hotel-id-clerk.sql
new file mode 100644
index 000000000..9cf33b81a
--- /dev/null
+++ b/backend/supabase/migrations/20260407181147_hotel-id-clerk.sql
@@ -0,0 +1,35 @@
+-- drop all fks referencing hotels.id
+ALTER TABLE public.users DROP CONSTRAINT users_hotel_id_fkey;
+ALTER TABLE public.guest_bookings DROP CONSTRAINT guest_bookings_hotel_id_fkey;
+ALTER TABLE public.requests DROP CONSTRAINT requests_hotel_id_fkey;
+ALTER TABLE public.rooms DROP CONSTRAINT rooms_hotel_id_fkey;
+
+-- change hotels.id to text and constraint of floors
+ALTER TABLE public.hotels
+    ALTER COLUMN id TYPE text,
+    ALTER COLUMN id DROP DEFAULT,
+    ALTER COLUMN floors DROP NOT NULL,
+    ALTER COLUMN floors DROP DEFAULT;
+
+-- change all hotel_id columns to text
+ALTER TABLE public.users ALTER COLUMN hotel_id TYPE text;
+ALTER TABLE public.guest_bookings ALTER COLUMN hotel_id TYPE text;
+ALTER TABLE public.requests ALTER COLUMN hotel_id TYPE text;
+ALTER TABLE public.rooms ALTER COLUMN hotel_id TYPE text;
+
+-- re-add all fks
+ALTER TABLE public.users
+    ADD CONSTRAINT users_hotel_id_fkey
+    FOREIGN KEY (hotel_id) REFERENCES public.hotels(id);
+
+ALTER TABLE public.guest_bookings
+    ADD CONSTRAINT guest_bookings_hotel_id_fkey
+    FOREIGN KEY (hotel_id) REFERENCES public.hotels(id);
+
+ALTER TABLE public.requests
+    ADD CONSTRAINT requests_hotel_id_fkey
+    FOREIGN KEY (hotel_id) REFERENCES public.hotels(id);
+
+ALTER TABLE public.rooms
+    ADD CONSTRAINT rooms_hotel_id_fkey
+    FOREIGN KEY (hotel_id) REFERENCES public.hotels(id);
\ No newline at end of file
diff --git a/backend/supabase/migrations/20260407190000_create-departments-table.sql b/backend/supabase/migrations/20260407190000_create-departments-table.sql
new file mode 100644
index 000000000..c785c7056
--- /dev/null
+++ b/backend/supabase/migrations/20260407190000_create-departments-table.sql
@@ -0,0 +1,11 @@
+CREATE TABLE IF NOT EXISTS public.departments (
+    id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
+    hotel_id TEXT NOT NULL REFERENCES public.hotels(id) ON DELETE CASCADE,
+    name VARCHAR(255) NOT NULL,
+    created_at TIMESTAMPTZ DEFAULT now(),
+    updated_at TIMESTAMPTZ DEFAULT now()
+);
+
+CREATE INDEX idx_departments_hotel_id ON public.departments (hotel_id);
+
+ALTER TABLE public.departments ENABLE ROW LEVEL SECURITY;
diff --git a/backend/supabase/migrations/20260409000001_employee-departments.sql b/backend/supabase/migrations/20260409000001_employee-departments.sql
new file mode 100644
index 000000000..ac8849359
--- /dev/null
+++ b/backend/supabase/migrations/20260409000001_employee-departments.sql
@@ -0,0 +1,11 @@
+ALTER TABLE public.departments
+    ADD CONSTRAINT departments_hotel_id_name_unique UNIQUE (hotel_id, name);
+
+CREATE TABLE IF NOT EXISTS public.employee_departments (
+    employee_id TEXT NOT NULL REFERENCES public.users(id) ON DELETE CASCADE,
+    department_id UUID NOT NULL REFERENCES public.departments(id) ON DELETE CASCADE,
+    PRIMARY KEY (employee_id, department_id)
+);
+
+CREATE INDEX idx_employee_departments_employee_id ON public.employee_departments (employee_id);
+CREATE INDEX idx_employee_departments_department_id ON public.employee_departments (department_id);
diff --git a/backend/supabase/migrations/20260415220024_remove-assigned-status.sql b/backend/supabase/migrations/20260415220024_remove-assigned-status.sql
new file mode 100644
index 000000000..e08ccca1a
--- /dev/null
+++ b/backend/supabase/migrations/20260415220024_remove-assigned-status.sql
@@ -0,0 +1,4 @@
+-- Migrate requests with 'assigned' status to 'pending'
+update public.requests
+set status = 'pending'
+where status = 'assigned';
diff --git a/backend/supabase/migrations/20260416000001_views-add-display-name.sql b/backend/supabase/migrations/20260416000001_views-add-display-name.sql
new file mode 100644
index 000000000..9167dae1b
--- /dev/null
+++ b/backend/supabase/migrations/20260416000001_views-add-display-name.sql
@@ -0,0 +1,8 @@
+alter table public.views
+    add column display_name text not null default '';
+
+alter table public.views
+    alter column display_name drop default;
+
+create index if not exists idx_views_user_id_slug
+    on public.views (user_id, slug);
diff --git a/backend/supabase/migrations/20260417061146_rooms-accessible.sql b/backend/supabase/migrations/20260417061146_rooms-accessible.sql
new file mode 100644
index 000000000..4b39bf189
--- /dev/null
+++ b/backend/supabase/migrations/20260417061146_rooms-accessible.sql
@@ -0,0 +1,2 @@
+ALTER TABLE public.rooms
+ADD COLUMN IF NOT EXISTS is_accessible BOOLEAN DEFAULT FALSE;
\ No newline at end of file
diff --git a/backend/supabase/migrations/20260417070000_add-changed-by-to-requests.sql b/backend/supabase/migrations/20260417070000_add-changed-by-to-requests.sql
new file mode 100644
index 000000000..cafb3729e
--- /dev/null
+++ b/backend/supabase/migrations/20260417070000_add-changed-by-to-requests.sql
@@ -0,0 +1 @@
+ALTER TABLE public.requests ADD COLUMN IF NOT EXISTS changed_by text REFERENCES public.users(id) ON DELETE SET NULL;
diff --git a/backend/supabase/seed.sql b/backend/supabase/seed.sql
new file mode 100644
index 000000000..c7437a2a2
--- /dev/null
+++ b/backend/supabase/seed.sql
@@ -0,0 +1,709 @@
+-- =============================================================================
+-- Seed: hotel · rooms (floors 1–3) · guests · guest_bookings
+-- =============================================================================
+-- Run with:
+--   cd backend && make seed
+--   — or —
+--   bash scripts/seed.sh
+--
+-- Automatically run by `supabase db reset`.
+-- All INSERTs are idempotent (ON CONFLICT DO NOTHING with fixed UUIDs).
+-- The postgres superuser bypasses RLS, so no policy changes are needed.
+-- =============================================================================
+
+BEGIN;
+
+-- -----------------------------------------------------------------------------
+-- Hotel
+-- -----------------------------------------------------------------------------
+INSERT INTO public.hotels (id, name, floors)
+VALUES ('a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11', 'Grand Hotel', 5)
+ON CONFLICT (id) DO NOTHING;
+
+-- -----------------------------------------------------------------------------
+-- Users
+-- -----------------------------------------------------------------------------
+INSERT INTO public.users (id, first_name, last_name, role, hotel_id)
+VALUES ('user_3BgSkSK6KDYGD1VJRZvyO4MVF7L', 'Dev', 'User', 'admin', 'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11')
+ON CONFLICT (id) DO NOTHING;
+
+-- -----------------------------------------------------------------------------
+-- Rooms  (3 per floor, floors 1–3)
+-- -----------------------------------------------------------------------------
+INSERT INTO public.rooms (id, room_number, floor, suite_type, room_status, is_accessible, features, hotel_id)
+VALUES
+  -- Floor 1
+  ('10000000-0000-0000-0000-000000000101', 101, 1, 'standard',  'available',
+   TRUE,
+   ARRAY['wifi','tv'],                              'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11'),
+  ('10000000-0000-0000-0000-000000000102', 102, 1, 'deluxe',    'occupied',
+   FALSE,
+   ARRAY['wifi','tv','minibar'],                    'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11'),
+  ('10000000-0000-0000-0000-000000000103', 103, 1, 'suite',     'available',
+   FALSE,
+   ARRAY['wifi','tv','jacuzzi','minibar'],           'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11'),
+
+  -- Floor 2
+  ('10000000-0000-0000-0000-000000000201', 201, 2, 'standard',  'occupied',
+   TRUE,
+   ARRAY['wifi','tv'],                              'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11'),
+  ('10000000-0000-0000-0000-000000000202', 202, 2, 'deluxe',    'occupied',
+   FALSE,
+   ARRAY['wifi','tv','balcony'],                    'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11'),
+  ('10000000-0000-0000-0000-000000000203', 203, 2, 'penthouse', 'maintenance',
+   FALSE,
+   ARRAY['wifi','tv','kitchen','jacuzzi'],           'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11'),
+
+  -- Floor 3
+  ('10000000-0000-0000-0000-000000000301', 301, 3, 'standard',  'available',
+   FALSE,
+   ARRAY['wifi','tv'],                              'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11'),
+  ('10000000-0000-0000-0000-000000000302', 302, 3, 'deluxe',    'occupied',
+   TRUE,
+   ARRAY['wifi','tv','balcony'],                    'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11'),
+  ('10000000-0000-0000-0000-000000000303', 303, 3, 'suite',     'occupied',
+   FALSE,
+   ARRAY['wifi','tv','jacuzzi','minibar','balcony'], 'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11')
+ON CONFLICT (id) DO NOTHING;
+
+INSERT INTO public.requests (
+  id, request_version, hotel_id, guest_id, user_id, room_id,
+  name, description, request_category, request_type, department,
+  status, priority, estimated_completion_time, scheduled_time, completed_at, notes, created_at
+)
+VALUES
+
+  -- ── Pending (10) ─────────────────────────────────────────────────────────
+
+  ('c0000000-0000-0000-0000-000000000001', '2026-04-01 00:01:00+00',
+   'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11',
+   'a0000000-0000-0000-0000-000000000001', 'user_3BgSkSK6KDYGD1VJRZvyO4MVF7L',
+   '10000000-0000-0000-0000-000000000102',
+   'Extra towels',
+   'Guest requested 2 extra bath towels and 1 hand towel. Prefers Egyptian cotton if available.',
+   'Linen & Towels', 'on demand', 'Housekeeping',
+   'pending', 'medium', 15,
+   '2026-04-01 10:00:00+00', NULL,
+   'Alice mentioned she has guests visiting. Deliver to door if DND is not active.',
+   '2026-04-01 09:00:00+00'),
+
+  ('c0000000-0000-0000-0000-000000000002', '2026-04-01 00:02:00+00',
+   'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11',
+   'a0000000-0000-0000-0000-000000000002', 'user_3BgSkSK6KDYGD1VJRZvyO4MVF7L',
+   '10000000-0000-0000-0000-000000000202',
+   'AC thermostat unresponsive',
+   'Thermostat display is blank and does not respond to input. Room temperature rising above 26°C.',
+   'HVAC', 'on demand', 'Maintenance',
+   'pending', 'high', 45,
+   '2026-04-01 11:00:00+00', NULL,
+   'Guest has a medical condition requiring cool room. Prioritize immediately.',
+   '2026-04-01 09:15:00+00'),
+
+  ('c0000000-0000-0000-0000-000000000003', '2026-04-01 00:03:00+00',
+   'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11',
+   'a0000000-0000-0000-0000-000000000003', 'user_3BgSkSK6KDYGD1VJRZvyO4MVF7L',
+   '10000000-0000-0000-0000-000000000303',
+   'In-room safe malfunction',
+   'Guest is unable to open the in-room safe. Keypad is unresponsive and display shows error E3.',
+   'Hardware', 'on demand', 'Maintenance',
+   'pending', 'high', 30,
+   '2026-04-01 12:00:00+00', NULL,
+   'Guest has passport and valuables inside. Do NOT force open — use override key from security.',
+   '2026-04-01 09:30:00+00'),
+
+  ('c0000000-0000-0000-0000-000000000004', '2026-04-01 00:04:00+00',
+   'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11',
+   NULL, 'user_3BgSkSK6KDYGD1VJRZvyO4MVF7L',
+   '10000000-0000-0000-0000-000000000101',
+   'Late checkout request',
+   'Guest is requesting a late checkout at 2:00 PM instead of the standard 11:00 AM.',
+   'Checkout', 'on demand', 'Front Desk',
+   'pending', 'low', 5,
+   '2026-04-01 13:00:00+00', NULL,
+   'Confirm room availability before approving. Guest is a loyalty member — accommodate if possible.',
+   '2026-04-01 08:00:00+00'),
+
+  ('c0000000-0000-0000-0000-000000000005', '2026-04-01 00:05:00+00',
+   'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11',
+   NULL, 'user_3BgSkSK6KDYGD1VJRZvyO4MVF7L',
+   '10000000-0000-0000-0000-000000000201',
+   'Baby crib delivery',
+   'Family with 8-month-old infant requesting a standard travel crib with fitted sheet.',
+   'Baby Amenities', 'on demand', 'Housekeeping',
+   'pending', 'medium', 20,
+   '2026-04-01 14:00:00+00', NULL,
+   'Ensure crib is sanitized and all parts are present before delivery. Baby blanket optional.',
+   '2026-04-01 10:00:00+00'),
+
+  ('c0000000-0000-0000-0000-000000000006', '2026-04-01 00:06:00+00',
+   'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11',
+   NULL, 'user_3BgSkSK6KDYGD1VJRZvyO4MVF7L',
+   '10000000-0000-0000-0000-000000000302',
+   'Restaurant reservation for tonight',
+   'Guest requests a table for 2 at the hotel restaurant at 7:30 PM. Prefers window seating.',
+   'Dining', 'on demand', 'Concierge',
+   'pending', 'low', 10,
+   '2026-04-01 19:30:00+00', NULL,
+   'Guest mentioned it is a first date. Arrange rose on table if possible.',
+   '2026-04-01 11:00:00+00'),
+
+  ('c0000000-0000-0000-0000-000000000007', '2026-04-01 00:07:00+00',
+   'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11',
+   NULL, 'user_3BgSkSK6KDYGD1VJRZvyO4MVF7L',
+   '10000000-0000-0000-0000-000000000103',
+   'Key card replacement',
+   'Guest reports losing one of their two key cards. Requesting an immediate replacement.',
+   'Access', 'on demand', 'Front Desk',
+   'pending', 'medium', 5,
+   '2026-04-01 10:30:00+00', NULL,
+   'Deactivate the old card immediately and verify guest identity before issuing replacement.',
+   '2026-04-01 10:15:00+00'),
+
+  ('c0000000-0000-0000-0000-000000000008', '2026-04-01 00:08:00+00',
+   'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11',
+   NULL, 'user_3BgSkSK6KDYGD1VJRZvyO4MVF7L',
+   '10000000-0000-0000-0000-000000000203',
+   'Leaking bathroom faucet',
+   'Bathroom sink faucet is dripping constantly. Guest estimates about 1 drip per second.',
+   'Plumbing', 'on demand', 'Maintenance',
+   'pending', 'medium', 60,
+   '2026-04-01 15:00:00+00', NULL,
+   'Check both hot and cold lines. Bring washer and O-ring replacement kits.',
+   '2026-04-01 09:45:00+00'),
+
+  ('c0000000-0000-0000-0000-000000000009', '2026-04-01 00:09:00+00',
+   'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11',
+   'a0000000-0000-0000-0000-000000000003', 'user_3BgSkSK6KDYGD1VJRZvyO4MVF7L',
+   '10000000-0000-0000-0000-000000000303',
+   'Champagne and strawberries delivery',
+   'Guest is celebrating anniversary and requested a bottle of Moët & Chandon with fresh strawberries and chocolates.',
+   'Room Service', 'on demand', 'Food & Beverage',
+   'pending', 'medium', 15,
+   '2026-04-01 20:00:00+00', NULL,
+   'Arrange rose petal presentation on tray. Guest is celebrating 5th anniversary.',
+   '2026-04-01 12:00:00+00'),
+
+  ('c0000000-0000-0000-0000-000000000010', '2026-04-01 00:10:00+00',
+   'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11',
+   NULL, 'user_3BgSkSK6KDYGD1VJRZvyO4MVF7L',
+   '10000000-0000-0000-0000-000000000301',
+   'Noise complaint from adjacent room',
+   'Guest in room 301 is reporting loud music and voices from room 302 since 11:30 PM.',
+   'Guest Relations', 'on demand', 'Front Desk',
+   'pending', 'high', 10,
+   '2026-04-01 23:45:00+00', NULL,
+   'Approach room 302 discreetly. If noise continues after first warning, escalate to manager.',
+   '2026-04-01 23:30:00+00'),
+
+  -- ── Pending with assignee (10) ───────────────────────────────────────────
+
+  ('c0000000-0000-0000-0000-000000000011', '2026-04-01 00:11:00+00',
+   'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11',
+   'a0000000-0000-0000-0000-000000000001', 'user_3BgSkSK6KDYGD1VJRZvyO4MVF7L',
+   '10000000-0000-0000-0000-000000000102',
+   'Full room cleaning',
+   'Guest requested a full room cleaning: vacuuming, bathroom scrub, fresh linen, and restocking of all toiletries.',
+   'Room Cleaning', 'recurring', 'Housekeeping',
+   'pending','medium', 40,
+   '2026-04-01 14:00:00+00', NULL,
+   'Guest prefers unscented cleaning products. Note allergy to lavender on file.',
+   '2026-04-01 08:30:00+00'),
+
+  ('c0000000-0000-0000-0000-000000000012', '2026-04-01 00:12:00+00',
+   'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11',
+   'a0000000-0000-0000-0000-000000000002', 'user_3BgSkSK6KDYGD1VJRZvyO4MVF7L',
+   '10000000-0000-0000-0000-000000000202',
+   'Minibar restock',
+   'Guest consumed all sparkling water and soft drinks. Requesting full minibar restock including snacks.',
+   'Minibar', 'on demand', 'Food & Beverage',
+   'pending','low', 20,
+   '2026-04-01 16:00:00+00', NULL,
+   'Guest requested extra sparkling water (x4) and no beer. Add mixed nuts and chocolate.',
+   '2026-04-01 10:00:00+00'),
+
+  ('c0000000-0000-0000-0000-000000000013', '2026-04-01 00:13:00+00',
+   'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11',
+   'a0000000-0000-0000-0000-000000000003', 'user_3BgSkSK6KDYGD1VJRZvyO4MVF7L',
+   '10000000-0000-0000-0000-000000000303',
+   'Overnight shoe shine',
+   'Guest left 2 pairs of dress shoes outside the door: one black Oxford, one tan leather pump.',
+   'Valet', 'on demand', 'Concierge',
+   'pending','low', 30,
+   '2026-04-02 07:00:00+00', NULL,
+   'Return before 7 AM. Black shoes take high gloss, tan shoes take matte. No resoling.',
+   '2026-04-01 21:00:00+00'),
+
+  ('c0000000-0000-0000-0000-000000000014', '2026-04-01 00:14:00+00',
+   'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11',
+   NULL, 'user_3BgSkSK6KDYGD1VJRZvyO4MVF7L',
+   '10000000-0000-0000-0000-000000000101',
+   'WiFi connection issues',
+   'Guest laptop is unable to connect to hotel WiFi. Other devices in room connect fine. Error: "Authentication failed".',
+   'Network', 'on demand', 'Maintenance',
+   'pending','medium', 20,
+   '2026-04-01 11:30:00+00', NULL,
+   'Bring a network extender as a backup. Guest is on a work call at 2 PM and needs stable connection.',
+   '2026-04-01 10:30:00+00'),
+
+  ('c0000000-0000-0000-0000-000000000015', '2026-04-01 00:15:00+00',
+   'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11',
+   NULL, 'user_3BgSkSK6KDYGD1VJRZvyO4MVF7L',
+   '10000000-0000-0000-0000-000000000201',
+   'Extra pillows requested',
+   'Guest is requesting 2 additional firm pillows for back support. No feather pillows per profile.',
+   'Linen & Towels', 'on demand', 'Housekeeping',
+   'pending','low', 10,
+   '2026-04-01 15:00:00+00', NULL,
+   'Memory foam or hypoallergenic pillows preferred. Check notes on guest profile.',
+   '2026-04-01 13:00:00+00'),
+
+  ('c0000000-0000-0000-0000-000000000016', '2026-04-01 00:16:00+00',
+   'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11',
+   NULL, 'user_3BgSkSK6KDYGD1VJRZvyO4MVF7L',
+   '10000000-0000-0000-0000-000000000302',
+   'Morning newspaper delivery',
+   'Guest requested daily delivery of the Financial Times and local newspaper before 7:30 AM.',
+   'Amenities', 'recurring', 'Concierge',
+   'pending','low', 5,
+   '2026-04-02 07:30:00+00', NULL,
+   'Guest prefers papers left outside door without knocking. Fold neatly.',
+   '2026-04-01 20:00:00+00'),
+
+  ('c0000000-0000-0000-0000-000000000017', '2026-04-01 00:17:00+00',
+   'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11',
+   NULL, 'user_3BgSkSK6KDYGD1VJRZvyO4MVF7L',
+   '10000000-0000-0000-0000-000000000103',
+   'Towel replacement',
+   'Towels in room are stained. Guest requesting a fresh set of 4 bath towels and 2 hand towels.',
+   'Linen & Towels', 'on demand', 'Housekeeping',
+   'pending','low', 15,
+   '2026-04-01 13:30:00+00', NULL,
+   'Collect old towels. Guest expressed dissatisfaction — apologize and offer complimentary amenity.',
+   '2026-04-01 12:30:00+00'),
+
+  ('c0000000-0000-0000-0000-000000000018', '2026-04-01 00:18:00+00',
+   'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11',
+   NULL, 'user_3BgSkSK6KDYGD1VJRZvyO4MVF7L',
+   '10000000-0000-0000-0000-000000000203',
+   'Pool towel delivery',
+   'Guest is heading to the pool and requested 4 large pool towels delivered to their room first.',
+   'Pool', 'on demand', 'Housekeeping',
+   'pending','medium', 10,
+   '2026-04-01 12:00:00+00', NULL,
+   'Deliver to room 203 if guest has not yet left. Otherwise deliver directly to pool deck.',
+   '2026-04-01 11:30:00+00'),
+
+  ('c0000000-0000-0000-0000-000000000019', '2026-04-01 00:19:00+00',
+   'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11',
+   NULL, 'user_3BgSkSK6KDYGD1VJRZvyO4MVF7L',
+   '10000000-0000-0000-0000-000000000301',
+   'Luggage storage after checkout',
+   'Guest is checking out at 11 AM but flight departs at 8 PM. Requesting secure storage for 2 suitcases and 1 carry-on.',
+   'Luggage', 'on demand', 'Concierge',
+   'pending','medium', 15,
+   '2026-04-01 11:00:00+00', NULL,
+   'Issue luggage claim ticket. Store in secure room B. Guest will collect between 5–6 PM.',
+   '2026-04-01 09:00:00+00'),
+
+  ('c0000000-0000-0000-0000-000000000020', '2026-04-01 00:20:00+00',
+   'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11',
+   'a0000000-0000-0000-0000-000000000002', 'user_3BgSkSK6KDYGD1VJRZvyO4MVF7L',
+   '10000000-0000-0000-0000-000000000202',
+   'Wake-up call at 6:30 AM',
+   'Guest has an early morning flight and requested a phone wake-up call at 6:30 AM with a follow-up at 6:45 AM if no answer.',
+   'Alarm', 'scheduled', 'Front Desk',
+   'pending','low', 5,
+   '2026-04-02 06:30:00+00', NULL,
+   'Set both primary and backup calls. Guest checkout is at 7:30 AM — arrange taxi if requested.',
+   '2026-04-01 22:00:00+00'),
+
+  -- ── Completed (10) ───────────────────────────────────────────────────────
+
+  ('c0000000-0000-0000-0000-000000000021', '2026-04-01 00:21:00+00',
+   'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11',
+   'a0000000-0000-0000-0000-000000000001', 'user_3BgSkSK6KDYGD1VJRZvyO4MVF7L',
+   '10000000-0000-0000-0000-000000000102',
+   'In-room breakfast delivery',
+   'Guest ordered Continental Plus for 2: assorted pastries, fresh fruit, smoked salmon, yoghurt, OJ, and English breakfast tea.',
+   'In-Room Dining', 'on demand', 'Food & Beverage',
+   'completed', 'medium', 30,
+   '2026-04-01 08:00:00+00', '2026-04-01 08:05:00+00',
+   'Delivered on time. Guest tipped the team. Very satisfied.',
+   '2026-04-01 07:15:00+00'),
+
+  ('c0000000-0000-0000-0000-000000000022', '2026-04-01 00:22:00+00',
+   'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11',
+   'a0000000-0000-0000-0000-000000000003', 'user_3BgSkSK6KDYGD1VJRZvyO4MVF7L',
+   '10000000-0000-0000-0000-000000000303',
+   'Spa appointment booking',
+   'Guest requested a 60-minute couples deep tissue massage at the hotel spa at 3:00 PM.',
+   'Spa & Wellness', 'on demand', 'Concierge',
+   'completed', 'low', 10,
+   '2026-04-01 15:00:00+00', '2026-04-01 12:05:00+00',
+   'Booked with therapists Mia and James. Guest requested eucalyptus aromatherapy oil.',
+   '2026-04-01 11:00:00+00'),
+
+  ('c0000000-0000-0000-0000-000000000023', '2026-04-01 00:23:00+00',
+   'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11',
+   'a0000000-0000-0000-0000-000000000002', 'user_3BgSkSK6KDYGD1VJRZvyO4MVF7L',
+   '10000000-0000-0000-0000-000000000202',
+   'Airport transfer arrangement',
+   'Guest requested a private car to JFK Airport for 2 passengers with 3 checked bags. Flight departs at 4:00 PM.',
+   'Transportation', 'on demand', 'Concierge',
+   'completed', 'medium', 15,
+   '2026-04-01 13:00:00+00', '2026-04-01 10:10:00+00',
+   'Booked Blacklane — confirmation #BL-48291. Driver: Michael, plates NY-3847. Pickup lobby 1:00 PM.',
+   '2026-04-01 09:30:00+00'),
+
+  ('c0000000-0000-0000-0000-000000000024', '2026-04-01 00:24:00+00',
+   'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11',
+   NULL, 'user_3BgSkSK6KDYGD1VJRZvyO4MVF7L',
+   '10000000-0000-0000-0000-000000000101',
+   'Iron and ironing board delivery',
+   'Guest requires a steam iron and ironing board to press business attire for a morning meeting.',
+   'In-Room Equipment', 'on demand', 'Housekeeping',
+   'completed', 'low', 10,
+   '2026-04-01 07:00:00+00', '2026-04-01 07:08:00+00',
+   'Delivered before 7 AM as requested. Guest has an 8:30 AM board meeting.',
+   '2026-04-01 06:45:00+00'),
+
+  ('c0000000-0000-0000-0000-000000000025', '2026-04-01 00:25:00+00',
+   'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11',
+   NULL, 'user_3BgSkSK6KDYGD1VJRZvyO4MVF7L',
+   '10000000-0000-0000-0000-000000000201',
+   'TV remote not working',
+   'Guest reports that the TV remote control is unresponsive. Suspected dead batteries.',
+   'Electronics', 'on demand', 'Maintenance',
+   'completed', 'low', 5,
+   '2026-04-01 16:00:00+00', '2026-04-01 16:12:00+00',
+   'Replaced AA batteries. Remote tested and functioning. Also adjusted TV input settings at guest request.',
+   '2026-04-01 15:55:00+00'),
+
+  ('c0000000-0000-0000-0000-000000000026', '2026-04-01 00:26:00+00',
+   'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11',
+   NULL, 'user_3BgSkSK6KDYGD1VJRZvyO4MVF7L',
+   '10000000-0000-0000-0000-000000000302',
+   'Express laundry pickup',
+   'Guest has 3 dress shirts, 1 suit jacket, and 2 pairs of trousers for express laundry. Needs same-day return by 6 PM.',
+   'Laundry', 'on demand', 'Housekeeping',
+   'completed', 'medium', 60,
+   '2026-04-01 09:00:00+00', '2026-04-01 17:45:00+00',
+   'Collected at 9:15 AM. Returned and hung at 5:45 PM. Guest confirmed satisfied.',
+   '2026-04-01 08:50:00+00'),
+
+  ('c0000000-0000-0000-0000-000000000027', '2026-04-01 00:27:00+00',
+   'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11',
+   NULL, 'user_3BgSkSK6KDYGD1VJRZvyO4MVF7L',
+   '10000000-0000-0000-0000-000000000103',
+   'Medical assistance request',
+   'Guest is feeling unwell — headache, nausea, and mild fever. Requesting a doctor visit or medical kit.',
+   'Medical', 'on demand', 'Front Desk',
+   'completed', 'high', 15,
+   '2026-04-01 22:00:00+00', '2026-04-01 22:20:00+00',
+   'On-call doctor visited. Diagnosed mild dehydration. Provided electrolytes and paracetamol. Doctor notes filed.',
+   '2026-04-01 21:50:00+00'),
+
+  ('c0000000-0000-0000-0000-000000000028', '2026-04-01 00:28:00+00',
+   'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11',
+   NULL, 'user_3BgSkSK6KDYGD1VJRZvyO4MVF7L',
+   '10000000-0000-0000-0000-000000000203',
+   'Valet car retrieval',
+   'Guest is checking out and requesting their vehicle (black Tesla Model S, plate NY-1234) at the front entrance.',
+   'Valet', 'on demand', 'Concierge',
+   'completed', 'medium', 15,
+   '2026-04-01 11:30:00+00', '2026-04-01 11:42:00+00',
+   'Vehicle retrieved from level 2, spot B14. Guest departed at 11:45 AM. No damage noted.',
+   '2026-04-01 11:25:00+00'),
+
+  ('c0000000-0000-0000-0000-000000000029', '2026-04-01 00:29:00+00',
+   'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11',
+   NULL, 'user_3BgSkSK6KDYGD1VJRZvyO4MVF7L',
+   '10000000-0000-0000-0000-000000000301',
+   'Turndown service',
+   'Guest opted in for nightly turndown: bed preparation, dim lighting, soft music, and pillow mint.',
+   'Turndown', 'recurring', 'Housekeeping',
+   'completed', 'low', 20,
+   '2026-04-01 20:00:00+00', '2026-04-01 20:18:00+00',
+   'Service completed. Left chocolates and hotel note. DND sign was up — slipped card under door.',
+   '2026-04-01 19:00:00+00'),
+
+  ('c0000000-0000-0000-0000-000000000030', '2026-04-01 00:30:00+00',
+   'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11',
+   'a0000000-0000-0000-0000-000000000003', 'user_3BgSkSK6KDYGD1VJRZvyO4MVF7L',
+   '10000000-0000-0000-0000-000000000303',
+   'Dinner reservation at La Maison',
+   'Guest requested a table for 2 at La Maison at 8:00 PM for their 10th wedding anniversary.',
+   'Dining', 'on demand', 'Concierge',
+   'completed', 'medium', 10,
+   '2026-04-01 20:00:00+00', '2026-04-01 13:15:00+00',
+   'Confirmed table 8 by window. Arranged complimentary dessert with sparkler from management. Guest was delighted.',
+   '2026-04-01 12:00:00+00')
+
+ON CONFLICT (id, request_version) DO NOTHING;
+
+-- -----------------------------------------------------------------------------
+-- Guests
+-- Rooms 102, 202, 303 are occupied (active bookings below).
+-- Room 101 has an inactive (past) booking — should NOT appear as occupied.
+-- -----------------------------------------------------------------------------
+INSERT INTO public.guests (id, first_name, last_name, profile_picture, timezone, phone, email, preferences, notes,
+                          pronouns, do_not_disturb_start, do_not_disturb_end, housekeeping_cadence, assistance)
+VALUES
+  ('a0000000-0000-0000-0000-000000000001', 'Alice', 'Johnson',  NULL, 'America/New_York',
+   '+1 (212) 555-0101', 'alice.johnson@example.com',
+   'Extra pillows, Egyptian cotton linens, high floor preferred',
+   'VIP — champagne on arrival. Loyalty member since 2018. Allergy to lavender products.',
+   'she/her', '22:00:00', '08:00:00', 'daily', '{}'),
+
+  ('a0000000-0000-0000-0000-000000000002', 'Bob',   'Smith',    NULL, 'America/Chicago',
+   '+1 (312) 555-0102', 'bob.smith@example.com',
+   'Hypoallergenic bedding, no feather products, firm pillows',
+   'Corporate account — Acme Corp. Business traveller, early checkout likely.',
+   'he/him', '23:00:00', '07:00:00', 'daily', '{"dietary":["gluten_free"]}'),
+
+  ('a0000000-0000-0000-0000-000000000003', 'Carol', 'Williams', NULL, 'America/Los_Angeles',
+   '+1 (310) 555-0103', 'carol.williams@example.com',
+   'No feather pillows, quiet room, low-level floor preferred',
+   'Celebrating anniversary. Requested rose petal turndown on 2026-04-02.',
+   'she/her', '21:00:00', '09:00:00', 'every_other_day', '{"medical":["low_noise_environment"]}'),
+
+  ('a0000000-0000-0000-0000-000000000004', 'David', 'Brown',    NULL, 'Europe/London',
+   '+44 20 7946 0104', 'david.brown@example.com',
+   'Earl Grey tea on arrival, Financial Times delivered daily',
+   'Regular guest — previous stays in 2024 and 2025. Prefers ground floor.',
+   'he/him', NULL, NULL, 'daily', '{}'),
+
+  ('a0000000-0000-0000-0000-000000000005', 'Emma',  'Davis',    NULL, 'America/New_York',
+   '+1 (646) 555-0105', 'emma.davis@example.com',
+   'Crib required (infant), blackout curtains, quiet room',
+   'Family with 8-month-old infant. Baby amenities pre-arranged.',
+   'she/her', '20:00:00', '09:00:00', 'daily', '{"dietary":["nut_free"]}'),
+
+  ('a0000000-0000-0000-0000-000000000006', 'Liam',  'Garcia',   NULL, 'America/Denver',
+   '+1 (720) 555-0106', 'liam.garcia@example.com',
+   'Accessible bathroom, roll-in shower, lowered bed if available',
+   'Uses manual wheelchair. Requires accessible room features.',
+   'he/him', NULL, NULL, 'daily', '{"accessibility":["wheelchair","roll_in_shower"]}')
+ON CONFLICT (id) DO NOTHING;
+
+-- -----------------------------------------------------------------------------
+-- Guest bookings
+--   active   → guest currently checked in (arrival ≤ today ≤ departure)
+--   inactive → past stay; must NOT appear in occupied room listings
+--
+-- Relationships:
+--   Alice  (a...001) → room 102 (10...102) — active
+--   Bob    (a...002) → room 202 (10...202) — active
+--   Carol  (a...003) → room 303 (10...303) — active
+--   David  (a...004) → room 101 (10...101) — inactive (past stay)
+-- -----------------------------------------------------------------------------
+INSERT INTO public.guest_bookings (id, guest_id, room_id, hotel_id, arrival_date, departure_date, notes, status, group_size)
+VALUES
+  ('b0000000-0000-0000-0000-000000000001',
+   'a0000000-0000-0000-0000-000000000001',
+   '10000000-0000-0000-0000-000000000102',
+   'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11',
+   '2026-03-20', '2026-03-28', 'Early check-in requested', 'active', 1),
+
+  ('b0000000-0000-0000-0000-000000000002',
+   'a0000000-0000-0000-0000-000000000002',
+   '10000000-0000-0000-0000-000000000202',
+   'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11',
+   '2026-03-22', '2026-03-26', NULL, 'active', 2),
+
+  ('b0000000-0000-0000-0000-000000000003',
+   'a0000000-0000-0000-0000-000000000003',
+   '10000000-0000-0000-0000-000000000303',
+   'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11',
+   '2026-03-21', '2026-03-30', 'No feather pillows please', 'active', 2),
+
+  ('b0000000-0000-0000-0000-000000000004',
+   'a0000000-0000-0000-0000-000000000004',
+   '10000000-0000-0000-0000-000000000101',
+   'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11',
+   '2026-03-01', '2026-03-07', NULL, 'inactive', NULL),
+
+  ('b0000000-0000-0000-0000-000000000005',
+   'a0000000-0000-0000-0000-000000000005',
+   '10000000-0000-0000-0000-000000000201',
+   'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11',
+   '2026-03-25', '2026-04-02', 'Crib pre-arranged', 'active', 3),
+
+  ('b0000000-0000-0000-0000-000000000006',
+   'a0000000-0000-0000-0000-000000000006',
+   '10000000-0000-0000-0000-000000000302',
+   'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11',
+   '2026-03-28', '2026-04-05', 'Accessible room confirmed', 'active', 1)
+ON CONFLICT (id) DO NOTHING;
+
+-- -----------------------------------------------------------------------------
+-- Requests — 5 versions of the same request (composite PK: id + request_version)
+-- All share the same created_at (original creation time) and scheduled_time 06:00.
+-- The latest request_version is what FindRequestsByStatusPaginated will surface.
+-- -----------------------------------------------------------------------------
+INSERT INTO public.requests (id, hotel_id, user_id, name, request_type, status, priority, room_id, department, scheduled_time, created_at, request_version)
+VALUES
+  ('c0000000-0000-0000-0000-000000000001', 'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11', 'user_3BgSkSK6KDYGD1VJRZvyO4MVF7L',
+   'room cleaning', 'recurring', 'pending', 'normal', '102', 'Housekeeping',
+   '2026-03-31T06:00:00Z', '2026-03-31T01:00:00Z', '2026-03-31T01:00:00Z'),
+
+  ('c0000000-0000-0000-0000-000000000001', 'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11', 'user_3BgSkSK6KDYGD1VJRZvyO4MVF7L',
+   'room cleaning', 'recurring', 'pending', 'normal', '102', 'Housekeeping',
+   '2026-03-31T06:00:00Z', '2026-03-31T01:00:00Z', '2026-03-31T02:00:00Z'),
+
+  ('c0000000-0000-0000-0000-000000000001', 'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11', 'user_3BgSkSK6KDYGD1VJRZvyO4MVF7L',
+   'room cleaning', 'recurring', 'pending', 'high', '102', 'Housekeeping',
+   '2026-03-31T06:00:00Z', '2026-03-31T01:00:00Z', '2026-03-31T03:00:00Z'),
+
+  ('c0000000-0000-0000-0000-000000000001', 'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11', 'user_3BgSkSK6KDYGD1VJRZvyO4MVF7L',
+   'room cleaning', 'recurring', 'pending', 'high', '102', 'Housekeeping',
+   '2026-03-31T06:00:00Z', '2026-03-31T01:00:00Z', '2026-03-31T04:00:00Z'),
+
+  ('c0000000-0000-0000-0000-000000000001', 'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11', 'user_3BgSkSK6KDYGD1VJRZvyO4MVF7L',
+   'room cleaning', 'recurring', 'pending', 'urgent', '102', 'Housekeeping',
+   '2026-03-31T06:00:00Z', '2026-03-31T01:00:00Z', '2026-03-31T05:00:00Z')
+ON CONFLICT (id, request_version) DO NOTHING;
+
+-- -----------------------------------------------------------------------------
+-- Requests — 300 bulk rows: 100 pending · 100 pending · 100 completed
+-- UUIDs are deterministic (md5 of status+index) so the seed is idempotent.
+-- scheduled_time cycles through 08:00–19:00 (never below 8AM).
+-- -----------------------------------------------------------------------------
+INSERT INTO public.requests (id, hotel_id, user_id, name, request_type, status, priority, room_id, department, scheduled_time, created_at, request_version)
+SELECT
+  md5('pending' || i::text)::uuid,
+  'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11',
+  'user_3BgSkSK6KDYGD1VJRZvyO4MVF7L',
+  (ARRAY['room cleaning','towel replacement','minibar refill','maintenance repair','extra pillows',
+         'wake-up call','laundry pickup','concierge request','turndown service','luggage assistance'])[((i-1) % 10) + 1],
+  (ARRAY['recurring','one-time'])[((i-1) % 2) + 1],
+  'pending',
+  (ARRAY['low','medium','normal','high','urgent'])[((i-1) % 5) + 1],
+  (ARRAY['101','102','103','201','202','203','301','302','303'])[((i-1) % 9) + 1],
+  (ARRAY['Housekeeping','Maintenance','Concierge','Food & Beverage','Front Desk'])[((i-1) % 5) + 1],
+  '2026-03-31'::date + '08:00:00'::interval + (((i-1) % 12) || ' hours')::interval,
+  '2026-03-01'::timestamptz + (i || ' hours')::interval,
+  '2026-03-01'::timestamptz + (i || ' hours')::interval
+FROM generate_series(1, 100) AS i
+ON CONFLICT (id, request_version) DO NOTHING;
+
+INSERT INTO public.requests (id, hotel_id, user_id, name, request_type, status, priority, room_id, department, scheduled_time, created_at, request_version)
+SELECT
+  md5('assigned' || i::text)::uuid,
+  'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11',
+  'user_3BgSkSK6KDYGD1VJRZvyO4MVF7L',
+  (ARRAY['room cleaning','towel replacement','minibar refill','maintenance repair','extra pillows',
+         'wake-up call','laundry pickup','concierge request','turndown service','luggage assistance'])[((i-1) % 10) + 1],
+  (ARRAY['recurring','one-time'])[((i-1) % 2) + 1],
+  'pending',
+  (ARRAY['low','medium','normal','high','urgent'])[((i-1) % 5) + 1],
+  (ARRAY['101','102','103','201','202','203','301','302','303'])[((i-1) % 9) + 1],
+  (ARRAY['Housekeeping','Maintenance','Concierge','Food & Beverage','Front Desk'])[((i-1) % 5) + 1],
+  '2026-03-31'::date + '08:00:00'::interval + (((i-1) % 12) || ' hours')::interval,
+  '2026-03-02'::timestamptz + (i || ' hours')::interval,
+  '2026-03-02'::timestamptz + (i || ' hours')::interval
+FROM generate_series(1, 100) AS i
+ON CONFLICT (id, request_version) DO NOTHING;
+
+INSERT INTO public.requests (id, hotel_id, user_id, name, request_type, status, priority, room_id, department, scheduled_time, created_at, request_version)
+SELECT
+  md5('completed' || i::text)::uuid,
+  'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11',
+  'user_3BgSkSK6KDYGD1VJRZvyO4MVF7L',
+  (ARRAY['room cleaning','towel replacement','minibar refill','maintenance repair','extra pillows',
+         'wake-up call','laundry pickup','concierge request','turndown service','luggage assistance'])[((i-1) % 10) + 1],
+  (ARRAY['recurring','one-time'])[((i-1) % 2) + 1],
+  'completed',
+  (ARRAY['low','medium','normal','high','urgent'])[((i-1) % 5) + 1],
+  (ARRAY['101','102','103','201','202','203','301','302','303'])[((i-1) % 9) + 1],
+  (ARRAY['Housekeeping','Maintenance','Concierge','Food & Beverage','Front Desk'])[((i-1) % 5) + 1],
+  '2026-03-31'::date + '08:00:00'::interval + (((i-1) % 12) || ' hours')::interval,
+  '2026-03-03'::timestamptz + (i || ' hours')::interval,
+  '2026-03-03'::timestamptz + (i || ' hours')::interval
+FROM generate_series(1, 100) AS i
+ON CONFLICT (id, request_version) DO NOTHING;
+
+-- Requests
+--   Mix of statuses and priorities across occupied rooms (102, 202, 303)
+--   and unoccupied rooms to test filtering.
+-- -----------------------------------------------------------------------------
+INSERT INTO public.requests (id, request_version, hotel_id, guest_id, room_id, name, description, request_category, request_type, department, status, priority, estimated_completion_time, notes, created_at)
+VALUES
+  -- Room 102 (Alice, occupied) — pending towel request
+  ('c0000000-0000-0000-0000-000000000001', '2026-04-01 09:00:00+00',
+   'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11',
+   'a0000000-0000-0000-0000-000000000001',
+   '10000000-0000-0000-0000-000000000102',
+   'Extra towels', 'Guest requested 2 extra bath towels',
+   'Housekeeping', 'on demand', 'housekeeping',
+   'pending', 'medium', 15, '', '2026-04-01 09:00:00+00'),
+
+  -- Room 102 (Alice, occupied) — completed minibar restock
+  ('c0000000-0000-0000-0000-000000000002', '2026-04-01 10:30:00+00',
+   'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11',
+   'a0000000-0000-0000-0000-000000000001',
+   '10000000-0000-0000-0000-000000000102',
+   'Minibar restock', 'Please restock the minibar with water and sparkling water',
+   'Room Service', 'on demand', 'food & beverage',
+   'completed', 'low', 20, '', '2026-04-01 08:00:00+00'),
+
+  -- Room 202 (Bob, occupied) — pending maintenance
+  ('c0000000-0000-0000-0000-000000000003', '2026-04-02 07:15:00+00',
+   'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11',
+   'a0000000-0000-0000-0000-000000000002',
+   '10000000-0000-0000-0000-000000000202',
+   'AC not cooling', 'Air conditioning unit is blowing warm air',
+   'Maintenance', 'on demand', 'maintenance',
+   'pending', 'high', 45, 'Technician dispatched', '2026-04-02 07:00:00+00'),
+
+  -- Room 202 (Bob, occupied) — pending wake-up call
+  ('c0000000-0000-0000-0000-000000000004', '2026-04-02 06:00:00+00',
+   'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11',
+   'a0000000-0000-0000-0000-000000000002',
+   '10000000-0000-0000-0000-000000000202',
+   'Wake-up call', 'Requested wake-up call at 7:00 AM',
+   'Concierge', 'scheduled', 'front desk',
+   'pending','low', 5, '', '2026-04-01 22:00:00+00'),
+
+  -- Room 303 (Carol, occupied) — pending high-priority DND override
+  ('c0000000-0000-0000-0000-000000000005', '2026-04-02 08:45:00+00',
+   'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11',
+   'a0000000-0000-0000-0000-000000000003',
+   '10000000-0000-0000-0000-000000000303',
+   'Room cleaning', 'Guest requested full room cleaning and bed linen change',
+   'Housekeeping', 'on demand', 'housekeeping',
+   'pending', 'high', 40, 'Celebrating anniversary — use rose petal turndown', '2026-04-02 08:30:00+00'),
+
+  -- Room 303 (Carol, occupied) — completed spa booking assistance
+  ('c0000000-0000-0000-0000-000000000006', '2026-04-01 14:00:00+00',
+   'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11',
+   'a0000000-0000-0000-0000-000000000003',
+   '10000000-0000-0000-0000-000000000303',
+   'Spa booking', 'Guest requested a couples massage appointment for 3 PM',
+   'Concierge', 'on demand', 'concierge',
+   'completed', 'medium', 10, '', '2026-04-01 11:00:00+00'),
+
+  -- Unassigned (no guest, no room) — hotel-level pending request
+  ('c0000000-0000-0000-0000-000000000007', '2026-04-02 09:00:00+00',
+   'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11',
+   NULL, NULL,
+   'Pool area inspection', 'Routine safety inspection for pool deck',
+   'Maintenance', 'recurring', 'maintenance',
+   'pending', 'medium', 60, '', '2026-04-02 09:00:00+00')
+
+ON CONFLICT (id, request_version) DO NOTHING;
+
+COMMIT;
+
+-- Quick sanity-check (printed after the transaction commits)
+SELECT 'hotels'         AS "table", COUNT(*) FROM public.hotels        WHERE id       = 'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11'
+UNION ALL
+SELECT 'rooms',                      COUNT(*) FROM public.rooms         WHERE hotel_id = 'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11'
+UNION ALL
+SELECT 'guests',                     COUNT(*) FROM public.guests        WHERE id::text LIKE 'a0000000%'
+UNION ALL
+SELECT 'guest_bookings (active)',     COUNT(*) FROM public.guest_bookings WHERE id::text LIKE 'b0000000%' AND status = 'active'
+UNION ALL
+SELECT 'guest_bookings (inactive)',   COUNT(*) FROM public.guest_bookings WHERE id::text LIKE 'b0000000%' AND status = 'inactive'
+UNION ALL
+SELECT 'requests',                   COUNT(*) FROM public.requests       WHERE id::text LIKE 'c0000000%';
diff --git a/clients/Makefile b/clients/Makefile
index 65d8e2c54..5065cc047 100644
--- a/clients/Makefile
+++ b/clients/Makefile
@@ -1,4 +1,4 @@
-.PHONY: install install-shared install-mobile install-web dev-web dev-mobile format format-mobile format-web lint lint-web lint-mobile lint-fix lint-fix-web lint-fix-mobile
+.PHONY: install install-shared install-mobile install-web dev-web dev-mobile format format-mobile format-web lint lint-web lint-mobile lint-fix lint-fix-web lint-fix-mobile sync-api typecheck typecheck-web typecheck-mobile
 
 # Install dependencies in shared, mobile, and web
 install: install-shared install-mobile install-web
@@ -54,7 +54,21 @@ dev-web:
 	@cd web && npm run dev
 
 dev-mobile:
-	@cd mobile && npx expo start
+	@cd mobile && npm run start
 
 generate:
-	@cd shared && npm run generate:api
\ No newline at end of file
+	@cd shared && npm run generate:api
+
+sync-api:
+	@cd ../backend && make swagger
+	@cd shared && npm run generate:api
+
+typecheck: typecheck-web typecheck-mobile
+
+typecheck-web:
+	@echo "Type checking web..."
+	@cd web && npx tsc --noEmit
+
+typecheck-mobile:
+	@echo "Type checking mobile..."
+	@cd mobile && npx tsc --noEmit
\ No newline at end of file
diff --git a/clients/mobile/.env.sample b/clients/mobile/.env.sample
index d0eb74d6a..5eee17e0e 100644
--- a/clients/mobile/.env.sample
+++ b/clients/mobile/.env.sample
@@ -1,2 +1,8 @@
+# DEPRECATED: This file is for reference only
+# Secrets are managed via Doppler
+# To set up: doppler login && doppler setup
+# To view secrets: doppler secrets
+# To manage: https://dashboard.doppler.com/
+
 EXPO_PUBLIC_CLERK_PUBLISHABLE_KEY=YOUR_CLERK_PUBLISHABLE_KEY
-EXPO_PUBLIC_API_URL=http://localhost:8080
\ No newline at end of file
+EXPO_PUBLIC_API_BASE_URL=http://localhost:8080/api/v1
\ No newline at end of file
diff --git a/clients/mobile/app.json b/clients/mobile/app.json
index f169dd454..435dd5872 100644
--- a/clients/mobile/app.json
+++ b/clients/mobile/app.json
@@ -6,7 +6,7 @@
     "orientation": "portrait",
     "icon": "./assets/images/icon.png",
     "scheme": "mobile",
-    "userInterfaceStyle": "automatic",
+    "userInterfaceStyle": "light",
     "newArchEnabled": true,
     "ios": {
       "supportsTablet": true,
@@ -34,13 +34,18 @@
           "image": "./assets/images/splash-icon.png",
           "imageWidth": 200,
           "resizeMode": "contain",
-          "backgroundColor": "#ffffff",
-          "dark": {
-            "backgroundColor": "#000000"
-          }
+          "backgroundColor": "#ffffff"
         }
       ],
-      "expo-secure-store"
+      "expo-secure-store",
+      [
+        "expo-notifications",
+        {
+          "icon": "./assets/images/icon.png",
+          "color": "#ffffff",
+          "sounds": []
+        }
+      ]
     ],
     "experiments": {
       "typedRoutes": true,
diff --git a/clients/mobile/app/(auth)/sign-in.tsx b/clients/mobile/app/(auth)/sign-in.tsx
new file mode 100644
index 000000000..796cd20e1
--- /dev/null
+++ b/clients/mobile/app/(auth)/sign-in.tsx
@@ -0,0 +1,174 @@
+import { ClerkErrorCode, ClerkStatus } from "@/constants/clerk";
+import { useClerkErrorHandler } from "@/hooks/useClerkErrorHandler";
+import { useAuth, useSignIn, useSSO } from "@clerk/clerk-expo";
+import { AntDesign } from "@expo/vector-icons";
+import { createURL } from "expo-linking";
+import { router } from "expo-router";
+import {
+  coolDownAsync,
+  maybeCompleteAuthSession,
+  warmUpAsync,
+} from "expo-web-browser";
+import { useEffect, useRef, useState } from "react";
+import {
+  Pressable,
+  TextInput,
+  View,
+  Text,
+  Keyboard,
+  KeyboardAvoidingView,
+  Platform,
+  ScrollView,
+} from "react-native";
+
+maybeCompleteAuthSession();
+
+const PLACEHOLDER_COLOR = "#AFAFAD";
+
+export default function Login() {
+  const { isLoaded, signIn, setActive } = useSignIn();
+  const { startSSOFlow } = useSSO();
+  const { isSignedIn } = useAuth();
+  const [email, setEmail] = useState<string>("");
+  const [password, setPassword] = useState<string>("");
+  const [error, setError] = useState("");
+  const [loading, setLoading] = useState(false);
+  const [googleLoading, setGoogleLoading] = useState(false);
+  const passwordRef = useRef<TextInput>(null);
+  const handleClerkAction = useClerkErrorHandler(setError);
+
+  useEffect(() => {
+    warmUpAsync();
+    return () => {
+      coolDownAsync();
+    };
+  }, []);
+
+  const onLogin = () => {
+    setLoading(true);
+    handleClerkAction(async () => {
+      if (!isLoaded || !signIn || !setActive) return;
+      const result = await signIn.create({ identifier: email, password });
+      if (result.status === ClerkStatus.Complete) {
+        await setActive({ session: result.createdSessionId });
+        router.replace("/(tabs)");
+      }
+    }).finally(() => setLoading(false));
+  };
+
+  const onGoogleSignIn = async () => {
+    if (isSignedIn) {
+      router.replace("/(tabs)");
+      return;
+    }
+    setGoogleLoading(true);
+    setError("");
+    try {
+      const { createdSessionId, setActive: setActiveSession } =
+        await startSSOFlow({
+          strategy: "oauth_google",
+          redirectUrl: createURL("/sign-in"),
+        });
+      if (createdSessionId) {
+        await setActiveSession!({ session: createdSessionId });
+      }
+      router.replace("/(tabs)");
+    } catch (err: any) {
+      const code = err.errors?.[0]?.code as string | undefined;
+      if (
+        code === ClerkErrorCode.SessionExists ||
+        code === ClerkErrorCode.IdentifierAlreadySignedIn
+      ) {
+        router.replace("/(tabs)");
+      } else {
+        setError(err.errors?.[0]?.message ?? "Google sign in failed");
+      }
+    } finally {
+      setGoogleLoading(false);
+    }
+  };
+
+  return (
+    <KeyboardAvoidingView
+      className="flex-1 bg-bg-surface"
+      behavior={Platform.OS === "ios" ? "padding" : "height"}
+    >
+      <ScrollView
+        contentContainerClassName="flex-grow justify-center px-8 py-12"
+        keyboardShouldPersistTaps="handled"
+        onScrollBeginDrag={Keyboard.dismiss}
+      >
+        <View className="items-center mb-10">
+          <View className="w-10 h-10 bg-primary rounded-lg items-center justify-center">
+            <Text className="text-white font-bold text-lg leading-none">S</Text>
+          </View>
+        </View>
+
+        <Text className="text-[22px] font-semibold text-text-default mb-1.5 tracking-tight">
+          Log in
+        </Text>
+        <Text className="text-sm text-text-subtle mb-7">
+          Enter your credentials to continue
+        </Text>
+
+        <View className="gap-y-2 mb-5">
+          <TextInput
+            value={email}
+            onChangeText={setEmail}
+            placeholder="Email"
+            placeholderTextColor={PLACEHOLDER_COLOR}
+            keyboardType="email-address"
+            autoCapitalize="none"
+            autoFocus
+            returnKeyType="next"
+            onSubmitEditing={() => passwordRef.current?.focus()}
+            className="bg-bg-input rounded-md px-3 py-3.5 text-sm text-text-default"
+          />
+          <TextInput
+            ref={passwordRef}
+            value={password}
+            onChangeText={setPassword}
+            placeholder="Password"
+            placeholderTextColor={PLACEHOLDER_COLOR}
+            secureTextEntry
+            autoCapitalize="none"
+            returnKeyType="done"
+            onSubmitEditing={onLogin}
+            className="bg-bg-input rounded-md px-3 py-3.5 text-sm text-text-default"
+          />
+        </View>
+
+        {error ? (
+          <Text className="text-danger text-sm mb-4">{error}</Text>
+        ) : null}
+
+        <Pressable
+          onPress={onLogin}
+          disabled={loading || !email || !password}
+          className="bg-primary rounded-md py-3.5 items-center mb-6 active:opacity-75 disabled:opacity-40"
+        >
+          <Text className="text-white font-medium text-sm">
+            {loading ? "Signing in…" : "Continue"}
+          </Text>
+        </Pressable>
+
+        <View className="flex-row items-center mb-4">
+          <View className="flex-1 h-px bg-stroke-subtle" />
+          <Text className="text-text-subtle text-xs mx-3">or</Text>
+          <View className="flex-1 h-px bg-stroke-subtle" />
+        </View>
+
+        <Pressable
+          onPress={onGoogleSignIn}
+          disabled={googleLoading}
+          className="bg-bg-container border border-stroke-subtle rounded-md py-3.5 flex-row items-center justify-center gap-x-2.5 active:opacity-75 disabled:opacity-40"
+        >
+          <AntDesign name="google" size={16} color="#4285F4" />
+          <Text className="text-text-default font-medium text-sm">
+            {googleLoading ? "Signing in…" : "Continue with Google"}
+          </Text>
+        </Pressable>
+      </ScrollView>
+    </KeyboardAvoidingView>
+  );
+}
diff --git a/clients/mobile/app/(tabs)/__tests__/index.test.tsx b/clients/mobile/app/(tabs)/__tests__/index.test.tsx
deleted file mode 100644
index 36996383d..000000000
--- a/clients/mobile/app/(tabs)/__tests__/index.test.tsx
+++ /dev/null
@@ -1,54 +0,0 @@
-import { render } from "@testing-library/react-native";
-import HomeScreen from "../index";
-
-jest.mock("@clerk/clerk-expo", () => {
-  const actual = jest.requireActual("@clerk/clerk-expo");
-  return {
-    ...actual,
-    useAuth: () => ({
-      getToken: async () => null,
-      isLoaded: true,
-      isSignedIn: false,
-      userId: null,
-      sessionId: null,
-    }),
-  };
-});
-
-jest.mock("../../../hooks/use-hello", () => ({
-  useGetHello: () => ({
-    data: "hello",
-    isLoading: false,
-    error: null,
-    refetch: jest.fn(),
-  }),
-  useGetHelloName: () => ({
-    data: "hello-name",
-    isLoading: false,
-    error: null,
-    refetch: jest.fn(),
-  }),
-}));
-
-// Mock expo-image
-jest.mock("expo-image", () => ({
-  Image: "Image",
-}));
-
-// Mock parallax scroll view - just render children
-jest.mock("@/components/parallax-scroll-view", () => ({
-  __esModule: true,
-  default: ({ children }: { children: React.ReactNode }) => children,
-}));
-
-describe("HomeScreen", () => {
-  it("renders without crashing", () => {
-    const { getByText } = render(<HomeScreen />);
-    expect(getByText("Welcome!")).toBeTruthy();
-  });
-
-  it("displays the API Test section", () => {
-    const { getByText } = render(<HomeScreen />);
-    expect(getByText("API Test")).toBeTruthy();
-  });
-});
diff --git a/clients/mobile/app/(tabs)/_layout.tsx b/clients/mobile/app/(tabs)/_layout.tsx
index 5aa333657..5fde24a28 100644
--- a/clients/mobile/app/(tabs)/_layout.tsx
+++ b/clients/mobile/app/(tabs)/_layout.tsx
@@ -1,58 +1,165 @@
 import { Tabs } from "expo-router";
-import React from "react";
+import React, { useCallback, useEffect } from "react";
+import Animated, {
+  useSharedValue,
+  useAnimatedStyle,
+  withSpring,
+} from "react-native-reanimated";
+import { useWindowDimensions, View, Text, Pressable } from "react-native";
+import type { BottomTabBarProps } from "@react-navigation/bottom-tabs";
+import * as Haptics from "expo-haptics";
 
-import { HapticTab } from "@/components/haptic-tab";
 import { IconSymbol } from "@/components/ui/icon-symbol";
-import { Colors } from "@/constants/theme";
-import { useColorScheme } from "@/hooks/use-color-scheme";
+import { StartupStatus, useStartup } from "@/context/startup";
+
+const PADDING_H = 20;
+const INDICATOR_W = 56;
+const TAB_COUNT = 5;
+
+// Color values for props that don't support className
+const COLOR_ACTIVE = "#124425"; // primary-surface
+const COLOR_INACTIVE = "#a2a2a2";
+const COLOR_WHITE = "#ffffff";
+
+type TabBarIconProps = {
+  name: React.ComponentProps<typeof IconSymbol>["name"];
+  focused: boolean;
+  label: string;
+};
+
+const TabBarIcon = ({ name, focused, label }: TabBarIconProps) => (
+  <View className="items-center gap-0.5 px-2 py-1">
+    <IconSymbol
+      size={18}
+      name={name}
+      color={focused ? COLOR_ACTIVE : COLOR_INACTIVE}
+    />
+    <Text
+      numberOfLines={1}
+      className={`text-xs font-medium ${focused ? "text-primary-surface" : "text-[#a2a2a2]"}`}
+    >
+      {label}
+    </Text>
+  </View>
+);
+
+const PlusButton = () => (
+  <View className="bg-primary rounded-full size-10 items-center justify-center">
+    <IconSymbol size={22} name="plus" color={COLOR_WHITE} />
+  </View>
+);
+
+type TabConfig = {
+  icon: React.ComponentProps<typeof IconSymbol>["name"];
+  label: string;
+};
+
+const TAB_CONFIG: Record<string, TabConfig> = {
+  tasks: { icon: "checklist", label: "Tasks" },
+  explore: { icon: "house.fill", label: "Rooms" },
+  guests: { icon: "suitcase.cart", label: "Guests" },
+  profile: { icon: "person.circle", label: "Profile" },
+};
+
+function CustomTabBar({ state, navigation, insets }: BottomTabBarProps) {
+  const { width: screenWidth } = useWindowDimensions();
+  const tabWidth = (screenWidth - PADDING_H * 2) / TAB_COUNT;
+
+  const getX = useCallback(
+    (index: number) => index * tabWidth + (tabWidth - INDICATOR_W) / 2,
+    [tabWidth],
+  );
+
+  const initialIndex = state.index === 2 ? 0 : state.index;
+  const translateX = useSharedValue(getX(initialIndex));
+  const opacity = useSharedValue(state.index === 2 ? 0 : 1);
+
+  useEffect(() => {
+    if (state.index === 2) {
+      opacity.value = withSpring(0, { damping: 20, stiffness: 300 });
+      return;
+    }
+    opacity.value = withSpring(1, { damping: 20, stiffness: 300 });
+    translateX.value = withSpring(getX(state.index), {
+      damping: 24,
+      stiffness: 350,
+      mass: 0.8,
+    });
+  }, [state.index, getX, opacity, translateX]);
+
+  const indicatorStyle = useAnimatedStyle(() => ({
+    transform: [{ translateX: translateX.value }],
+    opacity: opacity.value,
+  }));
+
+  return (
+    <View
+      className="bg-bg-surface border-t border-stroke-disabled"
+      style={{ paddingBottom: Math.max(12, insets.bottom) }}
+    >
+      <View>
+        <Animated.View
+          className="absolute w-[56px] h-[44px] bg-bg-selected rounded-lg top-4 left-5"
+          style={indicatorStyle}
+        />
+        <View className="flex-row pt-2 px-5">
+          {state.routes.map((route, index) => {
+            const focused = state.index === index;
+            const isPlus = index === 2;
+            const config = TAB_CONFIG[route.name];
+
+            const handlePress = () => {
+              if (process.env.EXPO_OS === "ios") {
+                Haptics.impactAsync(Haptics.ImpactFeedbackStyle.Light);
+              }
+              const event = navigation.emit({
+                type: "tabPress",
+                target: route.key,
+                canPreventDefault: true,
+              });
+              if (!focused && !event.defaultPrevented) {
+                navigation.navigate(route.name as never);
+              }
+            };
+
+            return (
+              <Pressable
+                key={route.key}
+                className="flex-1 h-[60px] items-center justify-center"
+                onPress={handlePress}
+              >
+                {isPlus ? (
+                  <PlusButton />
+                ) : (
+                  <TabBarIcon
+                    name={config.icon}
+                    focused={focused}
+                    label={config.label}
+                  />
+                )}
+              </Pressable>
+            );
+          })}
+        </View>
+      </View>
+    </View>
+  );
+}
 
 export default function TabLayout() {
-  const colorScheme = useColorScheme();
+  const status = useStartup();
+  if (status !== StartupStatus.Ready) return null;
 
   return (
     <Tabs
-      screenOptions={{
-        tabBarActiveTintColor: Colors[colorScheme ?? "light"].tint,
-        headerShown: false,
-        tabBarButton: HapticTab,
-      }}
+      tabBar={(props) => <CustomTabBar {...props} />}
+      screenOptions={{ headerShown: false }}
     >
-      <Tabs.Screen
-        name="index"
-        options={{
-          title: "Home",
-          tabBarIcon: ({ color }) => (
-            <IconSymbol size={28} name="house.fill" color={color} />
-          ),
-        }}
-      />
-      <Tabs.Screen
-        name="explore"
-        options={{
-          title: "Explore",
-          tabBarIcon: ({ color }) => (
-            <IconSymbol size={28} name="paperplane.fill" color={color} />
-          ),
-        }}
-      />
-      <Tabs.Screen
-        name="tasks"
-        options={{
-          title: "Tasks",
-          tabBarIcon: ({ color }) => (
-            <IconSymbol size={28} name="checklist" color={color} />
-          ),
-        }}
-      />
-      <Tabs.Screen
-        name="guests"
-        options={{
-          title: "Guests",
-          tabBarIcon: ({ color }) => (
-            <IconSymbol size={28} name="person.3.fill" color={color} />
-          ),
-        }}
-      />
+      <Tabs.Screen name="tasks" options={{ title: "Tasks" }} />
+      <Tabs.Screen name="explore" options={{ title: "Rooms" }} />
+      <Tabs.Screen name="index" options={{ title: "" }} />
+      <Tabs.Screen name="guests" options={{ title: "Guest" }} />
+      <Tabs.Screen name="profile" options={{ title: "Profile" }} />
     </Tabs>
   );
 }
diff --git a/clients/mobile/app/(tabs)/explore.tsx b/clients/mobile/app/(tabs)/explore.tsx
deleted file mode 100644
index 055d85264..000000000
--- a/clients/mobile/app/(tabs)/explore.tsx
+++ /dev/null
@@ -1,113 +0,0 @@
-import { Image } from "expo-image";
-import { Platform } from "react-native";
-
-import { Collapsible } from "@/components/ui/collapsible";
-import { ExternalLink } from "@/components/external-link";
-import ParallaxScrollView from "@/components/parallax-scroll-view";
-import { ThemedText } from "@/components/themed-text";
-import { ThemedView } from "@/components/themed-view";
-import { IconSymbol } from "@/components/ui/icon-symbol";
-import { Fonts } from "@/constants/theme";
-
-export default function TabTwoScreen() {
-  return (
-    <ParallaxScrollView
-      headerBackgroundColor={{ light: "#D0D0D0", dark: "#353636" }}
-      headerImage={
-        <IconSymbol
-          size={310}
-          color="#808080"
-          name="chevron.left.forwardslash.chevron.right"
-          className="absolute -bottom-[80px] -left-[35px]"
-        />
-      }
-    >
-      <ThemedView className="flex-row gap-2">
-        <ThemedText
-          type="title"
-          style={{
-            fontFamily: Fonts.rounded,
-          }}
-        >
-          Explore
-        </ThemedText>
-      </ThemedView>
-      <ThemedText>
-        This app includes example code to help you get started.
-      </ThemedText>
-      <Collapsible title="File-based routing">
-        <ThemedText>
-          This app has two screens:{" "}
-          <ThemedText type="defaultSemiBold">app/(tabs)/index.tsx</ThemedText>{" "}
-          and{" "}
-          <ThemedText type="defaultSemiBold">app/(tabs)/explore.tsx</ThemedText>
-        </ThemedText>
-        <ThemedText>
-          The layout file in{" "}
-          <ThemedText type="defaultSemiBold">app/(tabs)/_layout.tsx</ThemedText>{" "}
-          sets up the tab navigator.
-        </ThemedText>
-        <ExternalLink href="https://docs.expo.dev/router/introduction">
-          <ThemedText type="link">Learn more</ThemedText>
-        </ExternalLink>
-      </Collapsible>
-      <Collapsible title="Android, iOS, and web support">
-        <ThemedText>
-          You can open this project on Android, iOS, and the web. To open the
-          web version, press <ThemedText type="defaultSemiBold">w</ThemedText>{" "}
-          in the terminal running this project.
-        </ThemedText>
-      </Collapsible>
-      <Collapsible title="Images">
-        <ThemedText>
-          For static images, you can use the{" "}
-          <ThemedText type="defaultSemiBold">@2x</ThemedText> and{" "}
-          <ThemedText type="defaultSemiBold">@3x</ThemedText> suffixes to
-          provide files for different screen densities
-        </ThemedText>
-        <Image
-          source={require("@/assets/images/react-logo.png")}
-          className="w-[100px] h-[100px] self-center"
-        />
-        <ExternalLink href="https://reactnative.dev/docs/images">
-          <ThemedText type="link">Learn more</ThemedText>
-        </ExternalLink>
-      </Collapsible>
-      <Collapsible title="Light and dark mode components">
-        <ThemedText>
-          This template has light and dark mode support. The{" "}
-          <ThemedText type="defaultSemiBold">useColorScheme()</ThemedText> hook
-          lets you inspect what the user&apos;s current color scheme is, and so
-          you can adjust UI colors accordingly.
-        </ThemedText>
-        <ExternalLink href="https://docs.expo.dev/develop/user-interface/color-themes/">
-          <ThemedText type="link">Learn more</ThemedText>
-        </ExternalLink>
-      </Collapsible>
-      <Collapsible title="Animations">
-        <ThemedText>
-          This template includes an example of an animated component. The{" "}
-          <ThemedText type="defaultSemiBold">
-            components/HelloWave.tsx
-          </ThemedText>{" "}
-          component uses the powerful{" "}
-          <ThemedText type="defaultSemiBold" style={{ fontFamily: Fonts.mono }}>
-            react-native-reanimated
-          </ThemedText>{" "}
-          library to create a waving hand animation.
-        </ThemedText>
-        {Platform.select({
-          ios: (
-            <ThemedText>
-              The{" "}
-              <ThemedText type="defaultSemiBold">
-                components/ParallaxScrollView.tsx
-              </ThemedText>{" "}
-              component provides a parallax effect for the header image.
-            </ThemedText>
-          ),
-        })}
-      </Collapsible>
-    </ParallaxScrollView>
-  );
-}
diff --git a/clients/mobile/app/(tabs)/explore/[id].tsx b/clients/mobile/app/(tabs)/explore/[id].tsx
new file mode 100644
index 000000000..5745b4a59
--- /dev/null
+++ b/clients/mobile/app/(tabs)/explore/[id].tsx
@@ -0,0 +1,246 @@
+import { useState } from "react";
+import {
+  View,
+  Text,
+  Pressable,
+  ScrollView,
+  ActivityIndicator,
+} from "react-native";
+import { router, useLocalSearchParams } from "expo-router";
+import {
+  ChevronLeft,
+  ChevronUp,
+  ChevronDown,
+  Flag,
+  MapPin,
+  ClipboardList,
+  User,
+} from "lucide-react-native";
+import { SafeAreaView } from "react-native-safe-area-context";
+import { useGetRequestRoomId, useAssignRequestToSelf } from "@shared";
+import type { GuestRequest } from "@shared";
+import { Colors } from "@/constants/theme";
+import { GuestInfoTab } from "@/components/rooms/guest-info-tab";
+
+type TabId = "tasks" | "guest-info";
+
+const TABS: {
+  id: TabId;
+  label: string;
+  Icon: React.ComponentType<{ size: number; color: string }>;
+}[] = [
+  { id: "tasks", label: "Tasks", Icon: ClipboardList },
+  { id: "guest-info", label: "Guest Info", Icon: User },
+];
+
+function TaskCard({
+  task,
+  showAssign,
+  onAssign,
+}: {
+  task: GuestRequest;
+  showAssign?: boolean;
+  onAssign?: () => void;
+}) {
+  return (
+    <View className="bg-white border border-stroke-disabled p-3 rounded gap-3">
+      <View className="flex-row items-start gap-3">
+        <View className="flex-1 gap-2">
+          <Text className="text-base font-medium text-text-default">
+            {task.name}
+          </Text>
+          <View className="flex-row items-center gap-1">
+            <MapPin size={10} color={Colors.light.iconMuted} />
+            <Text className="text-xs text-text-secondary">
+              Floor {task.floor}, Room {task.room_number}
+            </Text>
+          </View>
+          <View className="flex-row flex-wrap gap-3 items-center">
+            {task.priority === "high" && (
+              <View className="flex-row items-center gap-1 bg-priority-high-bg px-2 py-1 rounded">
+                <Flag size={12} color={Colors.light.danger} />
+                <Text className="text-xs text-priority-high">
+                  High Priority
+                </Text>
+              </View>
+            )}
+            {task.department_name && (
+              <View className="flex-row items-center gap-2 h-6 px-2 rounded border border-stroke-subtle">
+                <Text className="text-xs text-text-default">
+                  {task.department_name}
+                </Text>
+              </View>
+            )}
+          </View>
+        </View>
+        <ChevronUp size={18} color={Colors.light.iconMuted} />
+      </View>
+      {showAssign && (
+        <Pressable
+          className="bg-primary items-center justify-center px-6 py-[10px] rounded"
+          onPress={onAssign}
+        >
+          <Text className="text-white text-sm">Assign to Self</Text>
+        </Pressable>
+      )}
+    </View>
+  );
+}
+
+function Section({
+  title,
+  count,
+  expanded,
+  onToggle,
+  children,
+}: {
+  title: string;
+  count: number;
+  expanded: boolean;
+  onToggle: () => void;
+  children: React.ReactNode;
+}) {
+  return (
+    <View className="gap-3">
+      <Pressable
+        className="flex-row items-center justify-between"
+        onPress={onToggle}
+      >
+        <Text className="text-[15px] font-medium text-text-default">
+          {title} ({count})
+        </Text>
+        {expanded ? (
+          <ChevronUp size={14} color={Colors.light.iconMuted} />
+        ) : (
+          <ChevronDown size={14} color={Colors.light.iconMuted} />
+        )}
+      </Pressable>
+      {expanded && children}
+    </View>
+  );
+}
+
+export default function RoomDetailScreen() {
+  const {
+    id,
+    roomNumber,
+    guestIds: guestIdsParam,
+  } = useLocalSearchParams<{
+    id: string;
+    roomNumber: string;
+    guestIds: string;
+  }>();
+
+  const guestIds = guestIdsParam
+    ? guestIdsParam.split(",").filter(Boolean)
+    : [];
+
+  const [activeTab, setActiveTab] = useState<TabId>("tasks");
+  const [yourTasksExpanded, setYourTasksExpanded] = useState(true);
+  const [unassignedExpanded, setUnassignedExpanded] = useState(true);
+
+  const { data, isLoading } = useGetRequestRoomId(id, {
+    query: { enabled: !!id },
+  });
+  const { mutate: assignToSelf } = useAssignRequestToSelf(id);
+
+  const assigned = data?.assigned ?? [];
+  const unassigned = data?.unassigned ?? [];
+
+  return (
+    <SafeAreaView className="flex-1 bg-white" edges={["top"]}>
+      {/* Header */}
+      <View className="flex-row items-center gap-3 px-6 pb-2 pt-3">
+        <Pressable onPress={() => router.back()} hitSlop={8}>
+          <ChevronLeft size={20} color={Colors.light.textDefault} />
+        </Pressable>
+        <Text className="text-2xl font-medium text-text-default tracking-tight">
+          Room {roomNumber}
+        </Text>
+      </View>
+
+      {/* Tab bar */}
+      <View className="flex-row border-b border-stroke-subtle">
+        {TABS.map(({ id, label, Icon }) => {
+          const active = activeTab === id;
+          const color = active
+            ? Colors.light.tabBarActive
+            : Colors.light.iconMuted;
+          return (
+            <Pressable
+              key={id}
+              className={`flex-1 flex-row items-center justify-center gap-2 py-2 px-3 ${
+                active ? "border-b-2 border-primary" : ""
+              }`}
+              onPress={() => setActiveTab(id)}
+            >
+              <Icon size={16} color={color} />
+              <Text
+                className={`text-[14px] leading-5 ${
+                  active ? "text-primary" : "text-text-secondary"
+                }`}
+                style={{ color }}
+              >
+                {label}
+              </Text>
+            </Pressable>
+          );
+        })}
+      </View>
+
+      {/* Tasks tab */}
+      {activeTab === "tasks" &&
+        (isLoading ? (
+          <View className="flex-1 items-center justify-center">
+            <ActivityIndicator />
+          </View>
+        ) : (
+          <ScrollView
+            className="flex-1"
+            contentContainerStyle={{
+              gap: 16,
+              paddingHorizontal: 24,
+              paddingBottom: 24,
+              paddingTop: 16,
+            }}
+          >
+            {/* Your Tasks */}
+            <Section
+              title="Your Tasks"
+              count={assigned.length}
+              expanded={yourTasksExpanded}
+              onToggle={() => setYourTasksExpanded((v) => !v)}
+            >
+              <View className="gap-2">
+                {assigned.map((task, i) => (
+                  <TaskCard key={task.id ?? i} task={task} />
+                ))}
+              </View>
+            </Section>
+
+            {/* Unassigned Tasks */}
+            <Section
+              title="Unassigned Tasks"
+              count={unassigned.length}
+              expanded={unassignedExpanded}
+              onToggle={() => setUnassignedExpanded((v) => !v)}
+            >
+              <View className="gap-2">
+                {unassigned.map((task, i) => (
+                  <TaskCard
+                    key={task.id ?? i}
+                    task={task}
+                    showAssign
+                    onAssign={() => task.id && assignToSelf(task.id)}
+                  />
+                ))}
+              </View>
+            </Section>
+          </ScrollView>
+        ))}
+
+      {/* Guest Info tab */}
+      {activeTab === "guest-info" && <GuestInfoTab guestIds={guestIds} />}
+    </SafeAreaView>
+  );
+}
diff --git a/clients/mobile/app/(tabs)/explore/_layout.tsx b/clients/mobile/app/(tabs)/explore/_layout.tsx
new file mode 100644
index 000000000..282a69b5c
--- /dev/null
+++ b/clients/mobile/app/(tabs)/explore/_layout.tsx
@@ -0,0 +1,10 @@
+import { Stack } from "expo-router";
+
+export default function ExploreLayout() {
+  return (
+    <Stack screenOptions={{ headerShown: false }}>
+      <Stack.Screen name="index" />
+      <Stack.Screen name="[id]" />
+    </Stack>
+  );
+}
diff --git a/clients/mobile/app/(tabs)/explore/index.tsx b/clients/mobile/app/(tabs)/explore/index.tsx
new file mode 100644
index 000000000..ad72f9518
--- /dev/null
+++ b/clients/mobile/app/(tabs)/explore/index.tsx
@@ -0,0 +1,223 @@
+import { useState } from "react";
+import { FlatList, Pressable, Text, View } from "react-native";
+import {
+  ChevronDown,
+  Search,
+  SlidersHorizontal,
+  ArrowUpDown,
+  X,
+} from "lucide-react-native";
+import { SafeAreaView } from "react-native-safe-area-context";
+import { router } from "expo-router";
+import { Colors } from "@/constants/theme";
+import { RoomCard, type RoomStatus } from "@/components/rooms/room-card";
+import { FloorPickerSheet } from "@/components/rooms/floor-picker-sheet";
+import {
+  RoomFilterSheet,
+  type RoomFilters,
+  EMPTY_ROOM_FILTERS,
+  STATUS_OPTIONS,
+  ATTRIBUTE_OPTIONS,
+  ADVANCED_OPTIONS,
+} from "@/components/rooms/room-filter-sheet";
+import {
+  RoomSortSheet,
+  type RoomSort,
+  DEFAULT_ROOM_SORT,
+} from "@/components/rooms/room-sort-sheet";
+import {
+  useGetRooms,
+  useGetRoomsFloors,
+  BookingStatus,
+  RoomStatusValue,
+} from "@shared/api/rooms";
+import type { RoomWithOptionalGuestBooking } from "@shared";
+
+function getRoomStatus(room: RoomWithOptionalGuestBooking): RoomStatus {
+  switch (true) {
+    case room.room_status === RoomStatusValue.OutOfOrder:
+      return { type: "out-of-order" };
+    case room.booking_status === BookingStatus.BookingStatusActive: {
+      const guest = room.guests?.[0];
+      const guestName =
+        [guest?.first_name, guest?.last_name].filter(Boolean).join(" ") ||
+        "Guest";
+      return { type: "occupied", guestName };
+    }
+    default:
+      return {
+        type: "vacant",
+        isAvailable: room.room_status === RoomStatusValue.Available,
+      };
+  }
+}
+
+function getFloorLabel(selectedFloors: number[]): string {
+  if (selectedFloors.length === 0) return "All Floors";
+  if (selectedFloors.length === 1) return `Floor ${selectedFloors[0]}`;
+  return `${selectedFloors.length} Floors`;
+}
+
+export default function RoomsScreen() {
+  const [selectedFloors, setSelectedFloors] = useState<number[]>([]);
+  const [floorPickerVisible, setFloorPickerVisible] = useState(false);
+  const [filterVisible, setFilterVisible] = useState(false);
+  const [sortVisible, setSortVisible] = useState(false);
+  const [filters, setFilters] = useState<RoomFilters>(EMPTY_ROOM_FILTERS);
+  const [sort, setSort] = useState<RoomSort>(DEFAULT_ROOM_SORT);
+
+  const { data: floors = [] } = useGetRoomsFloors();
+
+  const hasActiveFilters =
+    filters.status.length > 0 ||
+    filters.attributes.length > 0 ||
+    filters.advanced.length > 0;
+
+  const { data: roomsData } = useGetRooms({
+    floors: selectedFloors.length ? selectedFloors : undefined,
+    status: filters.status.length ? filters.status : undefined,
+    attributes: filters.attributes.length ? filters.attributes : undefined,
+    advanced: filters.advanced.length ? filters.advanced : undefined,
+    sort: sort !== "ascending" ? sort : undefined,
+  });
+  const rooms = roomsData?.items ?? [];
+
+  return (
+    <SafeAreaView className="flex-1 bg-white" edges={["top"]}>
+      {/* Top app bar */}
+      <View className="flex-row items-center justify-between px-[22px] pb-2 pt-3">
+        <Pressable
+          className="flex-row items-center gap-[10px]"
+          onPress={() => setFloorPickerVisible(true)}
+        >
+          <Text className="text-2xl font-medium text-text-default tracking-tight">
+            {getFloorLabel(selectedFloors)}
+          </Text>
+          <ChevronDown size={14} color={Colors.light.textDefault} />
+        </Pressable>
+        <View className="flex-row items-center gap-2">
+          <Pressable className="items-center justify-center rounded w-[34px] h-[34px]">
+            <Search size={19} color={Colors.light.textDefault} />
+          </Pressable>
+          <Pressable
+            className={`items-center justify-center rounded w-[34px] h-[34px] ${filterVisible ? "bg-bg-selected" : ""}`}
+            onPress={() => setFilterVisible(true)}
+          >
+            <SlidersHorizontal
+              size={19}
+              color={
+                filterVisible
+                  ? Colors.light.tabBarActive
+                  : Colors.light.textDefault
+              }
+            />
+            {hasActiveFilters && (
+              <View className="absolute top-[5px] right-[5px] w-[6px] h-[6px] rounded-full bg-primary" />
+            )}
+          </Pressable>
+          <Pressable
+            className={`items-center justify-center rounded w-[34px] h-[34px] ${sortVisible ? "bg-bg-selected" : ""}`}
+            onPress={() => setSortVisible(true)}
+          >
+            <ArrowUpDown
+              size={18}
+              color={
+                sortVisible
+                  ? Colors.light.tabBarActive
+                  : Colors.light.textDefault
+              }
+            />
+          </Pressable>
+        </View>
+      </View>
+
+      {/* Active filter pills */}
+      {hasActiveFilters && (
+        <View className="flex-row flex-wrap gap-2 items-center px-6 py-4 border-b border-stroke-subtle">
+          {[
+            ...filters.status.map((v) => ({
+              label: STATUS_OPTIONS.find((o) => o.value === v)!.label,
+              onRemove: () =>
+                setFilters((f) => ({
+                  ...f,
+                  status: f.status.filter((s) => s !== v),
+                })),
+            })),
+            ...filters.attributes.map((v) => ({
+              label: ATTRIBUTE_OPTIONS.find((o) => o.value === v)!.label,
+              onRemove: () =>
+                setFilters((f) => ({
+                  ...f,
+                  attributes: f.attributes.filter((a) => a !== v),
+                })),
+            })),
+            ...filters.advanced.map((v) => ({
+              label: ADVANCED_OPTIONS.find((o) => o.value === v)!.label,
+              onRemove: () =>
+                setFilters((f) => ({
+                  ...f,
+                  advanced: f.advanced.filter((a) => a !== v),
+                })),
+            })),
+          ].map(({ label, onRemove }) => (
+            <Pressable
+              key={label}
+              onPress={onRemove}
+              className="flex-row items-center gap-2 bg-bg-selected px-3 py-1.5 rounded"
+            >
+              <Text className="text-[13px] text-primary">{label}</Text>
+              <X size={9} color={Colors.light.tabBarActive} />
+            </Pressable>
+          ))}
+          <Pressable onPress={() => setFilters(EMPTY_ROOM_FILTERS)}>
+            <Text className="text-[12px] text-text-subtle">Clear All</Text>
+          </Pressable>
+        </View>
+      )}
+
+      {/* Content */}
+      <FlatList
+        data={rooms}
+        keyExtractor={(item) => item.id ?? String(item.room_number)}
+        renderItem={({ item }) => (
+          <RoomCard
+            roomNumber={item.room_number ?? ""}
+            roomType={item.suite_type ?? ""}
+            status={getRoomStatus(item)}
+            onPress={() => {
+              const guestIds =
+                item.booking_status === BookingStatus.BookingStatusActive
+                  ? (item.guests
+                      ?.map((g) => g.id)
+                      .filter(Boolean)
+                      .join(",") ?? "")
+                  : "";
+              router.push(
+                `/explore/${item.id}?roomNumber=${item.room_number}&guestIds=${guestIds}`,
+              );
+            }}
+          />
+        )}
+      />
+      <FloorPickerSheet
+        visible={floorPickerVisible}
+        floors={floors}
+        selectedFloors={selectedFloors}
+        onApply={setSelectedFloors}
+        onClose={() => setFloorPickerVisible(false)}
+      />
+      <RoomFilterSheet
+        visible={filterVisible}
+        filters={filters}
+        onApply={setFilters}
+        onClose={() => setFilterVisible(false)}
+      />
+      <RoomSortSheet
+        visible={sortVisible}
+        sort={sort}
+        onSelect={setSort}
+        onClose={() => setSortVisible(false)}
+      />
+    </SafeAreaView>
+  );
+}
diff --git a/clients/mobile/app/(tabs)/guests/[id].tsx b/clients/mobile/app/(tabs)/guests/[id].tsx
index f96e4edd4..f2857c5f1 100644
--- a/clients/mobile/app/(tabs)/guests/[id].tsx
+++ b/clients/mobile/app/(tabs)/guests/[id].tsx
@@ -1,16 +1,105 @@
-import { useLocalSearchParams } from "expo-router";
-import { Text } from "react-native";
-import GuestProfile from "@/components/ui/guest-profile";
-import { guestData } from "@/test-data/guests";
+import { useState, useMemo } from "react";
+import {
+  View,
+  Text,
+  Pressable,
+  ScrollView,
+  ActivityIndicator,
+} from "react-native";
+import { Info, ChevronRight } from "lucide-react-native";
+import { router, useLocalSearchParams } from "expo-router";
+import { useGetGuestsStaysId } from "@shared/api/generated/endpoints/guests/guests";
+import { useInfiniteRequestsByGuest } from "@shared";
+import { GuestHeader, Tab } from "@/components/ui/guest-header";
+import { GuestProfileTab } from "@/components/ui/guest-profile";
+import { GuestRequestsTab } from "@/components/ui/guest-activity";
+import { Colors } from "@/constants/theme";
 
-export default function ProfileScreen() {
+export default function GuestProfileScreen() {
   const { id } = useLocalSearchParams();
+  const guestId = id as string;
 
-  const guest = guestData.find((g) => g.id === Number(id));
+  const { data, isLoading } = useGetGuestsStaysId(guestId);
 
-  if (!guest) {
-    return <Text>Guest not found</Text>;
-  }
+  const {
+    data: requestPages,
+    fetchNextPage,
+    hasNextPage,
+    isFetchingNextPage,
+  } = useInfiniteRequestsByGuest(guestId);
 
-  return <GuestProfile {...guest} />;
+  const requests = useMemo(
+    () => requestPages?.pages.flatMap((p) => p.items ?? []) ?? [],
+    [requestPages],
+  );
+
+  const [activeTab, setActiveTab] = useState<Tab>("profile");
+
+  const hasUrgent = requests.some((r) => r.priority === "high");
+
+  if (isLoading)
+    return (
+      <View className="flex-1 items-center justify-center">
+        <ActivityIndicator />
+      </View>
+    );
+
+  if (!data)
+    return (
+      <View className="flex-1 items-center justify-center">
+        <Text>Guest not found</Text>
+      </View>
+    );
+
+  return (
+    <View className="flex-1 bg-white">
+      <GuestHeader
+        name={data.first_name}
+        activeTab={activeTab}
+        onTabChange={setActiveTab}
+        hasUrgent={hasUrgent}
+      />
+
+      {requests.length > 0 && (
+        <Pressable
+          onPress={() => setActiveTab("requests")}
+          className="flex-row items-center justify-between px-[4vw] py-[1.5vh] bg-primary"
+        >
+          <View className="flex-row items-center gap-[2vw]">
+            <Info size={16} color={Colors.light.background} />
+            <Text className="text-white text-[3.5vw]">
+              {data.first_name} is waiting on requests
+            </Text>
+          </View>
+          <ChevronRight size={16} color={Colors.light.background} />
+        </Pressable>
+      )}
+
+      {activeTab === "profile" ? (
+        <ScrollView className="flex-1">
+          <GuestProfileTab
+            guestId={guestId}
+            firstName={data.first_name}
+            lastName={data.last_name}
+            pronouns={data.pronouns}
+            doNotDisturbStart={data.do_not_disturb_start}
+            doNotDisturbEnd={data.do_not_disturb_end}
+            housekeepingCadence={data.housekeeping_cadence}
+            notes={data.notes}
+            assistance={data.assistance}
+            currentStays={data.current_stays ?? []}
+            onViewAllBookings={() =>
+              router.push(`/guests/booking-history?id=${guestId}`)
+            }
+          />
+        </ScrollView>
+      ) : (
+        <GuestRequestsTab
+          requests={requests}
+          onLoadMore={hasNextPage ? fetchNextPage : undefined}
+          isFetchingMore={isFetchingNextPage}
+        />
+      )}
+    </View>
+  );
 }
diff --git a/clients/mobile/app/(tabs)/guests/booking-history.tsx b/clients/mobile/app/(tabs)/guests/booking-history.tsx
new file mode 100644
index 000000000..98425f667
--- /dev/null
+++ b/clients/mobile/app/(tabs)/guests/booking-history.tsx
@@ -0,0 +1,132 @@
+import { View, Text, Pressable, SectionList } from "react-native";
+import { ChevronLeft, Users, Calendar, Clock } from "lucide-react-native";
+import { router, useLocalSearchParams } from "expo-router";
+import { Colors } from "@/constants/theme";
+import { useGetGuestsStaysId } from "@shared/api/generated/endpoints/guests/guests";
+import type { Stay } from "@shared";
+import { formatDate, formatTime } from "@/utils/time";
+
+export default function BookingHistoryScreen() {
+  const { id } = useLocalSearchParams();
+  const { data, isLoading } = useGetGuestsStaysId(id as string);
+
+  const currentStays = data?.current_stays ?? [];
+  const pastStays = data?.past_stays ?? [];
+
+  const grouped = pastStays.reduce<Record<string, Stay[]>>((acc, stay) => {
+    const year = new Date(stay.arrival_date).getFullYear().toString();
+    if (!acc[year]) acc[year] = [];
+    acc[year].push(stay);
+    return acc;
+  }, {});
+
+  const pastSections = Object.entries(grouped)
+    .sort(([a], [b]) => Number(b) - Number(a))
+    .map(([year, data]) => ({ title: year, data, active: false }));
+
+  const sections = [
+    ...(currentStays.length > 0
+      ? [{ title: "Active", data: currentStays, active: true }]
+      : []),
+    ...pastSections,
+  ];
+
+  return (
+    <View className="flex-1 bg-white pt-safe">
+      <View className="flex-row items-center px-[4vw] py-[3vh] border-b border-stroke-subtle">
+        <Pressable onPress={() => router.back()}>
+          <ChevronLeft size={24} color={Colors.light.text} />
+        </Pressable>
+        <Text className="flex-1 text-center text-[5vw] font-semibold text-black">
+          All Bookings
+        </Text>
+        <View className="w-[6vw]" />
+      </View>
+
+      {isLoading ? (
+        <Text className="text-center mt-[4vh] text-[3.5vw] text-text-subtle">
+          Loading...
+        </Text>
+      ) : (
+        <SectionList
+          sections={sections}
+          keyExtractor={(_, i) => i.toString()}
+          contentContainerStyle={{ padding: 16, gap: 8 }}
+          renderSectionHeader={({ section }) => (
+            <Text className="text-[3.5vw] font-semibold text-black mt-[2vh] mb-[1vh]">
+              {section.title}
+            </Text>
+          )}
+          renderItem={({ item, section }) =>
+            section.active ? (
+              <ActiveBookingCard stay={item} />
+            ) : (
+              <PastBookingCard stay={item} />
+            )
+          }
+        />
+      )}
+    </View>
+  );
+}
+
+function ActiveBookingCard({ stay }: { stay: Stay }) {
+  return (
+    <View className="bg-success-accent border border-success-stroke rounded-xl p-[4vw] gap-[1.5vh]">
+      <View className="flex-row items-center justify-between">
+        <Text className="text-[5.5vw] font-bold text-primary">
+          Suite {stay.room_number}
+        </Text>
+        <View className="flex-row items-center gap-[1.5vw]">
+          <Users size={16} color={Colors.light.tabBarActive} />
+          <Text className="text-[4vw] text-primary font-medium">
+            {stay.group_size ?? 1}
+          </Text>
+        </View>
+      </View>
+
+      <View className="flex-row items-center gap-[2vw]">
+        <Text className="text-[3.5vw] text-primary w-[22vw]">Arrival:</Text>
+        <Calendar size={13} color={Colors.light.tabBarActive} />
+        <Text className="text-[3.5vw] text-primary">
+          {formatDate(stay.arrival_date)}
+        </Text>
+        <Clock size={13} color={Colors.light.tabBarActive} />
+        <Text className="text-[3.5vw] text-primary">
+          {formatTime(stay.arrival_date)}
+        </Text>
+      </View>
+
+      <View className="flex-row items-center gap-[2vw]">
+        <Text className="text-[3.5vw] text-primary w-[22vw]">Departure:</Text>
+        <Calendar size={13} color={Colors.light.tabBarActive} />
+        <Text className="text-[3.5vw] text-primary">
+          {formatDate(stay.departure_date)}
+        </Text>
+        <Clock size={13} color={Colors.light.tabBarActive} />
+        <Text className="text-[3.5vw] text-primary">
+          {formatTime(stay.departure_date)}
+        </Text>
+      </View>
+    </View>
+  );
+}
+
+function PastBookingCard({ stay }: { stay: Stay }) {
+  return (
+    <View className="border border-stroke-subtle rounded-xl px-[4vw] py-[2.5vh] gap-[0.8vh]">
+      <View className="flex-row items-center gap-[2vw]">
+        <Text className="text-[3.8vw] font-medium text-black">
+          Suite {stay.room_number}
+        </Text>
+        <Users size={13} color={Colors.light.icon} />
+        <Text className="text-[3.5vw] text-text-subtle">
+          {stay.group_size ?? 1}
+        </Text>
+      </View>
+      <Text className="text-[3.2vw] text-text-subtle">
+        {formatDate(stay.arrival_date)} - {formatDate(stay.departure_date)}
+      </Text>
+    </View>
+  );
+}
diff --git a/clients/mobile/app/(tabs)/guests/index.tsx b/clients/mobile/app/(tabs)/guests/index.tsx
index f538def4a..d62611c68 100644
--- a/clients/mobile/app/(tabs)/guests/index.tsx
+++ b/clients/mobile/app/(tabs)/guests/index.tsx
@@ -1,78 +1,126 @@
-import React, { useState } from "react";
-import { View, ScrollView, Alert } from "react-native";
-import { Header } from "@/components/ui/header";
-import { SearchBar } from "@/components/ui/search-bar";
-import { Filters } from "@/components/ui/filters";
+import { useState } from "react";
+import { FlatList, ActivityIndicator, Text } from "react-native";
+import { SafeAreaView } from "react-native-safe-area-context";
 import { GuestCard } from "@/components/ui/guest-card";
-import { guestData } from "@/test-data/guests";
 import { router } from "expo-router";
+import { useAPIClient } from "@shared/api/client";
+import { useInfiniteQuery, InfiniteData } from "@tanstack/react-query";
+import type { GuestPage } from "@shared";
+import { useGetRoomsFloors } from "@shared";
+import { GuestListHeader } from "@/components/ui/guest-list-header";
+import {
+  GuestFilterSheet,
+  GuestFilterState,
+} from "@/components/ui/guest-filter-sheet";
 
 export default function GuestsList() {
   const [search, setSearch] = useState("");
-  const [group, setGroup] = useState<number | null>(null);
-  const [floor, setFloor] = useState<number | null>(null);
-
-  const handleGuestPress = (guestId: number) => {
-    router.push(`/guests/${guestId}`);
-  };
-
-  const filterConfig = [
-    {
-      value: group,
-      onChange: setGroup,
-      placeholder: "Group",
-      emptyValue: null,
-      options: [
-        { label: "Group 1", value: 1 },
-        { label: "Group 2", value: 2 },
-        { label: "Group 3", value: 3 },
-      ],
-    },
-    {
-      value: floor,
-      onChange: setFloor,
-      placeholder: "Floor",
-      emptyValue: null,
-      options: [
-        { label: "Floor 1", value: 1 },
-        { label: "Floor 2", value: 2 },
-        { label: "Floor 3", value: 3 },
-      ],
-    },
-  ];
-
-  const filteredGuests = guestData.filter((guest) => {
-    const matchesSearch = guest.name
-      .toLowerCase()
-      .includes(search.toLowerCase());
-    const matchesGroup = group === null || guest.group === group;
-    const matchesFloor = floor === null || guest.floor === floor;
+  const [filterSheetOpen, setFilterSheetOpen] = useState(false);
+  const [filters, setFilters] = useState<GuestFilterState>({
+    status: [],
+    requestSort: null,
+    floorSort: null,
+    assistance: [],
+    floors: [],
+  });
 
-    return matchesSearch && matchesGroup && matchesFloor;
+  const { data: floorOptions } = useGetRoomsFloors({
+    query: { staleTime: Infinity },
   });
 
-  return (
-    <View className="flex-1 bg-white">
-      <Header title="Guests" />
+  const api = useAPIClient();
+  const {
+    data: guestData,
+    fetchNextPage,
+    hasNextPage,
+    isFetchingNextPage,
+  } = useInfiniteQuery<
+    GuestPage,
+    Error,
+    InfiniteData<GuestPage>,
+    unknown[],
+    string | undefined
+  >({
+    queryKey: ["guests", filters, search],
+    queryFn: ({ pageParam }) =>
+      api.post<GuestPage>("/guests/search", {
+        floors: filters.floors.length ? filters.floors : undefined,
+        status: filters.status.length ? filters.status : undefined,
+        assistance: filters.assistance.length ? filters.assistance : undefined,
+        request_sort: filters.requestSort ?? undefined,
+        floor_sort: filters.floorSort ?? undefined,
+        search: search || undefined,
+        cursor: pageParam,
+        limit: 20,
+      }),
+    initialPageParam: undefined,
+    getNextPageParam: (lastPage) => lastPage.next_cursor ?? undefined,
+  });
 
-      <ScrollView className="flex-1 px-[4vw] py-[2vh]">
-        <SearchBar value={search} onChangeText={setSearch} />
+  const allGuests = guestData?.pages.flatMap((page) => page.data ?? []) ?? [];
 
-        <Filters filters={filterConfig} className="mt-[2vh]" />
+  const clearAll = () =>
+    setFilters({
+      status: [],
+      requestSort: null,
+      floorSort: null,
+      assistance: [],
+      floors: [],
+    });
 
-        <View className="mt-[2vh] gap-[1vh]">
-          {filteredGuests.map((guest) => (
-            <GuestCard
-              key={guest.id}
-              name={guest.name}
-              floor={guest.floor}
-              room={guest.room}
-              group={guest.group}
-              onPress={() => handleGuestPress(guest.id)}
-            />
-          ))}
-        </View>
-      </ScrollView>
-    </View>
+  return (
+    <SafeAreaView className="flex-1 bg-white" edges={["top"]}>
+      <FlatList
+        data={allGuests}
+        keyExtractor={(g, index) => g.id ?? `guest-${index}`}
+        renderItem={({ item }) => (
+          <GuestCard
+            firstName={item.first_name ?? ""}
+            lastName={item.last_name ?? ""}
+            activeBookings={item.active_bookings ?? []}
+            requestCount={item.request_count ?? 0}
+            hasUrgent={item.has_urgent ?? false}
+            assistance={item.assistance}
+            onPress={() => {
+              if (item.id) router.push(`/guests/${item.id}`);
+            }}
+          />
+        )}
+        onEndReached={() => {
+          if (hasNextPage && !isFetchingNextPage) fetchNextPage();
+        }}
+        onEndReachedThreshold={0.3}
+        ListHeaderComponent={
+          <GuestListHeader
+            search={search}
+            setSearch={setSearch}
+            filters={filters}
+            onFiltersChange={setFilters}
+            onOpenFilterSheet={() => setFilterSheetOpen(true)}
+          />
+        }
+        ListEmptyComponent={
+          guestData ? (
+            <Text className="text-[5vw] font-semibold text-black px-[4vw] pt-[3vh]">
+              No Guests Found
+            </Text>
+          ) : null
+        }
+        ListFooterComponent={
+          isFetchingNextPage ? <ActivityIndicator className="py-[2vh]" /> : null
+        }
+        contentContainerStyle={{ gap: 8 }}
+        className="flex-1"
+      />
+      <GuestFilterSheet
+        visible={filterSheetOpen}
+        onClose={() => setFilterSheetOpen(false)}
+        filters={filters}
+        onFiltersChange={setFilters}
+        floorOptions={floorOptions ?? []}
+        onShowResults={() => setFilterSheetOpen(false)}
+        onClearAll={clearAll}
+      />
+    </SafeAreaView>
   );
 }
diff --git a/clients/mobile/app/(tabs)/index.tsx b/clients/mobile/app/(tabs)/index.tsx
index f46cdb2d6..81a994dda 100644
--- a/clients/mobile/app/(tabs)/index.tsx
+++ b/clients/mobile/app/(tabs)/index.tsx
@@ -1,105 +1,72 @@
-import { Image } from "expo-image";
-import { Text, TextInput, Pressable, ActivityIndicator } from "react-native";
-import { useState } from "react";
-
-import { HelloWave } from "@/components/hello-wave";
-import ParallaxScrollView from "@/components/parallax-scroll-view";
-import { ThemedText } from "@/components/themed-text";
-import { ThemedView } from "@/components/themed-view";
-import { useGetHelloName } from "@/hooks/use-hello";
-
-export default function HomeScreen() {
-  const [name, setName] = useState("");
-  const [submittedName, setSubmittedName] = useState("");
-
-  const { data, isLoading, error, refetch } = useGetHelloName(submittedName);
-
-  const handleSubmit = () => {
-    if (name.trim()) {
-      setSubmittedName(name);
-    }
-  };
+import { View, Text, Pressable } from "react-native";
+import { SafeAreaView } from "react-native-safe-area-context";
+import { useUser } from "@clerk/clerk-expo";
+import { Sparkles, ClipboardList, ChevronRight } from "lucide-react-native";
+import { router } from "expo-router";
 
+function SelectionBox({
+  icon,
+  label,
+  onPress,
+}: {
+  icon: React.ReactNode;
+  label: string;
+  onPress: () => void;
+}) {
   return (
-    <ParallaxScrollView
-      headerBackgroundColor={{ light: "#A1CEDC", dark: "#1D3D47" }}
-      headerImage={
-        <Image
-          source={require("@/assets/images/dao.webp")}
-          contentFit="cover"
-          style={{
-            width: "100%",
-            height: "100%",
-          }}
-        />
-      }
+    <Pressable
+      onPress={onPress}
+      className="flex-row items-center justify-between bg-white rounded-lg p-4"
+      style={{ borderWidth: 0.5, borderColor: "#aeaeae", borderRadius: 8 }}
     >
-      <ThemedView className="flex-row items-center gap-2">
-        <Text className="text-primary text-[32px] font-bold">Welcome!</Text>
-        <HelloWave />
-      </ThemedView>
-
-      {/* API Test Section */}
-      <ThemedView className="gap-2 mb-4 p-4 border border-gray-300 dark:border-gray-700 rounded-lg">
-        <ThemedText type="subtitle">API Test</ThemedText>
-        <ThemedText className="text-sm">
-          Test the shared API client with GET /api/v1/hello/:name
-        </ThemedText>
-
-        <TextInput
-          value={name}
-          onChangeText={setName}
-          placeholder="Enter your name"
-          placeholderTextColor="#999"
-          className="border border-gray-300 dark:border-gray-700 rounded-lg px-4 py-2 mb-2 text-black dark:text-white bg-white dark:bg-gray-800"
-        />
+      <View className="flex-row items-center gap-2">
+        {icon}
+        <Text className="text-[15px] text-text-default tracking-tight">
+          {label}
+        </Text>
+      </View>
+      <ChevronRight size={18} color="#aeaeae" />
+    </Pressable>
+  );
+}
 
-        <Pressable
-          onPress={handleSubmit}
-          disabled={!name.trim() || isLoading}
-          className={`rounded-lg px-4 py-3 items-center ${
-            !name.trim() || isLoading
-              ? "bg-gray-400 dark:bg-gray-600"
-              : "bg-blue-500"
-          }`}
-        >
-          <ThemedText className="text-white font-semibold">
-            {isLoading ? "Loading..." : "Call API"}
-          </ThemedText>
-        </Pressable>
+export default function CreateTaskScreen() {
+  const { user } = useUser();
+  const firstName = user?.firstName ?? "there";
 
-        {/* Response Section */}
-        <ThemedView className="mt-4">
-          {isLoading && (
-            <ThemedView className="flex-row items-center gap-2">
-              <ActivityIndicator size="small" color="#0ea5e9" />
-              <ThemedText>Fetching data...</ThemedText>
-            </ThemedView>
-          )}
+  return (
+    <SafeAreaView className="flex-1 bg-white" edges={["top"]}>
+      {/* Header */}
+      <View className="px-6 pb-3 pt-3 border-b border-[#e9e9e9]">
+        <Text className="text-2xl font-medium text-text-default tracking-tight">
+          Task Creation
+        </Text>
+      </View>
 
-          {error && (
-            <ThemedView className="bg-red-100 dark:bg-red-900/20 p-3 rounded-lg">
-              <ThemedText className="text-red-600 dark:text-red-400 font-semibold">
-                Error: {error.message}
-              </ThemedText>
-            </ThemedView>
-          )}
+      {/* Content */}
+      <View className="px-6 pt-8 gap-6">
+        <View className="gap-2">
+          <Text className="text-2xl font-medium text-text-default tracking-tight">
+            Welcome Back, {firstName}!
+          </Text>
+          <Text className="text-[15px] text-text-default">
+            How would you like to get started today?
+          </Text>
+        </View>
 
-          {data && !isLoading && (
-            <ThemedView className="bg-green-100 dark:bg-green-900/20 p-3 rounded-lg">
-              <ThemedText className="text-green-700 dark:text-green-400 font-semibold mb-2">
-                Success! 🎉
-              </ThemedText>
-              <ThemedText className="text-lg font-mono">{data}</ThemedText>
-              <Pressable onPress={() => refetch()} className="mt-2">
-                <ThemedText className="text-blue-500 underline">
-                  Refetch
-                </ThemedText>
-              </Pressable>
-            </ThemedView>
-          )}
-        </ThemedView>
-      </ThemedView>
-    </ParallaxScrollView>
+        <View className="gap-4">
+          <SelectionBox
+            icon={<Sparkles size={20} color="#15502c" />}
+            label="Use SelfServe's AI"
+            onPress={() => router.push("/create-task-ai")}
+          />
+          <SelectionBox
+            icon={<ClipboardList size={20} color="#15502c" />}
+            label="Manually Create Task"
+            onPress={() => router.push("/create-task-manual")}
+          />
+        </View>
+      </View>
+    </SafeAreaView>
   );
 }
diff --git a/clients/mobile/app/(tabs)/profile.tsx b/clients/mobile/app/(tabs)/profile.tsx
new file mode 100644
index 000000000..febf818f9
--- /dev/null
+++ b/clients/mobile/app/(tabs)/profile.tsx
@@ -0,0 +1,55 @@
+import { View, Text, ScrollView, ActivityIndicator } from "react-native";
+import { SafeAreaView } from "react-native-safe-area-context";
+import { useAuth } from "@clerk/clerk-expo";
+import { router } from "expo-router";
+import { useGetUser } from "@shared";
+import LogoutButton from "@/components/Logout";
+import { ProfileHero } from "@/components/profile/ProfileHero";
+import { ProfileInfoCard } from "@/components/profile/ProfileInfoCard";
+
+export default function Profile() {
+  const { userId } = useAuth();
+  const { data: user, isLoading } = useGetUser(userId ?? undefined);
+
+  const onSignOut = () => {
+    router.replace("/sign-in");
+  };
+
+  const firstName = user?.first_name ?? "";
+  const lastName = user?.last_name ?? "";
+  const displayName = [firstName, lastName].filter(Boolean).join(" ") || "User";
+
+  return (
+    <SafeAreaView className="flex-1 bg-bg-primary" edges={["top"]}>
+      <View className="px-4 py-4 border-b border-stroke-subtle">
+        <Text className="text-2xl font-semibold text-text-default">
+          Profile
+        </Text>
+        <Text className="text-sm text-text-subtle">Overview of profile</Text>
+      </View>
+
+      {isLoading ? (
+        <View className="flex-1 items-center justify-center">
+          <ActivityIndicator size="large" />
+        </View>
+      ) : (
+        <ScrollView className="flex-1" contentContainerClassName="pb-12">
+          <ProfileHero
+            firstName={firstName}
+            lastName={lastName}
+            avatarUrl={user?.profile_picture ?? undefined}
+          />
+          <ProfileInfoCard
+            governmentName={displayName}
+            email={user?.primary_email ?? "—"}
+            phoneNumber={user?.phone_number ?? "—"}
+            department={user?.department ?? "—"}
+          />
+          <View className="px-4 mt-8">
+            <LogoutButton onSignOut={onSignOut} />
+          </View>
+        </ScrollView>
+      )}
+    </SafeAreaView>
+  );
+}
diff --git a/clients/mobile/app/(tabs)/tasks.tsx b/clients/mobile/app/(tabs)/tasks.tsx
index b078eb537..4df167ddf 100644
--- a/clients/mobile/app/(tabs)/tasks.tsx
+++ b/clients/mobile/app/(tabs)/tasks.tsx
@@ -1,54 +1,138 @@
+import { useAuth } from "@clerk/clerk-expo";
 import { useState } from "react";
-import { View } from "react-native";
+import { ActivityIndicator, View } from "react-native";
 import { SafeAreaView } from "react-native-safe-area-context";
 
-import { ActiveFilterChips } from "@/components/tasks/active-filter-chips";
 import { TabBar } from "@/components/tasks/tab-bar";
+import { TaskDetailSheet } from "@/components/tasks/task-detail-sheet";
+import { TaskFilterSheet } from "@/components/tasks/task-filter-sheet";
 import { TaskList } from "@/components/tasks/task-list";
 import { TasksHeader } from "@/components/tasks/tasks-header";
-import { TAB, TabName, TASK_ASSIGNMENT_STATE } from "@/constants/tasks";
-import { myTasks, unassignedTasks } from "@/data/mockTasks";
-
-const tabConfigs: Record<
-  TabName,
-  {
-    tasks: typeof myTasks;
-    variant: (typeof TASK_ASSIGNMENT_STATE)[keyof typeof TASK_ASSIGNMENT_STATE];
-    showFilters: boolean;
-  }
-> = {
-  [TAB.MY_TASKS]: {
-    tasks: myTasks,
-    variant: TASK_ASSIGNMENT_STATE.ASSIGNED,
-    showFilters: false,
-  },
-  [TAB.UNASSIGNED]: {
-    tasks: unassignedTasks,
-    variant: TASK_ASSIGNMENT_STATE.UNASSIGNED,
-    showFilters: true,
-  },
-};
+import { TAB, TabName } from "@/constants/tasks";
+import {
+  useAssignRequestToSelf,
+  useCompleteTask,
+  useDropTask,
+  useMarkTaskPending,
+  useGetRequestsFeed,
+  type RequestFeedItem,
+  type RequestFeedSort,
+} from "@shared/api/requests";
 
 export default function TasksScreen() {
   const [activeTab, setActiveTab] = useState<TabName>(TAB.MY_TASKS);
-  const currentTab = tabConfigs[activeTab];
+  const [selectedTask, setSelectedTask] = useState<RequestFeedItem | null>(
+    null,
+  );
+  const [filterSheetOpen, setFilterSheetOpen] = useState(false);
+  const [searchOpen, setSearchOpen] = useState(false);
+  const [search, setSearch] = useState("");
+  const [sort, setSort] = useState<RequestFeedSort>("priority");
+  const [priorities, setPriorities] = useState<string[]>([]);
+  const [departments, setDepartments] = useState<string[]>([]);
+  const [floors, setFloors] = useState<number[]>([]);
+  const { userId } = useAuth();
+  const { mutate: completeTask } = useCompleteTask();
+  const { mutate: markTaskPending } = useMarkTaskPending();
+  const { mutate: dropTask } = useDropTask();
+  const { mutate: pickUpTask } = useAssignRequestToSelf(undefined);
+
+  const myTasksQuery = useGetRequestsFeed({
+    userId: userId ?? undefined,
+    sort,
+    priorities,
+    departments,
+    floors,
+    search: search || undefined,
+  });
+  const myTaskItems =
+    myTasksQuery.data?.pages.flatMap((page) => page.items ?? []) ?? [];
+
+  const unassignedQuery = useGetRequestsFeed({
+    unassigned: true,
+    sort,
+    priorities,
+    departments,
+    floors,
+    search: search || undefined,
+  });
+  const unassignedItems =
+    unassignedQuery.data?.pages.flatMap((page) => page.items ?? []) ?? [];
+
+  const activeQuery =
+    activeTab === TAB.MY_TASKS ? myTasksQuery : unassignedQuery;
+
+  function handleEndReached() {
+    if (activeQuery.hasNextPage && !activeQuery.isFetchingNextPage) {
+      activeQuery.fetchNextPage();
+    }
+  }
 
   return (
-    <SafeAreaView className="flex-1 bg-gray-50" edges={["top"]}>
-      <TasksHeader />
+    <SafeAreaView className="flex-1 bg-bg-surface" edges={["top"]}>
+      <TasksHeader
+        onFilterPress={() => setFilterSheetOpen(true)}
+        filterActive={filterSheetOpen}
+        searchOpen={searchOpen}
+        onSearchOpen={() => setSearchOpen(true)}
+        onSearchClose={() => {
+          setSearchOpen(false);
+          setSearch("");
+        }}
+        search={search}
+        onSearchChange={setSearch}
+      />
       <TabBar activeTab={activeTab} onTabChange={setActiveTab} />
-      {currentTab.showFilters && (
-        <ActiveFilterChips
-          filters={[
-            { label: "Department: Room Service", value: "room-service" },
-          ]}
-          onRemoveFilter={() => {}}
-          onClearAll={() => {}}
-        />
-      )}
       <View className="flex-1">
-        <TaskList tasks={currentTab.tasks} variant={currentTab.variant} />
+        {activeQuery.isLoading ? (
+          <View className="flex-1 items-center justify-center">
+            <ActivityIndicator />
+          </View>
+        ) : (
+          <TaskList
+            tasks={activeTab === TAB.MY_TASKS ? myTaskItems : unassignedItems}
+            onEndReached={handleEndReached}
+            isLoadingMore={activeQuery.isFetchingNextPage}
+            onTaskPress={setSelectedTask}
+            onComplete={
+              activeTab === TAB.MY_TASKS
+                ? (id: string) => completeTask(id)
+                : undefined
+            }
+            onMarkPending={
+              activeTab === TAB.MY_TASKS
+                ? (id: string) => markTaskPending(id)
+                : undefined
+            }
+            onPickUp={
+              activeTab === TAB.UNASSIGNED
+                ? (id: string) => pickUpTask(id)
+                : undefined
+            }
+          />
+        )}
       </View>
+      <TaskDetailSheet
+        task={selectedTask}
+        onClose={() => setSelectedTask(null)}
+        onComplete={(id) => completeTask(id)}
+        onMarkPending={(id) => markTaskPending(id)}
+        onDropTask={
+          activeTab === TAB.MY_TASKS ? (id) => dropTask(id) : undefined
+        }
+      />
+      <TaskFilterSheet
+        visible={filterSheetOpen}
+        onClose={() => setFilterSheetOpen(false)}
+        sort={sort}
+        onSortChange={setSort}
+        priorities={priorities}
+        onPrioritiesChange={setPriorities}
+        departments={departments}
+        onDepartmentsChange={setDepartments}
+        floors={floors}
+        onFloorsChange={setFloors}
+      />
     </SafeAreaView>
   );
 }
diff --git a/clients/mobile/app/_layout.tsx b/clients/mobile/app/_layout.tsx
index 4c63df2b7..23f9a5065 100644
--- a/clients/mobile/app/_layout.tsx
+++ b/clients/mobile/app/_layout.tsx
@@ -9,18 +9,19 @@ import {
   DefaultTheme,
   ThemeProvider,
 } from "@react-navigation/native";
-
 import { tokenCache } from "@clerk/clerk-expo/token-cache";
-import { ClerkProvider, ClerkLoaded, useAuth } from "@clerk/clerk-expo";
+import { ClerkProvider } from "@clerk/clerk-expo";
 import { useColorScheme } from "@/hooks/use-color-scheme";
-import { setConfig } from "@shared";
-import { useEffect } from "react";
+import { StartupProvider, StartupStatus, useStartup } from "@/context/startup";
+import NoUserInfo from "@/components/ui/NoUserInfo";
+import { ActivityIndicator, StyleSheet, View } from "react-native";
+import { GestureHandlerRootView } from "react-native-gesture-handler";
+import { usePushNotifications } from "@/hooks/use-push-notifications";
 
-// Client explicity created outside component to avoid recreation
 const queryClient = new QueryClient({
   defaultOptions: {
     queries: {
-      staleTime: 60 * 1000, // 1 min
+      staleTime: 60 * 1000,
       retry: 1,
       refetchOnWindowFocus: false,
     },
@@ -31,46 +32,63 @@ export const unstable_settings = {
   anchor: "(tabs)",
 };
 
-// Component to configure auth provider and the api base url
-function AppConfigurator() {
-  const { getToken } = useAuth();
-  useEffect(() => {
-    setConfig({
-      API_BASE_URL: process.env.EXPO_PUBLIC_API_BASE_URL ?? "",
-      getToken,
-    });
-  }, [getToken]);
+function AppLayout() {
+  const colorScheme = useColorScheme();
+  const status = useStartup();
+
+  if (status === StartupStatus.NoUserInfo) return <NoUserInfo />;
 
+  return (
+    <ThemeProvider value={colorScheme === "dark" ? DarkTheme : DefaultTheme}>
+      <Stack>
+        <Stack.Screen name="(tabs)" options={{ headerShown: false }} />
+        <Stack.Screen name="create-task-ai" options={{ headerShown: false }} />
+        <Stack.Screen
+          name="create-task-manual"
+          options={{ headerShown: false }}
+        />
+        <Stack.Screen name="(auth)/sign-in" options={{ headerShown: false }} />
+        <Stack.Screen
+          name="modal"
+          options={{ presentation: "modal", title: "Modal" }}
+        />
+      </Stack>
+      {status === StartupStatus.Loading && (
+        <View
+          style={StyleSheet.absoluteFill}
+          className="justify-center items-center bg-bg-primary"
+        >
+          <ActivityIndicator size="large" />
+        </View>
+      )}
+      <StatusBar style="auto" />
+    </ThemeProvider>
+  );
+}
+
+// Registers the Expo push token with the backend and wires up tap-to-navigate.
+// Must render inside QueryClientProvider so useMutation is available.
+function PushNotificationRegistrar() {
+  usePushNotifications();
   return null;
 }
 
 export default function RootLayout() {
-  const colorScheme = useColorScheme();
-
   return (
-    <ClerkProvider
-      publishableKey={process.env.EXPO_PUBLIC_CLERK_PUBLISHABLE_KEY!}
-      tokenCache={tokenCache}
-    >
-      <ClerkLoaded>
-        <AppConfigurator />
+    <GestureHandlerRootView style={{ flex: 1 }}>
+      <ClerkProvider
+        publishableKey={process.env.EXPO_PUBLIC_CLERK_PUBLISHABLE_KEY!}
+        tokenCache={tokenCache}
+      >
         <QueryClientProvider client={queryClient}>
-          <SafeAreaProvider>
-            <ThemeProvider
-              value={colorScheme === "dark" ? DarkTheme : DefaultTheme}
-            >
-              <Stack>
-                <Stack.Screen name="(tabs)" options={{ headerShown: false }} />
-                <Stack.Screen
-                  name="modal"
-                  options={{ presentation: "modal", title: "Modal" }}
-                />
-              </Stack>
-              <StatusBar style="auto" />
-            </ThemeProvider>
-          </SafeAreaProvider>
+          <PushNotificationRegistrar />
+          <StartupProvider>
+            <SafeAreaProvider>
+              <AppLayout />
+            </SafeAreaProvider>
+          </StartupProvider>
         </QueryClientProvider>
-      </ClerkLoaded>
-    </ClerkProvider>
+      </ClerkProvider>
+    </GestureHandlerRootView>
   );
 }
diff --git a/clients/mobile/app/create-task-ai.tsx b/clients/mobile/app/create-task-ai.tsx
new file mode 100644
index 000000000..2eec4f851
--- /dev/null
+++ b/clients/mobile/app/create-task-ai.tsx
@@ -0,0 +1,342 @@
+import { useState } from "react";
+import {
+  View,
+  Text,
+  TextInput,
+  Pressable,
+  ScrollView,
+  Modal,
+  ActivityIndicator,
+  KeyboardAvoidingView,
+  Platform,
+} from "react-native";
+import { SafeAreaView } from "react-native-safe-area-context";
+import { router } from "expo-router";
+import { useMutation, useQueryClient } from "@tanstack/react-query";
+import {
+  Sparkles,
+  Send,
+  ChevronLeft,
+  NotepadText,
+  Clock4,
+  CalendarSync,
+  Flag,
+  MapPin,
+  House,
+  ChevronRight,
+} from "lucide-react-native";
+import { useAPIClient } from "@shared/api/client";
+import { getConfig } from "@shared/api/config";
+import type { GenerateRequestResponse, MakeRequest } from "@shared";
+import { SkeletonCard } from "@/components/ui/SkeletonCard";
+
+// Token values for JSX props that can't use className (icon colors, placeholder, etc.)
+const colors = {
+  primary: "#15502c",
+  textSubtle: "#747474",
+  textSecondary: "#5d5d5d",
+  strokeSubtle: "#d8d8d8",
+  white: "#ffffff",
+} as const;
+
+type ScreenState = "idle" | "loading" | "complete";
+
+type GeneratedTask = {
+  name: string;
+  request_type?: string;
+  scheduled_time?: string;
+  reoccurring?: string;
+  priority?: string;
+  room_id?: string;
+  department?: string;
+  description?: string;
+  user_id?: string;
+};
+
+type TaskFieldRowProps = {
+  icon: React.ReactNode;
+  label: string;
+  value?: string;
+};
+
+function TaskFieldRow({ icon, label, value }: TaskFieldRowProps) {
+  return (
+    <View className="flex-row items-center justify-between h-6">
+      <View className="flex-row items-center gap-1">
+        {icon}
+        <Text className="text-[15px] text-text-subtle tracking-tight">
+          {label}
+        </Text>
+      </View>
+      <View className="flex-row items-center">
+        {value ? (
+          <Text className="text-[15px] text-text-default tracking-tight">
+            {value}
+          </Text>
+        ) : (
+          <>
+            <Text className="text-[15px] text-text-subtle tracking-tight">
+              Select...
+            </Text>
+            <ChevronRight size={16} color={colors.textSubtle} />
+          </>
+        )}
+      </View>
+    </View>
+  );
+}
+
+export default function CreateTaskAIScreen() {
+  const [query, setQuery] = useState("");
+  const [submittedQuery, setSubmittedQuery] = useState("");
+  const [screenState, setScreenState] = useState<ScreenState>("idle");
+  const [generatedTask, setGeneratedTask] = useState<GeneratedTask | null>(
+    null,
+  );
+  const [taskSheetVisible, setTaskSheetVisible] = useState(false);
+
+  const api = useAPIClient();
+  const queryClient = useQueryClient();
+
+  const generateMutation = useMutation({
+    mutationFn: (rawText: string) => {
+      const { hotelId } = getConfig();
+      return api.post<GenerateRequestResponse>("/request/generate", {
+        hotel_id: hotelId,
+        raw_text: rawText,
+      });
+    },
+    onSuccess: (data) => {
+      const req = data.request;
+      setGeneratedTask({
+        name: req?.name ?? "Untitled Task",
+        request_type: req?.request_type,
+        scheduled_time: req?.scheduled_time,
+        priority: req?.priority,
+        room_id: req?.room_id,
+        department: req?.department,
+        description: req?.description,
+        user_id: req?.user_id,
+      });
+      setScreenState("complete");
+      setTaskSheetVisible(true);
+    },
+  });
+
+  const saveMutation = useMutation({
+    mutationFn: (task: MakeRequest) => api.post<unknown>("/request", task),
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ["requests"] });
+      router.navigate("/(tabs)/tasks");
+    },
+  });
+
+  const handleSend = () => {
+    if (!query.trim() || generateMutation.isPending) return;
+    setSubmittedQuery(query);
+    setQuery("");
+    setScreenState("loading");
+    generateMutation.mutate(query.trim());
+  };
+
+  const handleSaveTask = () => {
+    if (!generatedTask) return;
+    const { hotelId } = getConfig();
+    saveMutation.mutate({
+      hotel_id: hotelId,
+      name: generatedTask.name,
+      request_type: generatedTask.request_type,
+      scheduled_time: generatedTask.scheduled_time,
+      priority: generatedTask.priority as MakeRequest["priority"],
+      room_id: generatedTask.room_id,
+      department: generatedTask.department,
+      description: generatedTask.description,
+      user_id: generatedTask.user_id,
+    });
+  };
+
+  const handleCancelSheet = () => {
+    setTaskSheetVisible(false);
+    setScreenState("idle");
+    setGeneratedTask(null);
+    setSubmittedQuery("");
+  };
+
+  return (
+    <SafeAreaView className="flex-1 bg-white" edges={["top"]}>
+      {/* Header */}
+      <View className="flex-row items-center px-[22px] py-3 border-b border-stroke-disabled h-14">
+        <Pressable onPress={() => router.back()} className="mr-3">
+          <ChevronLeft size={20} color="black" />
+        </Pressable>
+        <Text className="text-2xl font-medium text-text-default tracking-tight">
+          Task Creation
+        </Text>
+      </View>
+
+      <KeyboardAvoidingView
+        className="flex-1"
+        behavior={Platform.OS === "ios" ? "padding" : "height"}
+        keyboardVerticalOffset={0}
+      >
+        {/* Content area */}
+        <ScrollView
+          className="flex-1"
+          contentContainerStyle={{ padding: 24, gap: 16 }}
+          keyboardShouldPersistTaps="handled"
+        >
+          {/* Submitted query bubble */}
+          {submittedQuery ? (
+            <View className="bg-bg-selected border border-primary-accent rounded-lg p-4">
+              <Text className="text-[15px] text-primary-surface tracking-tight leading-[1.25]">
+                {submittedQuery}
+              </Text>
+            </View>
+          ) : null}
+
+          {/* Loading state */}
+          {screenState === "loading" && (
+            <>
+              <View className="flex-row items-center gap-3 py-2">
+                <ActivityIndicator size="small" color={colors.primary} />
+                <Text className="text-[16px] text-primary tracking-tight">
+                  Creating Task...
+                </Text>
+              </View>
+              <SkeletonCard />
+            </>
+          )}
+        </ScrollView>
+
+        {/* AI Chat Input */}
+        <View className="px-6 py-5 bg-white border-t border-stroke-disabled">
+          <View className="flex-row items-center border border-stroke-subtle rounded-lg px-4 py-3 gap-3">
+            <Sparkles size={20} color={colors.primary} />
+            <View className="w-px h-5 bg-stroke-subtle" />
+            <TextInput
+              className="flex-1 text-[15px] text-text-secondary tracking-tight"
+              placeholder="Start typing to create a new task..."
+              placeholderTextColor={colors.textSecondary}
+              value={query}
+              onChangeText={setQuery}
+              onSubmitEditing={handleSend}
+              returnKeyType="send"
+              multiline={false}
+            />
+            <Pressable
+              onPress={handleSend}
+              disabled={!query.trim() || generateMutation.isPending}
+              className="p-1"
+            >
+              <Send
+                size={16}
+                color={
+                  query.trim() && !generateMutation.isPending
+                    ? colors.primary
+                    : colors.strokeSubtle
+                }
+              />
+            </Pressable>
+          </View>
+        </View>
+      </KeyboardAvoidingView>
+
+      {/* Task Review Sheet */}
+      <Modal
+        visible={taskSheetVisible}
+        transparent
+        animationType="slide"
+        onRequestClose={handleCancelSheet}
+      >
+        <View className="flex-1 bg-black/50 justify-end">
+          <View className="bg-white rounded-tl-3xl rounded-tr-3xl pt-10 pb-12 px-6">
+            {/* Drag handle */}
+            <View className="absolute top-4 left-0 right-0 items-center">
+              <View className="w-11 h-1 rounded-full bg-text-disabled" />
+            </View>
+
+            <ScrollView showsVerticalScrollIndicator={false}>
+              <View className="gap-6">
+                {/* Title */}
+                <View className="border border-stroke-subtle rounded p-2">
+                  <Text className="text-2xl font-medium text-text-default tracking-tight">
+                    {generatedTask?.name}
+                  </Text>
+                </View>
+
+                {/* Fields */}
+                <View className="gap-4">
+                  <TaskFieldRow
+                    icon={<NotepadText size={16} color={colors.textSubtle} />}
+                    label="Task Type"
+                    value={generatedTask?.request_type}
+                  />
+                  <TaskFieldRow
+                    icon={<Clock4 size={16} color={colors.textSubtle} />}
+                    label="Deadline"
+                    value={generatedTask?.scheduled_time}
+                  />
+                  <TaskFieldRow
+                    icon={<CalendarSync size={16} color={colors.textSubtle} />}
+                    label="Reoccurring"
+                    value={generatedTask?.reoccurring}
+                  />
+                  <TaskFieldRow
+                    icon={<Flag size={16} color={colors.textSubtle} />}
+                    label="Priority"
+                    value={generatedTask?.priority}
+                  />
+                  <TaskFieldRow
+                    icon={<MapPin size={16} color={colors.textSubtle} />}
+                    label="Location"
+                    value={generatedTask?.room_id}
+                  />
+                  <TaskFieldRow
+                    icon={<House size={16} color={colors.textSubtle} />}
+                    label="Department"
+                    value={generatedTask?.department}
+                  />
+
+                  {/* Description */}
+                  <View className="gap-1">
+                    <Text className="text-[15px] font-medium text-text-subtle tracking-tight">
+                      Description
+                    </Text>
+                    <Text className="text-[15px] text-text-secondary tracking-tight leading-[1.25]">
+                      {generatedTask?.description ?? "Empty"}
+                    </Text>
+                  </View>
+                </View>
+
+                {/* Actions */}
+                <View className="gap-4 mt-2">
+                  <Pressable
+                    onPress={handleSaveTask}
+                    disabled={saveMutation.isPending}
+                    className="bg-primary rounded h-[39px] items-center justify-center"
+                  >
+                    {saveMutation.isPending ? (
+                      <ActivityIndicator size="small" color={colors.white} />
+                    ) : (
+                      <Text className="text-[15px] text-white tracking-tight">
+                        Save Task
+                      </Text>
+                    )}
+                  </Pressable>
+                  <Pressable
+                    onPress={handleCancelSheet}
+                    className="border border-primary rounded h-[39px] items-center justify-center"
+                  >
+                    <Text className="text-[15px] text-primary tracking-tight">
+                      Cancel
+                    </Text>
+                  </Pressable>
+                </View>
+              </View>
+            </ScrollView>
+          </View>
+        </View>
+      </Modal>
+    </SafeAreaView>
+  );
+}
diff --git a/clients/mobile/app/create-task-manual.tsx b/clients/mobile/app/create-task-manual.tsx
new file mode 100644
index 000000000..594ebff06
--- /dev/null
+++ b/clients/mobile/app/create-task-manual.tsx
@@ -0,0 +1,172 @@
+import { useState } from "react";
+import {
+  View,
+  Text,
+  TextInput,
+  Pressable,
+  ScrollView,
+  ActivityIndicator,
+  KeyboardAvoidingView,
+  Platform,
+} from "react-native";
+import { SafeAreaView } from "react-native-safe-area-context";
+import { router } from "expo-router";
+import { useMutation, useQueryClient } from "@tanstack/react-query";
+import { ChevronLeft } from "lucide-react-native";
+import { Colors } from "@/constants/theme";
+import { useAPIClient } from "@shared/api/client";
+import { getConfig } from "@shared/api/config";
+import { REQUESTS_FEED_QUERY_KEY } from "@shared/api/requests";
+import type {
+  MakeRequest,
+  MakeRequestPriority,
+  Department,
+  User,
+  RoomWithOptionalGuestBooking,
+} from "@shared";
+import { PriorityPicker } from "@/components/tasks/priority-picker";
+import { DepartmentPicker } from "@/components/tasks/department-picker";
+import { DeadlinePicker } from "@/components/tasks/deadline-picker";
+import { AssigneePicker } from "@/components/tasks/assignee-picker";
+import { RoomPicker } from "@/components/tasks/room-picker";
+
+export default function CreateTaskManualScreen() {
+  const [taskName, setTaskName] = useState("");
+  const [description, setDescription] = useState("");
+  const [priority, setPriority] = useState<MakeRequestPriority>("medium");
+  const [department, setDepartment] = useState<Department | undefined>(
+    undefined,
+  );
+  const [deadline, setDeadline] = useState<Date | undefined>(undefined);
+  const [assignee, setAssignee] = useState<User | undefined>(undefined);
+  const [room, setRoom] = useState<RoomWithOptionalGuestBooking | undefined>(
+    undefined,
+  );
+
+  const api = useAPIClient();
+  const queryClient = useQueryClient();
+
+  const saveMutation = useMutation({
+    mutationFn: (task: MakeRequest) => api.post<unknown>("/request", task),
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: REQUESTS_FEED_QUERY_KEY });
+      router.navigate("/(tabs)/tasks");
+    },
+  });
+
+  const handleSave = () => {
+    if (!taskName.trim() || saveMutation.isPending) return;
+    const { hotelId } = getConfig();
+    saveMutation.mutate({
+      hotel_id: hotelId,
+      name: taskName.trim(),
+      description: description.trim() || undefined,
+      priority,
+      department: department?.id,
+      user_id: assignee?.id,
+      room_id: room?.id,
+      scheduled_time: deadline?.toISOString(),
+      status: "pending",
+      request_type: "general",
+    });
+  };
+
+  return (
+    <SafeAreaView className="flex-1 bg-white" edges={["top"]}>
+      {/* Header */}
+      <View className="flex-row items-center px-[22px] py-3 border-b border-stroke-disabled h-14">
+        <Pressable onPress={() => router.back()} className="mr-3">
+          <ChevronLeft size={20} color="black" />
+        </Pressable>
+        <Text className="text-2xl font-medium text-text-default tracking-tight">
+          Tasks
+        </Text>
+      </View>
+
+      <KeyboardAvoidingView
+        className="flex-1"
+        behavior={Platform.OS === "ios" ? "padding" : "height"}
+        keyboardVerticalOffset={0}
+      >
+        <ScrollView
+          className="flex-1"
+          contentContainerStyle={{ padding: 24, gap: 24 }}
+          keyboardShouldPersistTaps="handled"
+        >
+          {/* Task Name Input */}
+          <View className="border border-stroke-subtle rounded p-2">
+            <TextInput
+              className="text-2xl font-bold text-text-default tracking-tight"
+              placeholder="Task Name"
+              placeholderTextColor={Colors.light.textSubtle}
+              value={taskName}
+              onChangeText={setTaskName}
+              returnKeyType="done"
+            />
+          </View>
+
+          {/* Task Fields */}
+          <View className="gap-4">
+            <PriorityPicker
+              value={priority}
+              onChange={(v) => setPriority(v ?? "medium")}
+            />
+
+            <DeadlinePicker value={deadline} onChange={setDeadline} />
+
+            <AssigneePicker value={assignee} onChange={setAssignee} />
+
+            <RoomPicker value={room} onChange={setRoom} />
+
+            <DepartmentPicker
+              hotelId={getConfig().hotelId}
+              value={department}
+              onChange={setDepartment}
+            />
+
+            {/* Description */}
+            <View className="gap-1">
+              <Text className="text-[15px] font-medium text-text-subtle tracking-tight">
+                Description
+              </Text>
+              <TextInput
+                className="text-[15px] text-text-default tracking-tight leading-[1.25]"
+                placeholder="Empty"
+                placeholderTextColor={Colors.light.textSubtle}
+                value={description}
+                onChangeText={setDescription}
+                multiline
+                textAlignVertical="top"
+              />
+            </View>
+          </View>
+
+          {/* Actions */}
+          <View className="gap-4">
+            <Pressable
+              onPress={handleSave}
+              disabled={!taskName.trim() || saveMutation.isPending}
+              className={`bg-primary rounded h-[39px] items-center justify-center ${!taskName.trim() ? "opacity-50" : ""}`}
+            >
+              {saveMutation.isPending ? (
+                <ActivityIndicator size="small" color={Colors.light.white} />
+              ) : (
+                <Text className="text-[15px] text-white tracking-tight">
+                  Save Task
+                </Text>
+              )}
+            </Pressable>
+            <Pressable
+              onPress={() => router.back()}
+              className="border border-primary rounded h-[39px] items-center justify-center"
+            >
+              <Text className="text-[15px] text-primary tracking-tight">
+                Cancel
+              </Text>
+            </Pressable>
+          </View>
+        </ScrollView>
+      </KeyboardAvoidingView>
+    </SafeAreaView>
+  );
+}
diff --git a/clients/mobile/app/index.tsx b/clients/mobile/app/index.tsx
index 39a4f6989..2ac21ffd1 100644
--- a/clients/mobile/app/index.tsx
+++ b/clients/mobile/app/index.tsx
@@ -1,12 +1,20 @@
-import { StyleSheet, Text, View } from "react-native";
-
-export default function Page() {
-  return (
-    <View className="flex-1 items-center p-6">
-      <View className="flex-1 justify-center max-w-4xl mx-auto">
-        <Text className="text-6xl font-bold">Hello</Text>
-        <Text className="text-4xl text-gray-700">World</Text>
-      </View>
-    </View>
-  );
+import { StartupStatus, useStartup } from "@/context/startup";
+import { useRouter } from "expo-router";
+import { useEffect } from "react";
+
+export default function Index() {
+  const status = useStartup();
+  const router = useRouter();
+
+  useEffect(() => {
+    if (status === StartupStatus.Loading) return;
+    if (status === StartupStatus.Unauthenticated) {
+      router.replace("/sign-in");
+      return;
+    }
+
+    router.replace("/(tabs)");
+  }, [status, router]);
+
+  return null;
 }
diff --git a/clients/mobile/components/Logout.tsx b/clients/mobile/components/Logout.tsx
new file mode 100644
index 000000000..5523d88cd
--- /dev/null
+++ b/clients/mobile/components/Logout.tsx
@@ -0,0 +1,20 @@
+import { useClerk } from "@clerk/clerk-expo";
+import { Pressable, Text } from "react-native";
+
+export default function LogoutButton({ onSignOut }: { onSignOut: () => void }) {
+  const { signOut } = useClerk();
+
+  const onPress = async () => {
+    await signOut();
+    onSignOut();
+  };
+
+  return (
+    <Pressable
+      onPress={onPress}
+      className="border border-danger rounded-xl py-4 items-center active:opacity-80"
+    >
+      <Text className="text-danger font-semibold text-base">Sign Out</Text>
+    </Pressable>
+  );
+}
diff --git a/clients/mobile/components/__tests__/themed-text.test.tsx b/clients/mobile/components/__tests__/themed-text.test.tsx
deleted file mode 100644
index a7464b31d..000000000
--- a/clients/mobile/components/__tests__/themed-text.test.tsx
+++ /dev/null
@@ -1,34 +0,0 @@
-import { render } from "@testing-library/react-native";
-import { ThemedText } from "../themed-text";
-
-describe("ThemedText", () => {
-  it("renders text content", () => {
-    const { getByText } = render(<ThemedText>Hello World</ThemedText>);
-    expect(getByText("Hello World")).toBeTruthy();
-  });
-
-  it("applies title className", () => {
-    const { getByText } = render(<ThemedText type="title">Title</ThemedText>);
-    const element = getByText("Title");
-    expect(element.props.className).toContain("text-[32px]");
-    expect(element.props.className).toContain("font-bold");
-  });
-
-  it("applies custom className", () => {
-    const { getByText } = render(
-      <ThemedText className="text-red-500">Custom</ThemedText>,
-    );
-    const element = getByText("Custom");
-    expect(element.props.className).toContain("text-red-500");
-  });
-
-  it("passes through props", () => {
-    const { getByTestId } = render(
-      <ThemedText testID="test-text" numberOfLines={2}>
-        Test
-      </ThemedText>,
-    );
-    const element = getByTestId("test-text");
-    expect(element.props.numberOfLines).toBe(2);
-  });
-});
diff --git a/clients/mobile/components/profile/ProfileHero.tsx b/clients/mobile/components/profile/ProfileHero.tsx
new file mode 100644
index 000000000..691adc1bc
--- /dev/null
+++ b/clients/mobile/components/profile/ProfileHero.tsx
@@ -0,0 +1,34 @@
+import { View, Text, Image } from "react-native";
+
+type ProfileHeroProps = {
+  firstName: string;
+  lastName: string;
+  avatarUrl: string | undefined;
+};
+
+export function ProfileHero({
+  firstName,
+  lastName,
+  avatarUrl,
+}: ProfileHeroProps) {
+  const displayName = [firstName, lastName].filter(Boolean).join(" ") || "User";
+  const initial = displayName.charAt(0).toUpperCase();
+
+  return (
+    <View className="items-center py-8 gap-4">
+      {avatarUrl ? (
+        <Image source={{ uri: avatarUrl }} className="w-24 h-24 rounded-full" />
+      ) : (
+        <View className="w-24 h-24 rounded-full bg-primary items-center justify-center">
+          <Text className="text-4xl font-semibold text-white">{initial}</Text>
+        </View>
+      )}
+      <View className="items-center gap-1">
+        <Text className="text-2xl font-bold text-text-default">
+          {displayName}
+        </Text>
+        <Text className="text-sm font-semibold text-primary">Hotel Chain</Text>
+      </View>
+    </View>
+  );
+}
diff --git a/clients/mobile/components/profile/ProfileInfoCard.tsx b/clients/mobile/components/profile/ProfileInfoCard.tsx
new file mode 100644
index 000000000..1d1b744e3
--- /dev/null
+++ b/clients/mobile/components/profile/ProfileInfoCard.tsx
@@ -0,0 +1,41 @@
+import { View, Text } from "react-native";
+import { formatPhoneNumber } from "@/utils";
+
+function DetailRow({ label, value }: { label: string; value: string }) {
+  return (
+    <View className="flex-row items-center py-4 border-b border-stroke-subtle">
+      <Text className="w-2/5 text-sm font-medium text-text-default">
+        {label}
+      </Text>
+      <Text className="flex-1 text-sm text-text-subtle">{value}</Text>
+    </View>
+  );
+}
+
+type ProfileInfoCardProps = {
+  governmentName: string;
+  email: string;
+  phoneNumber: string;
+  department: string;
+};
+
+export function ProfileInfoCard({
+  governmentName,
+  email,
+  phoneNumber,
+  department,
+}: ProfileInfoCardProps) {
+  return (
+    <View className="rounded-xl border border-stroke-subtle bg-white mx-4 px-4">
+      <DetailRow label="Government Name" value={governmentName} />
+      <DetailRow label="Email" value={email} />
+      <DetailRow label="Phone Number" value={formatPhoneNumber(phoneNumber)} />
+      <View className="flex-row items-center py-4">
+        <Text className="w-2/5 text-sm font-medium text-text-default">
+          Department
+        </Text>
+        <Text className="flex-1 text-sm text-text-subtle">{department}</Text>
+      </View>
+    </View>
+  );
+}
diff --git a/clients/mobile/components/rooms/floor-picker-sheet.tsx b/clients/mobile/components/rooms/floor-picker-sheet.tsx
new file mode 100644
index 000000000..3465deab0
--- /dev/null
+++ b/clients/mobile/components/rooms/floor-picker-sheet.tsx
@@ -0,0 +1,242 @@
+import { useEffect, useRef, useState } from "react";
+import {
+  Animated,
+  Dimensions,
+  Modal,
+  PanResponder,
+  Pressable,
+  ScrollView,
+  Text,
+  TextInput,
+  View,
+} from "react-native";
+import { Check, Search, X } from "lucide-react-native";
+import { Colors } from "@/constants/theme";
+
+const { height: SCREEN_HEIGHT } = Dimensions.get("window");
+
+type FloorPickerSheetProps = {
+  visible: boolean;
+  floors: number[];
+  selectedFloors: number[];
+  onApply: (floors: number[]) => void;
+  onClose: () => void;
+};
+
+export function FloorPickerSheet({
+  visible,
+  floors,
+  selectedFloors,
+  onApply,
+  onClose,
+}: FloorPickerSheetProps) {
+  const translateY = useRef(new Animated.Value(SCREEN_HEIGHT)).current;
+  const [draft, setDraft] = useState<number[]>(selectedFloors);
+  const [search, setSearch] = useState("");
+
+  useEffect(() => {
+    if (visible) {
+      setDraft(selectedFloors);
+      setSearch("");
+      translateY.setValue(SCREEN_HEIGHT);
+      Animated.spring(translateY, {
+        toValue: 0,
+        useNativeDriver: true,
+        damping: 28,
+        stiffness: 280,
+      }).start();
+    }
+  }, [visible, selectedFloors, translateY]);
+
+  function close() {
+    Animated.timing(translateY, {
+      toValue: SCREEN_HEIGHT,
+      duration: 220,
+      useNativeDriver: true,
+    }).start(onClose);
+  }
+
+  const panResponder = useRef(
+    PanResponder.create({
+      onMoveShouldSetPanResponder: (_, { dy }) => dy > 3,
+      onPanResponderMove: (_, { dy }) => {
+        if (dy > 0) translateY.setValue(dy);
+      },
+      onPanResponderRelease: (_, { dy, vy }) => {
+        if (dy > 80 || vy > 0.5) {
+          close();
+        } else {
+          Animated.spring(translateY, {
+            toValue: 0,
+            useNativeDriver: true,
+            damping: 28,
+            stiffness: 280,
+          }).start();
+        }
+      },
+    }),
+  ).current;
+
+  const filtered = floors.filter((f) =>
+    `floor ${f}`.includes(search.toLowerCase()),
+  );
+
+  function toggle(floor: number) {
+    setDraft((d) =>
+      d.includes(floor) ? d.filter((f) => f !== floor) : [...d, floor],
+    );
+  }
+
+  return (
+    <Modal
+      visible={visible}
+      transparent
+      animationType="none"
+      onRequestClose={close}
+    >
+      <View style={{ flex: 1, justifyContent: "flex-end" }}>
+        <Pressable className="absolute inset-0 bg-black/40" onPress={close} />
+
+        <Animated.View
+          style={{
+            backgroundColor: "white",
+            borderTopLeftRadius: 26,
+            borderTopRightRadius: 26,
+            maxHeight: SCREEN_HEIGHT * 0.9,
+            transform: [{ translateY }],
+          }}
+          onStartShouldSetResponder={() => true}
+        >
+          {/* Drag handle */}
+          <View
+            {...panResponder.panHandlers}
+            className="items-center pt-3 pb-2"
+          >
+            <View className="w-11 h-1 rounded-full bg-stroke-subtle" />
+          </View>
+
+          {/* Search bar */}
+          <View className="px-6 pt-3 pb-2">
+            <View className="flex-row items-center bg-bg-input rounded-lg px-3 py-4 gap-2">
+              <TextInput
+                value={search}
+                onChangeText={setSearch}
+                placeholder="Search for a floor"
+                placeholderTextColor={Colors.light.textSubtle}
+                className="flex-1 text-[15px] text-text-default"
+              />
+              <Search size={14} color={Colors.light.textSubtle} />
+            </View>
+          </View>
+
+          {/* Floor list */}
+          <ScrollView
+            showsVerticalScrollIndicator={false}
+            style={{ flexGrow: 0, maxHeight: SCREEN_HEIGHT * 0.4 }}
+          >
+            {filtered.map((floor) => {
+              const selected = draft.includes(floor);
+              return (
+                <Pressable
+                  key={floor}
+                  onPress={() => toggle(floor)}
+                  className="flex-row items-center gap-3 px-6 py-4"
+                >
+                  <View
+                    className="w-4 h-4 items-center justify-center rounded"
+                    style={
+                      selected
+                        ? { backgroundColor: "#124425" }
+                        : {
+                            borderWidth: 1,
+                            borderColor: "rgba(46,46,46,0.5)",
+                            borderRadius: 2,
+                          }
+                    }
+                  >
+                    {selected && (
+                      <Check size={9} color="white" strokeWidth={3} />
+                    )}
+                  </View>
+                  <Text className="text-[14px] text-text-default leading-5">
+                    Floor {floor}
+                  </Text>
+                </Pressable>
+              );
+            })}
+          </ScrollView>
+
+          {/* Footer */}
+          <View>
+            {/* Selected floors label */}
+            <View className="border-b border-stroke-subtle px-6 py-3">
+              <Text className="text-[12px] text-text-subtle">
+                Selected Floors
+              </Text>
+            </View>
+
+            {/* Selected tags row */}
+            <View className="flex-row items-center px-6 py-3 min-h-[56px]">
+              <ScrollView
+                horizontal
+                showsHorizontalScrollIndicator={false}
+                style={{ flex: 1 }}
+                contentContainerStyle={{
+                  gap: 4,
+                  flexDirection: "row",
+                  alignItems: "center",
+                }}
+              >
+                {draft
+                  .slice()
+                  .sort((a, b) => a - b)
+                  .map((floor) => (
+                    <Pressable
+                      key={floor}
+                      onPress={() => toggle(floor)}
+                      className="flex-row items-center gap-2 bg-bg-selected px-2 py-1 rounded"
+                    >
+                      <Text className="text-[14px] text-primary">
+                        Floor {floor}
+                      </Text>
+                      <X size={8} color={Colors.light.tabBarActive} />
+                    </Pressable>
+                  ))}
+              </ScrollView>
+              {draft.length > 0 && (
+                <Pressable onPress={() => setDraft([])} className="ml-2">
+                  <Text className="text-[15px] text-text-subtle tracking-tight">
+                    Clear
+                  </Text>
+                </Pressable>
+              )}
+            </View>
+
+            {/* Action buttons */}
+            <View className="flex-row gap-3 border-t border-stroke-subtle px-6 pt-3 pb-12">
+              <Pressable
+                onPress={close}
+                className="flex-1 items-center justify-center py-[10px] rounded"
+              >
+                <Text className="text-[14px] leading-5 text-primary">
+                  Cancel
+                </Text>
+              </Pressable>
+              <Pressable
+                onPress={() => {
+                  onApply(draft);
+                  close();
+                }}
+                className="flex-1 items-center justify-center bg-primary py-[10px] rounded"
+              >
+                <Text className="text-[14px] leading-5 text-white">
+                  Apply Filters
+                </Text>
+              </Pressable>
+            </View>
+          </View>
+        </Animated.View>
+      </View>
+    </Modal>
+  );
+}
diff --git a/clients/mobile/components/rooms/guest-info-tab.tsx b/clients/mobile/components/rooms/guest-info-tab.tsx
new file mode 100644
index 000000000..24c9e94eb
--- /dev/null
+++ b/clients/mobile/components/rooms/guest-info-tab.tsx
@@ -0,0 +1,240 @@
+import {
+  View,
+  Text,
+  Pressable,
+  ScrollView,
+  ActivityIndicator,
+} from "react-native";
+import { ChevronRight, Accessibility, FileText } from "lucide-react-native";
+import { router } from "expo-router";
+import { useGetGuestsStaysId } from "@shared";
+import type { GuestWithStays } from "@shared";
+import { formatDate, formatTime } from "@/utils/time";
+import { Colors } from "@/constants/theme";
+
+type Props = {
+  guestIds: string[];
+};
+
+export function GuestInfoTab({ guestIds }: Props) {
+  if (guestIds.length === 0) {
+    return (
+      <View className="flex-1 items-center justify-center px-6">
+        <Text className="text-text-secondary text-sm text-center">
+          No active guests for this room
+        </Text>
+      </View>
+    );
+  }
+
+  return (
+    <ScrollView
+      className="flex-1"
+      contentContainerStyle={{
+        paddingHorizontal: 24,
+        paddingBottom: 24,
+        paddingTop: 16,
+        gap: 16,
+      }}
+    >
+      {guestIds.map((guestId) => (
+        <GuestInfoCard key={guestId} guestId={guestId} />
+      ))}
+    </ScrollView>
+  );
+}
+
+function GuestInfoCard({ guestId }: { guestId: string }) {
+  const { data, isLoading } = useGetGuestsStaysId(guestId);
+
+  if (isLoading) {
+    return (
+      <View className="items-center justify-center py-12">
+        <ActivityIndicator />
+      </View>
+    );
+  }
+
+  if (!data) return null;
+
+  return (
+    <View className="gap-4">
+      <GuestProfileSection data={data} guestId={guestId} />
+      <GuestOverviewSection data={data} />
+    </View>
+  );
+}
+
+function GuestProfileSection({
+  data,
+  guestId,
+}: {
+  data: GuestWithStays;
+  guestId: string;
+}) {
+  const hasAccessibility = (data.assistance?.accessibility?.length ?? 0) > 0;
+  const hasNotes = !!data.notes;
+
+  return (
+    <View className="border-b border-stroke-subtle pb-4 gap-3">
+      <Text className="text-[15px] font-medium text-text-default tracking-tight">
+        Guest Profile
+      </Text>
+      <View className="border border-stroke-subtle rounded p-3 gap-2">
+        <View className="flex-row items-end gap-2">
+          <Text className="text-base font-medium text-black">
+            {data.first_name} {data.last_name}
+          </Text>
+          {data.pronouns && (
+            <Text className="text-[11px] text-text-secondary leading-5">
+              {data.pronouns}
+            </Text>
+          )}
+        </View>
+
+        {(hasAccessibility || hasNotes) && (
+          <View className="flex-row gap-1 flex-wrap">
+            {hasAccessibility && (
+              <View className="flex-row items-center gap-2 bg-bg-container px-2 py-1 rounded h-6">
+                <Accessibility size={12} color={Colors.light.iconMuted} />
+                <Text className="text-[12px] text-text-default">
+                  Accessibility Needs
+                </Text>
+              </View>
+            )}
+            {hasNotes && (
+              <View className="flex-row items-center gap-2 bg-bg-container px-2 py-1 rounded h-6">
+                <FileText size={12} color={Colors.light.iconMuted} />
+                <Text className="text-[12px] text-text-default">Notes</Text>
+              </View>
+            )}
+          </View>
+        )}
+
+        <Pressable
+          className="flex-row items-center gap-2"
+          onPress={() => router.push(`/guests/${guestId}`)}
+        >
+          <Text className="text-[11px] text-text-secondary">
+            View full guest profile
+          </Text>
+          <ChevronRight size={12} color={Colors.light.iconMuted} />
+        </Pressable>
+      </View>
+    </View>
+  );
+}
+
+function GuestOverviewSection({ data }: { data: GuestWithStays }) {
+  const currentStay = data.current_stays?.[0];
+
+  const dnd =
+    data.do_not_disturb_start && data.do_not_disturb_end
+      ? `${formatTime(data.do_not_disturb_start)} - ${formatTime(data.do_not_disturb_end)}`
+      : null;
+
+  const capitalize = (s?: string | null) =>
+    s ? s.charAt(0).toUpperCase() + s.slice(1) : null;
+
+  return (
+    <View className="gap-3">
+      <Text className="text-[15px] font-medium text-text-default tracking-tight">
+        Guest Overview
+      </Text>
+
+      <View className="gap-5 pt-2">
+        <OverviewField
+          label="Government Name"
+          value={`${data.first_name} ${data.last_name}`}
+        />
+
+        {data.pronouns && (
+          <OverviewField label="Pronouns" value={data.pronouns} />
+        )}
+
+        {currentStay && (
+          <View className="flex-row gap-6">
+            <OverviewField
+              label="Arrival"
+              value={`${formatDate(currentStay.arrival_date)}, ${formatTime(currentStay.arrival_date)}`}
+            />
+            <OverviewField
+              label="Departure"
+              value={`${formatDate(currentStay.departure_date)}, ${formatTime(currentStay.departure_date)}`}
+            />
+          </View>
+        )}
+
+        {dnd && <OverviewField label="Do Not Disturb" value={dnd} />}
+
+        {data.housekeeping_cadence && (
+          <OverviewField
+            label="Housekeeping Preferences"
+            value={capitalize(data.housekeeping_cadence)!}
+          />
+        )}
+
+        {(data.assistance?.accessibility?.length ?? 0) > 0 && (
+          <TagField
+            label="Accessibility"
+            items={data.assistance!.accessibility!}
+          />
+        )}
+
+        {(data.assistance?.dietary?.length ?? 0) > 0 && (
+          <TagField
+            label="Dietary Restrictions"
+            items={data.assistance!.dietary!}
+          />
+        )}
+
+        <View className="gap-2">
+          <Text className="text-[12px] text-text-subtle">Medical Needs</Text>
+          {(data.assistance?.medical?.length ?? 0) > 0 ? (
+            <View className="flex-row flex-wrap gap-2">
+              {data.assistance!.medical!.map((item, i) => (
+                <Tag key={i} label={item} />
+              ))}
+            </View>
+          ) : (
+            <Text className="text-[15px] text-text-secondary">
+              None recorded.
+            </Text>
+          )}
+        </View>
+
+        {data.notes && <OverviewField label="Notes" value={data.notes} />}
+      </View>
+    </View>
+  );
+}
+
+function OverviewField({ label, value }: { label: string; value: string }) {
+  return (
+    <View className="gap-2 flex-1">
+      <Text className="text-[12px] text-text-subtle">{label}</Text>
+      <Text className="text-base text-black">{value}</Text>
+    </View>
+  );
+}
+
+function TagField({ label, items }: { label: string; items: string[] }) {
+  return (
+    <View className="gap-2">
+      <Text className="text-[12px] text-text-subtle">{label}</Text>
+      <View className="flex-row flex-wrap gap-2">
+        {items.map((item, i) => (
+          <Tag key={i} label={item} />
+        ))}
+      </View>
+    </View>
+  );
+}
+
+function Tag({ label }: { label: string }) {
+  return (
+    <View className="bg-bg-container px-2 py-1 rounded">
+      <Text className="text-sm text-text-default">{label}</Text>
+    </View>
+  );
+}
diff --git a/clients/mobile/components/rooms/overview-tab.tsx b/clients/mobile/components/rooms/overview-tab.tsx
new file mode 100644
index 000000000..05793116d
--- /dev/null
+++ b/clients/mobile/components/rooms/overview-tab.tsx
@@ -0,0 +1,200 @@
+import Feather from "@expo/vector-icons/Feather";
+import { Pressable, ScrollView, Text, View } from "react-native";
+
+import { PriorityTag } from "@/components/tasks/priority-tag";
+import { Colors } from "@/constants/theme";
+import {
+  useAssignRequestToSelf,
+  useGetRequestsFeed,
+  type RequestFeedItem,
+} from "@shared/api/requests";
+import { useGetRooms, BookingStatus, RoomStatusValue } from "@shared/api/rooms";
+
+type UnassignedTaskCardProps = {
+  task: RequestFeedItem;
+  onAssignToSelf: (taskId: string) => void;
+  isAssigning: boolean;
+};
+
+function UnassignedTaskCard({
+  task,
+  onAssignToSelf,
+  isAssigning,
+}: UnassignedTaskCardProps) {
+  const location = [
+    task.floor != null ? `Floor ${task.floor}` : null,
+    task.room_number != null ? `Room ${task.room_number}` : null,
+  ]
+    .filter(Boolean)
+    .join(", ");
+
+  return (
+    <View
+      className="bg-white rounded gap-3 px-3 py-4"
+      style={{ borderWidth: 0.5, borderColor: "#e9e9e9" }}
+    >
+      <View className="gap-2">
+        <View className="flex-row flex-wrap items-center gap-3">
+          <PriorityTag priority={task.priority} />
+          {task.department_name ? (
+            <View className="border border-stroke-subtle flex-row items-center gap-2 h-6 px-2 rounded">
+              <Feather name="home" size={12} color={Colors.light.iconMuted} />
+              <Text className="text-xs text-text-default" numberOfLines={1}>
+                {task.department_name}
+              </Text>
+            </View>
+          ) : null}
+        </View>
+        <Text
+          className="text-[15px] font-medium text-text-default"
+          numberOfLines={2}
+        >
+          {task.name}
+        </Text>
+        {location ? (
+          <View className="flex-row items-center gap-1">
+            <Feather name="map-pin" size={10} color={Colors.light.iconSubtle} />
+            <Text className="text-xs text-text-secondary">{location}</Text>
+          </View>
+        ) : null}
+      </View>
+      <Pressable
+        onPress={() => onAssignToSelf(task.id)}
+        disabled={isAssigning}
+        className="bg-primary items-center justify-center px-6 py-[10px] rounded"
+        style={{ opacity: isAssigning ? 0.6 : 1 }}
+      >
+        <Text className="text-sm text-white">Assign to Self</Text>
+      </Pressable>
+    </View>
+  );
+}
+
+type OverviewTabProps = {
+  floorId: number;
+};
+
+export function OverviewTab({ floorId }: OverviewTabProps) {
+  const { data: requestsData } = useGetRequestsFeed({
+    unassigned: true,
+    floors: [floorId],
+  });
+  const { data: roomsData } = useGetRooms({ floors: [floorId] });
+  const {
+    mutate: assignToSelf,
+    isPending: isAssigning,
+    variables: assigningTaskId,
+  } = useAssignRequestToSelf();
+
+  const unassignedTasks =
+    requestsData?.pages.flatMap((p) => p.items ?? []) ?? [];
+
+  const rooms = roomsData?.items ?? [];
+  const totalRooms = rooms.length;
+  const occupiedRooms = rooms.filter(
+    (r) => r.booking_status === BookingStatus.BookingStatusActive,
+  ).length;
+  const vacantRooms = totalRooms - occupiedRooms;
+  const cleaningRooms = rooms.filter(
+    (r) => r.room_status === RoomStatusValue.Cleaning,
+  ).length;
+  const occupiedAndCleaningRooms = rooms.filter(
+    (r) =>
+      r.booking_status === BookingStatus.BookingStatusActive &&
+      r.room_status === RoomStatusValue.Cleaning,
+  ).length;
+
+  return (
+    <ScrollView
+      className="flex-1"
+      contentContainerStyle={{ paddingHorizontal: 24, paddingBottom: 32 }}
+    >
+      {/* Stats section */}
+      <View>
+        <View className="border-b border-stroke-subtle py-3">
+          <Text className="text-[15px] font-medium text-text-subtle">
+            Overview
+          </Text>
+        </View>
+
+        {/* Row 1: Urgent · Unassigned · Pending */}
+        <View className="flex-row">
+          <View className="flex-1 p-4 gap-1">
+            <View className="flex-row items-center gap-1">
+              <Feather
+                name="alert-circle"
+                size={16}
+                color={Colors.light.textDefault}
+              />
+              <Text className="text-[15px] text-text-default">Urgent</Text>
+            </View>
+            <Text className="text-[32px] font-medium text-text-default leading-tight">
+              0
+            </Text>
+            <Text className="text-[15px] text-text-subtle">Tasks</Text>
+          </View>
+          <View className="flex-1 p-4 gap-1">
+            <Text className="text-[15px] text-text-default">Unassigned</Text>
+            <Text className="text-[32px] font-medium text-text-default leading-tight">
+              {unassignedTasks.length}
+            </Text>
+            <Text className="text-[15px] text-text-subtle">Tasks</Text>
+          </View>
+          <View className="flex-1 p-4 gap-1">
+            <Text className="text-[15px] text-text-default">Pending</Text>
+            <Text className="text-[32px] font-medium text-text-default leading-tight">
+              {cleaningRooms}
+            </Text>
+            <Text className="text-[15px] text-text-subtle">Tasks</Text>
+          </View>
+        </View>
+
+        {/* Row 2: Floor Occupancy · Expected Arrivals · Expected Departures */}
+        <View className="flex-row">
+          <View className="flex-1 p-4 gap-1">
+            <Text className="text-[15px] text-text-default">{`Floor\nOccupancy`}</Text>
+            <View className="flex-row items-baseline gap-1">
+              <Text className="text-[32px] font-medium text-text-default leading-tight">
+                {occupiedRooms}
+              </Text>
+              <Text className="text-xs text-text-subtle">/</Text>
+              <Text className="text-xs text-text-subtle">{totalRooms}</Text>
+            </View>
+            <Text className="text-[15px] text-text-subtle">Rooms occupied</Text>
+          </View>
+          <View className="flex-1 p-4 gap-1">
+            <Text className="text-[15px] text-text-default">{`Expected\nArrivals`}</Text>
+            <Text className="text-[32px] font-medium text-text-default leading-tight">
+              {vacantRooms}
+            </Text>
+            <Text className="text-[15px] text-text-subtle">Guests</Text>
+          </View>
+          <View className="flex-1 p-4 gap-1">
+            <Text className="text-[15px] text-text-default">{`Expected\nDepartures`}</Text>
+            <Text className="text-[32px] font-medium text-text-default leading-tight">
+              {occupiedAndCleaningRooms}
+            </Text>
+            <Text className="text-[15px] text-text-subtle">Guests</Text>
+          </View>
+        </View>
+      </View>
+
+      {/* Unassigned tasks section */}
+      <View className="gap-3">
+        <View className="border-b border-stroke-subtle py-3">
+          <Text className="text-[15px] font-medium text-text-subtle">
+            Unassigned Tasks ({unassignedTasks.length})
+          </Text>
+        </View>
+        {unassignedTasks.map((task) => (
+          <UnassignedTaskCard
+            key={task.id}
+            task={task}
+            onAssignToSelf={assignToSelf}
+            isAssigning={isAssigning && assigningTaskId === task.id}
+          />
+        ))}
+      </View>
+    </ScrollView>
+  );
+}
diff --git a/clients/mobile/components/rooms/room-card.tsx b/clients/mobile/components/rooms/room-card.tsx
new file mode 100644
index 000000000..e363bc15f
--- /dev/null
+++ b/clients/mobile/components/rooms/room-card.tsx
@@ -0,0 +1,117 @@
+import { Pressable, View, Text } from "react-native";
+import { Flag, Accessibility, User, AlertCircle } from "lucide-react-native";
+import { Colors } from "@/constants/theme";
+
+export type RoomStatus =
+  | { type: "occupied"; guestName: string }
+  | { type: "out-of-order" }
+  | { type: "vacant"; isAvailable?: boolean };
+
+type RoomCardProps = {
+  roomNumber: string | number;
+  roomType: string;
+  status: RoomStatus;
+  hasHighPriority?: boolean;
+  isAccessible?: boolean;
+  extraTagCount?: number;
+  onPress?: () => void;
+};
+
+function StatusTag({ status }: { status: RoomStatus }) {
+  if (status.type === "out-of-order") {
+    return (
+      <View className="flex-row items-center gap-2 bg-priority-high-bg h-6 px-2 rounded self-start">
+        <AlertCircle size={12} color={Colors.light.danger} />
+        <Text className="text-xs text-priority-high">Out of Order</Text>
+      </View>
+    );
+  }
+  if (status.type === "occupied") {
+    return (
+      <View className="flex-row items-center gap-2 bg-bg-input h-6 px-2 rounded self-start">
+        <User size={12} color={Colors.light.iconMuted} />
+        <Text className="text-xs text-text-secondary">
+          Occupied: {status.guestName}
+        </Text>
+      </View>
+    );
+  }
+  return (
+    <View className="flex-row items-center gap-1">
+      <View className="flex-row items-center gap-2 bg-bg-input h-6 px-2 rounded">
+        <User size={12} color={Colors.light.iconMuted} />
+        <Text className="text-xs text-text-secondary">Vacant</Text>
+      </View>
+      {status.isAvailable && (
+        <View className="flex-row items-center gap-2 bg-bg-selected h-6 px-2 rounded">
+          <Text className="text-xs text-primary">Available</Text>
+        </View>
+      )}
+    </View>
+  );
+}
+
+export function RoomCard({
+  roomNumber,
+  roomType,
+  status,
+  hasHighPriority,
+  isAccessible,
+  extraTagCount,
+  onPress,
+}: RoomCardProps) {
+  const hasFeatureTags =
+    hasHighPriority ||
+    isAccessible ||
+    (extraTagCount != null && extraTagCount > 0);
+
+  return (
+    <Pressable
+      onPress={onPress}
+      className="px-6 py-4 border-b border-stroke-subtle bg-white"
+    >
+      <View className="flex-row gap-2 items-stretch">
+        {/* Room number badge — square, stretches to match info column height */}
+        <View className="bg-card rounded items-center justify-center size-[86px]">
+          <Text className="text-xs text-primary text-center">Room</Text>
+          <Text className="text-2xl font-medium text-primary leading-tight text-center">
+            {roomNumber}
+          </Text>
+        </View>
+
+        {/* Info column — fixed order: type → status → tags */}
+        <View className="flex-1 gap-2 justify-center">
+          <Text className="text-[15px] text-text-default">{roomType}</Text>
+          <StatusTag status={status} />
+          {hasFeatureTags && (
+            <View className="flex-row flex-wrap gap-1 items-center">
+              {hasHighPriority && (
+                <View className="flex-row items-center gap-1 bg-priority-high-bg px-2 py-1 rounded">
+                  <Flag size={12} color={Colors.light.danger} />
+                  <Text className="text-xs text-priority-high">
+                    High Priority
+                  </Text>
+                </View>
+              )}
+              {isAccessible && (
+                <View className="flex-row items-center gap-2 bg-bg-input h-6 px-2 rounded">
+                  <Accessibility size={12} color={Colors.light.iconMuted} />
+                  <Text className="text-xs text-text-secondary">
+                    Accessible
+                  </Text>
+                </View>
+              )}
+              {extraTagCount != null && extraTagCount > 0 && (
+                <View className="bg-bg-input px-2 py-1 rounded">
+                  <Text className="text-xs text-text-secondary">
+                    +{extraTagCount}
+                  </Text>
+                </View>
+              )}
+            </View>
+          )}
+        </View>
+      </View>
+    </Pressable>
+  );
+}
diff --git a/clients/mobile/components/rooms/room-filter-sheet.tsx b/clients/mobile/components/rooms/room-filter-sheet.tsx
new file mode 100644
index 000000000..e27b8e106
--- /dev/null
+++ b/clients/mobile/components/rooms/room-filter-sheet.tsx
@@ -0,0 +1,359 @@
+import { useEffect, useRef, useState } from "react";
+import {
+  Animated,
+  Dimensions,
+  Modal,
+  PanResponder,
+  Pressable,
+  ScrollView,
+  Text,
+  View,
+} from "react-native";
+import { X } from "lucide-react-native";
+import { Colors } from "@/constants/theme";
+
+const { height: SCREEN_HEIGHT } = Dimensions.get("window");
+
+export type RoomStatusFilter = "occupied" | "vacant" | "open-tasks";
+
+export type RoomAttributeFilter =
+  | "standard"
+  | "deluxe"
+  | "suite"
+  | "accessible";
+
+export type RoomAdvancedFilter = "arrivals-today" | "departures-today";
+
+export type RoomFilters = {
+  status: RoomStatusFilter[];
+  attributes: RoomAttributeFilter[];
+  advanced: RoomAdvancedFilter[];
+};
+
+export const EMPTY_ROOM_FILTERS: RoomFilters = {
+  status: [],
+  attributes: [],
+  advanced: [],
+};
+
+type RoomFilterSheetProps = {
+  visible: boolean;
+  filters: RoomFilters;
+  onApply: (filters: RoomFilters) => void;
+  onClose: () => void;
+};
+
+export const STATUS_OPTIONS: { value: RoomStatusFilter; label: string }[] = [
+  { value: "occupied", label: "Occupied" },
+  { value: "vacant", label: "Vacant" },
+  { value: "open-tasks", label: "Open Tasks" },
+];
+
+export const ATTRIBUTE_OPTIONS: {
+  value: RoomAttributeFilter;
+  label: string;
+}[] = [
+  { value: "standard", label: "Standard" },
+  { value: "deluxe", label: "Deluxe" },
+  { value: "suite", label: "Suite" },
+  { value: "accessible", label: "Accessible" },
+];
+
+export const ADVANCED_OPTIONS: { value: RoomAdvancedFilter; label: string }[] =
+  [
+    { value: "arrivals-today", label: "Arrivals Today" },
+    { value: "departures-today", label: "Departures Today" },
+  ];
+
+function toggle<T>(arr: T[], val: T): T[] {
+  return arr.includes(val) ? arr.filter((v) => v !== val) : [...arr, val];
+}
+
+function Chip({
+  label,
+  selected,
+  onPress,
+}: {
+  label: string;
+  selected: boolean;
+  onPress: () => void;
+}) {
+  return (
+    <Pressable
+      onPress={onPress}
+      className={`px-4 py-2 rounded border ${
+        selected
+          ? "bg-bg-selected border-primary"
+          : "bg-white border-input-border"
+      }`}
+    >
+      <Text
+        className={`text-[14px] leading-5 ${
+          selected ? "text-primary" : "text-text-secondary"
+        }`}
+      >
+        {label}
+      </Text>
+    </Pressable>
+  );
+}
+
+function FilterSection({
+  title,
+  children,
+}: {
+  title: string;
+  children: React.ReactNode;
+}) {
+  return (
+    <View className="gap-3">
+      <Text className="text-[12px] text-text-subtle">{title}</Text>
+      <View className="flex-row flex-wrap gap-2">{children}</View>
+    </View>
+  );
+}
+
+export function RoomFilterSheet({
+  visible,
+  filters,
+  onApply,
+  onClose,
+}: RoomFilterSheetProps) {
+  const translateY = useRef(new Animated.Value(SCREEN_HEIGHT)).current;
+  const [draft, setDraft] = useState<RoomFilters>(filters);
+
+  useEffect(() => {
+    if (visible) {
+      setDraft(filters);
+      translateY.setValue(SCREEN_HEIGHT);
+      Animated.spring(translateY, {
+        toValue: 0,
+        useNativeDriver: true,
+        damping: 28,
+        stiffness: 280,
+      }).start();
+    }
+  }, [visible, filters, translateY]);
+
+  function close() {
+    Animated.timing(translateY, {
+      toValue: SCREEN_HEIGHT,
+      duration: 220,
+      useNativeDriver: true,
+    }).start(onClose);
+  }
+
+  const panResponder = useRef(
+    PanResponder.create({
+      onMoveShouldSetPanResponder: (_, { dy }) => dy > 3,
+      onPanResponderMove: (_, { dy }) => {
+        if (dy > 0) translateY.setValue(dy);
+      },
+      onPanResponderRelease: (_, { dy, vy }) => {
+        if (dy > 80 || vy > 0.5) {
+          close();
+        } else {
+          Animated.spring(translateY, {
+            toValue: 0,
+            useNativeDriver: true,
+            damping: 28,
+            stiffness: 280,
+          }).start();
+        }
+      },
+    }),
+  ).current;
+
+  const allSelected: { label: string; onRemove: () => void }[] = [
+    ...draft.status.map((v) => ({
+      label: STATUS_OPTIONS.find((o) => o.value === v)!.label,
+      onRemove: () =>
+        setDraft((d) => ({ ...d, status: d.status.filter((s) => s !== v) })),
+    })),
+    ...draft.attributes.map((v) => ({
+      label: ATTRIBUTE_OPTIONS.find((o) => o.value === v)!.label,
+      onRemove: () =>
+        setDraft((d) => ({
+          ...d,
+          attributes: d.attributes.filter((a) => a !== v),
+        })),
+    })),
+    ...draft.advanced.map((v) => ({
+      label: ADVANCED_OPTIONS.find((o) => o.value === v)!.label,
+      onRemove: () =>
+        setDraft((d) => ({
+          ...d,
+          advanced: d.advanced.filter((a) => a !== v),
+        })),
+    })),
+  ];
+
+  return (
+    <Modal
+      visible={visible}
+      transparent
+      animationType="none"
+      onRequestClose={close}
+    >
+      <View style={{ flex: 1, justifyContent: "flex-end" }}>
+        <Pressable className="absolute inset-0 bg-black/40" onPress={close} />
+
+        <Animated.View
+          style={{
+            backgroundColor: "white",
+            borderTopLeftRadius: 26,
+            borderTopRightRadius: 26,
+            maxHeight: SCREEN_HEIGHT * 0.9,
+            transform: [{ translateY }],
+          }}
+          onStartShouldSetResponder={() => true}
+        >
+          {/* Drag handle */}
+          <View
+            {...panResponder.panHandlers}
+            className="items-center pt-3 pb-2"
+          >
+            <View className="w-11 h-1 rounded-full bg-stroke-subtle" />
+          </View>
+
+          {/* Scrollable filter content */}
+          <ScrollView
+            showsVerticalScrollIndicator={false}
+            contentContainerStyle={{
+              paddingHorizontal: 24,
+              paddingVertical: 20,
+              gap: 20,
+            }}
+          >
+            {/* Header */}
+            <View className="flex-row items-center justify-between">
+              <Text className="text-[15px] font-medium text-black tracking-tight">
+                All Filters
+              </Text>
+              <Pressable onPress={() => setDraft(EMPTY_ROOM_FILTERS)}>
+                <Text className="text-[15px] text-text-subtle tracking-tight">
+                  Reset
+                </Text>
+              </Pressable>
+            </View>
+
+            {/* Filter sections */}
+            <FilterSection title="Status">
+              {STATUS_OPTIONS.map((opt) => (
+                <Chip
+                  key={opt.value}
+                  label={opt.label}
+                  selected={draft.status.includes(opt.value)}
+                  onPress={() =>
+                    setDraft((d) => ({
+                      ...d,
+                      status: toggle(d.status, opt.value),
+                    }))
+                  }
+                />
+              ))}
+            </FilterSection>
+
+            <FilterSection title="Room Attributes">
+              {ATTRIBUTE_OPTIONS.map((opt) => (
+                <Chip
+                  key={opt.value}
+                  label={opt.label}
+                  selected={draft.attributes.includes(opt.value)}
+                  onPress={() =>
+                    setDraft((d) => ({
+                      ...d,
+                      attributes: toggle(d.attributes, opt.value),
+                    }))
+                  }
+                />
+              ))}
+            </FilterSection>
+
+            <FilterSection title="Advanced">
+              {ADVANCED_OPTIONS.map((opt) => (
+                <Chip
+                  key={opt.value}
+                  label={opt.label}
+                  selected={draft.advanced.includes(opt.value)}
+                  onPress={() =>
+                    setDraft((d) => ({
+                      ...d,
+                      advanced: toggle(d.advanced, opt.value),
+                    }))
+                  }
+                />
+              ))}
+            </FilterSection>
+          </ScrollView>
+
+          {/* Footer */}
+          <View>
+            {/* Selected filters row */}
+            <View className="border-b border-stroke-subtle px-6 py-3">
+              <Text className="text-[12px] text-text-subtle">
+                Selected Filters
+              </Text>
+            </View>
+            <View className="flex-row items-center px-6 py-3 min-h-[56px]">
+              <ScrollView
+                horizontal
+                showsHorizontalScrollIndicator={false}
+                style={{ flex: 1 }}
+                contentContainerStyle={{
+                  gap: 4,
+                  flexDirection: "row",
+                  alignItems: "center",
+                }}
+              >
+                {allSelected.map(({ label, onRemove }) => (
+                  <Pressable
+                    key={label}
+                    onPress={onRemove}
+                    className="flex-row items-center gap-2 bg-bg-selected px-2 py-1 rounded"
+                  >
+                    <Text className="text-[14px] text-primary">{label}</Text>
+                    <X size={8} color={Colors.light.tabBarActive} />
+                  </Pressable>
+                ))}
+              </ScrollView>
+              {allSelected.length > 0 && (
+                <Pressable
+                  onPress={() => setDraft(EMPTY_ROOM_FILTERS)}
+                  className="ml-2"
+                >
+                  <Text className="text-[15px] text-text-subtle tracking-tight">
+                    Clear
+                  </Text>
+                </Pressable>
+              )}
+            </View>
+
+            {/* Action buttons */}
+            <View className="flex-row gap-3 border-t border-stroke-subtle px-6 pt-3 pb-12">
+              <Pressable
+                onPress={close}
+                className="flex-1 items-center justify-center py-[10px] rounded"
+              >
+                <Text className="text-[14px] leading-5 text-primary">
+                  Cancel
+                </Text>
+              </Pressable>
+              <Pressable
+                onPress={() => {
+                  onApply(draft);
+                  close();
+                }}
+                className="flex-1 items-center justify-center bg-primary py-[10px] rounded"
+              >
+                <Text className="text-[14px] leading-5 text-white">
+                  Apply Filters
+                </Text>
+              </Pressable>
+            </View>
+          </View>
+        </Animated.View>
+      </View>
+    </Modal>
+  );
+}
diff --git a/clients/mobile/components/rooms/room-sort-sheet.tsx b/clients/mobile/components/rooms/room-sort-sheet.tsx
new file mode 100644
index 000000000..eb0109ca8
--- /dev/null
+++ b/clients/mobile/components/rooms/room-sort-sheet.tsx
@@ -0,0 +1,158 @@
+import { useEffect, useRef } from "react";
+import {
+  Animated,
+  Dimensions,
+  Modal,
+  PanResponder,
+  Pressable,
+  Text,
+  View,
+} from "react-native";
+import {
+  ArrowUpNarrowWide,
+  ArrowDownNarrowWide,
+  Clock,
+  Check,
+} from "lucide-react-native";
+import { Colors } from "@/constants/theme";
+
+const { height: SCREEN_HEIGHT } = Dimensions.get("window");
+
+export type RoomSort = "ascending" | "descending" | "urgency";
+
+export const DEFAULT_ROOM_SORT: RoomSort = "ascending";
+
+type RoomSortSheetProps = {
+  visible: boolean;
+  sort: RoomSort;
+  onSelect: (sort: RoomSort) => void;
+  onClose: () => void;
+};
+
+const SORT_OPTIONS: {
+  value: RoomSort;
+  label: string;
+  Icon: React.ComponentType<{ size: number; color: string }>;
+}[] = [
+  { value: "ascending", label: "Ascending", Icon: ArrowUpNarrowWide },
+  { value: "descending", label: "Descending", Icon: ArrowDownNarrowWide },
+  { value: "urgency", label: "Urgency", Icon: Clock },
+];
+
+export function RoomSortSheet({
+  visible,
+  sort,
+  onSelect,
+  onClose,
+}: RoomSortSheetProps) {
+  const translateY = useRef(new Animated.Value(SCREEN_HEIGHT)).current;
+
+  useEffect(() => {
+    if (visible) {
+      translateY.setValue(SCREEN_HEIGHT);
+      Animated.spring(translateY, {
+        toValue: 0,
+        useNativeDriver: true,
+        damping: 28,
+        stiffness: 280,
+      }).start();
+    }
+  }, [visible, translateY]);
+
+  function close() {
+    Animated.timing(translateY, {
+      toValue: SCREEN_HEIGHT,
+      duration: 220,
+      useNativeDriver: true,
+    }).start(onClose);
+  }
+
+  const panResponder = useRef(
+    PanResponder.create({
+      onMoveShouldSetPanResponder: (_, { dy }) => dy > 3,
+      onPanResponderMove: (_, { dy }) => {
+        if (dy > 0) translateY.setValue(dy);
+      },
+      onPanResponderRelease: (_, { dy, vy }) => {
+        if (dy > 80 || vy > 0.5) {
+          close();
+        } else {
+          Animated.spring(translateY, {
+            toValue: 0,
+            useNativeDriver: true,
+            damping: 28,
+            stiffness: 280,
+          }).start();
+        }
+      },
+    }),
+  ).current;
+
+  return (
+    <Modal
+      visible={visible}
+      transparent
+      animationType="none"
+      onRequestClose={close}
+    >
+      <View style={{ flex: 1, justifyContent: "flex-end" }}>
+        <Pressable className="absolute inset-0 bg-black/40" onPress={close} />
+
+        <Animated.View
+          style={{
+            backgroundColor: "white",
+            borderTopLeftRadius: 26,
+            borderTopRightRadius: 26,
+            transform: [{ translateY }],
+          }}
+          onStartShouldSetResponder={() => true}
+        >
+          {/* Drag handle */}
+          <View
+            {...panResponder.panHandlers}
+            className="items-center pt-3 pb-2"
+          >
+            <View className="w-11 h-1 rounded-full bg-stroke-subtle" />
+          </View>
+
+          {/* Title */}
+          <View className="px-6 py-4">
+            <Text className="text-[15px] text-black tracking-tight">
+              Sort by
+            </Text>
+          </View>
+
+          {/* Sort options */}
+          <View>
+            {SORT_OPTIONS.map(({ value, label, Icon }) => {
+              const selected = sort === value;
+              return (
+                <Pressable
+                  key={value}
+                  onPress={() => {
+                    onSelect(value);
+                    close();
+                  }}
+                  className="flex-row items-center justify-between px-6 py-4"
+                  style={selected ? { backgroundColor: "#f3f6f4" } : undefined}
+                >
+                  <View className="flex-row items-center gap-2">
+                    <Icon size={14} color={Colors.light.textDefault} />
+                    <Text className="text-[15px] text-black tracking-tight">
+                      {label}
+                    </Text>
+                  </View>
+                  {selected && (
+                    <Check size={14} color={Colors.light.textDefault} />
+                  )}
+                </Pressable>
+              );
+            })}
+          </View>
+
+          <View className="h-12" />
+        </Animated.View>
+      </View>
+    </Modal>
+  );
+}
diff --git a/clients/mobile/components/tasks/active-filter-chips.tsx b/clients/mobile/components/tasks/active-filter-chips.tsx
index bac98fb85..c6b8ee592 100644
--- a/clients/mobile/components/tasks/active-filter-chips.tsx
+++ b/clients/mobile/components/tasks/active-filter-chips.tsx
@@ -1,11 +1,6 @@
 import Feather from "@expo/vector-icons/Feather";
 import { Pressable, Text, View } from "react-native";
 
-interface FilterItem {
-  label: string;
-  value: string;
-}
-
 interface ActiveFilterChipsProps {
   filters: { label: string; value: string }[];
   onRemoveFilter: (value: string) => void;
diff --git a/clients/mobile/components/tasks/assignee-picker.tsx b/clients/mobile/components/tasks/assignee-picker.tsx
new file mode 100644
index 000000000..b81ec009f
--- /dev/null
+++ b/clients/mobile/components/tasks/assignee-picker.tsx
@@ -0,0 +1,146 @@
+import { useRef, useState } from "react";
+import { View, Text, Pressable, TextInput } from "react-native";
+import { UserRound, ChevronRight, Search, X } from "lucide-react-native";
+import { useQuery } from "@tanstack/react-query";
+import { useAPIClient } from "@shared/api/client";
+import { getConfig } from "@shared/api/config";
+import type { User } from "@shared";
+import { Colors } from "@/constants/theme";
+
+const ICON_COLOR = Colors.light.textSubtle;
+
+type SearchUsersResponse = {
+  users: User[];
+  next_cursor: string;
+};
+
+type AssigneePickerProps = {
+  value: User | undefined;
+  onChange: (user: User | undefined) => void;
+};
+
+export function AssigneePicker({ value, onChange }: AssigneePickerProps) {
+  const [expanded, setExpanded] = useState(false);
+  const [search, setSearch] = useState("");
+  const inputRef = useRef<TextInput>(null);
+
+  const api = useAPIClient();
+  const { hotelId } = getConfig();
+
+  const { data, isLoading } = useQuery({
+    queryKey: ["users", "search", hotelId, search],
+    queryFn: () =>
+      api.post<SearchUsersResponse>("/users/search", {
+        hotel_id: hotelId,
+        q: search || undefined,
+      }),
+    enabled: expanded,
+  });
+
+  const users = data?.users ?? [];
+
+  function handleToggle() {
+    const next = !expanded;
+    setExpanded(next);
+    setSearch("");
+    if (next) setTimeout(() => inputRef.current?.focus(), 50);
+  }
+
+  function handleSelect(user: User) {
+    onChange(value?.id === user.id ? undefined : user);
+    setExpanded(false);
+    setSearch("");
+  }
+
+  const displayName = value
+    ? [value.first_name, value.last_name].filter(Boolean).join(" ")
+    : undefined;
+
+  return (
+    <View className="gap-2">
+      <Pressable
+        onPress={handleToggle}
+        className="flex-row items-center justify-between h-6"
+      >
+        <View className="flex-row items-center gap-1">
+          <UserRound size={16} color={ICON_COLOR} />
+          <Text className="text-[15px] text-text-subtle tracking-tight">
+            Assignee
+          </Text>
+        </View>
+        <View className="flex-row items-center gap-1">
+          <Text
+            className={`text-[15px] tracking-tight ${displayName ? "text-text-default" : "text-text-subtle"}`}
+          >
+            {displayName ?? "Select..."}
+          </Text>
+          <ChevronRight
+            size={14}
+            color={ICON_COLOR}
+            style={{ transform: [{ rotate: expanded ? "90deg" : "0deg" }] }}
+          />
+        </View>
+      </Pressable>
+
+      {expanded && (
+        <View className="rounded border border-input-border">
+          <View className="flex-row items-center gap-2.5 px-2 py-2 border-b border-input-border-light">
+            <Search size={17} color={ICON_COLOR} />
+            <View className="flex-row items-center flex-1 gap-1">
+              {value && (
+                <View className="flex-row items-center gap-1 bg-bg-selected rounded px-1.5 py-0.5">
+                  <Text className="text-xs text-text-default tracking-tight">
+                    {displayName}
+                  </Text>
+                  <Pressable onPress={() => onChange(undefined)} hitSlop={4}>
+                    <X size={10} color={ICON_COLOR} />
+                  </Pressable>
+                </View>
+              )}
+              <TextInput
+                ref={inputRef}
+                className="flex-1 text-xs text-text-default tracking-tight"
+                placeholder="Search by name..."
+                placeholderTextColor={ICON_COLOR}
+                value={search}
+                onChangeText={setSearch}
+                returnKeyType="search"
+              />
+            </View>
+          </View>
+
+          {isLoading ? (
+            <View className="px-4 py-3">
+              <Text className="text-xs text-text-subtle tracking-tight">
+                Loading...
+              </Text>
+            </View>
+          ) : users.length === 0 ? (
+            <View className="px-4 py-3">
+              <Text className="text-xs text-text-subtle tracking-tight">
+                No staff found
+              </Text>
+            </View>
+          ) : (
+            users.map((user) => (
+              <Pressable
+                key={user.id}
+                onPress={() => handleSelect(user)}
+                className={`px-4 py-2 ${value?.id === user.id ? "bg-bg-selected" : ""}`}
+              >
+                <Text className="text-xs text-text-default tracking-tight">
+                  {[user.first_name, user.last_name].filter(Boolean).join(" ")}
+                </Text>
+                {user.role && (
+                  <Text className="text-xs text-text-subtle tracking-tight">
+                    {user.role}
+                  </Text>
+                )}
+              </Pressable>
+            ))
+          )}
+        </View>
+      )}
+    </View>
+  );
+}
diff --git a/clients/mobile/components/tasks/deadline-picker.tsx b/clients/mobile/components/tasks/deadline-picker.tsx
new file mode 100644
index 000000000..ec112d23e
--- /dev/null
+++ b/clients/mobile/components/tasks/deadline-picker.tsx
@@ -0,0 +1,375 @@
+import { useEffect, useState } from "react";
+import { View, Text, Pressable } from "react-native";
+import { Picker } from "@react-native-picker/picker";
+import {
+  CalendarSync,
+  ChevronLeft,
+  ChevronRight,
+  Clock4,
+} from "lucide-react-native";
+import { Colors } from "@/constants/theme";
+
+const {
+  tabBarActive: PRIMARY,
+  textSubtle: ICON_COLOR,
+  borderLight: BORDER_LIGHT,
+} = Colors.light;
+
+const WEEK_DAYS = ["SUN", "MON", "TUE", "WED", "THU", "FRI", "SAT"];
+const MONTH_NAMES = [
+  "January",
+  "February",
+  "March",
+  "April",
+  "May",
+  "June",
+  "July",
+  "August",
+  "September",
+  "October",
+  "November",
+  "December",
+];
+const HOURS = Array.from({ length: 12 }, (_, i) => i + 1);
+const MINUTES = Array.from({ length: 12 }, (_, i) => i * 5);
+
+function getDaysInMonth(year: number, month: number) {
+  return new Date(year, month + 1, 0).getDate();
+}
+
+function getFirstWeekday(year: number, month: number) {
+  return new Date(year, month, 1).getDay();
+}
+
+function buildDate(
+  day: number,
+  year: number,
+  month: number,
+  hour: number,
+  minute: number,
+  ampm: "AM" | "PM",
+): Date {
+  const d = new Date(year, month, day);
+  let hours = hour % 12;
+  if (ampm === "PM") hours += 12;
+  d.setHours(hours, minute, 0, 0);
+  return d;
+}
+
+type DeadlinePickerProps = {
+  value?: Date;
+  onChange: (date: Date | undefined) => void;
+};
+
+export function DeadlinePicker({ value, onChange }: DeadlinePickerProps) {
+  const now = new Date();
+
+  const [expanded, setExpanded] = useState(false);
+  const [activeTab, setActiveTab] = useState<"date" | "time">("date");
+  const [viewMonth, setViewMonth] = useState(
+    value?.getMonth() ?? now.getMonth(),
+  );
+  const [viewYear, setViewYear] = useState(
+    value?.getFullYear() ?? now.getFullYear(),
+  );
+
+  // Sync calendar view when value changes from outside (e.g. pre-population)
+  useEffect(() => {
+    if (value) {
+      setViewMonth(value.getMonth());
+      setViewYear(value.getFullYear());
+    }
+  }, [value]);
+
+  // Derive selection and time entirely from value
+  const selDay = value?.getDate();
+  const selMonth = value?.getMonth();
+  const selYear = value?.getFullYear();
+  const hour = value ? value.getHours() % 12 || 12 : 12;
+  const minute = value ? Math.round(value.getMinutes() / 5) * 5 : 0;
+  const ampm: "AM" | "PM" = value
+    ? value.getHours() >= 12
+      ? "PM"
+      : "AM"
+    : "AM";
+
+  function handleDayPress(day: number) {
+    onChange(buildDate(day, viewYear, viewMonth, hour, minute, ampm));
+  }
+
+  function handleHourChange(h: number) {
+    const base = value ?? new Date(viewYear, viewMonth, now.getDate());
+    onChange(
+      buildDate(
+        base.getDate(),
+        base.getFullYear(),
+        base.getMonth(),
+        h,
+        minute,
+        ampm,
+      ),
+    );
+  }
+
+  function handleMinuteChange(m: number) {
+    const base = value ?? new Date(viewYear, viewMonth, now.getDate());
+    onChange(
+      buildDate(
+        base.getDate(),
+        base.getFullYear(),
+        base.getMonth(),
+        hour,
+        m,
+        ampm,
+      ),
+    );
+  }
+
+  function handleAmpmChange(ap: "AM" | "PM") {
+    const base = value ?? new Date(viewYear, viewMonth, now.getDate());
+    onChange(
+      buildDate(
+        base.getDate(),
+        base.getFullYear(),
+        base.getMonth(),
+        hour,
+        minute,
+        ap,
+      ),
+    );
+  }
+
+  function prevMonth() {
+    if (viewMonth === 0) {
+      setViewMonth(11);
+      setViewYear((y) => y - 1);
+    } else {
+      setViewMonth((m) => m - 1);
+    }
+  }
+
+  function nextMonth() {
+    if (viewMonth === 11) {
+      setViewMonth(0);
+      setViewYear((y) => y + 1);
+    } else {
+      setViewMonth((m) => m + 1);
+    }
+  }
+
+  const daysInMonth = getDaysInMonth(viewYear, viewMonth);
+  const firstWeekday = getFirstWeekday(viewYear, viewMonth);
+  const cells: (number | null)[] = [];
+  for (let i = 0; i < firstWeekday; i++) cells.push(null);
+  for (let d = 1; d <= daysInMonth; d++) cells.push(d);
+  while (cells.length % 7 !== 0) cells.push(null);
+
+  const triggerLabel = value
+    ? value.toLocaleString("en-US", {
+        month: "short",
+        day: "numeric",
+        year: "numeric",
+        hour: "numeric",
+        minute: "2-digit",
+        hour12: true,
+      })
+    : undefined;
+
+  return (
+    <View className="gap-2">
+      {/* Trigger row */}
+      <Pressable
+        onPress={() => setExpanded((v) => !v)}
+        className="flex-row items-center justify-between h-6"
+      >
+        <View className="flex-row items-center gap-1">
+          <Clock4 size={16} color={ICON_COLOR} />
+          <Text className="text-[15px] text-text-subtle tracking-tight">
+            Deadline
+          </Text>
+        </View>
+        <View className="flex-row items-center gap-1">
+          <Text
+            className={`text-[15px] tracking-tight ${triggerLabel ? "text-text-default" : "text-text-subtle"}`}
+          >
+            {triggerLabel ?? "Select..."}
+          </Text>
+          <ChevronRight
+            size={14}
+            color={ICON_COLOR}
+            style={{ transform: [{ rotate: expanded ? "90deg" : "0deg" }] }}
+          />
+        </View>
+      </Pressable>
+
+      {expanded && (
+        <View className="rounded overflow-hidden">
+          {/* Tab bar */}
+          <View
+            className="flex-row"
+            style={{ borderBottomWidth: 1, borderBottomColor: BORDER_LIGHT }}
+          >
+            {(["date", "time"] as const).map((tab) => (
+              <Pressable
+                key={tab}
+                onPress={() => setActiveTab(tab)}
+                className="flex-1 items-center py-2.5"
+                style={
+                  activeTab === tab
+                    ? {
+                        borderBottomWidth: 2,
+                        borderBottomColor: PRIMARY,
+                        marginBottom: -1,
+                      }
+                    : undefined
+                }
+              >
+                <Text
+                  className="text-sm font-medium tracking-tight"
+                  style={{ color: activeTab === tab ? PRIMARY : ICON_COLOR }}
+                >
+                  {tab === "date" ? "Today" : "Time"}
+                </Text>
+              </Pressable>
+            ))}
+          </View>
+
+          {activeTab === "date" ? (
+            <View className="px-3 pt-3 pb-1">
+              {/* Month navigation */}
+              <View className="flex-row items-center justify-between mb-3">
+                <Pressable onPress={prevMonth} hitSlop={8}>
+                  <ChevronLeft size={18} color={ICON_COLOR} />
+                </Pressable>
+                <Text className="text-[15px] font-semibold text-text-default tracking-tight">
+                  {MONTH_NAMES[viewMonth]} {viewYear}
+                </Text>
+                <Pressable onPress={nextMonth} hitSlop={8}>
+                  <ChevronRight size={18} color={ICON_COLOR} />
+                </Pressable>
+              </View>
+
+              {/* Weekday headers */}
+              <View className="flex-row mb-1">
+                {WEEK_DAYS.map((d) => (
+                  <View key={d} className="flex-1 items-center">
+                    <Text className="text-xs text-text-subtle tracking-tight">
+                      {d}
+                    </Text>
+                  </View>
+                ))}
+              </View>
+
+              {/* Day grid */}
+              {Array.from({ length: cells.length / 7 }, (_, row) => (
+                <View key={row} className="flex-row">
+                  {cells.slice(row * 7, row * 7 + 7).map((day, col) => {
+                    const isSelected =
+                      day !== null &&
+                      selDay === day &&
+                      selMonth === viewMonth &&
+                      selYear === viewYear;
+                    const isToday =
+                      day !== null &&
+                      day === now.getDate() &&
+                      viewMonth === now.getMonth() &&
+                      viewYear === now.getFullYear();
+                    return (
+                      <Pressable
+                        key={col}
+                        onPress={
+                          day !== null ? () => handleDayPress(day) : undefined
+                        }
+                        className="flex-1 items-center py-1.5"
+                        style={
+                          isSelected
+                            ? { backgroundColor: PRIMARY, borderRadius: 999 }
+                            : undefined
+                        }
+                      >
+                        {day !== null && (
+                          <Text
+                            className="text-xs tracking-tight"
+                            style={{
+                              color: isSelected
+                                ? Colors.light.white
+                                : isToday
+                                  ? PRIMARY
+                                  : Colors.light.textDefault,
+                              fontWeight: isSelected || isToday ? "600" : "400",
+                            }}
+                          >
+                            {day}
+                          </Text>
+                        )}
+                      </Pressable>
+                    );
+                  })}
+                </View>
+              ))}
+            </View>
+          ) : (
+            <View className="flex-row items-center h-28 overflow-hidden">
+              {/* Hours */}
+              <Picker
+                selectedValue={hour}
+                onValueChange={(v) => handleHourChange(Number(v))}
+                style={{ flex: 1, backgroundColor: "transparent" }}
+                itemStyle={{ fontSize: 17, color: Colors.light.textDefault }}
+              >
+                {HOURS.map((h) => (
+                  <Picker.Item key={h} label={String(h)} value={h} />
+                ))}
+              </Picker>
+
+              {/* Colon separator */}
+              <Text className="text-[22px] font-semibold text-text-default mx-0.5">
+                :
+              </Text>
+
+              {/* Minutes */}
+              <Picker
+                selectedValue={minute}
+                onValueChange={(v) => handleMinuteChange(Number(v))}
+                style={{ flex: 1, backgroundColor: "transparent" }}
+                itemStyle={{ fontSize: 17, color: Colors.light.textDefault }}
+              >
+                {MINUTES.map((m) => (
+                  <Picker.Item
+                    key={m}
+                    label={String(m).padStart(2, "0")}
+                    value={m}
+                  />
+                ))}
+              </Picker>
+
+              {/* AM/PM */}
+              <Picker
+                selectedValue={ampm}
+                onValueChange={(v) => handleAmpmChange(v as "AM" | "PM")}
+                style={{ flex: 1, backgroundColor: "transparent" }}
+                itemStyle={{ fontSize: 17, color: Colors.light.textDefault }}
+              >
+                <Picker.Item label="AM" value="AM" />
+                <Picker.Item label="PM" value="PM" />
+              </Picker>
+            </View>
+          )}
+
+          {/* Reoccurring row — placeholder */}
+          <View className="flex-row items-center justify-between px-3 py-2">
+            <View className="flex-row items-center gap-1">
+              <CalendarSync size={14} color={ICON_COLOR} />
+              <Text className="text-xs text-text-subtle tracking-tight">
+                Reoccurring
+              </Text>
+            </View>
+            <Text className="text-xs text-text-subtle tracking-tight">
+              None
+            </Text>
+          </View>
+        </View>
+      )}
+    </View>
+  );
+}
diff --git a/clients/mobile/components/tasks/department-picker.tsx b/clients/mobile/components/tasks/department-picker.tsx
new file mode 100644
index 000000000..ea3a4a848
--- /dev/null
+++ b/clients/mobile/components/tasks/department-picker.tsx
@@ -0,0 +1,130 @@
+import { useState, useRef } from "react";
+import { View, Text, Pressable, TextInput } from "react-native";
+import { House, ChevronRight, Search, X } from "lucide-react-native";
+import { useGetDepartments } from "@shared/api/departments";
+import type { Department } from "@shared";
+import { Colors } from "@/constants/theme";
+
+const ICON_COLOR = Colors.light.textSubtle;
+
+type DepartmentPickerProps = {
+  hotelId: string;
+  value: Department | undefined;
+  onChange: (department: Department | undefined) => void;
+};
+
+export function DepartmentPicker({
+  hotelId,
+  value,
+  onChange,
+}: DepartmentPickerProps) {
+  const [expanded, setExpanded] = useState(false);
+  const [search, setSearch] = useState("");
+  const inputRef = useRef<TextInput>(null);
+
+  const { data: departments, isLoading } = useGetDepartments(
+    expanded ? hotelId : undefined,
+  );
+
+  const filtered = (departments ?? []).filter((d) =>
+    search ? d.name.toLowerCase().includes(search.toLowerCase()) : true,
+  );
+
+  function handleToggle() {
+    const next = !expanded;
+    setExpanded(next);
+    setSearch("");
+    if (next) {
+      setTimeout(() => inputRef.current?.focus(), 50);
+    }
+  }
+
+  function handleSelect(department: Department) {
+    onChange(value?.id === department.id ? undefined : department);
+    setExpanded(false);
+    setSearch("");
+  }
+
+  return (
+    <View className="gap-2">
+      <Pressable
+        onPress={handleToggle}
+        className="flex-row items-center justify-between h-6"
+      >
+        <View className="flex-row items-center gap-1">
+          <House size={16} color={ICON_COLOR} />
+          <Text className="text-[15px] text-text-subtle tracking-tight">
+            Department
+          </Text>
+        </View>
+        <View className="flex-row items-center gap-1">
+          <Text
+            className={`text-[15px] tracking-tight ${value ? "text-text-default" : "text-text-subtle"}`}
+          >
+            {value?.name ?? "Select..."}
+          </Text>
+          <ChevronRight
+            size={14}
+            color={ICON_COLOR}
+            style={{ transform: [{ rotate: expanded ? "90deg" : "0deg" }] }}
+          />
+        </View>
+      </Pressable>
+
+      {expanded && (
+        <View className="rounded border border-input-border">
+          <View className="flex-row items-center gap-2.5 px-2 py-2 border-b border-input-border-light">
+            <Search size={17} color={ICON_COLOR} />
+            <View className="flex-row items-center flex-1 gap-1">
+              {value && (
+                <View className="flex-row items-center gap-1 bg-bg-selected rounded px-1.5 py-0.5">
+                  <Text className="text-[12px] text-text-default tracking-tight">
+                    {value.name}
+                  </Text>
+                  <Pressable onPress={() => onChange(undefined)} hitSlop={4}>
+                    <X size={10} color={ICON_COLOR} />
+                  </Pressable>
+                </View>
+              )}
+              <TextInput
+                ref={inputRef}
+                className="flex-1 text-[12px] text-text-default tracking-tight"
+                placeholder="Search departments..."
+                placeholderTextColor={ICON_COLOR}
+                value={search}
+                onChangeText={setSearch}
+                returnKeyType="search"
+              />
+            </View>
+          </View>
+
+          {isLoading ? (
+            <View className="px-4 py-3">
+              <Text className="text-[12px] text-text-subtle tracking-tight">
+                Loading...
+              </Text>
+            </View>
+          ) : filtered.length === 0 ? (
+            <View className="px-4 py-3">
+              <Text className="text-[12px] text-text-subtle tracking-tight">
+                No departments found
+              </Text>
+            </View>
+          ) : (
+            filtered.map((d) => (
+              <Pressable
+                key={d.id}
+                onPress={() => handleSelect(d)}
+                className={`px-4 py-2 ${value?.id === d.id ? "bg-bg-selected" : ""}`}
+              >
+                <Text className="text-[12px] text-text-default tracking-tight">
+                  {d.name}
+                </Text>
+              </Pressable>
+            ))
+          )}
+        </View>
+      )}
+    </View>
+  );
+}
diff --git a/clients/mobile/components/tasks/department-section.tsx b/clients/mobile/components/tasks/department-section.tsx
new file mode 100644
index 000000000..b22c49cf6
--- /dev/null
+++ b/clients/mobile/components/tasks/department-section.tsx
@@ -0,0 +1,43 @@
+import { ActivityIndicator } from "react-native";
+
+import { getConfig } from "@shared/api/config";
+import { useGetDepartments } from "@shared/api/departments";
+
+import { CheckboxRow, Section } from "./filter-section-header";
+
+type DepartmentSectionProps = {
+  departments: string[];
+  onDepartmentsChange: (departments: string[]) => void;
+};
+
+export function DepartmentSection({
+  departments,
+  onDepartmentsChange,
+}: DepartmentSectionProps) {
+  const { hotelId } = getConfig();
+  const { data: allDepartments = [], isLoading } = useGetDepartments(hotelId);
+
+  function toggle(id: string) {
+    const next = departments.includes(id)
+      ? departments.filter((d) => d !== id)
+      : [...departments, id];
+    onDepartmentsChange(next);
+  }
+
+  return (
+    <Section title="Department">
+      {isLoading ? (
+        <ActivityIndicator size="small" />
+      ) : (
+        allDepartments.map((dept) => (
+          <CheckboxRow
+            key={dept.id}
+            label={dept.name}
+            selected={departments.includes(dept.id)}
+            onPress={() => toggle(dept.id)}
+          />
+        ))
+      )}
+    </Section>
+  );
+}
diff --git a/clients/mobile/components/tasks/filter-section-header.tsx b/clients/mobile/components/tasks/filter-section-header.tsx
new file mode 100644
index 000000000..e3b0d7bdb
--- /dev/null
+++ b/clients/mobile/components/tasks/filter-section-header.tsx
@@ -0,0 +1,92 @@
+import { useState } from "react";
+import { Pressable, Text, View } from "react-native";
+import { Check, ChevronDown, ChevronUp } from "lucide-react-native";
+import { Colors } from "@/constants/theme";
+
+interface SectionProps {
+  title: string;
+  children: React.ReactNode;
+}
+
+export function Section({ title, children }: SectionProps) {
+  const [expanded, setExpanded] = useState(true);
+
+  return (
+    <View className="border-b border-stroke-subtle">
+      <Pressable
+        onPress={() => setExpanded(!expanded)}
+        className="flex-row items-center justify-between px-[5vw] py-[2vh]"
+      >
+        <Text className="text-sm font-medium text-text-default">{title}</Text>
+        {expanded ? (
+          <ChevronUp size={16} color={Colors.light.textDefault} />
+        ) : (
+          <ChevronDown size={16} color={Colors.light.textDefault} />
+        )}
+      </Pressable>
+      {expanded && <View className="px-[5vw] pb-[2vh]">{children}</View>}
+    </View>
+  );
+}
+
+export function CheckboxRow({
+  label,
+  selected,
+  onPress,
+}: {
+  label: string;
+  selected: boolean;
+  onPress: () => void;
+}) {
+  return (
+    <Pressable
+      onPress={onPress}
+      className="flex-row items-center gap-3 py-[1vh]"
+    >
+      <View
+        className={`w-5 h-5 rounded border items-center justify-center ${
+          selected
+            ? "bg-primary border-primary"
+            : "bg-white border-stroke-subtle"
+        }`}
+      >
+        {selected && <Check size={12} color={Colors.light.white} />}
+      </View>
+      <Text
+        className={`text-sm ${selected ? "text-primary font-medium" : "text-text-default"}`}
+      >
+        {label}
+      </Text>
+    </Pressable>
+  );
+}
+
+export function RadioRow({
+  label,
+  selected,
+  onPress,
+}: {
+  label: string;
+  selected: boolean;
+  onPress: () => void;
+}) {
+  return (
+    <Pressable
+      onPress={onPress}
+      className="flex-row items-center gap-3 py-[1vh]"
+    >
+      <View
+        className={`w-5 h-5 rounded-full border-2 items-center justify-center ${
+          selected ? "border-primary" : "border-stroke-subtle"
+        }`}
+      >
+        {selected && <View className="w-2.5 h-2.5 rounded-full bg-primary" />}
+      </View>
+      <Text
+        className={`text-sm ${selected ? "text-primary font-medium" : "text-text-default"}`}
+      >
+        {label}
+      </Text>
+    </Pressable>
+  );
+}
diff --git a/clients/mobile/components/tasks/location-section.tsx b/clients/mobile/components/tasks/location-section.tsx
new file mode 100644
index 000000000..0056a459c
--- /dev/null
+++ b/clients/mobile/components/tasks/location-section.tsx
@@ -0,0 +1,51 @@
+import { ActivityIndicator, ScrollView, View } from "react-native";
+
+import { useGetRoomsFloors } from "@shared";
+
+import { CheckboxRow, Section } from "./filter-section-header";
+
+type LocationSectionProps = {
+  floors: number[];
+  onFloorsChange: (floors: number[]) => void;
+};
+
+export function LocationSection({
+  floors,
+  onFloorsChange,
+}: LocationSectionProps) {
+  const { data: allFloors = [], isLoading } = useGetRoomsFloors({
+    query: { staleTime: Infinity },
+  });
+
+  function toggle(floor: number) {
+    const next = floors.includes(floor)
+      ? floors.filter((f) => f !== floor)
+      : [...floors, floor];
+    onFloorsChange(next);
+  }
+
+  return (
+    <Section title="Location">
+      {isLoading ? (
+        <ActivityIndicator size="small" />
+      ) : (
+        <View className="border border-stroke-subtle rounded-xl overflow-hidden max-h-[20vh]">
+          <ScrollView nestedScrollEnabled>
+            {allFloors.map((floor, idx) => (
+              <View
+                key={floor}
+                className={`px-[4vw] ${idx < allFloors.length - 1 ? "border-b border-stroke-subtle" : ""}`}
+              >
+                <CheckboxRow
+                  label={`Floor ${floor}`}
+                  selected={floors.includes(floor)}
+                  onPress={() => toggle(floor)}
+                />
+              </View>
+            ))}
+          </ScrollView>
+        </View>
+      )}
+    </Section>
+  );
+}
diff --git a/clients/mobile/components/tasks/priority-picker.tsx b/clients/mobile/components/tasks/priority-picker.tsx
new file mode 100644
index 000000000..505636d3b
--- /dev/null
+++ b/clients/mobile/components/tasks/priority-picker.tsx
@@ -0,0 +1,99 @@
+import { useState } from "react";
+import { View, Text, Pressable } from "react-native";
+import { Flag, ChevronRight, X } from "lucide-react-native";
+import type { MakeRequestPriority } from "@shared";
+
+type PriorityConfig = {
+  bgClass: string;
+  textClass: string;
+  selectedClass: string;
+  flagColor: string;
+  label: string;
+};
+
+const PRIORITY_CONFIG: Record<MakeRequestPriority, PriorityConfig> = {
+  high: {
+    bgClass: "bg-priority-high-bg",
+    textClass: "text-priority-high",
+    selectedClass: "border border-priority-high",
+    flagColor: "#a21313",
+    label: "High",
+  },
+  medium: {
+    bgClass: "bg-priority-medium-bg",
+    textClass: "text-priority-medium",
+    selectedClass: "border border-priority-medium",
+    flagColor: "#ff8c3f",
+    label: "Medium",
+  },
+  low: {
+    bgClass: "bg-priority-low-bg",
+    textClass: "text-priority-low",
+    selectedClass: "border border-priority-low",
+    flagColor: "#2f61ce",
+    label: "Low",
+  },
+};
+
+const PRIORITIES: MakeRequestPriority[] = ["high", "medium", "low"];
+
+type PriorityPickerProps = {
+  value: MakeRequestPriority | undefined;
+  onChange: (value: MakeRequestPriority | undefined) => void;
+};
+
+export function PriorityPicker({ value, onChange }: PriorityPickerProps) {
+  const [expanded, setExpanded] = useState(false);
+
+  return (
+    <View className="gap-2">
+      <Pressable
+        onPress={() => setExpanded((v) => !v)}
+        className="flex-row items-center justify-between h-6"
+      >
+        <View className="flex-row items-center gap-1">
+          <Flag size={16} color="#747474" />
+          <Text className="text-[15px] text-text-subtle tracking-tight">
+            Priority
+          </Text>
+        </View>
+        <View className="flex-row items-center gap-1">
+          <Text className="text-[15px] text-text-subtle tracking-tight">
+            {value ? PRIORITY_CONFIG[value].label : "Select..."}
+          </Text>
+          <ChevronRight
+            size={14}
+            color="#747474"
+            style={{ transform: [{ rotate: expanded ? "90deg" : "0deg" }] }}
+          />
+        </View>
+      </Pressable>
+
+      {expanded && (
+        <View className="flex-row gap-2">
+          {PRIORITIES.map((p) => {
+            const config = PRIORITY_CONFIG[p];
+            const isSelected = value === p;
+            return (
+              <Pressable
+                key={p}
+                onPress={() => onChange(p)}
+                className={`flex-row items-center gap-1 rounded px-2 py-1 ${config.bgClass} ${isSelected ? config.selectedClass : ""}`}
+              >
+                <Flag size={14} color={config.flagColor} />
+                <Text className={`text-xs tracking-tight ${config.textClass}`}>
+                  {config.label}
+                </Text>
+                {isSelected && (
+                  <Pressable onPress={() => onChange(undefined)} hitSlop={4}>
+                    <X size={12} color={config.flagColor} />
+                  </Pressable>
+                )}
+              </Pressable>
+            );
+          })}
+        </View>
+      )}
+    </View>
+  );
+}
diff --git a/clients/mobile/components/tasks/priority-section.tsx b/clients/mobile/components/tasks/priority-section.tsx
new file mode 100644
index 000000000..fe7a7c797
--- /dev/null
+++ b/clients/mobile/components/tasks/priority-section.tsx
@@ -0,0 +1,41 @@
+import { View } from "react-native";
+
+import { CheckboxRow, Section } from "./filter-section-header";
+
+const PRIORITY_OPTIONS = [
+  { label: "High", value: "high" },
+  { label: "Medium", value: "medium" },
+  { label: "Low", value: "low" },
+] as const;
+
+type PrioritySectionProps = {
+  priorities: string[];
+  onPrioritiesChange: (priorities: string[]) => void;
+};
+
+export function PrioritySection({
+  priorities,
+  onPrioritiesChange,
+}: PrioritySectionProps) {
+  function toggle(value: string) {
+    const next = priorities.includes(value)
+      ? priorities.filter((p) => p !== value)
+      : [...priorities, value];
+    onPrioritiesChange(next);
+  }
+
+  return (
+    <Section title="Priority">
+      <View className="flex-row gap-[4vw]">
+        {PRIORITY_OPTIONS.map((option) => (
+          <CheckboxRow
+            key={option.value}
+            label={option.label}
+            selected={priorities.includes(option.value)}
+            onPress={() => toggle(option.value)}
+          />
+        ))}
+      </View>
+    </Section>
+  );
+}
diff --git a/clients/mobile/components/tasks/priority-tag.tsx b/clients/mobile/components/tasks/priority-tag.tsx
new file mode 100644
index 000000000..8994a33c6
--- /dev/null
+++ b/clients/mobile/components/tasks/priority-tag.tsx
@@ -0,0 +1,60 @@
+import Feather from "@expo/vector-icons/Feather";
+import { Text, View } from "react-native";
+import type { RequestPriority } from "@shared";
+
+type PriorityConfig = {
+  containerClass: string;
+  textClass: string;
+  label: string;
+  iconColor: string;
+};
+
+const PRIORITY_CONFIG: Record<RequestPriority, PriorityConfig> = {
+  high: {
+    containerClass: "bg-priority-high-bg",
+    textClass: "text-priority-high",
+    label: "High Priority",
+    iconColor: "#a21313",
+  },
+  medium: {
+    containerClass: "bg-priority-medium-bg",
+    textClass: "text-priority-medium",
+    label: "Medium Priority",
+    iconColor: "#ff8c3f",
+  },
+  low: {
+    containerClass: "bg-priority-low-bg",
+    textClass: "text-priority-low",
+    label: "Low Priority",
+    iconColor: "#2f61ce",
+  },
+};
+
+type PriorityTagProps = {
+  priority: string;
+  dimmed?: boolean;
+};
+
+export function PriorityTag({ priority, dimmed = false }: PriorityTagProps) {
+  const config =
+    PRIORITY_CONFIG[priority.toLowerCase() as RequestPriority] ??
+    PRIORITY_CONFIG.low;
+
+  return (
+    <View
+      className={`${config.containerClass} flex-row items-center gap-1 px-2 py-1 rounded`}
+    >
+      <Feather
+        name="flag"
+        size={12}
+        color={dimmed ? "#bababa" : config.iconColor}
+      />
+      <Text
+        className={`${dimmed ? "text-text-disabled" : config.textClass} text-xs`}
+        numberOfLines={1}
+      >
+        {config.label}
+      </Text>
+    </View>
+  );
+}
diff --git a/clients/mobile/components/tasks/room-picker.tsx b/clients/mobile/components/tasks/room-picker.tsx
new file mode 100644
index 000000000..aef3b3a4e
--- /dev/null
+++ b/clients/mobile/components/tasks/room-picker.tsx
@@ -0,0 +1,137 @@
+import { useRef, useState } from "react";
+import { View, Text, Pressable, TextInput } from "react-native";
+import { DoorOpen, ChevronRight, Search, X } from "lucide-react-native";
+import { useQuery } from "@tanstack/react-query";
+import { usePostRoomsHook } from "@shared/api/generated/endpoints/rooms/rooms";
+import type { RoomWithOptionalGuestBooking } from "@shared";
+import { Colors } from "@/constants/theme";
+
+const ICON_COLOR = Colors.light.textSubtle;
+
+type RoomPickerProps = {
+  value: RoomWithOptionalGuestBooking | undefined;
+  onChange: (room: RoomWithOptionalGuestBooking | undefined) => void;
+};
+
+export function RoomPicker({ value, onChange }: RoomPickerProps) {
+  const [expanded, setExpanded] = useState(false);
+  const [search, setSearch] = useState("");
+  const inputRef = useRef<TextInput>(null);
+
+  const postRooms = usePostRoomsHook();
+
+  const { data, isLoading } = useQuery({
+    queryKey: ["rooms", "picker"],
+    queryFn: () => postRooms({ limit: 200 }),
+    enabled: expanded,
+  });
+
+  const allRooms = data?.items ?? [];
+  const filtered = allRooms.filter((r) =>
+    search ? String(r.room_number).includes(search) : true,
+  );
+
+  function handleToggle() {
+    const next = !expanded;
+    setExpanded(next);
+    setSearch("");
+    if (next) setTimeout(() => inputRef.current?.focus(), 50);
+  }
+
+  function handleSelect(room: RoomWithOptionalGuestBooking) {
+    onChange(value?.id === room.id ? undefined : room);
+    setExpanded(false);
+    setSearch("");
+  }
+
+  const triggerLabel = value ? `Room ${value.room_number}` : undefined;
+
+  return (
+    <View className="gap-2">
+      <Pressable
+        onPress={handleToggle}
+        className="flex-row items-center justify-between h-6"
+      >
+        <View className="flex-row items-center gap-1">
+          <DoorOpen size={16} color={ICON_COLOR} />
+          <Text className="text-[15px] text-text-subtle tracking-tight">
+            Room
+          </Text>
+        </View>
+        <View className="flex-row items-center gap-1">
+          <Text
+            className={`text-[15px] tracking-tight ${triggerLabel ? "text-text-default" : "text-text-subtle"}`}
+          >
+            {triggerLabel ?? "Select..."}
+          </Text>
+          <ChevronRight
+            size={14}
+            color={ICON_COLOR}
+            style={{ transform: [{ rotate: expanded ? "90deg" : "0deg" }] }}
+          />
+        </View>
+      </Pressable>
+
+      {expanded && (
+        <View className="rounded border border-input-border">
+          <View className="flex-row items-center gap-2.5 px-2 py-2 border-b border-input-border-light">
+            <Search size={17} color={ICON_COLOR} />
+            <View className="flex-row items-center flex-1 gap-1">
+              {value && (
+                <View className="flex-row items-center gap-1 bg-bg-selected rounded px-1.5 py-0.5">
+                  <Text className="text-xs text-text-default tracking-tight">
+                    Room {value.room_number}
+                  </Text>
+                  <Pressable onPress={() => onChange(undefined)} hitSlop={4}>
+                    <X size={10} color={ICON_COLOR} />
+                  </Pressable>
+                </View>
+              )}
+              <TextInput
+                ref={inputRef}
+                className="flex-1 text-xs text-text-default tracking-tight"
+                placeholder="Search by room number..."
+                placeholderTextColor={ICON_COLOR}
+                value={search}
+                onChangeText={setSearch}
+                keyboardType="numeric"
+                returnKeyType="search"
+              />
+            </View>
+          </View>
+
+          {isLoading ? (
+            <View className="px-4 py-3">
+              <Text className="text-xs text-text-subtle tracking-tight">
+                Loading...
+              </Text>
+            </View>
+          ) : filtered.length === 0 ? (
+            <View className="px-4 py-3">
+              <Text className="text-xs text-text-subtle tracking-tight">
+                No rooms found
+              </Text>
+            </View>
+          ) : (
+            filtered.map((room) => (
+              <Pressable
+                key={room.id}
+                onPress={() => handleSelect(room)}
+                className={`px-4 py-2 ${value?.id === room.id ? "bg-bg-selected" : ""}`}
+              >
+                <Text className="text-xs text-text-default tracking-tight">
+                  Room {room.room_number}
+                </Text>
+                {room.floor !== undefined && (
+                  <Text className="text-xs text-text-subtle tracking-tight">
+                    Floor {room.floor}
+                  </Text>
+                )}
+              </Pressable>
+            ))
+          )}
+        </View>
+      )}
+    </View>
+  );
+}
diff --git a/clients/mobile/components/tasks/sort-by-section.tsx b/clients/mobile/components/tasks/sort-by-section.tsx
new file mode 100644
index 000000000..c79e1d0eb
--- /dev/null
+++ b/clients/mobile/components/tasks/sort-by-section.tsx
@@ -0,0 +1,33 @@
+import { View } from "react-native";
+
+import type { RequestFeedSort } from "@shared/api/requests";
+
+import { RadioRow, Section } from "./filter-section-header";
+
+type SortBySectionProps = {
+  sort: RequestFeedSort;
+  onSortChange: (sort: RequestFeedSort) => void;
+};
+
+const SORT_OPTIONS: { label: string; value: RequestFeedSort }[] = [
+  { label: "Priority", value: "priority" },
+  { label: "Newest", value: "newest" },
+  { label: "Oldest", value: "oldest" },
+];
+
+export function SortBySection({ sort, onSortChange }: SortBySectionProps) {
+  return (
+    <Section title="Sort By">
+      <View className="flex-row gap-[4vw]">
+        {SORT_OPTIONS.map((option) => (
+          <RadioRow
+            key={option.value}
+            label={option.label}
+            selected={sort === option.value}
+            onPress={() => onSortChange(option.value)}
+          />
+        ))}
+      </View>
+    </Section>
+  );
+}
diff --git a/clients/mobile/components/tasks/tab-bar.tsx b/clients/mobile/components/tasks/tab-bar.tsx
index 88c38b248..147d82b70 100644
--- a/clients/mobile/components/tasks/tab-bar.tsx
+++ b/clients/mobile/components/tasks/tab-bar.tsx
@@ -1,4 +1,4 @@
-import MaterialCommunityIcons from "@expo/vector-icons/MaterialCommunityIcons";
+import Feather from "@expo/vector-icons/Feather";
 import { Pressable, Text, View } from "react-native";
 
 import { TAB, TabName } from "@/constants/tasks";
@@ -8,58 +8,58 @@ interface TabBarProps {
   onTabChange: (tab: TabName) => void;
 }
 
+const ACTIVE_COLOR = "#15502c";
+const INACTIVE_COLOR = "#464646";
+
 export function TabBar({ activeTab, onTabChange }: TabBarProps) {
+  const myTasksActive = activeTab === TAB.MY_TASKS;
+  const unassignedActive = activeTab === TAB.UNASSIGNED;
+
   return (
-    <View className="flex-row w-full">
+    <View
+      className="flex-row w-full"
+      style={{ borderBottomWidth: 1, borderBottomColor: "#e5e9ed" }}
+    >
       <Pressable
         onPress={() => onTabChange(TAB.MY_TASKS)}
-        className={`w-1/2 items-center py-3 border-b-2 ${
-          activeTab === TAB.MY_TASKS
-            ? "border-blue-600"
-            : "border-b border-gray-200"
-        }`}
+        className="flex-1 flex-row items-center justify-center gap-1 px-3 py-2"
+        style={{
+          borderBottomWidth: 2,
+          borderBottomColor: myTasksActive ? ACTIVE_COLOR : "transparent",
+        }}
       >
-        <View className="flex-row items-center gap-1.5">
-          <MaterialCommunityIcons
-            name="dots-grid"
-            size={14}
-            color={activeTab === TAB.MY_TASKS ? "#000" : "#9ca3af"}
-          />
-          <Text
-            className={
-              activeTab === TAB.MY_TASKS
-                ? "text-black font-semibold"
-                : "text-gray-400"
-            }
-          >
-            My Tasks
-          </Text>
-        </View>
+        <Feather
+          name="check-square"
+          size={16}
+          color={myTasksActive ? ACTIVE_COLOR : INACTIVE_COLOR}
+        />
+        <Text
+          className="text-[15px] tracking-tight"
+          style={{ color: myTasksActive ? ACTIVE_COLOR : INACTIVE_COLOR }}
+        >
+          My Tasks
+        </Text>
       </Pressable>
+
       <Pressable
         onPress={() => onTabChange(TAB.UNASSIGNED)}
-        className={`w-1/2 items-center py-3 border-b-2 ${
-          activeTab === TAB.UNASSIGNED
-            ? "border-blue-600"
-            : "border-b border-gray-200"
-        }`}
+        className="flex-1 flex-row items-center justify-center gap-1 px-3 py-2"
+        style={{
+          borderBottomWidth: 2,
+          borderBottomColor: unassignedActive ? ACTIVE_COLOR : "transparent",
+        }}
       >
-        <View className="flex-row items-center gap-1.5">
-          <MaterialCommunityIcons
-            name="dots-grid"
-            size={14}
-            color={activeTab === TAB.UNASSIGNED ? "#000" : "#9ca3af"}
-          />
-          <Text
-            className={
-              activeTab === TAB.UNASSIGNED
-                ? "text-black font-semibold"
-                : "text-gray-400"
-            }
-          >
-            Unassigned Tasks
-          </Text>
-        </View>
+        <Feather
+          name="clipboard"
+          size={16}
+          color={unassignedActive ? ACTIVE_COLOR : INACTIVE_COLOR}
+        />
+        <Text
+          className="text-[15px] tracking-tight"
+          style={{ color: unassignedActive ? ACTIVE_COLOR : INACTIVE_COLOR }}
+        >
+          Unassigned Tasks
+        </Text>
       </Pressable>
     </View>
   );
diff --git a/clients/mobile/components/tasks/task-card.tsx b/clients/mobile/components/tasks/task-card.tsx
deleted file mode 100644
index ebdfeefae..000000000
--- a/clients/mobile/components/tasks/task-card.tsx
+++ /dev/null
@@ -1,104 +0,0 @@
-import Feather from "@expo/vector-icons/Feather";
-import { Pressable, Text, View } from "react-native";
-
-import { TaskBadge } from "@/components/tasks/task-badge";
-import type { Task } from "@/data/mockTasks";
-import { TASK_ASSIGNMENT_STATE } from "@/constants/tasks";
-
-interface TaskCardProps {
-  task: Task;
-  variant: (typeof TASK_ASSIGNMENT_STATE)[keyof typeof TASK_ASSIGNMENT_STATE];
-  isExpanded: boolean;
-}
-
-function DotSeparator() {
-  return <View className="w-1 h-1 rounded-full bg-blue-600 mx-1.5" />;
-}
-
-export function TaskCard({ task, variant, isExpanded }: TaskCardProps) {
-  const isAssigned = variant === TASK_ASSIGNMENT_STATE.ASSIGNED;
-
-  if (isAssigned && isExpanded) {
-    return (
-      <View className="bg-white rounded-xl border border-gray-200 p-4 w-full">
-        <Text className="text-lg font-bold">{task.title}</Text>
-        <View className="flex-row items-center mt-1">
-          <Text className="text-sm">{task.priority}</Text>
-          <DotSeparator />
-          <Text className="text-sm">{task.department}</Text>
-          {task.dueTime && (
-            <>
-              <DotSeparator />
-              <Text className="text-sm">{task.dueTime}</Text>
-            </>
-          )}
-        </View>
-        {task.description && (
-          <Text className="text-sm text-gray-600 mt-1">{task.description}</Text>
-        )}
-        <Pressable
-          onPress={() => {}}
-          className="bg-blue-600 rounded-lg py-3 w-full items-center mt-3"
-        >
-          <Text className="text-white font-medium">Start</Text>
-        </Pressable>
-      </View>
-    );
-  }
-
-  if (isAssigned && !isExpanded) {
-    return (
-      <View className="bg-white rounded-xl border border-gray-200 p-4 w-full flex-row justify-between items-start">
-        <View className="flex-1">
-          <Text className="text-lg font-bold">{task.title}</Text>
-          <View className="flex-row flex-wrap gap-2 mt-1">
-            <TaskBadge label={task.priority} />
-            <TaskBadge label={task.location} />
-          </View>
-        </View>
-        <Pressable onPress={() => {}} className="p-1">
-          <Feather name="more-horizontal" size={24} color="#6b7280" />
-        </Pressable>
-      </View>
-    );
-  }
-
-  if (!isAssigned && isExpanded) {
-    return (
-      <View className="bg-white rounded-xl border border-gray-200 p-4 w-full">
-        <Text className="text-lg font-bold">{task.title}</Text>
-        <View className="flex-row flex-wrap gap-2 mt-1">
-          <TaskBadge label={task.priority} />
-          <TaskBadge label={task.location} />
-          <TaskBadge label={task.department} variant="outlined" />
-        </View>
-        {task.description && (
-          <Text className="text-sm text-gray-600 mt-1">{task.description}</Text>
-        )}
-        <Pressable
-          onPress={() => {}}
-          className="bg-white border border-gray-300 rounded-lg py-3 w-full items-center mt-3"
-        >
-          <Text className="text-black font-medium">Claim Task</Text>
-        </Pressable>
-      </View>
-    );
-  }
-
-  // Compact unassigned
-  return (
-    <View className="bg-white rounded-xl border border-gray-200 p-4 w-full flex-row justify-between items-start">
-      <View className="flex-1">
-        <Text className="text-lg font-bold">{task.title}</Text>
-        <View className="flex-row flex-wrap gap-2 mt-1">
-          <TaskBadge label={task.priority} />
-          <TaskBadge label={task.location} />
-          <TaskBadge label={task.department} variant="outlined" />
-        </View>
-      </View>
-      <Pressable onPress={() => {}} className="p-1">
-        <Feather name="more-horizontal" size={24} color="#6b7280" />
-      </Pressable>
-    </View>
-  );
-}
diff --git a/clients/mobile/components/tasks/task-detail-sheet.tsx b/clients/mobile/components/tasks/task-detail-sheet.tsx
new file mode 100644
index 000000000..5e042a5a9
--- /dev/null
+++ b/clients/mobile/components/tasks/task-detail-sheet.tsx
@@ -0,0 +1,687 @@
+import Feather from "@expo/vector-icons/Feather";
+import * as Haptics from "expo-haptics";
+import { useEffect, useRef, useState } from "react";
+import {
+  Alert,
+  Animated,
+  Dimensions,
+  Modal,
+  PanResponder,
+  Pressable,
+  ScrollView,
+  Text,
+  TextInput,
+  View,
+} from "react-native";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
+import { useQueryClient } from "@tanstack/react-query";
+
+import { Colors } from "@/constants/theme";
+import { AssigneePicker } from "@/components/tasks/assignee-picker";
+import { DeadlinePicker } from "@/components/tasks/deadline-picker";
+import { DepartmentPicker } from "@/components/tasks/department-picker";
+import { PriorityPicker } from "@/components/tasks/priority-picker";
+import { RoomPicker } from "@/components/tasks/room-picker";
+import { getConfig } from "@shared/api/config";
+import {
+  REQUESTS_FEED_QUERY_KEY,
+  useGetRequestById,
+} from "@shared/api/requests";
+import { usePutRequestId } from "@shared/api/generated/endpoints/requests/requests";
+import { useGetDepartments, useGetUsersId } from "@shared";
+import type {
+  Department,
+  MakeRequestPriority,
+  RoomWithOptionalGuestBooking,
+  User,
+} from "@shared";
+import type { RequestFeedItem } from "@shared/api/requests";
+
+type RequestForm = {
+  name: string;
+  description: string;
+  priority: MakeRequestPriority;
+  deadline: Date | undefined;
+  user_id: string | undefined;
+  room_id: string | undefined;
+  department_id: string | undefined;
+};
+
+type DetailRowProps = {
+  icon: React.ComponentProps<typeof Feather>["name"];
+  label: string;
+  value: string;
+};
+
+function DetailRow({ icon, label, value }: DetailRowProps) {
+  return (
+    <View className="flex-row items-center justify-between">
+      <View className="flex-row items-center gap-1.5">
+        <Feather name={icon} size={14} color={Colors.light.icon} />
+        <Text className="text-base text-text-subtle tracking-tight">
+          {label}
+        </Text>
+      </View>
+      <Text className="text-base text-text-default tracking-tight">
+        {value}
+      </Text>
+    </View>
+  );
+}
+
+function formatLocation(
+  floor?: number | null,
+  roomNumber?: number | null,
+): string {
+  if (floor != null && roomNumber != null)
+    return `Floor ${floor}, Room ${roomNumber}`;
+  if (roomNumber != null) return `Room ${roomNumber}`;
+  return "—";
+}
+
+function capitalize(s: string): string {
+  return s.charAt(0).toUpperCase() + s.slice(1);
+}
+
+const { height: SCREEN_HEIGHT } = Dimensions.get("window");
+// Sheet starts showing the bottom 58% of the screen
+const PARTIAL_OFFSET = Math.round(SCREEN_HEIGHT * 0.42);
+const SNAP_UP_THRESHOLD = 80;
+const SNAP_DOWN_THRESHOLD = 80;
+
+type TaskDetailSheetProps = {
+  task: RequestFeedItem | null;
+  onClose: () => void;
+  onComplete?: (taskId: string) => void;
+  onMarkPending?: (taskId: string) => void;
+  onDropTask?: (taskId: string) => void;
+};
+
+export function TaskDetailSheet({
+  task,
+  onClose,
+  onComplete,
+  onMarkPending,
+  onDropTask,
+}: TaskDetailSheetProps) {
+  const translateY = useRef(new Animated.Value(SCREEN_HEIGHT)).current;
+  const isFullScreenRef = useRef(false);
+  const [isFullScreen, setIsFullScreen] = useState(false);
+  const insets = useSafeAreaInsets();
+  const queryClient = useQueryClient();
+
+  // Edit mode state
+  const [isEditing, setIsEditing] = useState(false);
+
+  const [form, setForm] = useState<RequestForm>({
+    name: "",
+    description: "",
+    priority: "medium",
+    deadline: undefined,
+    user_id: undefined,
+    room_id: undefined,
+    department_id: undefined,
+  });
+
+  // Picker display objects — full objects needed by picker components; separate from form IDs
+  const [pickers, setPickers] = useState<{
+    assignee: User | undefined;
+    room: RoomWithOptionalGuestBooking | undefined;
+    department: Department | undefined;
+  }>({ assignee: undefined, room: undefined, department: undefined });
+
+  // Original snapshot — the task as it was when edit mode was entered
+  const orig = useRef<RequestForm | null>(null);
+
+  const assigneeInitializedRef = useRef(false);
+  const roomDeadlineInitializedRef = useRef(false);
+  const departmentInitializedRef = useRef(false);
+
+  const { hotelId } = getConfig();
+
+  // Fetch full request for edit pre-population (enabled whenever there's a task)
+  const { data: fullRequest } = useGetRequestById(task?.id ?? null);
+
+  // Fetch departments for pre-populating department picker
+  const { data: departments } = useGetDepartments(
+    isEditing ? hotelId : undefined,
+  );
+
+  // Fetch assignee user when there's a user_id
+  const { data: initialAssigneeData } = useGetUsersId(task?.user_id ?? "", {
+    query: { enabled: !!task?.user_id },
+  });
+
+  const { mutate: saveTask, isPending: isSaving } = usePutRequestId({
+    mutation: {
+      onSuccess: () => {
+        queryClient.invalidateQueries({ queryKey: REQUESTS_FEED_QUERY_KEY });
+        queryClient.invalidateQueries({ queryKey: ["request", task?.id] });
+        close();
+      },
+    },
+  });
+
+  // Animate sheet in when a new task opens
+  useEffect(() => {
+    if (task) {
+      translateY.setValue(SCREEN_HEIGHT);
+      setIsFullScreen(false);
+      isFullScreenRef.current = false;
+      setIsEditing(false);
+      Animated.spring(translateY, {
+        toValue: PARTIAL_OFFSET,
+        useNativeDriver: true,
+        damping: 28,
+        stiffness: 280,
+      }).start();
+    }
+  }, [task, translateY]);
+
+  // Initialize edit state when entering edit mode
+  useEffect(() => {
+    if (isEditing && task) {
+      assigneeInitializedRef.current = false;
+      roomDeadlineInitializedRef.current = false;
+      departmentInitializedRef.current = false;
+      const initial: RequestForm = {
+        name: task.name.trim(),
+        description: (task.description ?? "").trim(),
+        priority: (task.priority as MakeRequestPriority) ?? "medium",
+        deadline: undefined,
+        user_id: task.user_id ?? undefined,
+        room_id: undefined,
+        department_id: task.department_id ?? undefined,
+      };
+      setForm(initial);
+      setPickers({
+        assignee: undefined,
+        room: undefined,
+        department: undefined,
+      });
+      orig.current = { ...initial };
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [isEditing]);
+
+  // Pre-populate department once departments list loads
+  useEffect(() => {
+    if (
+      isEditing &&
+      departments &&
+      task?.department_id &&
+      !departmentInitializedRef.current
+    ) {
+      const dept = departments.find((d) => d.id === task.department_id);
+      if (dept) {
+        departmentInitializedRef.current = true;
+        setPickers((p) => ({ ...p, department: dept }));
+      }
+    }
+  }, [isEditing, departments, task?.department_id]);
+
+  // Pre-populate assignee once user data loads
+  useEffect(() => {
+    if (isEditing && initialAssigneeData && !assigneeInitializedRef.current) {
+      assigneeInitializedRef.current = true;
+      setPickers((p) => ({ ...p, assignee: initialAssigneeData }));
+    }
+  }, [isEditing, initialAssigneeData]);
+
+  // Pre-populate room and deadline once full request loads
+  useEffect(() => {
+    if (
+      isEditing &&
+      fullRequest &&
+      task &&
+      !roomDeadlineInitializedRef.current
+    ) {
+      roomDeadlineInitializedRef.current = true;
+      const room = fullRequest.room_id
+        ? {
+            id: fullRequest.room_id,
+            room_number: task.room_number ?? undefined,
+            floor: task.floor ?? undefined,
+          }
+        : undefined;
+      const deadline = fullRequest.scheduled_time
+        ? new Date(fullRequest.scheduled_time)
+        : undefined;
+      setForm((f) => ({
+        ...f,
+        room_id: fullRequest.room_id ?? undefined,
+        deadline,
+      }));
+      setPickers((p) => ({ ...p, room }));
+      // Update orig so pre-population doesn't count as a change
+      if (orig.current) {
+        orig.current = {
+          ...orig.current,
+          room_id: fullRequest.room_id ?? undefined,
+          deadline,
+        };
+      }
+    }
+  }, [isEditing, fullRequest, task]);
+
+  function enterEditMode() {
+    setIsEditing(true);
+    snapToFull();
+  }
+
+  function cancelEdit() {
+    setIsEditing(false);
+  }
+
+  const isDirty =
+    isEditing &&
+    orig.current !== null &&
+    (form.name.trim() !== (orig.current.name ?? "") ||
+      form.description.trim() !== (orig.current.description ?? "") ||
+      form.priority !== orig.current.priority ||
+      form.user_id !== orig.current.user_id ||
+      form.room_id !== orig.current.room_id ||
+      form.department_id !== orig.current.department_id ||
+      form.deadline?.getTime() !== orig.current.deadline?.getTime());
+
+  function handleSave() {
+    if (!task || isSaving || !isDirty) return;
+    saveTask({
+      id: task.id,
+      data: {
+        name: form.name.trim() || undefined,
+        description: form.description.trim() || undefined,
+        priority: form.priority,
+        department: form.department_id,
+        user_id: form.user_id,
+        room_id: form.room_id,
+        scheduled_time: form.deadline?.toISOString(),
+      },
+    });
+  }
+
+  function snapToFull() {
+    isFullScreenRef.current = true;
+    setIsFullScreen(true);
+    Animated.spring(translateY, {
+      toValue: 0,
+      useNativeDriver: true,
+      damping: 28,
+      stiffness: 280,
+    }).start();
+  }
+
+  function snapToPartial() {
+    isFullScreenRef.current = false;
+    setIsFullScreen(false);
+    Animated.spring(translateY, {
+      toValue: PARTIAL_OFFSET,
+      useNativeDriver: true,
+      damping: 28,
+      stiffness: 280,
+    }).start();
+  }
+
+  function close() {
+    Animated.timing(translateY, {
+      toValue: SCREEN_HEIGHT,
+      duration: 220,
+      useNativeDriver: true,
+    }).start(() => {
+      isFullScreenRef.current = false;
+      setIsFullScreen(false);
+      setIsEditing(false);
+      onClose();
+    });
+  }
+
+  // PanResponder for the drag handle (partial mode)
+  const handlePan = useRef(
+    PanResponder.create({
+      onStartShouldSetPanResponder: () => true,
+      onMoveShouldSetPanResponder: (_, { dy }) => Math.abs(dy) > 3,
+      onPanResponderMove: (_, { dy }) => {
+        const base = isFullScreenRef.current ? 0 : PARTIAL_OFFSET;
+        const next = base + dy;
+        translateY.setValue(Math.max(0, next));
+      },
+      onPanResponderRelease: (_, { dy, vy }) => {
+        if (isFullScreenRef.current) {
+          if (dy > SNAP_DOWN_THRESHOLD || vy > 0.5) {
+            snapToPartial();
+          } else {
+            snapToFull();
+          }
+        } else {
+          if (dy < -SNAP_UP_THRESHOLD || vy < -0.5) {
+            snapToFull();
+          } else if (dy > SNAP_DOWN_THRESHOLD || vy > 0.5) {
+            close();
+          } else {
+            snapToPartial();
+          }
+        }
+      },
+    }),
+  ).current;
+
+  if (!task) return null;
+
+  return (
+    <Modal
+      visible={!!task}
+      transparent
+      animationType="none"
+      onRequestClose={close}
+    >
+      <View style={{ flex: 1 }}>
+        {/* Dimmed backdrop — tapping closes the sheet */}
+        <Pressable className="absolute inset-0 bg-black/40" onPress={close} />
+
+        {/* Sheet panel */}
+        <Animated.View
+          style={[
+            {
+              position: "absolute",
+              left: 0,
+              right: 0,
+              top: 0,
+              height: SCREEN_HEIGHT,
+              backgroundColor: Colors.light.white,
+              borderTopLeftRadius: isFullScreen ? 0 : 24,
+              borderTopRightRadius: isFullScreen ? 0 : 24,
+              transform: [{ translateY }],
+            },
+          ]}
+          onStartShouldSetResponder={() => true}
+        >
+          {isFullScreen ? (
+            /* Full-screen top nav bar */
+            <View style={{ paddingTop: insets.top }}>
+              <View
+                {...(isEditing ? {} : handlePan.panHandlers)}
+                className="flex-row items-center justify-between px-6 pt-3 pb-2 h-14"
+              >
+                {isEditing ? (
+                  <Pressable
+                    onPress={cancelEdit}
+                    className="flex-row items-center gap-2.5 flex-1"
+                    hitSlop={8}
+                  >
+                    <Feather
+                      name="chevron-left"
+                      size={22}
+                      color={Colors.light.text}
+                    />
+                    <Text className="text-2xl font-bold text-black tracking-tight">
+                      Edit Task
+                    </Text>
+                  </Pressable>
+                ) : (
+                  <Pressable
+                    onPress={snapToPartial}
+                    className="flex-row items-center gap-2.5 flex-1"
+                    hitSlop={8}
+                  >
+                    <Feather
+                      name="chevron-left"
+                      size={22}
+                      color={Colors.light.text}
+                    />
+                    <Text className="text-2xl font-bold text-black tracking-tight">
+                      Tasks
+                    </Text>
+                  </Pressable>
+                )}
+                {isEditing ? (
+                  <Pressable
+                    onPress={handleSave}
+                    disabled={!isDirty || isSaving}
+                    className={`px-3 h-9 items-center justify-center rounded bg-primary ${!isDirty ? "opacity-40" : ""}`}
+                    hitSlop={8}
+                  >
+                    <Text className="text-white text-[14px] leading-5">
+                      {isSaving ? "Saving…" : "Save"}
+                    </Text>
+                  </Pressable>
+                ) : (
+                  <Pressable
+                    onPress={enterEditMode}
+                    className="w-9 h-9 items-center justify-center rounded"
+                    hitSlop={8}
+                  >
+                    <Feather
+                      name="edit-2"
+                      size={18}
+                      color={Colors.light.text}
+                    />
+                  </Pressable>
+                )}
+              </View>
+            </View>
+          ) : (
+            /* Drag handle for partial mode */
+            <View {...handlePan.panHandlers} className="items-center pt-4 pb-3">
+              <View className="w-11 h-1 rounded-full bg-text-disabled" />
+            </View>
+          )}
+
+          <ScrollView
+            showsVerticalScrollIndicator={false}
+            keyboardShouldPersistTaps="handled"
+            contentContainerStyle={{
+              paddingHorizontal: 24,
+              paddingTop: isFullScreen ? 8 : 20,
+              paddingBottom: insets.bottom + 48,
+            }}
+          >
+            {isEditing ? (
+              /* Edit form */
+              <View className="gap-6">
+                {/* Task Name Input */}
+                <View className="border border-stroke-subtle rounded p-2">
+                  <TextInput
+                    className="text-2xl font-bold text-text-default tracking-tight"
+                    placeholder="Task Name"
+                    placeholderTextColor={Colors.light.textSubtle}
+                    value={form.name}
+                    onChangeText={(v) => setForm((f) => ({ ...f, name: v }))}
+                    returnKeyType="done"
+                  />
+                </View>
+
+                {/* Fields */}
+                <View className="gap-4">
+                  <PriorityPicker
+                    value={form.priority}
+                    onChange={(v) =>
+                      setForm((f) => ({ ...f, priority: v ?? "medium" }))
+                    }
+                  />
+
+                  <DeadlinePicker
+                    value={form.deadline}
+                    onChange={(v) => setForm((f) => ({ ...f, deadline: v }))}
+                  />
+
+                  <AssigneePicker
+                    value={pickers.assignee}
+                    onChange={(v) => {
+                      setPickers((p) => ({ ...p, assignee: v }));
+                      setForm((f) => ({ ...f, user_id: v?.id }));
+                    }}
+                  />
+
+                  <RoomPicker
+                    value={pickers.room}
+                    onChange={(v) => {
+                      setPickers((p) => ({ ...p, room: v }));
+                      setForm((f) => ({ ...f, room_id: v?.id }));
+                    }}
+                  />
+
+                  <DepartmentPicker
+                    hotelId={hotelId}
+                    value={pickers.department}
+                    onChange={(v) => {
+                      setPickers((p) => ({ ...p, department: v }));
+                      setForm((f) => ({ ...f, department_id: v?.id }));
+                    }}
+                  />
+
+                  {/* Description */}
+                  <View className="gap-1">
+                    <Text className="text-[15px] font-medium text-text-subtle tracking-tight">
+                      Description
+                    </Text>
+                    <TextInput
+                      className="text-[15px] text-text-default tracking-tight leading-snug"
+                      placeholder="Empty"
+                      placeholderTextColor={Colors.light.textSubtle}
+                      value={form.description}
+                      onChangeText={(v) =>
+                        setForm((f) => ({ ...f, description: v }))
+                      }
+                      multiline
+                      textAlignVertical="top"
+                    />
+                  </View>
+                </View>
+              </View>
+            ) : (
+              /* View mode */
+              <>
+                {/* Task title */}
+                <View className="flex-row items-start justify-between mb-6">
+                  <Text className="text-2xl font-bold text-text-default tracking-tight flex-1 pr-2">
+                    {task.name}
+                  </Text>
+                  {!isFullScreen && (
+                    <Pressable
+                      onPress={enterEditMode}
+                      className="w-9 h-9 items-center justify-center rounded"
+                      hitSlop={8}
+                    >
+                      <Feather
+                        name="edit-2"
+                        size={18}
+                        color={Colors.light.text}
+                      />
+                    </Pressable>
+                  )}
+                </View>
+
+                {/* Detail rows */}
+                <View className="gap-4 mb-6">
+                  <DetailRow
+                    icon="flag"
+                    label="Priority"
+                    value={capitalize(task.priority)}
+                  />
+                  <DetailRow
+                    icon="map-pin"
+                    label="Location"
+                    value={formatLocation(task.floor, task.room_number)}
+                  />
+                  {task.department_name ? (
+                    <DetailRow
+                      icon="home"
+                      label="Department"
+                      value={task.department_name}
+                    />
+                  ) : null}
+                </View>
+
+                {/* Description */}
+                {task.description ? (
+                  <View className="gap-1 mb-6">
+                    <Text className="text-[15px] font-medium text-text-subtle tracking-tight">
+                      Description
+                    </Text>
+                    <Text className="text-[15px] text-text-default tracking-tight leading-snug">
+                      {task.description}
+                    </Text>
+                  </View>
+                ) : null}
+
+                {/* Activity — visible only in full-screen state */}
+                {isFullScreen ? (
+                  <View className="gap-1 mb-6">
+                    <Text className="text-[15px] font-medium text-text-subtle tracking-tight">
+                      Activity
+                    </Text>
+                    <Text className="text-[15px] text-text-disabled tracking-tight">
+                      No activity yet
+                    </Text>
+                  </View>
+                ) : null}
+
+                {/* Mark as Done / Mark as Pending */}
+                {task.status !== "completed" ? (
+                  <Pressable
+                    onPress={() => {
+                      Haptics.notificationAsync(
+                        Haptics.NotificationFeedbackType.Success,
+                      );
+                      onComplete?.(task.id);
+                      close();
+                    }}
+                    className="bg-primary rounded items-center justify-center py-2.5 w-full"
+                  >
+                    <Text className="text-white text-[14px] leading-5">
+                      Mark as Done
+                    </Text>
+                  </Pressable>
+                ) : (
+                  <Pressable
+                    onPress={() => {
+                      Haptics.impactAsync(Haptics.ImpactFeedbackStyle.Medium);
+                      onMarkPending?.(task.id);
+                      close();
+                    }}
+                    className="bg-primary rounded items-center justify-center py-2.5 w-full"
+                  >
+                    <Text className="text-white text-[14px] leading-5">
+                      Mark as Pending
+                    </Text>
+                  </Pressable>
+                )}
+
+                {/* Drop Task */}
+                {onDropTask ? (
+                  <Pressable
+                    onPress={() => {
+                      Alert.alert(
+                        "Drop Task",
+                        "Are you sure you want to drop this task? It will be returned to the unassigned queue.",
+                        [
+                          { text: "Cancel", style: "cancel" },
+                          {
+                            text: "Drop Task",
+                            style: "destructive",
+                            onPress: () => {
+                              Haptics.impactAsync(
+                                Haptics.ImpactFeedbackStyle.Medium,
+                              );
+                              onDropTask(task.id);
+                              close();
+                            },
+                          },
+                        ],
+                      );
+                    }}
+                    className="border border-primary rounded items-center justify-center py-2.5 w-full mt-2"
+                  >
+                    <Text className="text-primary text-[14px] leading-5">
+                      Drop Task
+                    </Text>
+                  </Pressable>
+                ) : null}
+              </>
+            )}
+          </ScrollView>
+        </Animated.View>
+      </View>
+    </Modal>
+  );
+}
diff --git a/clients/mobile/components/tasks/task-filter-sheet.tsx b/clients/mobile/components/tasks/task-filter-sheet.tsx
new file mode 100644
index 000000000..7418640ed
--- /dev/null
+++ b/clients/mobile/components/tasks/task-filter-sheet.tsx
@@ -0,0 +1,159 @@
+import { useEffect, useRef } from "react";
+import {
+  Animated,
+  Dimensions,
+  Modal,
+  PanResponder,
+  Pressable,
+  ScrollView,
+  Text,
+  View,
+} from "react-native";
+
+import type { RequestFeedSort } from "@shared/api/requests";
+
+import { DepartmentSection } from "./department-section";
+import { LocationSection } from "./location-section";
+import { PrioritySection } from "./priority-section";
+import { SortBySection } from "./sort-by-section";
+
+const { height: SCREEN_HEIGHT } = Dimensions.get("window");
+
+type TaskFilterSheetProps = {
+  visible: boolean;
+  onClose: () => void;
+  sort: RequestFeedSort;
+  onSortChange: (sort: RequestFeedSort) => void;
+  priorities: string[];
+  onPrioritiesChange: (priorities: string[]) => void;
+  departments: string[];
+  onDepartmentsChange: (departments: string[]) => void;
+  floors: number[];
+  onFloorsChange: (floors: number[]) => void;
+};
+
+export function TaskFilterSheet({
+  visible,
+  onClose,
+  sort,
+  onSortChange,
+  priorities,
+  onPrioritiesChange,
+  departments,
+  onDepartmentsChange,
+  floors,
+  onFloorsChange,
+}: TaskFilterSheetProps) {
+  const translateY = useRef(new Animated.Value(SCREEN_HEIGHT)).current;
+
+  useEffect(() => {
+    if (visible) {
+      translateY.setValue(SCREEN_HEIGHT);
+      Animated.spring(translateY, {
+        toValue: 0,
+        useNativeDriver: true,
+        damping: 28,
+        stiffness: 280,
+      }).start();
+    }
+  }, [visible, translateY]);
+
+  function close() {
+    Animated.timing(translateY, {
+      toValue: SCREEN_HEIGHT,
+      duration: 220,
+      useNativeDriver: true,
+    }).start(onClose);
+  }
+
+  const panResponder = useRef(
+    PanResponder.create({
+      onStartShouldSetPanResponder: () => true,
+      onMoveShouldSetPanResponder: (_, { dy }) => dy > 3,
+      onPanResponderMove: (_, { dy }) => {
+        if (dy > 0) translateY.setValue(dy);
+      },
+      onPanResponderRelease: (_, { dy, vy }) => {
+        if (dy > 80 || vy > 0.5) {
+          close();
+        } else {
+          Animated.spring(translateY, {
+            toValue: 0,
+            useNativeDriver: true,
+            damping: 28,
+            stiffness: 280,
+          }).start();
+        }
+      },
+    }),
+  ).current;
+
+  return (
+    <Modal
+      visible={visible}
+      transparent
+      animationType="none"
+      onRequestClose={close}
+    >
+      <View style={{ flex: 1, justifyContent: "flex-end" }}>
+        <Pressable className="absolute inset-0 bg-black/40" onPress={close} />
+
+        <Animated.View
+          style={{
+            backgroundColor: "white",
+            borderTopLeftRadius: 24,
+            borderTopRightRadius: 24,
+            maxHeight: SCREEN_HEIGHT * 0.9,
+            transform: [{ translateY }],
+          }}
+          onStartShouldSetResponder={() => true}
+        >
+          {/* Drag handle */}
+          <View
+            {...panResponder.panHandlers}
+            className="items-center pt-3 pb-2"
+          >
+            <View className="w-10 h-1 rounded-full bg-stroke-subtle" />
+          </View>
+
+          {/* Title */}
+          <View className="px-[5vw] pb-[1.5vh]">
+            <Text className="text-2xl font-bold text-text-default">
+              Filters
+            </Text>
+          </View>
+
+          <ScrollView showsVerticalScrollIndicator={false}>
+            <SortBySection sort={sort} onSortChange={onSortChange} />
+            <PrioritySection
+              priorities={priorities}
+              onPrioritiesChange={onPrioritiesChange}
+            />
+            <DepartmentSection
+              departments={departments}
+              onDepartmentsChange={onDepartmentsChange}
+            />
+            <LocationSection floors={floors} onFloorsChange={onFloorsChange} />
+          </ScrollView>
+
+          {/* Actions */}
+          <View className="px-[5vw] py-[2vh] border-t border-stroke-subtle gap-[1.5vh]">
+            <Pressable
+              onPress={close}
+              className="bg-primary rounded-xl py-[1.8vh] items-center"
+            >
+              <Text className="text-white font-semibold text-sm">
+                Show Results
+              </Text>
+            </Pressable>
+            <Pressable onPress={close} className="items-center py-[1vh]">
+              <Text className="text-sm text-primary font-medium">
+                Clear all
+              </Text>
+            </Pressable>
+          </View>
+        </Animated.View>
+      </View>
+    </Modal>
+  );
+}
diff --git a/clients/mobile/components/tasks/task-list.tsx b/clients/mobile/components/tasks/task-list.tsx
index 1de565104..1922412c0 100644
--- a/clients/mobile/components/tasks/task-list.tsx
+++ b/clients/mobile/components/tasks/task-list.tsx
@@ -1,30 +1,207 @@
-import { FlatList, ListRenderItem } from "react-native";
+import Feather from "@expo/vector-icons/Feather";
+import type { ComponentProps } from "react";
+import { Colors } from "@/constants/theme";
+import * as Haptics from "expo-haptics";
+import { useRef } from "react";
+import ReanimatedSwipeable, {
+  SwipeableMethods,
+} from "react-native-gesture-handler/ReanimatedSwipeable";
+import { ActivityIndicator, FlatList, Text, View } from "react-native";
 
-import { TaskCard } from "@/components/tasks/task-card";
-import type { Task } from "@/data/mockTasks";
-import { TASK_ASSIGNMENT_STATE } from "@/constants/tasks";
+import { TaskRow } from "@/components/tasks/task-row";
+import type { RequestFeedItem } from "@shared/api/requests";
 
-interface TaskListProps {
-  tasks: Task[];
-  variant: (typeof TASK_ASSIGNMENT_STATE)[keyof typeof TASK_ASSIGNMENT_STATE];
+type SectionHeader = { _type: "section-header"; title: string };
+type ListItem = RequestFeedItem | SectionHeader;
+
+function isSectionHeader(item: ListItem): item is SectionHeader {
+  return "_type" in item && item._type === "section-header";
+}
+
+type TaskListProps = {
+  tasks: RequestFeedItem[];
+  onEndReached?: () => void;
+  isLoadingMore?: boolean;
+  onTaskPress?: (task: RequestFeedItem) => void;
+  onComplete?: (taskId: string) => void;
+  onMarkPending?: (taskId: string) => void;
+  onPickUp?: (taskId: string) => void;
+};
+
+type SwipeActionProps = {
+  iconName: ComponentProps<typeof Feather>["name"];
+  label: string;
+};
+
+function SwipeAction({ iconName, label }: SwipeActionProps) {
+  return (
+    <View
+      style={{ backgroundColor: Colors.light.tabBarHighlight }}
+      className="flex-1 justify-center items-center flex-row gap-3 px-8"
+    >
+      <View className="bg-primary rounded-lg w-9 h-9 items-center justify-center">
+        <Feather name={iconName} size={18} color="white" />
+      </View>
+      <Text className="text-primary text-base font-medium">{label}</Text>
+    </View>
+  );
+}
+
+type SwipeableRowProps = {
+  item: RequestFeedItem;
+  onTaskPress?: (task: RequestFeedItem) => void;
+  onAction: (taskId: string) => void;
+  actionIcon: ComponentProps<typeof Feather>["name"];
+  actionLabel: string;
+  mode: "complete" | "pickup";
+};
+
+function SwipeableTaskRow({
+  item,
+  onTaskPress,
+  onAction,
+  actionIcon,
+  actionLabel,
+  mode,
+}: SwipeableRowProps) {
+  const swipeableRef = useRef<SwipeableMethods>(null);
+  const touchStartX = useRef(0);
+  const hasSwiped = useRef(false);
+
+  function handleOpen(direction: "left" | "right") {
+    if (direction !== "left") return;
+    Haptics.notificationAsync(Haptics.NotificationFeedbackType.Success);
+    onAction(item.id);
+    setTimeout(() => swipeableRef.current?.close(), 300);
+  }
+
+  return (
+    <ReanimatedSwipeable
+      ref={swipeableRef}
+      friction={1.5}
+      rightThreshold={60}
+      renderRightActions={() => (
+        <SwipeAction iconName={actionIcon} label={actionLabel} />
+      )}
+      onSwipeableOpen={handleOpen}
+    >
+      <View
+        onTouchStart={(e) => {
+          touchStartX.current = e.nativeEvent.pageX;
+          hasSwiped.current = false;
+        }}
+        onTouchMove={(e) => {
+          const dx = Math.abs(e.nativeEvent.pageX - touchStartX.current);
+          if (dx > 8) hasSwiped.current = true;
+        }}
+      >
+        <TaskRow
+          task={item}
+          onPress={(task) => {
+            if (!hasSwiped.current) onTaskPress?.(task);
+          }}
+          onCheckboxPress={
+            mode === "complete"
+              ? () => swipeableRef.current?.openRight()
+              : undefined
+          }
+          onPickUp={
+            mode === "pickup"
+              ? () => swipeableRef.current?.openRight()
+              : undefined
+          }
+        />
+      </View>
+    </ReanimatedSwipeable>
+  );
 }
 
-export function TaskList({ tasks, variant }: TaskListProps) {
-  const renderItem: ListRenderItem<Task> = ({ item, index }) => {
-    const isExpanded =
-      variant === TASK_ASSIGNMENT_STATE.ASSIGNED
-        ? index === 0
-        : item.priority === "High";
-    return <TaskCard task={item} variant={variant} isExpanded={isExpanded} />;
-  };
+export function TaskList({
+  tasks,
+  onEndReached,
+  isLoadingMore,
+  onTaskPress,
+  onComplete,
+  onMarkPending,
+  onPickUp,
+}: TaskListProps) {
+  const active = tasks.filter((t) => t.status !== "completed");
+  const completed = tasks.filter((t) => t.status === "completed");
+
+  const data: ListItem[] = [
+    ...active,
+    ...(completed.length > 0
+      ? [
+          { _type: "section-header" as const, title: "Completed Tasks" },
+          ...completed,
+        ]
+      : []),
+  ];
 
   return (
-    <FlatList
-      data={tasks}
-      keyExtractor={(item) => item.id}
-      renderItem={renderItem}
-      contentContainerClassName="px-[5vw] py-4 gap-4"
+    <FlatList<ListItem>
+      data={data}
+      keyExtractor={(item) =>
+        isSectionHeader(item) ? "section-completed" : item.id
+      }
+      renderItem={({ item }) => {
+        if (isSectionHeader(item)) {
+          return (
+            <View className="px-6 py-4">
+              <Text className="text-[15px] font-medium text-text-default tracking-tight">
+                {item.title}
+              </Text>
+            </View>
+          );
+        }
+
+        const isActive = item.status !== "completed";
+        if (isActive && onComplete) {
+          return (
+            <SwipeableTaskRow
+              item={item}
+              onTaskPress={onTaskPress}
+              onAction={onComplete}
+              actionIcon="check"
+              actionLabel="Task completed!"
+              mode="complete"
+            />
+          );
+        }
+
+        if (isActive && onPickUp) {
+          return (
+            <SwipeableTaskRow
+              item={item}
+              onTaskPress={onTaskPress}
+              onAction={onPickUp}
+              actionIcon="plus"
+              actionLabel="Task picked up!"
+              mode="pickup"
+            />
+          );
+        }
+
+        return (
+          <TaskRow
+            task={item}
+            onPress={onTaskPress}
+            onCheckboxPress={
+              onMarkPending ? () => onMarkPending(item.id) : undefined
+            }
+          />
+        );
+      }}
+      onEndReached={onEndReached}
+      onEndReachedThreshold={0.2}
       showsVerticalScrollIndicator={false}
+      ListFooterComponent={
+        isLoadingMore ? (
+          <View className="py-4 items-center">
+            <ActivityIndicator />
+          </View>
+        ) : null
+      }
     />
   );
 }
diff --git a/clients/mobile/components/tasks/task-row.tsx b/clients/mobile/components/tasks/task-row.tsx
new file mode 100644
index 000000000..0c7644018
--- /dev/null
+++ b/clients/mobile/components/tasks/task-row.tsx
@@ -0,0 +1,179 @@
+import Feather from "@expo/vector-icons/Feather";
+import { useRef, useState } from "react";
+import { Pressable, Text, View } from "react-native";
+
+import { PriorityTag } from "@/components/tasks/priority-tag";
+import { Colors } from "@/constants/theme";
+import type { RequestFeedItem } from "@shared/api/requests";
+
+type TaskRowProps = {
+  task: RequestFeedItem;
+  onPress?: (task: RequestFeedItem) => void;
+  onCheckboxPress?: () => void;
+  onPickUp?: () => void;
+};
+
+function formatTime(iso: string): string {
+  const date = new Date(iso);
+  const today = new Date();
+  const isToday =
+    date.getFullYear() === today.getFullYear() &&
+    date.getMonth() === today.getMonth() &&
+    date.getDate() === today.getDate();
+  const time = date
+    .toLocaleTimeString([], { hour: "numeric", minute: "2-digit" })
+    .toLowerCase();
+  return isToday
+    ? `Today at ${time}`
+    : date.toLocaleDateString([], { month: "short", day: "numeric" });
+}
+
+function formatLocation(roomNumber?: number | null): string {
+  return roomNumber != null ? `Room ${roomNumber}` : "—";
+}
+
+export function TaskRow({
+  task,
+  onPress,
+  onCheckboxPress,
+  onPickUp,
+}: TaskRowProps) {
+  const isCompleted = task.status === "completed";
+  const [visuallyUnchecked, setVisuallyUnchecked] = useState(false);
+  const pendingTimer = useRef<ReturnType<typeof setTimeout> | null>(null);
+
+  function handleUncheckPress() {
+    if (pendingTimer.current) return;
+    setVisuallyUnchecked(true);
+    pendingTimer.current = setTimeout(() => {
+      pendingTimer.current = null;
+      onCheckboxPress?.();
+    }, 400);
+  }
+
+  return (
+    <Pressable
+      onPress={() => onPress?.(task)}
+      className="bg-bg-surface border-b border-stroke-subtle px-6 py-5 flex-row items-start justify-between gap-3"
+    >
+      {/* Left content */}
+      <View className="flex-1 gap-2">
+        {/* Tags row */}
+        <View className="flex-row flex-wrap gap-2 items-start">
+          <PriorityTag priority={task.priority} dimmed={isCompleted} />
+          {task.department_name ? (
+            <View className="bg-bg-input flex-row items-center gap-1.5 h-6 px-2 rounded">
+              <Feather
+                name="home"
+                size={12}
+                color={
+                  isCompleted
+                    ? Colors.light.iconDisabled
+                    : Colors.light.iconMuted
+                }
+              />
+              <Text
+                className={`text-xs ${isCompleted ? "text-text-disabled" : "text-text-secondary"}`}
+                numberOfLines={1}
+              >
+                {task.department_name}
+              </Text>
+            </View>
+          ) : null}
+        </View>
+
+        {/* Title */}
+        <Text
+          className={`text-base font-bold leading-snug tracking-tight ${
+            isCompleted ? "text-text-subtle" : "text-text-default"
+          }`}
+          numberOfLines={2}
+        >
+          {task.name}
+        </Text>
+
+        {/* Meta row: time + location */}
+        <View className="flex-row flex-wrap gap-3 items-center">
+          <View className="flex-row items-center gap-1">
+            <Feather
+              name="clock"
+              size={14}
+              color={
+                isCompleted
+                  ? Colors.light.iconDisabled
+                  : Colors.light.iconSubtle
+              }
+            />
+            <Text
+              className={`text-sm leading-snug ${
+                isCompleted ? "text-text-disabled" : "text-text-subtle"
+              }`}
+              numberOfLines={1}
+            >
+              {formatTime(task.created_at)}
+            </Text>
+          </View>
+          <View className="flex-row items-center gap-1">
+            <Feather
+              name="map-pin"
+              size={14}
+              color={
+                isCompleted
+                  ? Colors.light.iconDisabled
+                  : Colors.light.iconSubtle
+              }
+            />
+            <Text
+              className={`text-sm leading-snug ${
+                isCompleted ? "text-text-disabled" : "text-text-subtle"
+              }`}
+              numberOfLines={1}
+            >
+              {formatLocation(task.room_number)}
+            </Text>
+          </View>
+        </View>
+
+        {/* Description */}
+        {task.description ? (
+          <Text
+            className={`text-sm leading-snug ${
+              isCompleted ? "text-text-disabled" : "text-text-secondary"
+            }`}
+            numberOfLines={2}
+          >
+            {task.description}
+          </Text>
+        ) : null}
+      </View>
+
+      {/* Action button */}
+      {onPickUp ? (
+        <Pressable
+          onPress={onPickUp}
+          hitSlop={4}
+          className="w-11 h-11 items-center justify-center shrink-0"
+        >
+          <View className="bg-primary rounded-xl p-2 items-center justify-center">
+            <Feather name="plus" size={22} color={Colors.light.white} />
+          </View>
+        </Pressable>
+      ) : isCompleted && !visuallyUnchecked ? (
+        <Pressable
+          onPress={handleUncheckPress}
+          hitSlop={8}
+          className="w-8 h-8 rounded bg-primary-surface items-center justify-center p-1.5 shrink-0"
+        >
+          <Feather name="check" size={16} color={Colors.light.white} />
+        </Pressable>
+      ) : (
+        <Pressable
+          onPress={onCheckboxPress}
+          hitSlop={8}
+          className="w-8 h-8 rounded border border-text-default shrink-0 items-center justify-center"
+          style={{ opacity: 0.5 }}
+        />
+      )}
+    </Pressable>
+  );
+}
diff --git a/clients/mobile/components/tasks/tasks-header.tsx b/clients/mobile/components/tasks/tasks-header.tsx
index d21ed55fe..bc877795c 100644
--- a/clients/mobile/components/tasks/tasks-header.tsx
+++ b/clients/mobile/components/tasks/tasks-header.tsx
@@ -1,19 +1,77 @@
 import Feather from "@expo/vector-icons/Feather";
-import { Pressable, Text, View } from "react-native";
+import { Pressable, Text, TextInput, View } from "react-native";
 
-export function TasksHeader() {
-  return (
-    <View className="flex-row justify-between items-center px-[5vw] py-3">
-      <Text className="text-2xl font-bold">Tasks</Text>
-      <View className="flex-row items-center gap-4">
-        <Pressable onPress={() => {}}>
-          <Feather name="search" size={24} color="#000" />
+import { Colors } from "@/constants/theme";
+
+type TasksHeaderProps = {
+  onFilterPress?: () => void;
+  filterActive?: boolean;
+  searchOpen: boolean;
+  onSearchOpen: () => void;
+  onSearchClose: () => void;
+  search: string;
+  onSearchChange: (value: string) => void;
+};
+
+export function TasksHeader({
+  onFilterPress,
+  filterActive,
+  searchOpen,
+  onSearchOpen,
+  onSearchClose,
+  search,
+  onSearchChange,
+}: TasksHeaderProps) {
+  if (searchOpen) {
+    return (
+      <View className="flex-row items-center px-5 py-5 gap-2">
+        <View className="flex-1 flex-row items-center border border-stroke-subtle rounded-xl px-3 h-10 gap-2">
+          <Feather name="search" size={16} color={Colors.light.placeholder} />
+          <TextInput
+            autoFocus
+            value={search}
+            onChangeText={onSearchChange}
+            placeholder="Search"
+            placeholderTextColor={Colors.light.placeholder}
+            className="flex-1 text-sm text-text-default"
+            returnKeyType="search"
+          />
+        </View>
+        <Pressable
+          onPress={onSearchClose}
+          className="w-9 h-9 items-center justify-center rounded"
+        >
+          <Feather name="x" size={19} color={Colors.light.textDefault} />
         </Pressable>
-        <Pressable onPress={() => {}}>
-          <Feather name="sliders" size={24} color="#000" />
+      </View>
+    );
+  }
+
+  return (
+    <View className="flex-row justify-between items-center px-5 py-5">
+      <Text className="text-2xl font-medium tracking-tight text-text-default">
+        Tasks
+      </Text>
+      <View className="flex-row items-center gap-2">
+        <Pressable
+          onPress={onSearchOpen}
+          className="w-9 h-9 items-center justify-center rounded"
+        >
+          <Feather name="search" size={19} color={Colors.light.textDefault} />
         </Pressable>
-        <Pressable onPress={() => {}}>
-          <Feather name="bell" size={24} color="#000" />
+        <Pressable
+          onPress={onFilterPress}
+          className={`w-9 h-9 items-center justify-center rounded${filterActive ? " bg-bg-selected" : ""}`}
+        >
+          <Feather
+            name="sliders"
+            size={19}
+            color={
+              filterActive
+                ? Colors.light.tabBarActive
+                : Colors.light.textDefault
+            }
+          />
         </Pressable>
       </View>
     </View>
diff --git a/clients/mobile/components/ui/NoUserInfo.tsx b/clients/mobile/components/ui/NoUserInfo.tsx
new file mode 100644
index 000000000..2a006ed0b
--- /dev/null
+++ b/clients/mobile/components/ui/NoUserInfo.tsx
@@ -0,0 +1,11 @@
+import { View, Text } from "react-native";
+
+export default function NoUserInfo() {
+  return (
+    <View className="flex-1 justify-center items-center px-6">
+      <Text className="text-lg font-semibold mb-2">
+        We could not fetch your information. Please contact your administrator.
+      </Text>
+    </View>
+  );
+}
diff --git a/clients/mobile/components/ui/SkeletonCard.tsx b/clients/mobile/components/ui/SkeletonCard.tsx
new file mode 100644
index 000000000..137251685
--- /dev/null
+++ b/clients/mobile/components/ui/SkeletonCard.tsx
@@ -0,0 +1,54 @@
+import { useEffect, useRef } from "react";
+import { Animated, Easing, View } from "react-native";
+
+type SkeletonLineProps = {
+  width: `${number}%` | number;
+  opacity: Animated.Value;
+};
+
+function SkeletonLine({ width, opacity }: SkeletonLineProps) {
+  return (
+    <Animated.View
+      className="bg-stroke-subtle rounded-full h-[10px]"
+      style={[{ width }, { opacity }]}
+    />
+  );
+}
+
+export function SkeletonCard() {
+  const opacity = useRef(new Animated.Value(1)).current;
+
+  useEffect(() => {
+    Animated.loop(
+      Animated.sequence([
+        Animated.timing(opacity, {
+          toValue: 0.3,
+          duration: 700,
+          easing: Easing.inOut(Easing.ease),
+          useNativeDriver: true,
+        }),
+        Animated.timing(opacity, {
+          toValue: 1,
+          duration: 700,
+          easing: Easing.inOut(Easing.ease),
+          useNativeDriver: true,
+        }),
+      ]),
+    ).start();
+
+    return () => opacity.stopAnimation();
+  }, [opacity]);
+
+  return (
+    <View className="bg-stroke-disabled rounded-lg px-4 py-4 gap-3">
+      <SkeletonLine width="100%" opacity={opacity} />
+      <SkeletonLine width="66%" opacity={opacity} />
+      <SkeletonLine width="84%" opacity={opacity} />
+      <View className="flex-row justify-between">
+        <SkeletonLine width="34%" opacity={opacity} />
+        <SkeletonLine width="34%" opacity={opacity} />
+      </View>
+      <SkeletonLine width="100%" opacity={opacity} />
+    </View>
+  );
+}
diff --git a/clients/mobile/components/ui/dropdown.tsx b/clients/mobile/components/ui/dropdown.tsx
deleted file mode 100644
index 13391502d..000000000
--- a/clients/mobile/components/ui/dropdown.tsx
+++ /dev/null
@@ -1,64 +0,0 @@
-import { useState } from "react";
-import { Filter } from "./filters";
-import { View, Text, Pressable, Modal } from "react-native";
-import { ChevronDown } from "lucide-react-native";
-
-export function Dropdown<T>({
-  value,
-  onChange,
-  options,
-  placeholder,
-  emptyValue,
-}: Filter<T>) {
-  const [isOpen, setIsOpen] = useState(false);
-  const selectedOption = options.find((opt) => opt.value === value);
-
-  return (
-    <View className="flex-1">
-      <Pressable
-        onPress={() => setIsOpen(true)}
-        className="border border-gray-300 rounded-md h-[6vh] px-[3vw] flex-row items-center justify-between"
-      >
-        <Text className="text-[4vw] text-gray-900">
-          {selectedOption ? selectedOption.label : placeholder}
-        </Text>
-        <ChevronDown className="w-[4vw] h-[4vw]" color="#000" />
-      </Pressable>
-
-      <Modal
-        visible={isOpen}
-        transparent
-        onRequestClose={() => setIsOpen(false)}
-      >
-        <Pressable
-          className="flex-1 bg-black/50 justify-center px-[4vw]"
-          onPress={() => setIsOpen(false)}
-        >
-          <View className="bg-white rounded-md">
-            <Pressable
-              onPress={() => {
-                onChange(emptyValue);
-                setIsOpen(false);
-              }}
-              className="p-[4vw] border-b border-gray-300"
-            >
-              <Text className="text-[4vw]">{placeholder}</Text>
-            </Pressable>
-            {options.map((option, idx) => (
-              <Pressable
-                key={idx}
-                onPress={() => {
-                  onChange(option.value);
-                  setIsOpen(false);
-                }}
-                className="p-[4vw] border-b border-gray-300"
-              >
-                <Text className="text-[4vw]">{option.label}</Text>
-              </Pressable>
-            ))}
-          </View>
-        </Pressable>
-      </Modal>
-    </View>
-  );
-}
diff --git a/clients/mobile/components/ui/filters.tsx b/clients/mobile/components/ui/filters.tsx
index 4d3693001..61b44b383 100644
--- a/clients/mobile/components/ui/filters.tsx
+++ b/clients/mobile/components/ui/filters.tsx
@@ -1,34 +1,34 @@
-// components/ui/filters.tsx
 import React from "react";
 import { View } from "react-native";
-import { Dropdown } from "./dropdown";
+import { MultiSelectFilter } from "./mutli-select-filter";
 
-interface FilterOption<T> {
+export interface FilterOption<T extends string | number> {
   label: string;
   value: T;
 }
 
-export interface Filter<T> {
-  value: T;
+export interface Filter<T extends string | number> {
+  value: T[];
   onChange: (value: T) => void;
   options: FilterOption<T>[];
   placeholder: string;
-  emptyValue: T;
 }
 
-interface FiltersProps {
-  // must use type any here because each filter's values can have a different type
-  // however, any is not a problem here because the only logic that interacts with the data
-  // is performed inside the filter component which has a type T and is type safe
-  filters: Filter<any>[];
+interface FiltersProps<T extends string | number> {
+  filters: Filter<T>[];
   className?: string;
 }
 
-export function Filters({ filters, className }: FiltersProps) {
+export function Filters<T extends string | number>({
+  filters,
+  className,
+}: FiltersProps<T>) {
   return (
-    <View className={`flex-row gap-[2vw] ${className || ""}`}>
+    <View className={`flex-row gap-[2vw] p-[3vw] ${className || ""}`}>
       {filters.map((filter, index) => (
-        <Dropdown key={index} {...filter} />
+        <View key={index} className="flex-1">
+          <MultiSelectFilter {...filter} />
+        </View>
       ))}
     </View>
   );
diff --git a/clients/mobile/components/ui/guest-activity.tsx b/clients/mobile/components/ui/guest-activity.tsx
new file mode 100644
index 000000000..e403d54da
--- /dev/null
+++ b/clients/mobile/components/ui/guest-activity.tsx
@@ -0,0 +1,92 @@
+import { View, Text, FlatList, ActivityIndicator } from "react-native";
+import { Flag, Clock } from "lucide-react-native";
+import { Colors } from "@/constants/theme";
+import type { GuestRequest } from "@shared";
+import { formatTime, timeAgo } from "@/utils/time";
+
+interface GuestRequestsTabProps {
+  requests: GuestRequest[];
+  onLoadMore?: () => void;
+  isFetchingMore?: boolean;
+}
+
+export function GuestRequestsTab({
+  requests,
+  onLoadMore,
+  isFetchingMore,
+}: GuestRequestsTabProps) {
+  if (requests.length === 0) {
+    return (
+      <View className="flex-1 items-center justify-center py-[8vh]">
+        <Text className="text-[3.5vw] text-text-subtle">
+          No requests on record
+        </Text>
+      </View>
+    );
+  }
+
+  return (
+    <FlatList
+      data={requests}
+      keyExtractor={(r, i) => r.id ?? String(i)}
+      contentContainerStyle={{ padding: 16, gap: 12 }}
+      renderItem={({ item }) => <RequestCard request={item} />}
+      onEndReached={onLoadMore}
+      onEndReachedThreshold={0.3}
+      ListFooterComponent={
+        isFetchingMore ? <ActivityIndicator className="py-4" /> : null
+      }
+    />
+  );
+}
+
+function RequestCard({ request }: { request: GuestRequest }) {
+  const isHighPriority = request.priority === "high";
+
+  return (
+    <View
+      className={`rounded-xl border p-[4vw] gap-[1vh] ${
+        isHighPriority
+          ? "border-danger bg-danger-accent"
+          : "border-stroke-subtle bg-white"
+      }`}
+    >
+      {isHighPriority && (
+        <View className="flex-row items-center gap-[1.5vw]">
+          <Flag size={12} color={Colors.light.danger} />
+          <Text className="text-[3vw] text-danger font-medium">
+            High Priority
+          </Text>
+        </View>
+      )}
+
+      <Text
+        className={`text-[4vw] ${
+          isHighPriority
+            ? "font-bold text-black"
+            : "font-semibold text-text-subtle"
+        }`}
+      >
+        {request.name}
+      </Text>
+
+      <View className="flex-row items-center gap-[1.5vw]">
+        {request.room_number != null && (
+          <Text className="text-[3vw] text-text-subtle">
+            Suite {request.room_number}
+          </Text>
+        )}
+        <Clock size={11} color={Colors.light.icon} />
+        <Text className="text-[3vw] text-text-subtle">
+          {timeAgo(request.created_at)} at {formatTime(request.created_at)}
+        </Text>
+      </View>
+
+      {request.description && (
+        <Text className="text-[3.2vw] text-text-subtle" numberOfLines={2}>
+          {request.description}
+        </Text>
+      )}
+    </View>
+  );
+}
diff --git a/clients/mobile/components/ui/guest-card.tsx b/clients/mobile/components/ui/guest-card.tsx
index 0148acf15..5e4f70f90 100644
--- a/clients/mobile/components/ui/guest-card.tsx
+++ b/clients/mobile/components/ui/guest-card.tsx
@@ -1,43 +1,104 @@
-import React from "react";
 import { Pressable, View, Text } from "react-native";
-import { User } from "lucide-react-native";
-import { cn } from "@shared/utils";
+import {
+  Accessibility,
+  BriefcaseMedical,
+  Utensils,
+  Flag,
+} from "lucide-react-native";
+import type { ActiveBooking, Assistance } from "@shared";
+import { Colors } from "@/constants/theme";
+
+const MAX_VISIBLE_BOOKINGS = 3;
 
 interface GuestCardProps {
-  name: string;
-  floor: number;
-  room: number;
-  group: number;
+  firstName: string;
+  lastName: string;
+  activeBookings: ActiveBooking[];
+  requestCount: number;
+  hasUrgent: boolean;
+  assistance?: Assistance;
   onPress: () => void;
-  className?: string;
 }
 
 export function GuestCard({
-  name,
-  floor,
-  room,
-  group,
+  firstName,
+  lastName,
+  activeBookings,
+  requestCount,
+  hasUrgent,
+  assistance,
   onPress,
-  className,
 }: GuestCardProps) {
+  const needsAccessibility = !!assistance?.accessibility?.length;
+  const needsMedical = !!assistance?.medical?.length;
+  const needsDietary = !!assistance?.dietary?.length;
+
+  const visibleBookings = activeBookings.slice(0, MAX_VISIBLE_BOOKINGS);
+  const overflow = Math.max(0, activeBookings.length - MAX_VISIBLE_BOOKINGS);
+
   return (
     <Pressable
       onPress={onPress}
-      className={cn(
-        "flex-row items-center p-[3vw] border border-gray-300 rounded-md active:bg-gray-100",
-        className,
-      )}
+      className="px-[4vw] py-[2vh] border-b border-stroke-subtle bg-white"
     >
-      <View className="w-[10vw] h-[10vw] rounded-full border-2 border-gray-400 items-center justify-center mr-[3vw]">
-        <User className="w-[6vw] h-[6vw]" color="#374151" />
+      {/* Row 1: name + assistance icons */}
+      <View className="flex-row items-center justify-between mb-[0.8vh]">
+        <Text className="text-[5vw] font-bold text-text-default">
+          {firstName} {lastName.charAt(0)}.
+        </Text>
+        <View className="flex-row gap-[3vw]">
+          <Accessibility
+            size={20}
+            color={needsAccessibility ? Colors.light.text : Colors.light.icon}
+          />
+          <BriefcaseMedical
+            size={20}
+            color={needsMedical ? Colors.light.text : Colors.light.icon}
+          />
+          <Utensils
+            size={20}
+            color={needsDietary ? Colors.light.text : Colors.light.icon}
+          />
+        </View>
       </View>
 
-      <View className="flex-1">
-        <Text className="text-[4vw] font-semibold text-gray-900">{name}</Text>
-        <Text className="text-[3.5vw] text-gray-600">
-          Floor: {floor} Room: {room} Group: {group}
+      {/* Row 2: priority badge + request count */}
+      <View className="flex-row items-center gap-[2vw] mb-[0.8vh]">
+        {hasUrgent && (
+          <View className="flex-row items-center gap-1 bg-danger-accent rounded-md px-[2vw] py-[0.3vh]">
+            <Flag size={11} color={Colors.light.danger} />
+            <Text className="text-danger text-[3vw] font-medium">
+              High Priority
+            </Text>
+          </View>
+        )}
+        <Text className="text-[3.2vw] text-text-subtle">
+          Requests: {requestCount}
         </Text>
       </View>
+
+      {/* Row 3: active bookings */}
+      <View className="flex-row items-center gap-[1.5vw] flex-wrap">
+        <Text className="text-[3.2vw] text-text-subtle">Active Bookings:</Text>
+        {activeBookings.length === 0 ? (
+          <Text className="text-[3.2vw] text-text-subtle">None</Text>
+        ) : (
+          <>
+            {visibleBookings.map((b, i) => (
+              <View key={i} className="bg-card rounded-md px-[2vw] py-[0.3vh]">
+                <Text className="text-primary text-[3vw] font-medium">
+                  Floor {b.floor}, Suite {b.room_number}
+                </Text>
+              </View>
+            ))}
+            {overflow > 0 && (
+              <Text className="text-[3vw] text-text-subtle">
+                + {overflow} more
+              </Text>
+            )}
+          </>
+        )}
+      </View>
     </Pressable>
   );
 }
diff --git a/clients/mobile/components/ui/guest-filter-sheet.tsx b/clients/mobile/components/ui/guest-filter-sheet.tsx
new file mode 100644
index 000000000..1b9b35b49
--- /dev/null
+++ b/clients/mobile/components/ui/guest-filter-sheet.tsx
@@ -0,0 +1,417 @@
+import { useState, useRef, useEffect } from "react";
+import {
+  View,
+  Text,
+  Modal,
+  Pressable,
+  ScrollView,
+  TextInput,
+  Animated,
+  PanResponder,
+  Dimensions,
+} from "react-native";
+import { ChevronDown, ChevronUp, Check } from "lucide-react-native";
+import type {
+  BookingStatus,
+  RequestSort,
+  FloorSort,
+  AssistanceFilter,
+} from "@shared";
+import { Colors } from "@/constants/theme";
+
+export interface GuestFilterState {
+  status: BookingStatus[];
+  requestSort: RequestSort | null;
+  floorSort: FloorSort | null;
+  assistance: AssistanceFilter[];
+  floors: number[];
+}
+
+interface GuestFilterSheetProps {
+  visible: boolean;
+  onClose: () => void;
+  filters: GuestFilterState;
+  onFiltersChange: (filters: GuestFilterState) => void;
+  floorOptions: number[];
+  onShowResults: () => void;
+  onClearAll: () => void;
+}
+
+type Update = (patch: Partial<GuestFilterState>) => void;
+
+interface SectionProps {
+  title: string;
+  children: React.ReactNode;
+}
+
+interface SectionFilterProps {
+  filters: GuestFilterState;
+  update: Update;
+}
+
+const SCREEN_HEIGHT = Dimensions.get("window").height;
+const DEFAULT_HEIGHT = SCREEN_HEIGHT * 0.86;
+const MAX_HEIGHT = SCREEN_HEIGHT * 0.97;
+const CLOSE_THRESHOLD = DEFAULT_HEIGHT * 0.65;
+
+function Section({ title, children }: SectionProps) {
+  const [expanded, setExpanded] = useState(true);
+
+  return (
+    <View className="border-b border-stroke-subtle">
+      <Pressable
+        onPress={() => setExpanded(!expanded)}
+        className="flex-row items-center justify-between px-[5vw] py-[2vh]"
+      >
+        <Text className="text-sm font-medium text-text-default">{title}</Text>
+        {expanded ? (
+          <ChevronUp size={16} color={Colors.light.textDefault} />
+        ) : (
+          <ChevronDown size={16} color={Colors.light.textDefault} />
+        )}
+      </Pressable>
+      {expanded && <View className="px-[5vw] pb-[2vh]">{children}</View>}
+    </View>
+  );
+}
+
+function CheckboxRow({
+  label,
+  selected,
+  onPress,
+}: {
+  label: string;
+  selected: boolean;
+  onPress: () => void;
+}) {
+  return (
+    <Pressable
+      onPress={onPress}
+      className="flex-row items-center gap-3 py-[1vh]"
+    >
+      <View
+        className={`w-5 h-5 rounded border items-center justify-center ${
+          selected
+            ? "bg-primary border-primary"
+            : "bg-white border-stroke-subtle"
+        }`}
+      >
+        {selected && <Check size={12} color={Colors.light.white} />}
+      </View>
+      <Text
+        className={`text-sm ${selected ? "text-primary font-medium" : "text-text-default"}`}
+      >
+        {label}
+      </Text>
+    </Pressable>
+  );
+}
+
+function RadioRow({
+  label,
+  selected,
+  onPress,
+}: {
+  label: string;
+  selected: boolean;
+  onPress: () => void;
+}) {
+  return (
+    <Pressable
+      onPress={onPress}
+      className="flex-row items-center gap-3 py-[1vh]"
+    >
+      <View
+        className={`w-5 h-5 rounded-full border-2 items-center justify-center ${
+          selected ? "border-primary" : "border-stroke-subtle"
+        }`}
+      >
+        {selected && <View className="w-2.5 h-2.5 rounded-full bg-primary" />}
+      </View>
+      <Text
+        className={`text-sm ${selected ? "text-primary font-medium" : "text-text-default"}`}
+      >
+        {label}
+      </Text>
+    </Pressable>
+  );
+}
+
+function StatusSection({ filters, update }: SectionFilterProps) {
+  const toggle = (s: BookingStatus) => {
+    const next = filters.status.includes(s)
+      ? filters.status.filter((x) => x !== s)
+      : [...filters.status, s];
+    update({ status: next });
+  };
+
+  return (
+    <Section title="Guest Status">
+      <CheckboxRow
+        label="Active (at least 1 active booking)"
+        selected={filters.status.includes("active")}
+        onPress={() => toggle("active")}
+      />
+      <CheckboxRow
+        label="Inactive (no active bookings)"
+        selected={filters.status.includes("inactive")}
+        onPress={() => toggle("inactive")}
+      />
+    </Section>
+  );
+}
+
+function RequestsSection({ filters, update }: SectionFilterProps) {
+  const toggle = (sort: RequestSort) =>
+    update({ requestSort: filters.requestSort === sort ? null : sort });
+
+  return (
+    <Section title="Requests">
+      <View className="flex-row gap-[4vw]">
+        <RadioRow
+          label="High to Low"
+          selected={filters.requestSort === "high_to_low"}
+          onPress={() => toggle("high_to_low")}
+        />
+        <RadioRow
+          label="Low to High"
+          selected={filters.requestSort === "low_to_high"}
+          onPress={() => toggle("low_to_high")}
+        />
+        <RadioRow
+          label="Urgent"
+          selected={filters.requestSort === "urgent"}
+          onPress={() => toggle("urgent")}
+        />
+      </View>
+    </Section>
+  );
+}
+
+function AssistanceSection({ filters, update }: SectionFilterProps) {
+  const toggle = (a: AssistanceFilter) => {
+    const next = filters.assistance.includes(a)
+      ? filters.assistance.filter((x) => x !== a)
+      : [...filters.assistance, a];
+    update({ assistance: next });
+  };
+
+  const options: { value: AssistanceFilter; label: string }[] = [
+    { value: "accessibility", label: "Accessibility" },
+    { value: "dietary", label: "Dietary" },
+    { value: "medical", label: "Medical" },
+  ];
+
+  return (
+    <Section title="Specific Assistance">
+      <View className="flex-row flex-wrap gap-x-[8vw]">
+        {options.map((a) => (
+          <CheckboxRow
+            key={a.value}
+            label={a.label}
+            selected={filters.assistance.includes(a.value)}
+            onPress={() => toggle(a.value)}
+          />
+        ))}
+      </View>
+    </Section>
+  );
+}
+
+function LocationSection({
+  filters,
+  update,
+  floorOptions,
+}: SectionFilterProps & { floorOptions: number[] }) {
+  const [floorSearch, setFloorSearch] = useState("");
+  const [debouncedSearch, setDebouncedSearch] = useState("");
+
+  useEffect(() => {
+    const timer = setTimeout(() => setDebouncedSearch(floorSearch), 300);
+    return () => clearTimeout(timer);
+  }, [floorSearch]);
+
+  const toggleFloor = (f: number) => {
+    const next = filters.floors.includes(f)
+      ? filters.floors.filter((x) => x !== f)
+      : [...filters.floors, f];
+    update({ floors: next });
+  };
+
+  const toggleFloorSort = (sort: FloorSort) =>
+    update({ floorSort: filters.floorSort === sort ? null : sort });
+
+  const filtered = floorOptions.filter((f) =>
+    debouncedSearch === "" ? true : f.toString().includes(debouncedSearch),
+  );
+
+  return (
+    <Section title="Location">
+      <View className="flex-row items-center bg-white border border-stroke-subtle rounded-xl px-3 mb-[1.5vh]">
+        <TextInput
+          value={floorSearch}
+          onChangeText={setFloorSearch}
+          placeholder="Search..."
+          placeholderTextColor={Colors.light.placeholder}
+          className="flex-1 py-[1.2vh] text-sm text-text-default"
+        />
+      </View>
+
+      <View className="border border-stroke-subtle rounded-xl overflow-hidden mb-[1.5vh] max-h-[20vh]">
+        <ScrollView nestedScrollEnabled>
+          {filtered.map((f, idx) => (
+            <View
+              key={f}
+              className={
+                idx < filtered.length - 1 ? "border-b border-stroke-subtle" : ""
+              }
+            >
+              <Pressable
+                onPress={() => toggleFloor(f)}
+                className={`flex-row items-center gap-3 px-[4vw] py-[1.2vh] ${
+                  filters.floors.includes(f) ? "bg-card" : "bg-white"
+                }`}
+              >
+                <View
+                  className={`w-5 h-5 rounded border items-center justify-center ${
+                    filters.floors.includes(f)
+                      ? "bg-primary border-primary"
+                      : "bg-white border-stroke-subtle"
+                  }`}
+                >
+                  {filters.floors.includes(f) && (
+                    <Check size={12} color={Colors.light.white} />
+                  )}
+                </View>
+                <Text
+                  className={`text-sm ${
+                    filters.floors.includes(f)
+                      ? "text-primary font-medium"
+                      : "text-text-default"
+                  }`}
+                >
+                  Floor {f}
+                </Text>
+              </Pressable>
+            </View>
+          ))}
+        </ScrollView>
+      </View>
+
+      <View className="flex-row gap-[6vw]">
+        <RadioRow
+          label="Ascending Floors"
+          selected={filters.floorSort === "ascending"}
+          onPress={() => toggleFloorSort("ascending")}
+        />
+        <RadioRow
+          label="Descending Floors"
+          selected={filters.floorSort === "descending"}
+          onPress={() => toggleFloorSort("descending")}
+        />
+      </View>
+    </Section>
+  );
+}
+
+export function GuestFilterSheet({
+  visible,
+  onClose,
+  filters,
+  onFiltersChange,
+  floorOptions,
+  onShowResults,
+  onClearAll,
+}: GuestFilterSheetProps) {
+  const sheetHeight = useRef(new Animated.Value(DEFAULT_HEIGHT)).current;
+  const lastHeight = useRef(DEFAULT_HEIGHT);
+
+  useEffect(() => {
+    if (visible) {
+      sheetHeight.setValue(DEFAULT_HEIGHT);
+      lastHeight.current = DEFAULT_HEIGHT;
+    }
+  }, [visible, sheetHeight]);
+
+  const panResponder = useRef(
+    PanResponder.create({
+      onStartShouldSetPanResponder: () => true,
+      onMoveShouldSetPanResponder: (_, { dy }) => Math.abs(dy) > 3,
+      onPanResponderMove: (_, { dy }) => {
+        const newH = lastHeight.current - dy;
+        sheetHeight.setValue(Math.min(MAX_HEIGHT, Math.max(80, newH)));
+      },
+      onPanResponderRelease: (_, { dy, vy }) => {
+        const newH = lastHeight.current - dy;
+        if (vy > 0.5 || newH < CLOSE_THRESHOLD) {
+          onClose();
+        } else {
+          const target =
+            newH > (DEFAULT_HEIGHT + MAX_HEIGHT) / 2
+              ? MAX_HEIGHT
+              : DEFAULT_HEIGHT;
+          Animated.spring(sheetHeight, {
+            toValue: target,
+            useNativeDriver: false,
+            bounciness: 4,
+          }).start();
+          lastHeight.current = target;
+        }
+      },
+    }),
+  ).current;
+
+  const update: Update = (patch) => onFiltersChange({ ...filters, ...patch });
+
+  return (
+    <Modal
+      visible={visible}
+      transparent
+      animationType="slide"
+      presentationStyle="overFullScreen"
+      onRequestClose={onClose}
+    >
+      <Pressable className="flex-1" onPress={onClose} />
+      <Animated.View
+        style={{ height: sheetHeight }}
+        className="bg-white rounded-t-2xl overflow-hidden"
+      >
+        <View {...panResponder.panHandlers} className="items-center pt-3 pb-2">
+          <View className="w-10 h-1 rounded-full bg-stroke-subtle" />
+        </View>
+
+        <View className="px-[5vw] pb-[1.5vh]">
+          <Text className="text-2xl font-bold text-text-default">Filters</Text>
+        </View>
+
+        <ScrollView showsVerticalScrollIndicator={false}>
+          <StatusSection filters={filters} update={update} />
+          <RequestsSection filters={filters} update={update} />
+          <AssistanceSection filters={filters} update={update} />
+          <LocationSection
+            filters={filters}
+            update={update}
+            floorOptions={floorOptions}
+          />
+        </ScrollView>
+
+        <View className="px-[5vw] py-[2vh] border-t border-stroke-subtle gap-[1.5vh]">
+          <Pressable
+            onPress={() => {
+              onShowResults();
+              onClose();
+            }}
+            className="bg-primary rounded-xl py-[1.8vh] items-center"
+          >
+            <Text className="text-white font-semibold text-sm">
+              Show Results
+            </Text>
+          </Pressable>
+          <Pressable onPress={onClearAll} className="items-center py-[1vh]">
+            <Text className="text-sm text-primary font-medium">Clear all</Text>
+          </Pressable>
+        </View>
+      </Animated.View>
+    </Modal>
+  );
+}
diff --git a/clients/mobile/components/ui/guest-header.tsx b/clients/mobile/components/ui/guest-header.tsx
new file mode 100644
index 000000000..47e3e3a30
--- /dev/null
+++ b/clients/mobile/components/ui/guest-header.tsx
@@ -0,0 +1,62 @@
+import { View, Text, Pressable } from "react-native";
+import { ChevronLeft } from "lucide-react-native";
+import { router } from "expo-router";
+import { Colors } from "@/constants/theme";
+
+export type Tab = "profile" | "requests";
+
+interface GuestHeaderProps {
+  name: string;
+  activeTab: Tab;
+  onTabChange: (t: Tab) => void;
+  hasUrgent?: boolean;
+}
+
+export function GuestHeader({
+  name,
+  activeTab,
+  onTabChange,
+  hasUrgent,
+}: GuestHeaderProps) {
+  return (
+    <View className="pt-safe">
+      <View className="flex-row items-center px-[4vw] py-[3vh]">
+        <Pressable onPress={() => router.back()}>
+          <ChevronLeft size={24} color={Colors.light.text} />
+        </Pressable>
+        <Text className="flex-1 text-center text-[5vw] font-semibold text-black">
+          {name}
+        </Text>
+        <View className="w-[6vw]" />
+      </View>
+
+      <View className="flex-row border-b border-stroke-subtle">
+        {(["profile", "requests"] as Tab[]).map((tab) => (
+          <Pressable
+            key={tab}
+            onPress={() => onTabChange(tab)}
+            className="relative flex-1 items-center py-[1.5vh]"
+          >
+            <View className="flex-row items-center gap-[1.5vw]">
+              <Text
+                className={`text-[3.5vw] font-medium ${
+                  activeTab === tab ? "text-primary" : "text-text-subtle"
+                }`}
+              >
+                {tab === "profile" ? "Profile" : "Requests"}
+              </Text>
+              {tab === "requests" && hasUrgent && (
+                <View className="w-[4vw] h-[4vw] rounded-full bg-danger items-center justify-center">
+                  <Text className="text-white text-[2.5vw] font-bold">!</Text>
+                </View>
+              )}
+            </View>
+            {activeTab === tab && (
+              <View className="absolute bottom-0 left-0 right-0 h-[2px] bg-primary" />
+            )}
+          </Pressable>
+        ))}
+      </View>
+    </View>
+  );
+}
diff --git a/clients/mobile/components/ui/guest-list-header.tsx b/clients/mobile/components/ui/guest-list-header.tsx
new file mode 100644
index 000000000..ef7cb6b26
--- /dev/null
+++ b/clients/mobile/components/ui/guest-list-header.tsx
@@ -0,0 +1,125 @@
+import {
+  Pressable,
+  ScrollView,
+  TouchableOpacity,
+  View,
+  Text,
+} from "react-native";
+import { SearchBar } from "./search-bar";
+import { SlidersHorizontal, X } from "lucide-react-native";
+import { GuestFilterState } from "./guest-filter-sheet";
+import { Colors } from "@/constants/theme";
+
+interface GuestListHeaderProps {
+  search: string;
+  setSearch: (s: string) => void;
+  filters: GuestFilterState;
+  onFiltersChange: (f: GuestFilterState) => void;
+  onOpenFilterSheet: () => void;
+}
+
+export function GuestListHeader({
+  search,
+  setSearch,
+  filters,
+  onFiltersChange,
+  onOpenFilterSheet,
+}: GuestListHeaderProps) {
+  const removeChip = (patch: Partial<GuestFilterState>) =>
+    onFiltersChange({ ...filters, ...patch });
+
+  const hasActiveFilters =
+    filters.floors.length > 0 ||
+    filters.status.length > 0 ||
+    filters.assistance.length > 0 ||
+    filters.requestSort !== null ||
+    filters.floorSort !== null;
+
+  return (
+    <View className="px-6 py-3 border-b border-stroke-subtle">
+      <View className="flex-row items-center gap-3">
+        <View className="flex-1">
+          <SearchBar value={search} onChangeText={setSearch} />
+        </View>
+        <TouchableOpacity onPress={onOpenFilterSheet} className="p-2">
+          <SlidersHorizontal size={22} className="text-primary" />
+        </TouchableOpacity>
+      </View>
+
+      {hasActiveFilters && (
+        <ScrollView
+          horizontal
+          showsHorizontalScrollIndicator={false}
+          className="mt-[1.5vh]"
+          contentContainerStyle={{ gap: 8 }}
+        >
+          {filters.floors.map((f) => (
+            <Chip
+              key={`floor-${f}`}
+              label={`Floor ${f}`}
+              onRemove={() =>
+                removeChip({ floors: filters.floors.filter((x) => x !== f) })
+              }
+            />
+          ))}
+          {filters.status.map((s) => (
+            <Chip
+              key={`status-${s}`}
+              label={s === "active" ? "Active" : "Inactive"}
+              onRemove={() =>
+                removeChip({
+                  status: filters.status.filter((x) => x !== s),
+                })
+              }
+            />
+          ))}
+          {filters.assistance.map((a) => (
+            <Chip
+              key={`assist-${a}`}
+              label={a.charAt(0).toUpperCase() + a.slice(1)}
+              onRemove={() =>
+                removeChip({
+                  assistance: filters.assistance.filter((x) => x !== a),
+                })
+              }
+            />
+          ))}
+          {filters.requestSort && (
+            <Chip
+              label={
+                filters.requestSort === "high_to_low"
+                  ? "Requests: High to Low"
+                  : filters.requestSort === "low_to_high"
+                    ? "Requests: Low to High"
+                    : "Requests: Urgent"
+              }
+              onRemove={() => removeChip({ requestSort: null })}
+            />
+          )}
+          {filters.floorSort && (
+            <Chip
+              label={
+                filters.floorSort === "ascending"
+                  ? "Floors: Ascending"
+                  : "Floors: Descending"
+              }
+              onRemove={() => removeChip({ floorSort: null })}
+            />
+          )}
+        </ScrollView>
+      )}
+    </View>
+  );
+}
+
+function Chip({ label, onRemove }: { label: string; onRemove: () => void }) {
+  return (
+    <Pressable
+      onPress={onRemove}
+      className="flex-row items-center gap-1 bg-card border border-primary rounded-md px-3 py-1"
+    >
+      <Text className="text-primary text-sm">{label}</Text>
+      <X size={12} color={Colors.light.tabBarActive} />
+    </Pressable>
+  );
+}
diff --git a/clients/mobile/components/ui/guest-profile.tsx b/clients/mobile/components/ui/guest-profile.tsx
index 8c6538077..e15333d0f 100755
--- a/clients/mobile/components/ui/guest-profile.tsx
+++ b/clients/mobile/components/ui/guest-profile.tsx
@@ -1,180 +1,250 @@
-import { View, Text, Pressable } from "react-native";
-import { Box } from "./box";
-import { ChevronLeft, User } from "lucide-react-native";
-import { Collapsible } from "./collapsible";
-import { router } from "expo-router";
-
-interface GuestProfileProps {
-  name: string;
-  pronouns: string;
-  dateOfBirth: Date;
-  room: number;
-  groupSize: number;
-  arrival: Date;
-  departure: Date;
-  notes: string;
-  preferences: string;
-  needs: string;
-  previousStays: Stay[];
-}
+import { useState, useEffect } from "react";
+import { View, Text, TextInput, Pressable } from "react-native";
+import { Calendar, Clock, Users } from "lucide-react-native";
+import { useQueryClient } from "@tanstack/react-query";
+import { Colors } from "@/constants/theme";
+import { usePutGuestsId, getGetGuestsStaysIdQueryKey } from "@shared";
+import type { Stay, Assistance } from "@shared";
+import { formatDate, formatTime } from "@/utils/time";
 
-type Stay = {
-  notes: string;
-  arrival: Date;
-  departure: Date;
-};
+interface GuestProfileTabProps {
+  guestId: string;
+  firstName: string;
+  lastName: string;
+  pronouns?: string | null;
+  doNotDisturbStart?: string | null;
+  doNotDisturbEnd?: string | null;
+  housekeepingCadence?: string | null;
+  notes?: string | null;
+  assistance?: Assistance;
+  currentStays: Stay[];
+  onViewAllBookings: () => void;
+}
 
-export default function GuestProfile(props: GuestProfileProps) {
+export function GuestProfileTab(props: GuestProfileTabProps) {
   return (
-    <Box>
-      <HeaderWithBackArrow />
-      <Box>
-        <GuestDescription {...props} />
-        <GuestInfoCollapsibles {...props} />
-      </Box>
-    </Box>
+    <View>
+      <InfoSection {...props} />
+      <ActiveBookingsSection
+        currentStays={props.currentStays}
+        onViewAll={props.onViewAllBookings}
+      />
+      <SpecificAssistanceSection assistance={props.assistance} />
+      <NotesSection guestId={props.guestId} notes={props.notes} />
+    </View>
   );
 }
 
-function HeaderWithBackArrow() {
-  return (
-    <Box className="flex-row items-center px-[4vw] py-[3vh] border-b border-gray-200">
-      <Pressable onPress={() => router.back()}>
-        <ChevronLeft className="w-[6vw] h-[6vw]" color="#000" />
-      </Pressable>
-      <Text className="flex-1 text-center text-[5vw] font-semibold text-gray-900">
-        Guest Profile
-      </Text>
+function InfoSection({
+  firstName,
+  lastName,
+  pronouns,
+  doNotDisturbStart,
+  doNotDisturbEnd,
+  housekeepingCadence,
+}: GuestProfileTabProps) {
+  const dnd =
+    doNotDisturbStart && doNotDisturbEnd
+      ? `${formatTime(doNotDisturbStart)} - ${formatTime(doNotDisturbEnd)}`
+      : null;
 
-      <View className="w-[6vw]" />
-    </Box>
+  const capitalize = (s?: string | null) =>
+    s ? s.charAt(0).toUpperCase() + s.slice(1) : null;
+
+  const fields = [
+    { label: "Government Name", value: `${firstName} ${lastName}` },
+    { label: "Pronouns", value: pronouns },
+    { label: "Do Not Disturb", value: dnd },
+    { label: "Housekeeping", value: capitalize(housekeepingCadence) },
+  ].filter((f) => f.value);
+
+  return (
+    <View className="px-[4vw] py-[3vh] border-b border-stroke-subtle gap-[2vh]">
+      {fields.map((field) => (
+        <View key={field.label} className="flex-row">
+          <Text className="text-[3.5vw] text-text-subtle w-[40vw]">
+            {field.label}
+          </Text>
+          <Text className="text-[3.5vw] font-semibold text-black flex-1">
+            {String(field.value)}
+          </Text>
+        </View>
+      ))}
+    </View>
   );
 }
 
-function GuestDescription(props: GuestProfileProps) {
+function ActiveBookingsSection({
+  currentStays,
+  onViewAll,
+}: {
+  currentStays: Stay[];
+  onViewAll: () => void;
+}) {
   return (
-    <Box className="p-[4vw] border-b border-gray-200">
-      <View className="flex-row items-center mb-[3vh]">
+    <View className="px-[4vw] py-[3vh] border-b border-stroke-subtle gap-[2vh]">
+      <Text className="text-[4vw] font-semibold text-black">
+        Active Bookings ({currentStays.length})
+      </Text>
+
+      {currentStays.map((stay, i) => (
         <View
-          className="w-[15vw] h-[15vw] rounded-full border-2 border-gray-400
-                items-center justify-center mr-[3vw]"
+          key={i}
+          className="bg-success-accent border border-success-stroke rounded-xl p-[4vw] gap-[1.5vh]"
         >
-          <User className="w-[10vw] h-[10vw]" color="#374151" />
-        </View>
-        <View>
-          <Text className="text-[5vw] font-semibold text-gray-900">
-            {props.name}
-          </Text>
-          <Text className="text-[3.5vw] text-gray-600">{props.pronouns}</Text>
+          <View className="flex-row items-center justify-between">
+            <Text className="text-[5.5vw] font-bold text-primary">
+              Suite {stay.room_number}
+            </Text>
+            <View className="flex-row items-center gap-[1.5vw]">
+              <Users size={16} color={Colors.light.tabBarActive} />
+              <Text className="text-[4vw] text-primary font-medium">
+                {stay.group_size ?? 1}
+              </Text>
+            </View>
+          </View>
+
+          <View className="flex-row items-center gap-[2vw]">
+            <Text className="text-[3.5vw] text-primary w-[22vw]">Arrival:</Text>
+            <Calendar size={13} color={Colors.light.tabBarActive} />
+            <Text className="text-[3.5vw] text-primary">
+              {formatDate(stay.arrival_date)}
+            </Text>
+            <Clock size={13} color={Colors.light.tabBarActive} />
+            <Text className="text-[3.5vw] text-primary">
+              {formatTime(stay.arrival_date)}
+            </Text>
+          </View>
+
+          <View className="flex-row items-center gap-[2vw]">
+            <Text className="text-[3.5vw] text-primary w-[22vw]">
+              Departure:
+            </Text>
+            <Calendar size={13} color={Colors.light.tabBarActive} />
+            <Text className="text-[3.5vw] text-primary">
+              {formatDate(stay.departure_date)}
+            </Text>
+            <Clock size={13} color={Colors.light.tabBarActive} />
+            <Text className="text-[3.5vw] text-primary">
+              {formatTime(stay.departure_date)}
+            </Text>
+          </View>
         </View>
-      </View>
+      ))}
 
-      <View className="gap-[2vh]">
-        {GUEST_PROFILE_CONFIG.infoFields.map((field, index) => (
-          <InfoRow
-            key={index}
-            label={field.label}
-            value={field.format(props)}
-          />
-        ))}
-      </View>
-    </Box>
+      <Pressable
+        onPress={onViewAll}
+        className="bg-primary rounded-xl py-[1.8vh] items-center"
+      >
+        <Text className="text-white text-[3.5vw] font-medium">
+          View All Bookings
+        </Text>
+      </Pressable>
+    </View>
   );
 }
 
-function InfoRow({ label, value }: { label: string; value: unknown }) {
+function SpecificAssistanceSection({
+  assistance,
+}: {
+  assistance?: Assistance;
+}) {
+  const categories = [
+    { label: "Accessibility", items: assistance?.accessibility ?? [] },
+    { label: "Dietary Restrictions", items: assistance?.dietary ?? [] },
+    { label: "Medical Needs", items: assistance?.medical ?? [] },
+  ];
+
   return (
-    <View className="flex-row">
-      <Text className="text-[3.5vw] text-gray-400 w-[35vw]">{label}</Text>
-      <Text className="text-[3.5vw] text-gray-900 flex-1">{String(value)}</Text>
+    <View className="px-[4vw] py-[3vh] border-b border-stroke-subtle">
+      <Text className="text-[4vw] font-semibold text-black mb-[2vh]">
+        Specific Assistance
+      </Text>
+      <View className="border border-stroke-subtle rounded-xl p-[3vw] gap-[2vh]">
+        {categories.map((cat, i) => (
+          <View key={cat.label}>
+            <Text className="text-[3.5vw] font-medium text-black mb-[1vh]">
+              {cat.label}
+            </Text>
+            {cat.items.length === 0 ? (
+              <Text className="text-[3.5vw] text-text-subtle">None</Text>
+            ) : (
+              <View className="flex-row flex-wrap gap-[2vw]">
+                {cat.items.map((item, j) => (
+                  <View
+                    key={j}
+                    className="bg-danger-accent border border-danger rounded-md px-[3vw] py-[0.5vh]"
+                  >
+                    <Text className="text-[3vw] text-danger">{item}</Text>
+                  </View>
+                ))}
+              </View>
+            )}
+            {i < categories.length - 1 && (
+              <View className="border-b border-stroke-subtle mt-[1.5vh]" />
+            )}
+          </View>
+        ))}
+      </View>
     </View>
   );
 }
 
-function GuestInfoCollapsibles(props: GuestProfileProps) {
-  return (
-    <Box className="p-[4vw] gap-[2vh]">
-      {GUEST_PROFILE_CONFIG.collapsibles.map((item, index) => (
-        <Collapsible key={index} title={item.title}>
-          <Text className="text-[3.5vw] text-gray-900">
-            {item.format(props)}
-          </Text>
-        </Collapsible>
-      ))}
+function NotesSection({
+  guestId,
+  notes,
+}: {
+  guestId: string;
+  notes?: string | null;
+}) {
+  const [value, setValue] = useState(notes ?? "");
+  const queryClient = useQueryClient();
 
-      <Collapsible title="Previous Stays">
-        {props.previousStays.length === 0 ? (
-          <Text className="text-[3.5vw] text-gray-400">No previous stays</Text>
-        ) : (
-          <View className="gap-[1vh]">
-            {props.previousStays.map((stay, index) => (
-              <View key={index} className="border-b border-gray-200 pb-[1vh]">
-                <Text className="text-[3.5vw] text-gray-900">{stay.notes}</Text>
-                <Text className="text-[3vw] text-gray-600">
-                  {stay.arrival.toLocaleDateString()}-{" "}
-                  {stay.departure.toLocaleDateString()}
-                </Text>
-              </View>
-            ))}
-          </View>
+  useEffect(() => {
+    setValue(notes ?? "");
+  }, [notes]);
+
+  const isDirty = value !== (notes ?? "");
+  const { mutate: updateGuest, isPending } = usePutGuestsId();
+
+  const save = () => {
+    updateGuest(
+      { id: guestId, data: { notes: value } },
+      {
+        onSuccess: () => {
+          queryClient.invalidateQueries({
+            queryKey: getGetGuestsStaysIdQueryKey(guestId),
+          });
+        },
+      },
+    );
+  };
+
+  return (
+    <View className="px-[4vw] py-[3vh]">
+      <View className="flex-row items-center justify-between mb-[2vh]">
+        <Text className="text-[4vw] font-semibold text-black">Notes</Text>
+        {isDirty && (
+          <Pressable
+            onPress={save}
+            disabled={isPending}
+            className="bg-primary rounded-lg px-[3vw] py-[0.6vh]"
+          >
+            <Text className="text-white text-[3vw] font-medium">
+              {isPending ? "Saving..." : "Save"}
+            </Text>
+          </Pressable>
         )}
-      </Collapsible>
-    </Box>
+      </View>
+      <TextInput
+        value={value}
+        onChangeText={setValue}
+        placeholder="Add a note..."
+        placeholderTextColor={Colors.light.icon}
+        multiline
+        className="border border-stroke-subtle rounded-xl p-[3vw] min-h-[15vh] text-[3.5vw] text-black"
+        textAlignVertical="top"
+      />
+    </View>
   );
 }
-
-// to provide a label and formatting of the data for each piece of data concerning the guest
-const GUEST_PROFILE_CONFIG = {
-  infoFields: [
-    {
-      key: "governmentName",
-      label: "Government Name",
-      format: (props: GuestProfileProps) => props.name,
-    },
-    {
-      key: "dateOfBirth",
-      label: "Date of Birth",
-      format: (props: GuestProfileProps) =>
-        props.dateOfBirth.toLocaleDateString(),
-    },
-    {
-      key: "room",
-      label: "Room",
-      format: (props: GuestProfileProps) => props.room,
-    },
-    {
-      key: "groupSize",
-      label: "Group Size",
-      format: (props: GuestProfileProps) => props.groupSize.toString(),
-    },
-    {
-      key: "arrival",
-      label: "Arrival",
-      format: (props: GuestProfileProps) =>
-        `${props.arrival.toLocaleTimeString([], { hour: "2-digit", minute: "2-digit" })} ${props.arrival.toLocaleDateString()}`,
-    },
-    {
-      key: "departure",
-      label: "Departure",
-      format: (props: GuestProfileProps) =>
-        `${props.departure.toLocaleTimeString([], { hour: "2-digit", minute: "2-digit" })} ${props.departure.toLocaleDateString()}`,
-    },
-  ],
-  collapsibles: [
-    {
-      key: "notes",
-      title: "Notes",
-      format: (props: GuestProfileProps) => props.notes,
-    },
-    {
-      key: "preferences",
-      title: "Housekeeping Preferences",
-      format: (props: GuestProfileProps) => props.preferences,
-    },
-    {
-      key: "needs",
-      title: "Special Needs",
-      format: (props: GuestProfileProps) => props.needs,
-    },
-  ],
-};
diff --git a/clients/mobile/components/ui/mutli-select-filter.tsx b/clients/mobile/components/ui/mutli-select-filter.tsx
new file mode 100644
index 000000000..214413f7c
--- /dev/null
+++ b/clients/mobile/components/ui/mutli-select-filter.tsx
@@ -0,0 +1,99 @@
+import { useState } from "react";
+import { View, Text, Pressable, ScrollView } from "react-native";
+import { ChevronDown, Check } from "lucide-react-native";
+import { Filter } from "./filters";
+import { Colors } from "@/constants/theme";
+
+type Option<T extends string | number> = {
+  label: string;
+  value: T;
+};
+
+export function MultiSelectFilter<T extends string | number>({
+  value,
+  onChange,
+  options,
+  placeholder,
+}: Filter<T>) {
+  const [isOpen, setIsOpen] = useState(false);
+
+  return (
+    <View>
+      <FilterTrigger
+        placeholder={placeholder}
+        isOpen={isOpen}
+        onPress={() => setIsOpen(!isOpen)}
+      />
+      {isOpen && (
+        <View className="bg-white border border-stroke-subtle rounded-b-xl overflow-hidden max-h-[40vh]">
+          <ScrollView>
+            {options.map((option, idx) => {
+              const isSelected = value?.includes(option.value as T);
+              return (
+                <FilterOptionRow
+                  key={option.value}
+                  option={option}
+                  isSelected={isSelected}
+                  showBottomBorder={idx < options.length - 1}
+                  onPress={() => onChange(option.value)}
+                />
+              );
+            })}
+          </ScrollView>
+        </View>
+      )}
+    </View>
+  );
+}
+
+function FilterTrigger({
+  placeholder,
+  isOpen,
+  onPress,
+}: {
+  placeholder: string;
+  isOpen: boolean;
+  onPress: () => void;
+}) {
+  return (
+    <Pressable
+      onPress={onPress}
+      className={`flex-row items-center justify-between px-[3vw] h-[5vh] bg-white border border-stroke-subtle ${
+        isOpen ? "rounded-t-xl border-b-0" : "rounded-xl"
+      }`}
+    >
+      <Text className="text-[3.5vw] font-semibold text-black">
+        {placeholder}
+      </Text>
+      <ChevronDown size={14} color="#000000" />
+    </Pressable>
+  );
+}
+
+function FilterOptionRow<T extends number | string>({
+  option,
+  isSelected,
+  showBottomBorder,
+  onPress,
+}: {
+  option: Option<T>;
+  isSelected: boolean;
+  showBottomBorder: boolean;
+  onPress: () => void;
+}) {
+  return (
+    <Pressable
+      onPress={onPress}
+      className={`flex-row items-center justify-between px-[4vw] py-[1.2vh] ${
+        showBottomBorder ? "border-b border-shadow-weak" : ""
+      } ${isSelected ? "bg-card" : "bg-white"}`}
+    >
+      <Text
+        className={`text-[3.5vw] ${isSelected ? "font-medium text-black" : "text-black"}`}
+      >
+        {option.label}
+      </Text>
+      {isSelected && <Check size={14} color={Colors.dark.greenBorder} />}
+    </Pressable>
+  );
+}
diff --git a/clients/mobile/components/ui/search-bar.tsx b/clients/mobile/components/ui/search-bar.tsx
index bf3555a69..a3b0c255a 100644
--- a/clients/mobile/components/ui/search-bar.tsx
+++ b/clients/mobile/components/ui/search-bar.tsx
@@ -1,6 +1,7 @@
 import React from "react";
-import { View, TextInput } from "react-native";
-import { Search } from "lucide-react-native";
+import { View, TextInput, Pressable } from "react-native";
+import { Search, X } from "lucide-react-native";
+import { Colors } from "@/constants/theme";
 
 interface SearchBarProps {
   value: string;
@@ -14,17 +15,20 @@ export function SearchBar({
   placeholder = "Search Guests",
 }: SearchBarProps) {
   return (
-    <View className="relative">
+    <View className="flex-row items-center border border-stroke-subtle rounded-lg px-[10px] py-2 gap-1">
+      <Search size={14} color={Colors.light.iconDisabled} />
       <TextInput
         value={value}
         onChangeText={onChangeText}
         placeholder={placeholder}
-        placeholderTextColor="#9CA3AF"
-        className="w-full h-[6vh] px-[4vw] pr-[12vw] border border-gray-300 rounded-md"
+        placeholderTextColor={Colors.light.iconDisabled}
+        className="flex-1 text-sm text-text-default"
       />
-      <View className="absolute right-[4vw] top-0 h-full justify-center w-[5vw] h-[5vw]">
-        <Search className="w-full h-full" color="#9CA3AF" />
-      </View>
+      {value.length > 0 && (
+        <Pressable onPress={() => onChangeText("")} hitSlop={8}>
+          <X size={16} color={Colors.light.iconDisabled} />
+        </Pressable>
+      )}
     </View>
   );
 }
diff --git a/clients/mobile/constants/clerk.ts b/clients/mobile/constants/clerk.ts
new file mode 100644
index 000000000..9cc0ac19d
--- /dev/null
+++ b/clients/mobile/constants/clerk.ts
@@ -0,0 +1,9 @@
+export enum ClerkStatus {
+  Complete = "complete",
+  MissingRequirements = "missing_requirements",
+}
+
+export enum ClerkErrorCode {
+  SessionExists = "session_exists",
+  IdentifierAlreadySignedIn = "identifier_already_signed_in",
+}
diff --git a/clients/mobile/constants/theme.ts b/clients/mobile/constants/theme.ts
index 7b8642a70..170d96c3e 100644
--- a/clients/mobile/constants/theme.ts
+++ b/clients/mobile/constants/theme.ts
@@ -11,11 +11,23 @@ const tintColorDark = "#fff";
 export const Colors = {
   light: {
     text: "#11181C",
+    textDefault: "#1a1a1a",
+    white: "#ffffff",
+    placeholder: "#aaaaaa",
     background: "#fff",
     tint: tintColorLight,
     icon: "#687076",
     tabIconDefault: "#687076",
     tabIconSelected: tintColorLight,
+    tabBarActive: "#15502C",
+    tabBarHighlight: "#EDF5F1",
+    danger: "#e71b1b",
+    iconSubtle: "#808080",
+    iconMuted: "#464646",
+    iconDisabled: "#bababa",
+    textSubtle: "#747474",
+    borderDefault: "#aeaeae",
+    borderLight: "#e5e9ed",
   },
   dark: {
     text: "#ECEDEE",
@@ -24,6 +36,9 @@ export const Colors = {
     icon: "#9BA1A6",
     tabIconDefault: "#9BA1A6",
     tabIconSelected: tintColorDark,
+    greenBorder: "#166534",
+    tabBarActive: "#15502C",
+    tabBarHighlight: "#EDF5F1",
   },
 };
 
diff --git a/clients/mobile/context/startup.tsx b/clients/mobile/context/startup.tsx
new file mode 100644
index 000000000..44843e5ae
--- /dev/null
+++ b/clients/mobile/context/startup.tsx
@@ -0,0 +1,59 @@
+import { createContext, useContext, useMemo } from "react";
+import { useAuth } from "@clerk/clerk-expo";
+import { useQuery } from "@tanstack/react-query";
+import { setConfig } from "@shared";
+
+export enum StartupStatus {
+  Loading,
+  Unauthenticated,
+  NoUserInfo,
+  Ready,
+}
+
+const StartupContext = createContext<StartupStatus>(StartupStatus.Loading);
+
+export function useStartup() {
+  return useContext(StartupContext);
+}
+
+export function StartupProvider({ children }: { children: React.ReactNode }) {
+  const { getToken, isLoaded, isSignedIn, userId } = useAuth();
+
+  const { data, status } = useQuery({
+    queryKey: ["startup-user", userId],
+    queryFn: async () => {
+      const token = await getToken();
+      const res = await fetch(
+        `${process.env.EXPO_PUBLIC_API_BASE_URL}/users/${userId}`,
+        { headers: { Authorization: `Bearer ${token}` } },
+      );
+      if (!res.ok) throw new Error(`${res.status}`);
+      return res.json();
+    },
+    enabled: !!isLoaded && !!isSignedIn && !!userId,
+    retry: 5,
+    retryDelay: (attempt) => 1000 * 2 ** attempt,
+  });
+
+  if (data) {
+    setConfig({
+      API_BASE_URL: process.env.EXPO_PUBLIC_API_BASE_URL ?? "",
+      getToken,
+      hotelId: data.hotel_id,
+    });
+  }
+
+  const startupStatus = useMemo<StartupStatus>(() => {
+    if (!isLoaded) return StartupStatus.Loading;
+    if (!isSignedIn) return StartupStatus.Unauthenticated;
+    if (status === "pending") return StartupStatus.Loading;
+    if (status === "error") return StartupStatus.NoUserInfo;
+    return StartupStatus.Ready;
+  }, [isLoaded, isSignedIn, status]);
+
+  return (
+    <StartupContext.Provider value={startupStatus}>
+      {children}
+    </StartupContext.Provider>
+  );
+}
diff --git a/clients/mobile/doppler.yaml b/clients/mobile/doppler.yaml
new file mode 100644
index 000000000..16a968c3e
--- /dev/null
+++ b/clients/mobile/doppler.yaml
@@ -0,0 +1,3 @@
+setup:
+  project: selfserve-mobile
+  config: dev
diff --git a/clients/mobile/eslint.config.js b/clients/mobile/eslint.config.js
index ece97001a..67de47bd5 100644
--- a/clients/mobile/eslint.config.js
+++ b/clients/mobile/eslint.config.js
@@ -7,4 +7,13 @@ module.exports = defineConfig([
   {
     ignores: ["dist/*"],
   },
+  {
+    settings: {
+      "import/resolver": {
+        typescript: {
+          project: "./tsconfig.json",
+        },
+      },
+    },
+  },
 ]);
diff --git a/clients/mobile/hooks/__tests__/use-push-notifications.test.ts b/clients/mobile/hooks/__tests__/use-push-notifications.test.ts
new file mode 100644
index 000000000..63f4dae7c
--- /dev/null
+++ b/clients/mobile/hooks/__tests__/use-push-notifications.test.ts
@@ -0,0 +1,263 @@
+import { renderHook, act } from "@testing-library/react-native";
+import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
+import React from "react";
+
+jest.mock("expo-notifications", () => ({
+  setNotificationHandler: jest.fn(),
+  getPermissionsAsync: jest.fn(),
+  requestPermissionsAsync: jest.fn(),
+  getExpoPushTokenAsync: jest.fn(),
+  setNotificationChannelAsync: jest.fn(),
+  addNotificationResponseReceivedListener: jest.fn(),
+  AndroidImportance: { MAX: 5 },
+  PermissionStatus: {
+    GRANTED: "granted",
+    UNDETERMINED: "undetermined",
+    DENIED: "denied",
+  },
+}));
+
+const mockRouterPush = jest.fn();
+jest.mock("expo-router", () => ({
+  useRouter: () => ({ push: mockRouterPush }),
+}));
+
+const mockRegisterToken = jest.fn();
+jest.mock("@shared/api/notifications", () => ({
+  usePostDeviceToken: () => ({ mutate: mockRegisterToken }),
+}));
+
+import {
+  usePushNotifications,
+  registerForPushNotificationsAsync,
+} from "../use-push-notifications";
+
+const Notifications = require("expo-notifications");
+
+const createWrapper = () => {
+  const queryClient = new QueryClient({
+    defaultOptions: { queries: { retry: false } },
+  });
+  return ({ children }: { children: React.ReactNode }) =>
+    React.createElement(QueryClientProvider, { client: queryClient }, children);
+};
+
+describe("registerForPushNotificationsAsync", () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it("requests permissions and registers an iOS token", async () => {
+    Notifications.getPermissionsAsync.mockResolvedValue({ status: "granted" });
+    Notifications.getExpoPushTokenAsync.mockResolvedValue({
+      data: "ExponentPushToken[xxx]",
+    });
+
+    await registerForPushNotificationsAsync(mockRegisterToken, {
+      isDevice: true,
+      platformOS: "ios",
+      projectId: "test-project-id",
+    });
+
+    expect(Notifications.getPermissionsAsync).toHaveBeenCalled();
+    expect(Notifications.getExpoPushTokenAsync).toHaveBeenCalledWith({
+      projectId: "test-project-id",
+    });
+    expect(mockRegisterToken).toHaveBeenCalledWith({
+      token: "ExponentPushToken[xxx]",
+      platform: "ios",
+    });
+  });
+
+  it("calls requestPermissionsAsync when status is undetermined and grants", async () => {
+    Notifications.getPermissionsAsync.mockResolvedValue({
+      status: "undetermined",
+    });
+    Notifications.requestPermissionsAsync.mockResolvedValue({
+      status: "granted",
+    });
+    Notifications.getExpoPushTokenAsync.mockResolvedValue({
+      data: "ExponentPushToken[yyy]",
+    });
+
+    await registerForPushNotificationsAsync(mockRegisterToken, {
+      isDevice: true,
+      platformOS: "ios",
+      projectId: "test-project-id",
+    });
+
+    expect(Notifications.requestPermissionsAsync).toHaveBeenCalled();
+    expect(mockRegisterToken).toHaveBeenCalledWith({
+      token: "ExponentPushToken[yyy]",
+      platform: "ios",
+    });
+  });
+
+  it("does not register token when permissions are denied", async () => {
+    Notifications.getPermissionsAsync.mockResolvedValue({
+      status: "undetermined",
+    });
+    Notifications.requestPermissionsAsync.mockResolvedValue({
+      status: "denied",
+    });
+
+    await registerForPushNotificationsAsync(mockRegisterToken, {
+      isDevice: true,
+      platformOS: "ios",
+      projectId: "test-project-id",
+    });
+
+    expect(mockRegisterToken).not.toHaveBeenCalled();
+  });
+
+  it("does not request permissions on a non-physical device (simulator)", async () => {
+    await registerForPushNotificationsAsync(mockRegisterToken, {
+      isDevice: false,
+      platformOS: "ios",
+      projectId: "test-project-id",
+    });
+
+    expect(Notifications.getPermissionsAsync).not.toHaveBeenCalled();
+    expect(mockRegisterToken).not.toHaveBeenCalled();
+  });
+
+  it("creates an Android notification channel before requesting permissions", async () => {
+    Notifications.getPermissionsAsync.mockResolvedValue({ status: "granted" });
+    Notifications.getExpoPushTokenAsync.mockResolvedValue({
+      data: "ExponentPushToken[android]",
+    });
+
+    await registerForPushNotificationsAsync(mockRegisterToken, {
+      isDevice: true,
+      platformOS: "android",
+      projectId: "test-project-id",
+    });
+
+    expect(Notifications.setNotificationChannelAsync).toHaveBeenCalledWith(
+      "default",
+      expect.objectContaining({ importance: 5 }),
+    );
+    expect(mockRegisterToken).toHaveBeenCalledWith({
+      token: "ExponentPushToken[android]",
+      platform: "android",
+    });
+  });
+
+  it("does not register token when projectId is missing", async () => {
+    Notifications.getPermissionsAsync.mockResolvedValue({ status: "granted" });
+
+    await registerForPushNotificationsAsync(mockRegisterToken, {
+      isDevice: true,
+      platformOS: "ios",
+      projectId: undefined,
+    });
+
+    expect(mockRegisterToken).not.toHaveBeenCalled();
+  });
+
+  it("silently handles errors from getExpoPushTokenAsync", async () => {
+    Notifications.getPermissionsAsync.mockResolvedValue({ status: "granted" });
+    Notifications.getExpoPushTokenAsync.mockRejectedValue(
+      new Error("token fetch failed"),
+    );
+
+    await expect(
+      registerForPushNotificationsAsync(mockRegisterToken, {
+        isDevice: true,
+        platformOS: "ios",
+        projectId: "test-project-id",
+      }),
+    ).resolves.toBeUndefined();
+
+    expect(mockRegisterToken).not.toHaveBeenCalled();
+  });
+});
+
+describe("usePushNotifications (notification response listener)", () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    Notifications.addNotificationResponseReceivedListener.mockReturnValue({
+      remove: jest.fn(),
+    });
+  });
+
+  it("navigates to tasks tab when a task_assigned notification is tapped", () => {
+    let capturedListener: ((response: unknown) => void) | null = null;
+    Notifications.addNotificationResponseReceivedListener.mockImplementation(
+      (fn: (response: unknown) => void) => {
+        capturedListener = fn;
+        return { remove: jest.fn() };
+      },
+    );
+
+    renderHook(() => usePushNotifications(), { wrapper: createWrapper() });
+
+    act(() => {
+      capturedListener?.({
+        notification: {
+          request: { content: { data: { type: "task_assigned" } } },
+        },
+      });
+    });
+
+    expect(mockRouterPush).toHaveBeenCalledWith("/(tabs)/tasks");
+  });
+
+  it("navigates to tasks tab for high_priority_task notifications", () => {
+    let capturedListener: ((response: unknown) => void) | null = null;
+    Notifications.addNotificationResponseReceivedListener.mockImplementation(
+      (fn: (response: unknown) => void) => {
+        capturedListener = fn;
+        return { remove: jest.fn() };
+      },
+    );
+
+    renderHook(() => usePushNotifications(), { wrapper: createWrapper() });
+
+    act(() => {
+      capturedListener?.({
+        notification: {
+          request: { content: { data: { type: "high_priority_task" } } },
+        },
+      });
+    });
+
+    expect(mockRouterPush).toHaveBeenCalledWith("/(tabs)/tasks");
+  });
+
+  it("does not navigate for unknown notification types", () => {
+    let capturedListener: ((response: unknown) => void) | null = null;
+    Notifications.addNotificationResponseReceivedListener.mockImplementation(
+      (fn: (response: unknown) => void) => {
+        capturedListener = fn;
+        return { remove: jest.fn() };
+      },
+    );
+
+    renderHook(() => usePushNotifications(), { wrapper: createWrapper() });
+
+    act(() => {
+      capturedListener?.({
+        notification: {
+          request: { content: { data: { type: "some_other_event" } } },
+        },
+      });
+    });
+
+    expect(mockRouterPush).not.toHaveBeenCalled();
+  });
+
+  it("removes the response listener on unmount", () => {
+    const mockRemove = jest.fn();
+    Notifications.addNotificationResponseReceivedListener.mockReturnValue({
+      remove: mockRemove,
+    });
+
+    const { unmount } = renderHook(() => usePushNotifications(), {
+      wrapper: createWrapper(),
+    });
+    unmount();
+
+    expect(mockRemove).toHaveBeenCalled();
+  });
+});
diff --git a/clients/mobile/hooks/__tests__/use-theme-color.test.ts b/clients/mobile/hooks/__tests__/use-theme-color.test.ts
deleted file mode 100644
index fcf181184..000000000
--- a/clients/mobile/hooks/__tests__/use-theme-color.test.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { renderHook } from "@testing-library/react-native";
-import { useThemeColor } from "../use-theme-color";
-import { Colors } from "@/constants/theme";
-
-jest.mock("@/hooks/use-color-scheme", () => ({
-  useColorScheme: jest.fn(),
-}));
-
-const { useColorScheme } = require("@/hooks/use-color-scheme");
-
-describe("useThemeColor", () => {
-  it("returns light theme color by default", () => {
-    useColorScheme.mockReturnValue("light");
-    const { result } = renderHook(() => useThemeColor({}, "text"));
-    expect(result.current).toBe(Colors.light.text);
-  });
-
-  it("returns dark theme color in dark mode", () => {
-    useColorScheme.mockReturnValue("dark");
-    const { result } = renderHook(() => useThemeColor({}, "text"));
-    expect(result.current).toBe(Colors.dark.text);
-  });
-
-  it("uses custom color when provided", () => {
-    useColorScheme.mockReturnValue("light");
-    const customColor = "#ff0000";
-    const { result } = renderHook(() =>
-      useThemeColor({ light: customColor }, "text"),
-    );
-    expect(result.current).toBe(customColor);
-  });
-});
diff --git a/clients/mobile/hooks/use-hello.ts b/clients/mobile/hooks/use-hello.ts
index 6814df990..9b8f2ec6d 100644
--- a/clients/mobile/hooks/use-hello.ts
+++ b/clients/mobile/hooks/use-hello.ts
@@ -13,6 +13,6 @@ export const useGetHelloName = (name: string) => {
   const api = useAPIClient();
   return useQuery({
     queryKey: ["hello", name],
-    queryFn: () => api.get<string>(`/api/v1/hello/${name}`),
+    queryFn: () => api.get<string>(`/hello/${name}`),
   });
 };
diff --git a/clients/mobile/hooks/use-push-notifications.ts b/clients/mobile/hooks/use-push-notifications.ts
new file mode 100644
index 000000000..b8524cfee
--- /dev/null
+++ b/clients/mobile/hooks/use-push-notifications.ts
@@ -0,0 +1,101 @@
+import { useEffect, useRef } from "react";
+import { Platform } from "react-native";
+import * as Device from "expo-device";
+import * as Notifications from "expo-notifications";
+import Constants from "expo-constants";
+import { useRouter } from "expo-router";
+import { usePostDeviceToken } from "@shared/api/notifications";
+import type { RegisterDeviceTokenInput } from "@shared/types/notifications";
+import { NotificationType, DevicePlatform } from "@shared/types/notifications";
+
+Notifications.setNotificationHandler({
+  handleNotification: async () => ({
+    shouldShowAlert: true,
+    shouldShowBanner: true,
+    shouldShowList: true,
+    shouldPlaySound: true,
+    shouldSetBadge: true,
+  }),
+});
+
+export const usePushNotifications = () => {
+  const router = useRouter();
+  const { mutate: registerToken } = usePostDeviceToken();
+  const responseListener = useRef<Notifications.Subscription | null>(null);
+
+  useEffect(() => {
+    registerForPushNotificationsAsync(registerToken);
+
+    responseListener.current =
+      Notifications.addNotificationResponseReceivedListener((response) => {
+        const data = response.notification.request.content.data;
+        const type = data?.type as NotificationType | undefined;
+        if (
+          type === NotificationType.TaskAssigned ||
+          type === NotificationType.HighPriorityTask
+        ) {
+          router.push("/(tabs)/tasks");
+        }
+      });
+
+    return () => {
+      responseListener.current?.remove();
+    };
+  }, [registerToken, router]);
+};
+
+/**
+ * Requests push notification permissions, retrieves the Expo push token,
+ * and registers it with the backend. Exported for unit testing.
+ */
+export async function registerForPushNotificationsAsync(
+  registerToken: (input: RegisterDeviceTokenInput) => void,
+  deps = {
+    isDevice: Device.isDevice,
+    platformOS: Platform.OS,
+    // Constants.expoConfig.extra is typed as Record<string, unknown> by Expo,
+    // so a cast is unavoidable here — the shape is defined in app.json.
+    projectId: Constants.expoConfig?.extra?.eas?.projectId as
+      | string
+      | undefined,
+  },
+): Promise<void> {
+  if (!deps.isDevice) {
+    return;
+  }
+
+  if (deps.platformOS === DevicePlatform.Android) {
+    await Notifications.setNotificationChannelAsync("default", {
+      name: "default",
+      importance: Notifications.AndroidImportance.MAX,
+      vibrationPattern: [0, 250, 250, 250],
+      lightColor: "#FF231F7C",
+    });
+  }
+
+  const { status: existingStatus } = await Notifications.getPermissionsAsync();
+  let finalStatus = existingStatus;
+
+  if (existingStatus !== Notifications.PermissionStatus.GRANTED) {
+    const { status } = await Notifications.requestPermissionsAsync();
+    finalStatus = status;
+  }
+
+  if (finalStatus !== Notifications.PermissionStatus.GRANTED) {
+    return;
+  }
+
+  if (!deps.projectId) {
+    return;
+  }
+
+  try {
+    const { data: token } = await Notifications.getExpoPushTokenAsync({
+      projectId: deps.projectId,
+    });
+    const platform = deps.platformOS as DevicePlatform;
+    registerToken({ token, platform });
+  } catch {
+    // Push notifications are non-critical; silently skip on failure.
+  }
+}
diff --git a/clients/mobile/hooks/useClerkErrorHandler.ts b/clients/mobile/hooks/useClerkErrorHandler.ts
new file mode 100644
index 000000000..afed762f5
--- /dev/null
+++ b/clients/mobile/hooks/useClerkErrorHandler.ts
@@ -0,0 +1,12 @@
+export const useClerkErrorHandler = (setError: (msg: string) => void) => {
+  const run = async (action: () => Promise<void>) => {
+    setError("");
+    try {
+      await action();
+    } catch (err: any) {
+      setError(err.errors?.[0]?.message);
+    }
+  };
+
+  return run;
+};
diff --git a/clients/mobile/package-lock.json b/clients/mobile/package-lock.json
index 110d04881..a2cc9e487 100644
--- a/clients/mobile/package-lock.json
+++ b/clients/mobile/package-lock.json
@@ -19,10 +19,12 @@
         "expo": "~54.0.31",
         "expo-auth-session": "^7.0.10",
         "expo-constants": "~18.0.13",
+        "expo-device": "~8.0.10",
         "expo-font": "~14.0.10",
         "expo-haptics": "~15.0.8",
         "expo-image": "~3.0.11",
         "expo-linking": "~8.0.11",
+        "expo-notifications": "^0.32.16",
         "expo-router": "~6.0.21",
         "expo-secure-store": "~15.0.8",
         "expo-splash-screen": "~31.0.13",
@@ -2453,6 +2455,12 @@
         "url": "https://github.com/sponsors/nzakas"
       }
     },
+    "node_modules/@ide/backoff": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@ide/backoff/-/backoff-1.0.0.tgz",
+      "integrity": "sha512-F0YfUDjvT+Mtt/R4xdl2X0EYCHMMiJqNLdxHD++jDT5ydEFIyqbCHh51Qx2E211dgZprPKhV7sHmnXKpLuvc5g==",
+      "license": "MIT"
+    },
     "node_modules/@isaacs/balanced-match": {
       "version": "4.0.1",
       "license": "MIT",
@@ -5244,6 +5252,19 @@
       "version": "2.0.6",
       "license": "MIT"
     },
+    "node_modules/assert": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/assert/-/assert-2.1.0.tgz",
+      "integrity": "sha512-eLHpSK/Y4nhMJ07gDaAzoX/XAKS8PSaojml3M0DM4JpV1LAi5JOJ/p6H/XWrl8L+DzVEvVCW1z3vWAaB9oTsQw==",
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "is-nan": "^1.3.2",
+        "object-is": "^1.1.5",
+        "object.assign": "^4.1.4",
+        "util": "^0.12.5"
+      }
+    },
     "node_modules/async-function": {
       "version": "1.0.0",
       "dev": true,
@@ -5263,7 +5284,6 @@
     },
     "node_modules/available-typed-arrays": {
       "version": "1.0.7",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "possible-typed-array-names": "^1.0.0"
@@ -5471,6 +5491,12 @@
         "@babel/core": "^7.0.0"
       }
     },
+    "node_modules/badgin": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/badgin/-/badgin-1.2.3.tgz",
+      "integrity": "sha512-NQGA7LcfCpSzIbGRbkgjgdWkjy7HI+Th5VLxTJfW5EeaAf3fnS+xWQaQOCYiny+q6QSvxqoSO04vCx+4u++EJw==",
+      "license": "MIT"
+    },
     "node_modules/balanced-match": {
       "version": "1.0.2",
       "license": "MIT"
@@ -5686,7 +5712,6 @@
     },
     "node_modules/call-bind": {
       "version": "1.0.8",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "call-bind-apply-helpers": "^1.0.0",
@@ -5703,7 +5728,6 @@
     },
     "node_modules/call-bind-apply-helpers": {
       "version": "1.0.2",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "es-errors": "^1.3.0",
@@ -5715,7 +5739,6 @@
     },
     "node_modules/call-bound": {
       "version": "1.0.4",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "call-bind-apply-helpers": "^1.0.2",
@@ -6449,7 +6472,6 @@
     },
     "node_modules/define-data-property": {
       "version": "1.1.4",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "es-define-property": "^1.0.0",
@@ -6472,7 +6494,6 @@
     },
     "node_modules/define-properties": {
       "version": "1.2.1",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "define-data-property": "^1.0.1",
@@ -6683,7 +6704,6 @@
     },
     "node_modules/dunder-proto": {
       "version": "1.0.1",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "call-bind-apply-helpers": "^1.0.1",
@@ -6829,7 +6849,6 @@
     },
     "node_modules/es-define-property": {
       "version": "1.0.1",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 0.4"
@@ -6837,7 +6856,6 @@
     },
     "node_modules/es-errors": {
       "version": "1.3.0",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 0.4"
@@ -6871,7 +6889,6 @@
     },
     "node_modules/es-object-atoms": {
       "version": "1.1.1",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "es-errors": "^1.3.0"
@@ -7506,6 +7523,15 @@
         }
       }
     },
+    "node_modules/expo-application": {
+      "version": "7.0.8",
+      "resolved": "https://registry.npmjs.org/expo-application/-/expo-application-7.0.8.tgz",
+      "integrity": "sha512-qFGyxk7VJbrNOQWBbE09XUuGuvkOgFS9QfToaK2FdagM2aQ+x3CvGV2DuVgl/l4ZxPgIf3b/MNh9xHpwSwn74Q==",
+      "license": "MIT",
+      "peerDependencies": {
+        "expo": "*"
+      }
+    },
     "node_modules/expo-asset": {
       "version": "12.0.12",
       "license": "MIT",
@@ -7537,15 +7563,6 @@
         "react-native": "*"
       }
     },
-    "node_modules/expo-auth-session/node_modules/expo-application": {
-      "version": "7.0.8",
-      "resolved": "https://registry.npmjs.org/expo-application/-/expo-application-7.0.8.tgz",
-      "integrity": "sha512-qFGyxk7VJbrNOQWBbE09XUuGuvkOgFS9QfToaK2FdagM2aQ+x3CvGV2DuVgl/l4ZxPgIf3b/MNh9xHpwSwn74Q==",
-      "license": "MIT",
-      "peerDependencies": {
-        "expo": "*"
-      }
-    },
     "node_modules/expo-auth-session/node_modules/expo-crypto": {
       "version": "15.0.8",
       "resolved": "https://registry.npmjs.org/expo-crypto/-/expo-crypto-15.0.8.tgz",
@@ -7570,6 +7587,44 @@
         "react-native": "*"
       }
     },
+    "node_modules/expo-device": {
+      "version": "8.0.10",
+      "resolved": "https://registry.npmjs.org/expo-device/-/expo-device-8.0.10.tgz",
+      "integrity": "sha512-jd5BxjaF7382JkDMaC+P04aXXknB2UhWaVx5WiQKA05ugm/8GH5uaz9P9ckWdMKZGQVVEOC8MHaUADoT26KmFA==",
+      "license": "MIT",
+      "dependencies": {
+        "ua-parser-js": "^0.7.33"
+      },
+      "peerDependencies": {
+        "expo": "*"
+      }
+    },
+    "node_modules/expo-device/node_modules/ua-parser-js": {
+      "version": "0.7.41",
+      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.41.tgz",
+      "integrity": "sha512-O3oYyCMPYgNNHuO7Jjk3uacJWZF8loBgwrfd/5LE/HyZ3lUIOdniQ7DNXJcIgZbwioZxk0fLfI4EVnetdiX5jg==",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/ua-parser-js"
+        },
+        {
+          "type": "paypal",
+          "url": "https://paypal.me/faisalman"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/faisalman"
+        }
+      ],
+      "license": "MIT",
+      "bin": {
+        "ua-parser-js": "script/cli.js"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/expo-file-system": {
       "version": "19.0.21",
       "license": "MIT",
@@ -7657,6 +7712,26 @@
         "react-native": "*"
       }
     },
+    "node_modules/expo-notifications": {
+      "version": "0.32.16",
+      "resolved": "https://registry.npmjs.org/expo-notifications/-/expo-notifications-0.32.16.tgz",
+      "integrity": "sha512-QQD/UA6v7LgvwIJ+tS7tSvqJZkdp0nCSj9MxsDk/jU1GttYdK49/5L2LvE/4U0H7sNBz1NZAyhDZozg8xgBLXw==",
+      "license": "MIT",
+      "dependencies": {
+        "@expo/image-utils": "^0.8.8",
+        "@ide/backoff": "^1.0.0",
+        "abort-controller": "^3.0.0",
+        "assert": "^2.0.0",
+        "badgin": "^1.1.5",
+        "expo-application": "~7.0.8",
+        "expo-constants": "~18.0.13"
+      },
+      "peerDependencies": {
+        "expo": "*",
+        "react": "*",
+        "react-native": "*"
+      }
+    },
     "node_modules/expo-router": {
       "version": "6.0.21",
       "license": "MIT",
@@ -8314,7 +8389,6 @@
     },
     "node_modules/for-each": {
       "version": "0.3.5",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "is-callable": "^1.2.7"
@@ -8406,7 +8480,6 @@
     },
     "node_modules/generator-function": {
       "version": "2.0.1",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 0.4"
@@ -8428,7 +8501,6 @@
     },
     "node_modules/get-intrinsic": {
       "version": "1.3.0",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "call-bind-apply-helpers": "^1.0.2",
@@ -8465,7 +8537,6 @@
     },
     "node_modules/get-proto": {
       "version": "1.0.1",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "dunder-proto": "^1.0.1",
@@ -8603,7 +8674,6 @@
     },
     "node_modules/gopd": {
       "version": "1.2.0",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 0.4"
@@ -8636,7 +8706,6 @@
     },
     "node_modules/has-property-descriptors": {
       "version": "1.0.2",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "es-define-property": "^1.0.0"
@@ -8661,7 +8730,6 @@
     },
     "node_modules/has-symbols": {
       "version": "1.1.0",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 0.4"
@@ -8672,7 +8740,6 @@
     },
     "node_modules/has-tostringtag": {
       "version": "1.0.2",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "has-symbols": "^1.0.3"
@@ -8980,6 +9047,22 @@
         "loose-envify": "^1.0.0"
       }
     },
+    "node_modules/is-arguments": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.2.0.tgz",
+      "integrity": "sha512-7bVbi0huj/wrIAOzb8U1aszg9kdi3KN/CyU19CTI7tAoZYEZoL9yCDXpbXN+uPsuWnP02cyug1gleqq+TU+YCA==",
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "has-tostringtag": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/is-array-buffer": {
       "version": "3.0.5",
       "dev": true,
@@ -9079,7 +9162,6 @@
     },
     "node_modules/is-callable": {
       "version": "1.2.7",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 0.4"
@@ -9184,7 +9266,6 @@
     },
     "node_modules/is-generator-function": {
       "version": "1.1.2",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "call-bound": "^1.0.4",
@@ -9222,6 +9303,22 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/is-nan": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/is-nan/-/is-nan-1.3.2.tgz",
+      "integrity": "sha512-E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w==",
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.0",
+        "define-properties": "^1.1.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/is-negative-zero": {
       "version": "2.0.3",
       "dev": true,
@@ -9272,7 +9369,6 @@
     },
     "node_modules/is-regex": {
       "version": "1.2.1",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "call-bound": "^1.0.2",
@@ -9356,7 +9452,6 @@
     },
     "node_modules/is-typed-array": {
       "version": "1.1.15",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "which-typed-array": "^1.1.16"
@@ -11149,7 +11244,6 @@
     },
     "node_modules/math-intrinsics": {
       "version": "1.1.0",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 0.4"
@@ -11755,9 +11849,24 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/object-is": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.6.tgz",
+      "integrity": "sha512-F8cZ+KfGlSGi09lJT7/Nd6KJZ9ygtvYC0/UYYLI9nmQKLMnydpB9yvbv9K1uSkEu7FU9vYPmVwLg328tX+ot3Q==",
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/object-keys": {
       "version": "1.1.1",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 0.4"
@@ -11765,7 +11874,6 @@
     },
     "node_modules/object.assign": {
       "version": "4.1.7",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.8",
@@ -12302,7 +12410,6 @@
     },
     "node_modules/possible-typed-array-names": {
       "version": "1.1.0",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 0.4"
@@ -13877,7 +13984,6 @@
     },
     "node_modules/safe-regex-test": {
       "version": "1.1.0",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "call-bound": "^1.0.2",
@@ -14021,7 +14127,6 @@
     },
     "node_modules/set-function-length": {
       "version": "1.2.2",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "define-data-property": "^1.1.4",
@@ -15253,6 +15358,19 @@
         "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
       }
     },
+    "node_modules/util": {
+      "version": "0.12.5",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz",
+      "integrity": "sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==",
+      "license": "MIT",
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "is-arguments": "^1.0.4",
+        "is-generator-function": "^1.0.7",
+        "is-typed-array": "^1.1.3",
+        "which-typed-array": "^1.1.2"
+      }
+    },
     "node_modules/util-deprecate": {
       "version": "1.0.2",
       "dev": true,
@@ -15750,7 +15868,6 @@
     },
     "node_modules/which-typed-array": {
       "version": "1.1.19",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "available-typed-arrays": "^1.0.7",
diff --git a/clients/mobile/package.json b/clients/mobile/package.json
index f3d160b22..a0bb953a5 100644
--- a/clients/mobile/package.json
+++ b/clients/mobile/package.json
@@ -3,16 +3,16 @@
   "main": "expo-router/entry",
   "version": "1.0.0",
   "scripts": {
-    "start": "expo start",
+    "start": "doppler run -- expo start",
     "reset-project": "node ./scripts/reset-project.js",
-    "android": "expo run:android",
-    "ios": "expo run:ios",
+    "android": "doppler run -- expo run:android",
+    "ios": "doppler run -- expo run:ios",
     "lint": "expo lint",
     "format": "prettier --write .",
     "format:check": "prettier --check .",
     "test": "jest",
     "test:watch": "jest --watch",
-    "test:coverage": "jest --coverage"
+    "test:coverage": "jest --coverage --passWithNoTests"
   },
   "dependencies": {
     "@clerk/clerk-expo": "^2.19.23",
@@ -26,10 +26,12 @@
     "expo": "~54.0.31",
     "expo-auth-session": "^7.0.10",
     "expo-constants": "~18.0.13",
+    "expo-device": "~8.0.10",
     "expo-font": "~14.0.10",
     "expo-haptics": "~15.0.8",
     "expo-image": "~3.0.11",
     "expo-linking": "~8.0.11",
+    "expo-notifications": "^0.32.16",
     "expo-router": "~6.0.21",
     "expo-secure-store": "~15.0.8",
     "expo-splash-screen": "~31.0.13",
@@ -58,9 +60,9 @@
     "@types/react": "~19.1.0",
     "eslint": "^9.25.0",
     "eslint-config-expo": "~10.0.0",
-    "prettier": "^3.5.3",
     "jest": "~29.7.0",
     "jest-expo": "^54.0.16",
+    "prettier": "^3.5.3",
     "react-native-dotenv": "^3.4.11",
     "react-test-renderer": "^19.1.0",
     "tailwindcss": "^3.4.19",
diff --git a/clients/mobile/tailwind.config.js b/clients/mobile/tailwind.config.js
index 599933441..1cef40b7e 100644
--- a/clients/mobile/tailwind.config.js
+++ b/clients/mobile/tailwind.config.js
@@ -6,7 +6,19 @@ module.exports = {
       colors: {
         primary: "#15502c",
         "primary-hover": "#0a2916",
+        "text-default": "#1a1a1a",
+        "text-subtle": "#747474",
+        "text-secondary": "#5d5d5d",
+        "text-disabled": "#bababa",
+        "bg-surface": "#ffffff",
+        "bg-input": "#f4f4f4",
+        "bg-selected": "#edf5f1",
         "stroke-subtle": "#d8d8d8",
+        "stroke-disabled": "#e9e9e9",
+        "input-border": "#aeaeae",
+        "input-border-light": "#e5e9ed",
+        "primary-accent": "#a8cdb9",
+        "primary-surface": "#124425",
         "success-accent": "#e8fff0",
         "success-container": "#bdffdd",
         "success-stroke": "#00a575",
@@ -46,6 +58,14 @@ module.exports = {
         "shadow-weak": "#e5e5e5",
         shadow: "#e7e7e7",
         "shadow-strong": "#dcdcdc",
+        card: "#EDF5F1",
+        "primary-border": "#166534",
+        "priority-high-bg": "#ffeded",
+        "priority-high": "#a21313",
+        "priority-medium-bg": "#fff3ed",
+        "priority-medium": "#ff8c3f",
+        "priority-low-bg": "#e1f0ff",
+        "priority-low": "#2f61ce",
       },
     },
   },
diff --git a/clients/mobile/utils.ts b/clients/mobile/utils.ts
new file mode 100644
index 000000000..446ce2f95
--- /dev/null
+++ b/clients/mobile/utils.ts
@@ -0,0 +1,46 @@
+import { Filter } from "@/components/ui/filters";
+
+/** Strip everything except digits, capped at 10. */
+export function parsePhoneDigits(value: string): string {
+  return value.replace(/\D/g, "").slice(0, 10);
+}
+
+/**
+ * Format a raw digit string (or already-formatted string) as (XXX) XXX-XXXX.
+ * Non-phone values like "—" are returned unchanged.
+ */
+export function formatPhoneNumber(value: string): string {
+  const d = parsePhoneDigits(value);
+  if (d.length === 0) return value; // preserve placeholder like "—"
+  if (d.length <= 3) return `(${d}`;
+  if (d.length <= 6) return `(${d.slice(0, 3)}) ${d.slice(3)}`;
+  return `(${d.slice(0, 3)}) ${d.slice(3, 6)}-${d.slice(6)}`;
+}
+
+const toFilterConfig = <T extends number | string>(
+  options: T[],
+  selected: T[],
+  onChange: (v: T) => void,
+  placeholder: string,
+  toLabel: (v: T) => string,
+): Filter<T>[] => [
+  {
+    value: selected,
+    onChange,
+    placeholder,
+    options: options.map((v) => ({ label: toLabel(v), value: v })),
+  },
+];
+
+export const getFloorConfig = (
+  floors: number[],
+  selected: number[],
+  onChange: (f: number) => void,
+) => toFilterConfig(floors, selected, onChange, "Floor", (n) => `Floor ${n}`);
+
+export const getGroupSizeConfig = (
+  sizes: number[],
+  selected: number[],
+  onChange: (s: number) => void,
+) =>
+  toFilterConfig(sizes, selected, onChange, "Group Size", (n) => `${n} guests`);
diff --git a/clients/mobile/utils/time.ts b/clients/mobile/utils/time.ts
new file mode 100644
index 000000000..4a7f62cdb
--- /dev/null
+++ b/clients/mobile/utils/time.ts
@@ -0,0 +1,21 @@
+export const formatDate = (iso: string) =>
+  new Date(iso).toLocaleDateString("en-US", {
+    month: "2-digit",
+    day: "2-digit",
+    year: "numeric",
+  });
+
+export const formatTime = (iso?: string | null) => {
+  if (!iso) return "";
+  return new Date(iso).toLocaleTimeString("en-US", {
+    hour: "numeric",
+    minute: "2-digit",
+  });
+};
+
+export const timeAgo = (iso?: string) => {
+  if (!iso) return "";
+  const mins = Math.floor((Date.now() - new Date(iso).getTime()) / 60000);
+  if (mins < 60) return `${mins} min ago`;
+  return `${Math.floor(mins / 60)}h ago`;
+};
diff --git a/clients/package-lock.json b/clients/package-lock.json
new file mode 100644
index 000000000..36c18ca1e
--- /dev/null
+++ b/clients/package-lock.json
@@ -0,0 +1,22 @@
+{
+  "name": "clients",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "dependencies": {
+        "canvas-confetti": "^1.9.4"
+      }
+    },
+    "node_modules/canvas-confetti": {
+      "version": "1.9.4",
+      "resolved": "https://registry.npmjs.org/canvas-confetti/-/canvas-confetti-1.9.4.tgz",
+      "integrity": "sha512-yxQbJkAVrFXWNbTUjPqjF7G+g6pDotOUHGbkZq2NELZUMDpiJ85rIEazVb8GTaAptNW2miJAXbs1BtioA251Pw==",
+      "license": "ISC",
+      "funding": {
+        "type": "donate",
+        "url": "https://www.paypal.me/kirilvatev"
+      }
+    }
+  }
+}
diff --git a/clients/package.json b/clients/package.json
new file mode 100644
index 000000000..556ec9149
--- /dev/null
+++ b/clients/package.json
@@ -0,0 +1,5 @@
+{
+  "dependencies": {
+    "canvas-confetti": "^1.9.4"
+  }
+}
diff --git a/clients/shared/README.md b/clients/shared/README.md
index afd1646ac..e9fa588ec 100644
--- a/clients/shared/README.md
+++ b/clients/shared/README.md
@@ -2,6 +2,51 @@
 
 This package contains shared code (API clients, hooks, types, utilities) used by both the web and mobile clients.
 
+## Environment Setup with Doppler
+
+Both web and mobile clients use Doppler for secrets management:
+
+- **selfserve-web** - Web app secrets (Vite env vars)
+- **selfserve-mobile** - Mobile app secrets (Expo env vars)
+
+### First-time Setup
+
+1. Install Doppler CLI (if not already installed):
+
+   ```bash
+   brew install dopplerhq/cli/doppler
+   ```
+
+2. Authenticate:
+
+   ```bash
+   doppler login
+   ```
+
+3. Set up each client project:
+
+   ```bash
+   # For web
+   cd clients/web
+   doppler setup
+
+   # For mobile
+   cd clients/mobile
+   doppler setup
+   ```
+
+### Running Apps
+
+```bash
+# Web
+cd clients/web
+npm run dev
+
+# Mobile
+cd clients/mobile
+npm run start
+```
+
 ## Architecture
 
 - **Source-only package**: This is not a compiled npm package. Web and mobile import the raw TypeScript source and bundle it with their own dependencies.
diff --git a/clients/shared/src/api/client.ts b/clients/shared/src/api/client.ts
index 752e14d19..2b97be39e 100644
--- a/clients/shared/src/api/client.ts
+++ b/clients/shared/src/api/client.ts
@@ -8,12 +8,12 @@ export const createRequest = (
   getToken: () => Promise<string | null>,
   baseUrl: string,
 ) => {
-  const hardCodedHotelId = "a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11"
   return async <T>(config: RequestConfig): Promise<T> => {
+    const hotelId = getConfig().hotelId;
     let fullUrl = `${baseUrl}${config.url}`;
     if (config.params && Object.keys(config.params).length > 0) {
       const searchParams = new URLSearchParams(config.params);
-      fullUrl += '?' + searchParams.toString();
+      fullUrl += "?" + searchParams.toString();
     }
 
     try {
@@ -24,7 +24,7 @@ export const createRequest = (
         headers: {
           "Content-Type": "application/json",
           ...(token && { Authorization: `Bearer ${token}` }),
-          "X-Hotel-ID": hardCodedHotelId,
+          "X-Hotel-ID": hotelId,
           ...config.headers,
         },
         body: config.data ? JSON.stringify(config.data) : undefined,
@@ -101,4 +101,4 @@ export const getBaseUrl = (): string => {
   }
 
   return url;
-};
\ No newline at end of file
+};
diff --git a/clients/shared/src/api/config.ts b/clients/shared/src/api/config.ts
index fee2aae85..12cb60820 100644
--- a/clients/shared/src/api/config.ts
+++ b/clients/shared/src/api/config.ts
@@ -8,6 +8,7 @@
 export type Config = {
   API_BASE_URL: string
   getToken: () => Promise<string | null>
+  hotelId: string
 }
 
 let config: Config | null = null
diff --git a/clients/shared/src/api/departments.ts b/clients/shared/src/api/departments.ts
new file mode 100644
index 000000000..312a8db8a
--- /dev/null
+++ b/clients/shared/src/api/departments.ts
@@ -0,0 +1,80 @@
+import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import type { Department } from "../types/departments";
+import { useAPIClient } from "./client";
+import { REQUESTS_FEED_QUERY_KEY } from "./requests";
+
+export const getDepartmentsQueryKey = (hotelId: string | undefined) =>
+  ["departments", hotelId] as const;
+
+export const useGetDepartments = (hotelId: string | undefined) => {
+  const api = useAPIClient();
+  return useQuery({
+    queryKey: getDepartmentsQueryKey(hotelId),
+    queryFn: () => api.get<Department[]>(`/hotels/${hotelId}/departments`),
+    enabled: !!hotelId,
+  });
+};
+
+export const useCreateDepartment = (hotelId: string | undefined) => {
+  const api = useAPIClient();
+  const queryClient = useQueryClient();
+  return useMutation({
+    mutationFn: (name: string) =>
+      api.post<Department>(`/hotels/${hotelId}/departments`, { name }),
+    onSettled: () => {
+      queryClient.invalidateQueries({ queryKey: getDepartmentsQueryKey(hotelId) });
+    },
+  });
+};
+
+export const useUpdateDepartment = (hotelId: string | undefined) => {
+  const api = useAPIClient();
+  const queryClient = useQueryClient();
+  return useMutation({
+    mutationFn: ({ id, name }: { id: string; name: string }) =>
+      api.put<Department>(`/hotels/${hotelId}/departments/${id}`, { name }),
+    onSettled: () => {
+      queryClient.invalidateQueries({ queryKey: getDepartmentsQueryKey(hotelId) });
+      queryClient.invalidateQueries({ queryKey: REQUESTS_FEED_QUERY_KEY });
+      queryClient.invalidateQueries({ queryKey: ["request"] });
+    },
+  });
+};
+
+export const useDeleteDepartment = (hotelId: string | undefined) => {
+  const api = useAPIClient();
+  const queryClient = useQueryClient();
+  return useMutation({
+    mutationFn: (id: string) =>
+      api.delete<void>(`/hotels/${hotelId}/departments/${id}`),
+    onSettled: () => {
+      queryClient.invalidateQueries({ queryKey: getDepartmentsQueryKey(hotelId) });
+    },
+  });
+};
+
+export const useAddEmployeeDepartment = (hotelId: string | undefined) => {
+  const api = useAPIClient();
+  const queryClient = useQueryClient();
+  return useMutation({
+    mutationFn: ({ employeeId, departmentId }: { employeeId: string; departmentId: string }) =>
+      api.post<void>(`/users/${employeeId}/departments`, { department_id: departmentId }),
+    onSettled: (_data, _err, { employeeId }) => {
+      queryClient.invalidateQueries({ queryKey: ["hotel-members", hotelId] });
+      queryClient.invalidateQueries({ queryKey: ["user", employeeId] });
+    },
+  });
+};
+
+export const useRemoveEmployeeDepartment = (hotelId: string | undefined) => {
+  const api = useAPIClient();
+  const queryClient = useQueryClient();
+  return useMutation({
+    mutationFn: ({ employeeId, departmentId }: { employeeId: string; departmentId: string }) =>
+      api.delete<void>(`/users/${employeeId}/departments/${departmentId}`),
+    onSettled: (_data, _err, { employeeId }) => {
+      queryClient.invalidateQueries({ queryKey: ["hotel-members", hotelId] });
+      queryClient.invalidateQueries({ queryKey: ["user", employeeId] });
+    },
+  });
+};
diff --git a/clients/shared/src/api/notifications.ts b/clients/shared/src/api/notifications.ts
new file mode 100644
index 000000000..2212e48c7
--- /dev/null
+++ b/clients/shared/src/api/notifications.ts
@@ -0,0 +1,44 @@
+import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import type { Notification, RegisterDeviceTokenInput } from "../types/notifications";
+import { useAPIClient } from "./client";
+
+export const NOTIFICATIONS_QUERY_KEY = ["notifications"] as const;
+
+export const useGetNotifications = () => {
+  const api = useAPIClient();
+  return useQuery({
+    queryKey: NOTIFICATIONS_QUERY_KEY,
+    queryFn: () => api.get<Notification[]>("/notifications"),
+    staleTime: 30_000,
+  });
+};
+
+export const useMarkNotificationRead = () => {
+  const api = useAPIClient();
+  const queryClient = useQueryClient();
+  return useMutation({
+    mutationFn: (id: string) => api.put<void>(`/notifications/${id}/read`, {}),
+    onSettled: () => {
+      queryClient.invalidateQueries({ queryKey: NOTIFICATIONS_QUERY_KEY });
+    },
+  });
+};
+
+export const useMarkAllNotificationsRead = () => {
+  const api = useAPIClient();
+  const queryClient = useQueryClient();
+  return useMutation({
+    mutationFn: () => api.put<void>("/notifications/read-all", {}),
+    onSettled: () => {
+      queryClient.invalidateQueries({ queryKey: NOTIFICATIONS_QUERY_KEY });
+    },
+  });
+};
+
+export const usePostDeviceToken = () => {
+  const api = useAPIClient();
+  return useMutation({
+    mutationFn: (input: RegisterDeviceTokenInput) =>
+      api.post<void>("/device-tokens", input),
+  });
+};
diff --git a/clients/shared/src/api/profile-picture.ts b/clients/shared/src/api/profile-picture.ts
new file mode 100644
index 000000000..f893476b8
--- /dev/null
+++ b/clients/shared/src/api/profile-picture.ts
@@ -0,0 +1,67 @@
+import type { HttpClient } from "../types/api.types";
+import { ApiError } from "../types/api.types";
+
+export type UploadUrlResponse = {
+  presigned_url: string;
+  key: string;
+};
+
+export type ProfilePictureResponse = {
+  key: string;
+  presigned_url: string;
+};
+
+export async function getProfilePicture(
+  api: HttpClient,
+  userId: string,
+): Promise<ProfilePictureResponse | null> {
+  try {
+    return await api.get<ProfilePictureResponse>(
+      `/users/${userId}/profile-picture`,
+    );
+  } catch (e) {
+    if (e instanceof ApiError && e.status === 404) {
+      return null;
+    }
+    throw e;
+  }
+}
+
+export function getUploadUrl(
+  api: HttpClient,
+  userId: string,
+  ext: string,
+): Promise<UploadUrlResponse> {
+  return api.get<UploadUrlResponse>(`/s3/upload-url/${userId}`, { ext });
+}
+
+export function saveProfilePictureKey(
+  api: HttpClient,
+  userId: string,
+  key: string,
+): Promise<void> {
+  return api.put<void>(`/users/${userId}/profile-picture`, { key });
+}
+
+export function deleteProfilePicture(
+  api: HttpClient,
+  userId: string,
+): Promise<void> {
+  return api.delete<void>(`/users/${userId}/profile-picture`);
+}
+
+export async function uploadFileToS3(
+  presignedUrl: string,
+  file: File,
+): Promise<void> {
+  const res = await fetch(presignedUrl, {
+    method: "PUT",
+    body: file,
+    headers: {
+      "Content-Type": file.type,
+    },
+  });
+  if (!res.ok) {
+    throw new Error("Failed to upload to S3");
+  }
+}
\ No newline at end of file
diff --git a/clients/shared/src/api/requests.ts b/clients/shared/src/api/requests.ts
new file mode 100644
index 000000000..13e74b2e9
--- /dev/null
+++ b/clients/shared/src/api/requests.ts
@@ -0,0 +1,463 @@
+import {
+  useInfiniteQuery,
+  useMutation,
+  useQuery,
+  useQueryClient,
+} from "@tanstack/react-query";
+import type { GuestRequest, Request } from "./generated/models";
+import { RequestStatus } from "./generated/models";
+import { useAPIClient } from "./client";
+import { getConfig } from "./config";
+
+type GuestRequestPage = {
+  items: GuestRequest[] | null;
+  next_cursor: string | null;
+  has_more: boolean;
+};
+
+export const getGuestRequestsQueryKey = (guestId: string) =>
+  ["requests", "guest", guestId] as const;
+
+export const useInfiniteRequestsByGuest = (guestId: string) => {
+  const api = useAPIClient();
+
+  return useInfiniteQuery({
+    queryKey: getGuestRequestsQueryKey(guestId),
+    queryFn: ({ pageParam }: { pageParam: string | undefined }) =>
+      api.get<GuestRequestPage>(`/request/guest/${guestId}`, {
+        ...(pageParam ? { cursor: pageParam } : {}),
+      }),
+    initialPageParam: undefined as string | undefined,
+    getNextPageParam: (lastPage) => lastPage.next_cursor,
+    enabled: !!guestId,
+  });
+};
+
+export const REQUESTS_FEED_QUERY_KEY = ["requests-feed"] as const;
+
+export const getRoomRequestsByRoomIdQueryKey = (roomId: string) =>
+  [`/request/room/${roomId}`] as const;
+
+export const useAssignRequestToSelf = (_roomId?: string) => {
+  const api = useAPIClient();
+  const queryClient = useQueryClient();
+
+  return useMutation({
+    mutationFn: (requestId: string) =>
+      api.post<unknown>(`/request/${requestId}/assign`, { assign_to_self: true }),
+    onMutate: async (requestId) => {
+      await queryClient.cancelQueries({
+        queryKey: REQUESTS_FEED_QUERY_KEY,
+        exact: false,
+      });
+      const previousData = queryClient.getQueriesData<{
+        pages: RequestFeedPage[];
+        pageParams: unknown[];
+      }>({ queryKey: REQUESTS_FEED_QUERY_KEY });
+      queryClient.setQueriesData<{
+        pages: RequestFeedPage[];
+        pageParams: unknown[];
+      }>({ queryKey: REQUESTS_FEED_QUERY_KEY }, (old) => {
+        if (!old) return old;
+        return {
+          ...old,
+          pages: old.pages.map((page) => ({
+            ...page,
+            items: (page.items ?? []).filter((item) => item.id !== requestId),
+          })),
+        };
+      });
+      return { previousData };
+    },
+    onError: (_err, _requestId, context) => {
+      if (context?.previousData) {
+        for (const [key, data] of context.previousData) {
+          queryClient.setQueryData(key, data);
+        }
+      }
+    },
+    onSettled: () => {
+      queryClient.invalidateQueries({
+        queryKey: REQUESTS_FEED_QUERY_KEY,
+        exact: false,
+      });
+      queryClient.invalidateQueries({
+        predicate: (query) => {
+          const key = query.queryKey[0];
+          return typeof key === "string" && key.startsWith("/request/room/");
+        },
+      });
+    },
+  });
+};
+
+export type RequestFeedItem = {
+  id: string;
+  name: string;
+  priority: string;
+  status: RequestStatus;
+  description?: string | null;
+  notes?: string | null;
+  room_number?: number | null;
+  floor?: number | null;
+  request_type: string;
+  request_category?: string | null;
+  department_id?: string | null;
+  department_name?: string | null;
+  user_id?: string | null;
+  created_at: string;
+  request_version: string;
+};
+
+export type RequestFeedPage = {
+  items: RequestFeedItem[] | null;
+  next_cursor: string | null;
+  has_more: boolean;
+};
+
+export type RequestFeedSort = "priority" | "newest" | "oldest";
+
+export type RequestFeedParams = {
+  userId?: string;
+  unassigned?: boolean;
+  sort?: RequestFeedSort;
+  status?: string;
+  priorities?: string[];
+  departments?: string[];
+  floors?: number[];
+  search?: string;
+};
+
+export const useDropTask = () => {
+  const api = useAPIClient();
+  const queryClient = useQueryClient();
+
+  return useMutation({
+    mutationFn: (taskId: string) =>
+      api.put<RequestFeedItem>(`/request/${taskId}`, { unassign: true }),
+    onSuccess: (_data, taskId) => {
+      queryClient.setQueriesData<{
+        pages: RequestFeedPage[];
+        pageParams: unknown[];
+      }>({ queryKey: REQUESTS_FEED_QUERY_KEY }, (old) => {
+        if (!old) return old;
+        return {
+          ...old,
+          pages: old.pages.map((page) => ({
+            ...page,
+            items: (page.items ?? []).filter((item) => item.id !== taskId),
+          })),
+        };
+      });
+    },
+    onSettled: () => {
+      queryClient.invalidateQueries({ queryKey: REQUESTS_FEED_QUERY_KEY });
+    },
+  });
+};
+
+export const useCompleteTask = () => {
+  const api = useAPIClient();
+  const queryClient = useQueryClient();
+
+  return useMutation({
+    mutationFn: (taskId: string) =>
+      api.put<RequestFeedItem>(`/request/${taskId}`, {
+        status: RequestStatus.completed,
+      }),
+    onMutate: async (taskId) => {
+      await queryClient.cancelQueries({
+        queryKey: REQUESTS_FEED_QUERY_KEY,
+        exact: false,
+      });
+      const previousData = queryClient.getQueriesData<{
+        pages: RequestFeedPage[];
+        pageParams: unknown[];
+      }>({ queryKey: REQUESTS_FEED_QUERY_KEY });
+      queryClient.setQueriesData<{
+        pages: RequestFeedPage[];
+        pageParams: unknown[];
+      }>({ queryKey: REQUESTS_FEED_QUERY_KEY }, (old) => {
+        if (!old) return old;
+        return {
+          ...old,
+          pages: old.pages.map((page) => ({
+            ...page,
+            items: (page.items ?? []).map((item) =>
+              item.id === taskId
+                ? { ...item, status: RequestStatus.completed }
+                : item,
+            ),
+          })),
+        };
+      });
+      return { previousData };
+    },
+    onError: (_err, _taskId, context) => {
+      if (context?.previousData) {
+        for (const [key, data] of context.previousData) {
+          queryClient.setQueryData(key, data);
+        }
+      }
+    },
+    onSettled: (_data, _err, taskId) => {
+      queryClient.invalidateQueries({
+        queryKey: REQUESTS_FEED_QUERY_KEY,
+        exact: false,
+      });
+      queryClient.invalidateQueries({
+        queryKey: getRequestActivityQueryKey(taskId),
+      });
+    },
+  });
+};
+
+export const useMarkTaskPending = () => {
+  const api = useAPIClient();
+  const queryClient = useQueryClient();
+
+  return useMutation({
+    mutationFn: (taskId: string) =>
+      api.put<RequestFeedItem>(`/request/${taskId}`, {
+        status: RequestStatus.pending,
+      }),
+    onMutate: async (taskId) => {
+      await queryClient.cancelQueries({
+        queryKey: REQUESTS_FEED_QUERY_KEY,
+        exact: false,
+      });
+      const previousData = queryClient.getQueriesData<{
+        pages: RequestFeedPage[];
+        pageParams: unknown[];
+      }>({ queryKey: REQUESTS_FEED_QUERY_KEY });
+      queryClient.setQueriesData<{
+        pages: RequestFeedPage[];
+        pageParams: unknown[];
+      }>({ queryKey: REQUESTS_FEED_QUERY_KEY }, (old) => {
+        if (!old) return old;
+        return {
+          ...old,
+          pages: old.pages.map((page) => ({
+            ...page,
+            items: (page.items ?? []).map((item) =>
+              item.id === taskId
+                ? { ...item, status: RequestStatus.pending }
+                : item,
+            ),
+          })),
+        };
+      });
+      return { previousData };
+    },
+    onError: (_err, _taskId, context) => {
+      if (context?.previousData) {
+        for (const [key, data] of context.previousData) {
+          queryClient.setQueryData(key, data);
+        }
+      }
+    },
+    onSettled: (_data, _err, taskId) => {
+      queryClient.invalidateQueries({
+        queryKey: REQUESTS_FEED_QUERY_KEY,
+        exact: false,
+      });
+      queryClient.invalidateQueries({
+        queryKey: getRequestActivityQueryKey(taskId),
+      });
+    },
+  });
+};
+
+export const useDeleteTask = () => {
+  const api = useAPIClient();
+  const queryClient = useQueryClient();
+
+  return useMutation({
+    mutationFn: (taskId: string) =>
+      api.put<void>(`/request/${taskId}`, { status: RequestStatus.archived }),
+    onMutate: async (taskId) => {
+      await queryClient.cancelQueries({
+        queryKey: REQUESTS_FEED_QUERY_KEY,
+        exact: false,
+      });
+      const previousData = queryClient.getQueriesData<{
+        pages: RequestFeedPage[];
+        pageParams: unknown[];
+      }>({ queryKey: REQUESTS_FEED_QUERY_KEY });
+      queryClient.setQueriesData<{
+        pages: RequestFeedPage[];
+        pageParams: unknown[];
+      }>({ queryKey: REQUESTS_FEED_QUERY_KEY }, (old) => {
+        if (!old) return old;
+        return {
+          ...old,
+          pages: old.pages.map((page) => ({
+            ...page,
+            items: (page.items ?? []).filter((item) => item.id !== taskId),
+          })),
+        };
+      });
+      return { previousData };
+    },
+    onError: (_err, _taskId, context) => {
+      if (context?.previousData) {
+        for (const [key, data] of context.previousData) {
+          queryClient.setQueryData(key, data);
+        }
+      }
+    },
+    onSettled: () => {
+      queryClient.invalidateQueries({
+        queryKey: REQUESTS_FEED_QUERY_KEY,
+        exact: false,
+      });
+    },
+  });
+};
+
+export const useGetRequestById = (requestId: string | null) => {
+  const api = useAPIClient();
+  return useQuery({
+    queryKey: ["request", requestId],
+    queryFn: () => api.get<Request>(`/request/${requestId}`),
+    enabled: !!requestId,
+  });
+};
+
+type UpdateRequestDepartmentVars = {
+  requestId: string;
+  departmentId: string;
+  sourceDepartmentId: string;
+  updatedItem: RequestFeedItem;
+};
+
+export const useUpdateRequestDepartment = () => {
+  const api = useAPIClient();
+  const queryClient = useQueryClient();
+
+  return useMutation({
+    mutationFn: ({ requestId, departmentId }: UpdateRequestDepartmentVars) =>
+      api.put<RequestFeedItem>(`/request/${requestId}`, { department: departmentId }),
+    onMutate: async ({ requestId, departmentId, sourceDepartmentId, updatedItem }) => {
+      await queryClient.cancelQueries({
+        queryKey: REQUESTS_FEED_QUERY_KEY,
+        exact: false,
+      });
+      const previousData = queryClient.getQueriesData<{
+        pages: RequestFeedPage[];
+        pageParams: unknown[];
+      }>({ queryKey: REQUESTS_FEED_QUERY_KEY });
+
+      for (const [key, data] of previousData) {
+        if (!data) continue;
+        const params = key[1] as RequestFeedParams | undefined;
+        const depts = params?.departments;
+        if (depts?.includes(sourceDepartmentId)) {
+          queryClient.setQueryData(key, {
+            ...data,
+            pages: data.pages.map((page) => ({
+              ...page,
+              items: (page.items ?? []).filter((item) => item.id !== requestId),
+            })),
+          });
+        } else if (depts?.includes(departmentId)) {
+          queryClient.setQueryData(key, {
+            ...data,
+            pages: data.pages.map((page, i) =>
+              i === 0
+                ? { ...page, items: [updatedItem, ...(page.items ?? [])] }
+                : page,
+            ),
+          });
+        }
+      }
+
+      return { previousData };
+    },
+    onError: (_err, _vars, context) => {
+      if (context?.previousData) {
+        for (const [key, data] of context.previousData) {
+          queryClient.setQueryData(key, data);
+        }
+      }
+    },
+    onSettled: () => {
+      queryClient.invalidateQueries({
+        queryKey: REQUESTS_FEED_QUERY_KEY,
+        exact: false,
+      });
+    },
+  });
+};
+
+export type RequestActivityType =
+  | "created"
+  | "status_changed"
+  | "priority_changed"
+  | "assigned"
+  | "unassigned"
+  | "name_changed"
+  | "title_changed"
+  | "description_changed"
+  | "department_changed"
+  | "room_changed";
+
+export type RequestActivityItem = {
+  type: RequestActivityType;
+  changed_by: string | null;
+  old_value?: string | null;
+  new_value?: string | null;
+  timestamp: string;
+};
+
+export type RequestActivityPage = {
+  items: RequestActivityItem[];
+  next_cursor?: string | null;
+};
+
+const ACTIVITY_PAGE_SIZE = 8;
+
+export const getRequestActivityQueryKey = (requestId: string) =>
+  ["request", requestId, "activity"] as const;
+
+export const useGetRequestActivity = (requestId: string | null) => {
+  const api = useAPIClient();
+  return useInfiniteQuery({
+    queryKey: getRequestActivityQueryKey(requestId ?? ""),
+    queryFn: ({ pageParam }) => {
+      const url = pageParam
+        ? `/request/${requestId}/activity?cursor=${encodeURIComponent(pageParam)}&limit=${ACTIVITY_PAGE_SIZE}`
+        : `/request/${requestId}/activity?limit=${ACTIVITY_PAGE_SIZE}`;
+      return api.get<RequestActivityPage>(url);
+    },
+    getNextPageParam: (last) => last.next_cursor ?? undefined,
+    initialPageParam: "",
+    enabled: !!requestId,
+  });
+};
+
+export const useGetRequestsFeed = (params: RequestFeedParams) => {
+  const api = useAPIClient();
+  return useInfiniteQuery({
+    queryKey: [...REQUESTS_FEED_QUERY_KEY, params] as const,
+    initialPageParam: "",
+    queryFn: ({ pageParam }) => {
+      const { hotelId } = getConfig();
+      return api.post<RequestFeedPage>("/requests/feed", {
+        hotel_id: hotelId,
+        cursor: pageParam || undefined,
+        limit: 20,
+        user_id: params.userId,
+        unassigned: params.unassigned,
+        sort: params.sort,
+        status: params.status,
+        priorities: params.priorities,
+        departments: params.departments,
+        floors: params.floors,
+        search: params.search,
+      });
+    },
+    getNextPageParam: (lastPage) => lastPage.next_cursor ?? undefined,
+  });
+};
+
diff --git a/clients/shared/src/api/rooms.ts b/clients/shared/src/api/rooms.ts
new file mode 100644
index 000000000..50b67242c
--- /dev/null
+++ b/clients/shared/src/api/rooms.ts
@@ -0,0 +1,54 @@
+import { useQuery } from "@tanstack/react-query";
+import { GithubComGenerateSelfserveInternalModelsBookingStatus } from "./generated/models";
+import type { RoomWithOptionalGuestBooking } from "./generated/models";
+import { useAPIClient } from "./client";
+
+export const BookingStatus = GithubComGenerateSelfserveInternalModelsBookingStatus;
+
+export const RoomStatusValue = {
+  Available: "available",
+  Cleaning: "cleaning",
+  OutOfOrder: "out-of-order",
+} as const;
+
+export type RoomStatusFilter = "occupied" | "vacant" | "open-tasks";
+export type RoomAttributeFilter = "standard" | "deluxe" | "suite" | "accessible";
+export type RoomAdvancedFilter = "arrivals-today" | "departures-today";
+export type RoomSortOption = "ascending" | "descending" | "urgency";
+
+export type RoomFiltersParams = {
+  floors?: number[];
+  status?: RoomStatusFilter[];
+  attributes?: RoomAttributeFilter[];
+  advanced?: RoomAdvancedFilter[];
+  sort?: RoomSortOption;
+  cursor?: string;
+  limit?: number;
+};
+
+type RoomsPage = {
+  items: RoomWithOptionalGuestBooking[] | null;
+  has_more: boolean;
+  next_cursor: string | null;
+};
+
+export const getRoomsQueryKey = (params: RoomFiltersParams) =>
+  ["rooms", params] as const;
+
+export const useGetRooms = (params: RoomFiltersParams, enabled = true) => {
+  const api = useAPIClient();
+  return useQuery({
+    queryKey: getRoomsQueryKey(params),
+    queryFn: () =>
+      api.post<RoomsPage>("/rooms", { limit: 200, ...params }),
+    enabled,
+  });
+};
+
+export const useGetRoomsFloors = () => {
+  const api = useAPIClient();
+  return useQuery({
+    queryKey: ["rooms", "floors"],
+    queryFn: () => api.get<number[]>("/rooms/floors"),
+  });
+};
diff --git a/clients/shared/src/api/users.ts b/clients/shared/src/api/users.ts
new file mode 100644
index 000000000..d7e0ce024
--- /dev/null
+++ b/clients/shared/src/api/users.ts
@@ -0,0 +1,39 @@
+import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import type { User } from "./generated/models";
+import { useAPIClient } from "./client";
+
+export const getUserQueryKey = (userId: string | undefined) =>
+  ["user", userId] as const;
+
+export const useGetUser = (userId: string | undefined) => {
+  const api = useAPIClient();
+  return useQuery({
+    queryKey: getUserQueryKey(userId),
+    queryFn: () => api.get<User>(`/users/${userId}`),
+    enabled: !!userId,
+  });
+};
+
+export const useUpdateUser = (userId: string | undefined) => {
+  const api = useAPIClient();
+  const queryClient = useQueryClient();
+  return useMutation({
+    mutationFn: (updates: { phone_number?: string }) =>
+      api.put<User>(`/users/${userId}`, updates),
+    onMutate: async (updates) => {
+      await queryClient.cancelQueries({ queryKey: getUserQueryKey(userId) });
+      const previous = queryClient.getQueryData<User>(getUserQueryKey(userId));
+      queryClient.setQueryData<User>(getUserQueryKey(userId), (old) => ({
+        ...old!,
+        ...updates,
+      }));
+      return { previous };
+    },
+    onError: (_err, _vars, context) => {
+      queryClient.setQueryData(getUserQueryKey(userId), context?.previous);
+    },
+    onSettled: () => {
+      queryClient.invalidateQueries({ queryKey: getUserQueryKey(userId) });
+    },
+  });
+};
diff --git a/clients/shared/src/api/views.ts b/clients/shared/src/api/views.ts
new file mode 100644
index 000000000..d36f64c91
--- /dev/null
+++ b/clients/shared/src/api/views.ts
@@ -0,0 +1,48 @@
+import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import type { View, CreateViewInput } from "../types/views";
+import { useAPIClient } from "./client";
+
+export const getViewsQueryKey = (slug: string) => ["views", slug] as const;
+
+export const useGetViews = (slug: string) => {
+  const api = useAPIClient();
+  return useQuery({
+    queryKey: getViewsQueryKey(slug),
+    queryFn: () => api.get<View[]>("/views", { slug }),
+    enabled: !!slug,
+  });
+};
+
+export const useCreateView = (slug: string) => {
+  const api = useAPIClient();
+  const queryClient = useQueryClient();
+  return useMutation({
+    mutationFn: (input: CreateViewInput) => api.post<View>("/views", input),
+    onSettled: () => {
+      queryClient.invalidateQueries({ queryKey: getViewsQueryKey(slug) });
+    },
+  });
+};
+
+export const useUpdateView = (slug: string) => {
+  const api = useAPIClient();
+  const queryClient = useQueryClient();
+  return useMutation({
+    mutationFn: ({ id, filters }: { id: string; filters: object }) =>
+      api.post<View>(`/views/${id}`, { filters }),
+    onSettled: () => {
+      queryClient.invalidateQueries({ queryKey: getViewsQueryKey(slug) });
+    },
+  });
+};
+
+export const useDeleteView = (slug: string) => {
+  const api = useAPIClient();
+  const queryClient = useQueryClient();
+  return useMutation({
+    mutationFn: (id: string) => api.delete<void>(`/views/${id}`),
+    onSettled: () => {
+      queryClient.invalidateQueries({ queryKey: getViewsQueryKey(slug) });
+    },
+  });
+};
diff --git a/clients/shared/src/index.ts b/clients/shared/src/index.ts
index d48f38370..ad2502c18 100644
--- a/clients/shared/src/index.ts
+++ b/clients/shared/src/index.ts
@@ -6,16 +6,42 @@ export type { Config } from "./api/config";
 // config functions
 export { setConfig, getConfig } from "./api/config";
 
+export { getExtFromMime } from "./utils";
+export {
+  getProfilePicture,
+  getUploadUrl,
+  saveProfilePictureKey,
+  deleteProfilePicture,
+  uploadFileToS3,
+} from "./api/profile-picture";
+export type {
+  UploadUrlResponse,
+  ProfilePictureResponse,
+} from "./api/profile-picture";
+
 // Generated Types - Models
+export { MakeRequestPriority, RequestPriority, RequestStatus } from "./api/generated/models";
+
 export type {
   User,
   CreateUser,
   Request,
   MakeRequest,
   GenerateRequestInput,
+  GenerateRequestResponse,
+  GenerateRequestWarning,
   Hotel,
   Guest,
+  GuestPage,
   Dev,
+  ActiveBooking,
+  Assistance,
+  Stay,
+  UpdateGuest,
+  GithubComGenerateSelfserveInternalModelsBookingStatus as BookingStatus,
+  GithubComGenerateSelfserveInternalModelsAssistanceFilter as AssistanceFilter,
+  GuestFiltersRequestSort as RequestSort,
+  GuestFiltersFloorSort as FloorSort,
 } from "./api/generated/models";
 
 // Generated API Functions
@@ -27,22 +53,128 @@ export {
 export {
   usePostRequest,
   usePostRequestGenerate,
+  useGetRequestRoomId,
+  useGetRequestGuestId,
+  // Hook variants
+  usePostRequestHook,
+  usePutRequestIdHook,
+  usePostRequestGenerateHook,
 } from "./api/generated/endpoints/requests/requests";
 
 export {
   usePostUsers,
   useGetUsersId,
+  // Hook variants
+  useGetUsersIdHook,
 } from "./api/generated/endpoints/users/users";
 
 export {
-  usePostApiV1Hotels,
-  useGetApiV1HotelsId,
+  usePostHotels,
+  useGetHotelsId,
 } from "./api/generated/endpoints/hotels/hotels";
 
 export { useGetDevsName } from "./api/generated/endpoints/devs/devs";
 
 export {
-  usePostApiV1Guests,
-  useGetApiV1GuestsId,
-  usePutApiV1GuestsId,
+  usePostGuests,
+  useGetGuestsId,
+  usePutGuestsId,
+  getGetGuestsStaysIdQueryKey,
+  usePostGuestsSearchHook,
+  useGetGuestsStaysId,
 } from "./api/generated/endpoints/guests/guests";
+
+export type {
+  GuestWithBooking,
+  GuestWithStays,
+  GuestFilters,
+} from "./api/generated/models";
+
+export {
+  usePostRooms,
+  useGetRoomsFloors,
+  // Hook variants
+  usePostRoomsHook,
+  useGetRoomsFloorsHook,
+} from "./api/generated/endpoints/rooms/rooms";
+export { useGetGuestBookingsGroupSizes } from "./api/generated/endpoints/guest-bookings/guest-bookings";
+
+export type {
+  RoomWithOptionalGuestBooking,
+  FilterRoomsRequest,
+  GuestRequest,
+  RoomRequestsResponse,
+} from "./api/generated/models";
+
+export {
+  REQUESTS_FEED_QUERY_KEY,
+  useGetRequestById,
+  useGetRequestsFeed,
+  useInfiniteRequestsByGuest,
+  getGuestRequestsQueryKey,
+  useCompleteTask,
+  useDropTask,
+  useMarkTaskPending,
+  useAssignRequestToSelf,
+  useDeleteTask,
+  getRoomRequestsByRoomIdQueryKey
+} from "./api/requests";
+
+export type {
+  RequestFeedItem,
+  RequestFeedSort,
+  RequestFeedParams,
+  RequestActivityItem,
+  RequestActivityPage,
+  RequestActivityType,
+} from "./api/requests";
+
+export {
+  getRequestActivityQueryKey,
+  useGetRequestActivity,
+} from "./api/requests";
+
+export { useCustomInstance } from "./api/orval-mutator";
+
+
+// User hooks
+export { getUserQueryKey, useGetUser, useUpdateUser } from "./api/users";
+
+// Department types and hooks
+export type { Department } from "./types/departments";
+
+export {
+  getDepartmentsQueryKey,
+  useGetDepartments,
+  useCreateDepartment,
+  useUpdateDepartment,
+  useDeleteDepartment,
+  useAddEmployeeDepartment,
+  useRemoveEmployeeDepartment,
+} from "./api/departments";
+
+// View types and hooks
+export type { View, CreateViewInput } from "./types/views";
+
+export {
+  getViewsQueryKey,
+  useGetViews,
+  useCreateView,
+  useUpdateView,
+  useDeleteView,
+} from "./api/views";
+
+// Notification types and hooks
+export type {
+  Notification,
+  NotificationType,
+  RegisterDeviceTokenInput,
+} from "./types/notifications";
+
+export {
+  NOTIFICATIONS_QUERY_KEY,
+  useGetNotifications,
+  useMarkNotificationRead,
+  useMarkAllNotificationsRead,
+  usePostDeviceToken,
+} from "./api/notifications";
diff --git a/clients/shared/src/types/departments.ts b/clients/shared/src/types/departments.ts
new file mode 100644
index 000000000..97d9a3a16
--- /dev/null
+++ b/clients/shared/src/types/departments.ts
@@ -0,0 +1,7 @@
+export type Department = {
+  id: string;
+  hotel_id: string;
+  name: string;
+  created_at: string;
+  updated_at: string;
+};
diff --git a/clients/shared/src/types/notifications.ts b/clients/shared/src/types/notifications.ts
new file mode 100644
index 000000000..60c0fa1af
--- /dev/null
+++ b/clients/shared/src/types/notifications.ts
@@ -0,0 +1,29 @@
+export const NotificationType = {
+  TaskAssigned: "task_assigned",
+  HighPriorityTask: "high_priority_task",
+} as const;
+
+export type NotificationType = (typeof NotificationType)[keyof typeof NotificationType];
+
+export const DevicePlatform = {
+  iOS: "ios",
+  Android: "android",
+} as const;
+
+export type DevicePlatform = (typeof DevicePlatform)[keyof typeof DevicePlatform];
+
+export type Notification = {
+  id: string;
+  user_id: string;
+  type: NotificationType;
+  title: string;
+  body: string;
+  data?: Record<string, unknown>;
+  read_at?: string;
+  created_at: string;
+};
+
+export type RegisterDeviceTokenInput = {
+  token: string;
+  platform: DevicePlatform;
+};
diff --git a/clients/shared/src/types/views.ts b/clients/shared/src/types/views.ts
new file mode 100644
index 000000000..b67cbcf9d
--- /dev/null
+++ b/clients/shared/src/types/views.ts
@@ -0,0 +1,15 @@
+export type View = {
+  id: string;
+  user_id: string;
+  slug: string;
+  display_name: string;
+  filters: Record<string, unknown>;
+  created_at: string;
+  updated_at: string;
+};
+
+export type CreateViewInput = {
+  slug: string;
+  display_name: string;
+  filters: Record<string, unknown>;
+};
diff --git a/clients/shared/src/utils/index.ts b/clients/shared/src/utils/index.ts
index dea19a2cb..6ea1da47a 100644
--- a/clients/shared/src/utils/index.ts
+++ b/clients/shared/src/utils/index.ts
@@ -5,4 +5,7 @@ import { twMerge } from "tailwind-merge";
 
 export function cn(...inputs: ClassValue[]) {
   return twMerge(clsx(inputs));
-}
\ No newline at end of file
+
+}
+
+export { getExtFromMime } from "./mime";
\ No newline at end of file
diff --git a/clients/shared/src/utils/mime.ts b/clients/shared/src/utils/mime.ts
new file mode 100644
index 000000000..24cd3a21c
--- /dev/null
+++ b/clients/shared/src/utils/mime.ts
@@ -0,0 +1,11 @@
+const MIME_TO_EXT: Record<string, string> = {
+    "image/jpeg": "jpg",
+    "image/png": "png",
+    "image/webp": "webp",
+    "image/jpg": "jpg",
+  };
+  
+  /** Map a MIME type to an allowed image extension. Falls back to 'jpg'. */
+  export function getExtFromMime(mimeType: string): string {
+    return MIME_TO_EXT[mimeType] ?? "jpg";
+  }
\ No newline at end of file
diff --git a/clients/shared/tsconfig.json b/clients/shared/tsconfig.json
index 46de0c48f..f31e1f167 100644
--- a/clients/shared/tsconfig.json
+++ b/clients/shared/tsconfig.json
@@ -16,7 +16,6 @@
     "esModuleInterop": true,
     "resolveJsonModule": true,
     "isolatedModules": true,
-    "baseUrl": ".",
     "paths": {
       "@/*": ["./src/*"],
     }
diff --git a/clients/web/.env.sample b/clients/web/.env.sample
index 9f5aa2afe..df486d26d 100644
--- a/clients/web/.env.sample
+++ b/clients/web/.env.sample
@@ -1,8 +1,14 @@
+# DEPRECATED: This file is for reference only
+# Secrets are managed via Doppler
+# To set up: doppler login && doppler setup
+# To view secrets: doppler secrets
+# To manage: https://dashboard.doppler.com/
+
 VITE_CLERK_PUBLISHABLE_KEY=YOUR_OWN_CLERK_PUBLISHABLE_KEY
-VITE_API_URL=http://localhost:8080
+API_BASE_URL=http://localhost:8080/api/v1
 
 # Clerk redirect URLs 
-VITE_CLERK_SIGN_IN_FORCE_REDIRECT_URL=/home
-VITE_CLERK_SIGN_UP_FORCE_REDIRECT_URL=/home
-VITE_CLERK_SIGN_IN_FALLBACK_REDIRECT_URL=/home
-VITE_CLERK_SIGN_UP_FALLBACK_REDIRECT_URL=/home
\ No newline at end of file
+VITE_CLERK_SIGN_IN_FORCE_REDIRECT_URL=/home # Optional
+VITE_CLERK_SIGN_UP_FORCE_REDIRECT_URL=/home # Optional
+VITE_CLERK_SIGN_IN_FALLBACK_REDIRECT_URL=/home # Optional
+VITE_CLERK_SIGN_UP_FALLBACK_REDIRECT_URL=/home # Optional
\ No newline at end of file
diff --git a/clients/web/doppler.yaml b/clients/web/doppler.yaml
new file mode 100644
index 000000000..a9319377c
--- /dev/null
+++ b/clients/web/doppler.yaml
@@ -0,0 +1,3 @@
+setup:
+  project: selfserve-web
+  config: dev
diff --git a/clients/web/package-lock.json b/clients/web/package-lock.json
index 1edb4a045..b29bf21cb 100644
--- a/clients/web/package-lock.json
+++ b/clients/web/package-lock.json
@@ -8,6 +8,8 @@
       "dependencies": {
         "@base-ui/react": "^1.3.0",
         "@clerk/clerk-react": "^5.60.0",
+        "@dnd-kit/core": "^6.3.1",
+        "@dnd-kit/utilities": "^3.2.2",
         "@tailwindcss/vite": "^4.0.6",
         "@tanstack/react-devtools": "^0.7.0",
         "@tanstack/react-query": "^5.90.20",
@@ -16,10 +18,13 @@
         "@tanstack/react-router-devtools": "^1.132.0",
         "@tanstack/react-start": "^1.132.0",
         "@tanstack/router-plugin": "^1.132.0",
+        "canvas-confetti": "^1.9.4",
         "class-variance-authority": "^0.7.1",
         "clsx": "^2.1.1",
         "lucide-react": "^0.561.0",
+        "radix-ui": "^1.4.3",
         "react": "^19.2.0",
+        "react-day-picker": "^9.14.0",
         "react-dom": "^19.2.0",
         "tailwind-merge": "^2.6.0",
         "tailwindcss": "^4.0.6",
@@ -30,6 +35,7 @@
         "@tanstack/eslint-config": "^0.3.0",
         "@testing-library/dom": "^10.4.0",
         "@testing-library/react": "^16.2.0",
+        "@types/canvas-confetti": "^1.9.0",
         "@types/node": "^22.10.2",
         "@types/react": "^19.2.0",
         "@types/react-dom": "^19.2.0",
@@ -664,6 +670,51 @@
         "node": ">=18"
       }
     },
+    "node_modules/@date-fns/tz": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/@date-fns/tz/-/tz-1.4.1.tgz",
+      "integrity": "sha512-P5LUNhtbj6YfI3iJjw5EL9eUAG6OitD0W3fWQcpQjDRc/QIsL0tRNuO1PcDvPccWL1fSTXXdE1ds+l95DV/OFA==",
+      "license": "MIT"
+    },
+    "node_modules/@dnd-kit/accessibility": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@dnd-kit/accessibility/-/accessibility-3.1.1.tgz",
+      "integrity": "sha512-2P+YgaXF+gRsIihwwY1gCsQSYnu9Zyj2py8kY5fFvUM1qm2WA2u639R6YNVfU4GWr+ZM5mqEsfHZZLoRONbemw==",
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^2.0.0"
+      },
+      "peerDependencies": {
+        "react": ">=16.8.0"
+      }
+    },
+    "node_modules/@dnd-kit/core": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/@dnd-kit/core/-/core-6.3.1.tgz",
+      "integrity": "sha512-xkGBRQQab4RLwgXxoqETICr6S5JlogafbhNsidmrkVv2YRs5MLwpjoF2qpiGjQt8S9AoxtIV603s0GIUpY5eYQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@dnd-kit/accessibility": "^3.1.1",
+        "@dnd-kit/utilities": "^3.2.2",
+        "tslib": "^2.0.0"
+      },
+      "peerDependencies": {
+        "react": ">=16.8.0",
+        "react-dom": ">=16.8.0"
+      }
+    },
+    "node_modules/@dnd-kit/utilities": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/@dnd-kit/utilities/-/utilities-3.2.2.tgz",
+      "integrity": "sha512-+MKAJEOfaBe5SmV6t34p80MMKhjvUz0vRrvVJbPT0WElzaOJ/1xs+D+KDv+tD/NE5ujfrChEcshd4fLn0wpiqg==",
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^2.0.0"
+      },
+      "peerDependencies": {
+        "react": ">=16.8.0"
+      }
+    },
     "node_modules/@emnapi/core": {
       "version": "1.8.1",
       "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.8.1.tgz",
@@ -1476,88 +1527,1586 @@
       "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==",
       "license": "MIT"
     },
-    "node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.31",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz",
-      "integrity": "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==",
+    "node_modules/@jridgewell/trace-mapping": {
+      "version": "0.3.31",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz",
+      "integrity": "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==",
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/resolve-uri": "^3.1.0",
+        "@jridgewell/sourcemap-codec": "^1.4.14"
+      }
+    },
+    "node_modules/@napi-rs/wasm-runtime": {
+      "version": "0.2.12",
+      "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-0.2.12.tgz",
+      "integrity": "sha512-ZVWUcfwY4E/yPitQJl481FjFo3K22D6qF0DuFH6Y/nbnE11GY5uguDxZMGXPQ8WQ0128MXQD7TnfHyK4oWoIJQ==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "@emnapi/core": "^1.4.3",
+        "@emnapi/runtime": "^1.4.3",
+        "@tybys/wasm-util": "^0.10.0"
+      }
+    },
+    "node_modules/@oozcitak/dom": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@oozcitak/dom/-/dom-2.0.2.tgz",
+      "integrity": "sha512-GjpKhkSYC3Mj4+lfwEyI1dqnsKTgwGy48ytZEhm4A/xnH/8z9M3ZVXKr/YGQi3uCLs1AEBS+x5T2JPiueEDW8w==",
+      "license": "MIT",
+      "dependencies": {
+        "@oozcitak/infra": "^2.0.2",
+        "@oozcitak/url": "^3.0.0",
+        "@oozcitak/util": "^10.0.0"
+      },
+      "engines": {
+        "node": ">=20.0"
+      }
+    },
+    "node_modules/@oozcitak/infra": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@oozcitak/infra/-/infra-2.0.2.tgz",
+      "integrity": "sha512-2g+E7hoE2dgCz/APPOEK5s3rMhJvNxSMBrP+U+j1OWsIbtSpWxxlUjq1lU8RIsFJNYv7NMlnVsCuHcUzJW+8vA==",
+      "license": "MIT",
+      "dependencies": {
+        "@oozcitak/util": "^10.0.0"
+      },
+      "engines": {
+        "node": ">=20.0"
+      }
+    },
+    "node_modules/@oozcitak/url": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@oozcitak/url/-/url-3.0.0.tgz",
+      "integrity": "sha512-ZKfET8Ak1wsLAiLWNfFkZc/BraDccuTJKR6svTYc7sVjbR+Iu0vtXdiDMY4o6jaFl5TW2TlS7jbLl4VovtAJWQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@oozcitak/infra": "^2.0.2",
+        "@oozcitak/util": "^10.0.0"
+      },
+      "engines": {
+        "node": ">=20.0"
+      }
+    },
+    "node_modules/@oozcitak/util": {
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/@oozcitak/util/-/util-10.0.0.tgz",
+      "integrity": "sha512-hAX0pT/73190NLqBPPWSdBVGtbY6VOhWYK3qqHqtXQ1gK7kS2yz4+ivsN07hpJ6I3aeMtKP6J6npsEKOAzuTLA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=20.0"
+      }
+    },
+    "node_modules/@pkgjs/parseargs": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
+      "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/@radix-ui/number": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@radix-ui/number/-/number-1.1.1.tgz",
+      "integrity": "sha512-MkKCwxlXTgz6CFoJx3pCwn07GKp36+aZyu/u2Ln2VrA5DcdyCZkASEDBTd8x5whTQQL5CiYf4prXKLcgQdv29g==",
+      "license": "MIT"
+    },
+    "node_modules/@radix-ui/primitive": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@radix-ui/primitive/-/primitive-1.1.3.tgz",
+      "integrity": "sha512-JTF99U/6XIjCBo0wqkU5sK10glYe27MRRsfwoiq5zzOEZLHU3A3KCMa5X/azekYRCJ0HlwI0crAXS/5dEHTzDg==",
+      "license": "MIT"
+    },
+    "node_modules/@radix-ui/react-accessible-icon": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-accessible-icon/-/react-accessible-icon-1.1.7.tgz",
+      "integrity": "sha512-XM+E4WXl0OqUJFovy6GjmxxFyx9opfCAIUku4dlKRd5YEPqt4kALOkQOp0Of6reHuUkJuiPBEc5k0o4z4lTC8A==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-visually-hidden": "1.2.3"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-accordion": {
+      "version": "1.2.12",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-accordion/-/react-accordion-1.2.12.tgz",
+      "integrity": "sha512-T4nygeh9YE9dLRPhAHSeOZi7HBXo+0kYIPJXayZfvWOWA0+n3dESrZbjfDPUABkUNym6Hd+f2IR113To8D2GPA==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.3",
+        "@radix-ui/react-collapsible": "1.1.12",
+        "@radix-ui/react-collection": "1.1.7",
+        "@radix-ui/react-compose-refs": "1.1.2",
+        "@radix-ui/react-context": "1.1.2",
+        "@radix-ui/react-direction": "1.1.1",
+        "@radix-ui/react-id": "1.1.1",
+        "@radix-ui/react-primitive": "2.1.3",
+        "@radix-ui/react-use-controllable-state": "1.2.2"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-alert-dialog": {
+      "version": "1.1.15",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-alert-dialog/-/react-alert-dialog-1.1.15.tgz",
+      "integrity": "sha512-oTVLkEw5GpdRe29BqJ0LSDFWI3qu0vR1M0mUkOQWDIUnY/QIkLpgDMWuKxP94c2NAC2LGcgVhG1ImF3jkZ5wXw==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.3",
+        "@radix-ui/react-compose-refs": "1.1.2",
+        "@radix-ui/react-context": "1.1.2",
+        "@radix-ui/react-dialog": "1.1.15",
+        "@radix-ui/react-primitive": "2.1.3",
+        "@radix-ui/react-slot": "1.2.3"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-arrow": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-arrow/-/react-arrow-1.1.7.tgz",
+      "integrity": "sha512-F+M1tLhO+mlQaOWspE8Wstg+z6PwxwRd8oQ8IXceWz92kfAmalTRf0EjrouQeo7QssEPfCn05B4Ihs1K9WQ/7w==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-primitive": "2.1.3"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-aspect-ratio": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-aspect-ratio/-/react-aspect-ratio-1.1.7.tgz",
+      "integrity": "sha512-Yq6lvO9HQyPwev1onK1daHCHqXVLzPhSVjmsNjCa2Zcxy2f7uJD2itDtxknv6FzAKCwD1qQkeVDmX/cev13n/g==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-primitive": "2.1.3"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-avatar": {
+      "version": "1.1.10",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-avatar/-/react-avatar-1.1.10.tgz",
+      "integrity": "sha512-V8piFfWapM5OmNCXTzVQY+E1rDa53zY+MQ4Y7356v4fFz6vqCyUtIz2rUD44ZEdwg78/jKmMJHj07+C/Z/rcog==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-context": "1.1.2",
+        "@radix-ui/react-primitive": "2.1.3",
+        "@radix-ui/react-use-callback-ref": "1.1.1",
+        "@radix-ui/react-use-is-hydrated": "0.1.0",
+        "@radix-ui/react-use-layout-effect": "1.1.1"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-checkbox": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-checkbox/-/react-checkbox-1.3.3.tgz",
+      "integrity": "sha512-wBbpv+NQftHDdG86Qc0pIyXk5IR3tM8Vd0nWLKDcX8nNn4nXFOFwsKuqw2okA/1D/mpaAkmuyndrPJTYDNZtFw==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.3",
+        "@radix-ui/react-compose-refs": "1.1.2",
+        "@radix-ui/react-context": "1.1.2",
+        "@radix-ui/react-presence": "1.1.5",
+        "@radix-ui/react-primitive": "2.1.3",
+        "@radix-ui/react-use-controllable-state": "1.2.2",
+        "@radix-ui/react-use-previous": "1.1.1",
+        "@radix-ui/react-use-size": "1.1.1"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-collapsible": {
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-collapsible/-/react-collapsible-1.1.12.tgz",
+      "integrity": "sha512-Uu+mSh4agx2ib1uIGPP4/CKNULyajb3p92LsVXmH2EHVMTfZWpll88XJ0j4W0z3f8NK1eYl1+Mf/szHPmcHzyA==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.3",
+        "@radix-ui/react-compose-refs": "1.1.2",
+        "@radix-ui/react-context": "1.1.2",
+        "@radix-ui/react-id": "1.1.1",
+        "@radix-ui/react-presence": "1.1.5",
+        "@radix-ui/react-primitive": "2.1.3",
+        "@radix-ui/react-use-controllable-state": "1.2.2",
+        "@radix-ui/react-use-layout-effect": "1.1.1"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-collection": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-collection/-/react-collection-1.1.7.tgz",
+      "integrity": "sha512-Fh9rGN0MoI4ZFUNyfFVNU4y9LUz93u9/0K+yLgA2bwRojxM8JU1DyvvMBabnZPBgMWREAJvU2jjVzq+LrFUglw==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-compose-refs": "1.1.2",
+        "@radix-ui/react-context": "1.1.2",
+        "@radix-ui/react-primitive": "2.1.3",
+        "@radix-ui/react-slot": "1.2.3"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-compose-refs": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-compose-refs/-/react-compose-refs-1.1.2.tgz",
+      "integrity": "sha512-z4eqJvfiNnFMHIIvXP3CY57y2WJs5g2v3X0zm9mEJkrkNv4rDxu+sg9Jh8EkXyeqBkB7SOcboo9dMVqhyrACIg==",
+      "license": "MIT",
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-context": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-context/-/react-context-1.1.2.tgz",
+      "integrity": "sha512-jCi/QKUM2r1Ju5a3J64TH2A5SpKAgh0LpknyqdQ4m6DCV0xJ2HG1xARRwNGPQfi1SLdLWZ1OJz6F4OMBBNiGJA==",
+      "license": "MIT",
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-context-menu": {
+      "version": "2.2.16",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-context-menu/-/react-context-menu-2.2.16.tgz",
+      "integrity": "sha512-O8morBEW+HsVG28gYDZPTrT9UUovQUlJue5YO836tiTJhuIWBm/zQHc7j388sHWtdH/xUZurK9olD2+pcqx5ww==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.3",
+        "@radix-ui/react-context": "1.1.2",
+        "@radix-ui/react-menu": "2.1.16",
+        "@radix-ui/react-primitive": "2.1.3",
+        "@radix-ui/react-use-callback-ref": "1.1.1",
+        "@radix-ui/react-use-controllable-state": "1.2.2"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-dialog": {
+      "version": "1.1.15",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-dialog/-/react-dialog-1.1.15.tgz",
+      "integrity": "sha512-TCglVRtzlffRNxRMEyR36DGBLJpeusFcgMVD9PZEzAKnUs1lKCgX5u9BmC2Yg+LL9MgZDugFFs1Vl+Jp4t/PGw==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.3",
+        "@radix-ui/react-compose-refs": "1.1.2",
+        "@radix-ui/react-context": "1.1.2",
+        "@radix-ui/react-dismissable-layer": "1.1.11",
+        "@radix-ui/react-focus-guards": "1.1.3",
+        "@radix-ui/react-focus-scope": "1.1.7",
+        "@radix-ui/react-id": "1.1.1",
+        "@radix-ui/react-portal": "1.1.9",
+        "@radix-ui/react-presence": "1.1.5",
+        "@radix-ui/react-primitive": "2.1.3",
+        "@radix-ui/react-slot": "1.2.3",
+        "@radix-ui/react-use-controllable-state": "1.2.2",
+        "aria-hidden": "^1.2.4",
+        "react-remove-scroll": "^2.6.3"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-direction": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-direction/-/react-direction-1.1.1.tgz",
+      "integrity": "sha512-1UEWRX6jnOA2y4H5WczZ44gOOjTEmlqv1uNW4GAJEO5+bauCBhv8snY65Iw5/VOS/ghKN9gr2KjnLKxrsvoMVw==",
+      "license": "MIT",
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-dismissable-layer": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.1.11.tgz",
+      "integrity": "sha512-Nqcp+t5cTB8BinFkZgXiMJniQH0PsUt2k51FUhbdfeKvc4ACcG2uQniY/8+h1Yv6Kza4Q7lD7PQV0z0oicE0Mg==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.3",
+        "@radix-ui/react-compose-refs": "1.1.2",
+        "@radix-ui/react-primitive": "2.1.3",
+        "@radix-ui/react-use-callback-ref": "1.1.1",
+        "@radix-ui/react-use-escape-keydown": "1.1.1"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-dropdown-menu": {
+      "version": "2.1.16",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-dropdown-menu/-/react-dropdown-menu-2.1.16.tgz",
+      "integrity": "sha512-1PLGQEynI/3OX/ftV54COn+3Sud/Mn8vALg2rWnBLnRaGtJDduNW/22XjlGgPdpcIbiQxjKtb7BkcjP00nqfJw==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.3",
+        "@radix-ui/react-compose-refs": "1.1.2",
+        "@radix-ui/react-context": "1.1.2",
+        "@radix-ui/react-id": "1.1.1",
+        "@radix-ui/react-menu": "2.1.16",
+        "@radix-ui/react-primitive": "2.1.3",
+        "@radix-ui/react-use-controllable-state": "1.2.2"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-focus-guards": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-guards/-/react-focus-guards-1.1.3.tgz",
+      "integrity": "sha512-0rFg/Rj2Q62NCm62jZw0QX7a3sz6QCQU0LpZdNrJX8byRGaGVTqbrW9jAoIAHyMQqsNpeZ81YgSizOt5WXq0Pw==",
+      "license": "MIT",
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-focus-scope": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-scope/-/react-focus-scope-1.1.7.tgz",
+      "integrity": "sha512-t2ODlkXBQyn7jkl6TNaw/MtVEVvIGelJDCG41Okq/KwUsJBwQ4XVZsHAVUkK4mBv3ewiAS3PGuUWuY2BoK4ZUw==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-compose-refs": "1.1.2",
+        "@radix-ui/react-primitive": "2.1.3",
+        "@radix-ui/react-use-callback-ref": "1.1.1"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-form": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-form/-/react-form-0.1.8.tgz",
+      "integrity": "sha512-QM70k4Zwjttifr5a4sZFts9fn8FzHYvQ5PiB19O2HsYibaHSVt9fH9rzB0XZo/YcM+b7t/p7lYCT/F5eOeF5yQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.3",
+        "@radix-ui/react-compose-refs": "1.1.2",
+        "@radix-ui/react-context": "1.1.2",
+        "@radix-ui/react-id": "1.1.1",
+        "@radix-ui/react-label": "2.1.7",
+        "@radix-ui/react-primitive": "2.1.3"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-hover-card": {
+      "version": "1.1.15",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-hover-card/-/react-hover-card-1.1.15.tgz",
+      "integrity": "sha512-qgTkjNT1CfKMoP0rcasmlH2r1DAiYicWsDsufxl940sT2wHNEWWv6FMWIQXWhVdmC1d/HYfbhQx60KYyAtKxjg==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.3",
+        "@radix-ui/react-compose-refs": "1.1.2",
+        "@radix-ui/react-context": "1.1.2",
+        "@radix-ui/react-dismissable-layer": "1.1.11",
+        "@radix-ui/react-popper": "1.2.8",
+        "@radix-ui/react-portal": "1.1.9",
+        "@radix-ui/react-presence": "1.1.5",
+        "@radix-ui/react-primitive": "2.1.3",
+        "@radix-ui/react-use-controllable-state": "1.2.2"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-id": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-id/-/react-id-1.1.1.tgz",
+      "integrity": "sha512-kGkGegYIdQsOb4XjsfM97rXsiHaBwco+hFI66oO4s9LU+PLAC5oJ7khdOVFxkhsmlbpUqDAvXw11CluXP+jkHg==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-use-layout-effect": "1.1.1"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-label": {
+      "version": "2.1.7",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-label/-/react-label-2.1.7.tgz",
+      "integrity": "sha512-YT1GqPSL8kJn20djelMX7/cTRp/Y9w5IZHvfxQTVHrOqa2yMl7i/UfMqKRU5V7mEyKTrUVgJXhNQPVCG8PBLoQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-primitive": "2.1.3"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-menu": {
+      "version": "2.1.16",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-menu/-/react-menu-2.1.16.tgz",
+      "integrity": "sha512-72F2T+PLlphrqLcAotYPp0uJMr5SjP5SL01wfEspJbru5Zs5vQaSHb4VB3ZMJPimgHHCHG7gMOeOB9H3Hdmtxg==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.3",
+        "@radix-ui/react-collection": "1.1.7",
+        "@radix-ui/react-compose-refs": "1.1.2",
+        "@radix-ui/react-context": "1.1.2",
+        "@radix-ui/react-direction": "1.1.1",
+        "@radix-ui/react-dismissable-layer": "1.1.11",
+        "@radix-ui/react-focus-guards": "1.1.3",
+        "@radix-ui/react-focus-scope": "1.1.7",
+        "@radix-ui/react-id": "1.1.1",
+        "@radix-ui/react-popper": "1.2.8",
+        "@radix-ui/react-portal": "1.1.9",
+        "@radix-ui/react-presence": "1.1.5",
+        "@radix-ui/react-primitive": "2.1.3",
+        "@radix-ui/react-roving-focus": "1.1.11",
+        "@radix-ui/react-slot": "1.2.3",
+        "@radix-ui/react-use-callback-ref": "1.1.1",
+        "aria-hidden": "^1.2.4",
+        "react-remove-scroll": "^2.6.3"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-menubar": {
+      "version": "1.1.16",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-menubar/-/react-menubar-1.1.16.tgz",
+      "integrity": "sha512-EB1FktTz5xRRi2Er974AUQZWg2yVBb1yjip38/lgwtCVRd3a+maUoGHN/xs9Yv8SY8QwbSEb+YrxGadVWbEutA==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.3",
+        "@radix-ui/react-collection": "1.1.7",
+        "@radix-ui/react-compose-refs": "1.1.2",
+        "@radix-ui/react-context": "1.1.2",
+        "@radix-ui/react-direction": "1.1.1",
+        "@radix-ui/react-id": "1.1.1",
+        "@radix-ui/react-menu": "2.1.16",
+        "@radix-ui/react-primitive": "2.1.3",
+        "@radix-ui/react-roving-focus": "1.1.11",
+        "@radix-ui/react-use-controllable-state": "1.2.2"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-navigation-menu": {
+      "version": "1.2.14",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-navigation-menu/-/react-navigation-menu-1.2.14.tgz",
+      "integrity": "sha512-YB9mTFQvCOAQMHU+C/jVl96WmuWeltyUEpRJJky51huhds5W2FQr1J8D/16sQlf0ozxkPK8uF3niQMdUwZPv5w==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.3",
+        "@radix-ui/react-collection": "1.1.7",
+        "@radix-ui/react-compose-refs": "1.1.2",
+        "@radix-ui/react-context": "1.1.2",
+        "@radix-ui/react-direction": "1.1.1",
+        "@radix-ui/react-dismissable-layer": "1.1.11",
+        "@radix-ui/react-id": "1.1.1",
+        "@radix-ui/react-presence": "1.1.5",
+        "@radix-ui/react-primitive": "2.1.3",
+        "@radix-ui/react-use-callback-ref": "1.1.1",
+        "@radix-ui/react-use-controllable-state": "1.2.2",
+        "@radix-ui/react-use-layout-effect": "1.1.1",
+        "@radix-ui/react-use-previous": "1.1.1",
+        "@radix-ui/react-visually-hidden": "1.2.3"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-one-time-password-field": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-one-time-password-field/-/react-one-time-password-field-0.1.8.tgz",
+      "integrity": "sha512-ycS4rbwURavDPVjCb5iS3aG4lURFDILi6sKI/WITUMZ13gMmn/xGjpLoqBAalhJaDk8I3UbCM5GzKHrnzwHbvg==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/number": "1.1.1",
+        "@radix-ui/primitive": "1.1.3",
+        "@radix-ui/react-collection": "1.1.7",
+        "@radix-ui/react-compose-refs": "1.1.2",
+        "@radix-ui/react-context": "1.1.2",
+        "@radix-ui/react-direction": "1.1.1",
+        "@radix-ui/react-primitive": "2.1.3",
+        "@radix-ui/react-roving-focus": "1.1.11",
+        "@radix-ui/react-use-controllable-state": "1.2.2",
+        "@radix-ui/react-use-effect-event": "0.0.2",
+        "@radix-ui/react-use-is-hydrated": "0.1.0",
+        "@radix-ui/react-use-layout-effect": "1.1.1"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-password-toggle-field": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-password-toggle-field/-/react-password-toggle-field-0.1.3.tgz",
+      "integrity": "sha512-/UuCrDBWravcaMix4TdT+qlNdVwOM1Nck9kWx/vafXsdfj1ChfhOdfi3cy9SGBpWgTXwYCuboT/oYpJy3clqfw==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.3",
+        "@radix-ui/react-compose-refs": "1.1.2",
+        "@radix-ui/react-context": "1.1.2",
+        "@radix-ui/react-id": "1.1.1",
+        "@radix-ui/react-primitive": "2.1.3",
+        "@radix-ui/react-use-controllable-state": "1.2.2",
+        "@radix-ui/react-use-effect-event": "0.0.2",
+        "@radix-ui/react-use-is-hydrated": "0.1.0"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-popover": {
+      "version": "1.1.15",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-popover/-/react-popover-1.1.15.tgz",
+      "integrity": "sha512-kr0X2+6Yy/vJzLYJUPCZEc8SfQcf+1COFoAqauJm74umQhta9M7lNJHP7QQS3vkvcGLQUbWpMzwrXYwrYztHKA==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.3",
+        "@radix-ui/react-compose-refs": "1.1.2",
+        "@radix-ui/react-context": "1.1.2",
+        "@radix-ui/react-dismissable-layer": "1.1.11",
+        "@radix-ui/react-focus-guards": "1.1.3",
+        "@radix-ui/react-focus-scope": "1.1.7",
+        "@radix-ui/react-id": "1.1.1",
+        "@radix-ui/react-popper": "1.2.8",
+        "@radix-ui/react-portal": "1.1.9",
+        "@radix-ui/react-presence": "1.1.5",
+        "@radix-ui/react-primitive": "2.1.3",
+        "@radix-ui/react-slot": "1.2.3",
+        "@radix-ui/react-use-controllable-state": "1.2.2",
+        "aria-hidden": "^1.2.4",
+        "react-remove-scroll": "^2.6.3"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-popper": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-popper/-/react-popper-1.2.8.tgz",
+      "integrity": "sha512-0NJQ4LFFUuWkE7Oxf0htBKS6zLkkjBH+hM1uk7Ng705ReR8m/uelduy1DBo0PyBXPKVnBA6YBlU94MBGXrSBCw==",
+      "license": "MIT",
+      "dependencies": {
+        "@floating-ui/react-dom": "^2.0.0",
+        "@radix-ui/react-arrow": "1.1.7",
+        "@radix-ui/react-compose-refs": "1.1.2",
+        "@radix-ui/react-context": "1.1.2",
+        "@radix-ui/react-primitive": "2.1.3",
+        "@radix-ui/react-use-callback-ref": "1.1.1",
+        "@radix-ui/react-use-layout-effect": "1.1.1",
+        "@radix-ui/react-use-rect": "1.1.1",
+        "@radix-ui/react-use-size": "1.1.1",
+        "@radix-ui/rect": "1.1.1"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-portal": {
+      "version": "1.1.9",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-portal/-/react-portal-1.1.9.tgz",
+      "integrity": "sha512-bpIxvq03if6UNwXZ+HTK71JLh4APvnXntDc6XOX8UVq4XQOVl7lwok0AvIl+b8zgCw3fSaVTZMpAPPagXbKmHQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-primitive": "2.1.3",
+        "@radix-ui/react-use-layout-effect": "1.1.1"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-presence": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-presence/-/react-presence-1.1.5.tgz",
+      "integrity": "sha512-/jfEwNDdQVBCNvjkGit4h6pMOzq8bHkopq458dPt2lMjx+eBQUohZNG9A7DtO/O5ukSbxuaNGXMjHicgwy6rQQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-compose-refs": "1.1.2",
+        "@radix-ui/react-use-layout-effect": "1.1.1"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-primitive": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.1.3.tgz",
+      "integrity": "sha512-m9gTwRkhy2lvCPe6QJp4d3G1TYEUHn/FzJUtq9MjH46an1wJU+GdoGC5VLof8RX8Ft/DlpshApkhswDLZzHIcQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-slot": "1.2.3"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-progress": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-progress/-/react-progress-1.1.7.tgz",
+      "integrity": "sha512-vPdg/tF6YC/ynuBIJlk1mm7Le0VgW6ub6J2UWnTQ7/D23KXcPI1qy+0vBkgKgd38RCMJavBXpB83HPNFMTb0Fg==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-context": "1.1.2",
+        "@radix-ui/react-primitive": "2.1.3"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-radio-group": {
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-radio-group/-/react-radio-group-1.3.8.tgz",
+      "integrity": "sha512-VBKYIYImA5zsxACdisNQ3BjCBfmbGH3kQlnFVqlWU4tXwjy7cGX8ta80BcrO+WJXIn5iBylEH3K6ZTlee//lgQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.3",
+        "@radix-ui/react-compose-refs": "1.1.2",
+        "@radix-ui/react-context": "1.1.2",
+        "@radix-ui/react-direction": "1.1.1",
+        "@radix-ui/react-presence": "1.1.5",
+        "@radix-ui/react-primitive": "2.1.3",
+        "@radix-ui/react-roving-focus": "1.1.11",
+        "@radix-ui/react-use-controllable-state": "1.2.2",
+        "@radix-ui/react-use-previous": "1.1.1",
+        "@radix-ui/react-use-size": "1.1.1"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-roving-focus": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-roving-focus/-/react-roving-focus-1.1.11.tgz",
+      "integrity": "sha512-7A6S9jSgm/S+7MdtNDSb+IU859vQqJ/QAtcYQcfFC6W8RS4IxIZDldLR0xqCFZ6DCyrQLjLPsxtTNch5jVA4lA==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.3",
+        "@radix-ui/react-collection": "1.1.7",
+        "@radix-ui/react-compose-refs": "1.1.2",
+        "@radix-ui/react-context": "1.1.2",
+        "@radix-ui/react-direction": "1.1.1",
+        "@radix-ui/react-id": "1.1.1",
+        "@radix-ui/react-primitive": "2.1.3",
+        "@radix-ui/react-use-callback-ref": "1.1.1",
+        "@radix-ui/react-use-controllable-state": "1.2.2"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-scroll-area": {
+      "version": "1.2.10",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-scroll-area/-/react-scroll-area-1.2.10.tgz",
+      "integrity": "sha512-tAXIa1g3sM5CGpVT0uIbUx/U3Gs5N8T52IICuCtObaos1S8fzsrPXG5WObkQN3S6NVl6wKgPhAIiBGbWnvc97A==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/number": "1.1.1",
+        "@radix-ui/primitive": "1.1.3",
+        "@radix-ui/react-compose-refs": "1.1.2",
+        "@radix-ui/react-context": "1.1.2",
+        "@radix-ui/react-direction": "1.1.1",
+        "@radix-ui/react-presence": "1.1.5",
+        "@radix-ui/react-primitive": "2.1.3",
+        "@radix-ui/react-use-callback-ref": "1.1.1",
+        "@radix-ui/react-use-layout-effect": "1.1.1"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-select": {
+      "version": "2.2.6",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-select/-/react-select-2.2.6.tgz",
+      "integrity": "sha512-I30RydO+bnn2PQztvo25tswPH+wFBjehVGtmagkU78yMdwTwVf12wnAOF+AeP8S2N8xD+5UPbGhkUfPyvT+mwQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/number": "1.1.1",
+        "@radix-ui/primitive": "1.1.3",
+        "@radix-ui/react-collection": "1.1.7",
+        "@radix-ui/react-compose-refs": "1.1.2",
+        "@radix-ui/react-context": "1.1.2",
+        "@radix-ui/react-direction": "1.1.1",
+        "@radix-ui/react-dismissable-layer": "1.1.11",
+        "@radix-ui/react-focus-guards": "1.1.3",
+        "@radix-ui/react-focus-scope": "1.1.7",
+        "@radix-ui/react-id": "1.1.1",
+        "@radix-ui/react-popper": "1.2.8",
+        "@radix-ui/react-portal": "1.1.9",
+        "@radix-ui/react-primitive": "2.1.3",
+        "@radix-ui/react-slot": "1.2.3",
+        "@radix-ui/react-use-callback-ref": "1.1.1",
+        "@radix-ui/react-use-controllable-state": "1.2.2",
+        "@radix-ui/react-use-layout-effect": "1.1.1",
+        "@radix-ui/react-use-previous": "1.1.1",
+        "@radix-ui/react-visually-hidden": "1.2.3",
+        "aria-hidden": "^1.2.4",
+        "react-remove-scroll": "^2.6.3"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-separator": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-separator/-/react-separator-1.1.7.tgz",
+      "integrity": "sha512-0HEb8R9E8A+jZjvmFCy/J4xhbXy3TV+9XSnGJ3KvTtjlIUy/YQ/p6UYZvi7YbeoeXdyU9+Y3scizK6hkY37baA==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-primitive": "2.1.3"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-slider": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-slider/-/react-slider-1.3.6.tgz",
+      "integrity": "sha512-JPYb1GuM1bxfjMRlNLE+BcmBC8onfCi60Blk7OBqi2MLTFdS+8401U4uFjnwkOr49BLmXxLC6JHkvAsx5OJvHw==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/number": "1.1.1",
+        "@radix-ui/primitive": "1.1.3",
+        "@radix-ui/react-collection": "1.1.7",
+        "@radix-ui/react-compose-refs": "1.1.2",
+        "@radix-ui/react-context": "1.1.2",
+        "@radix-ui/react-direction": "1.1.1",
+        "@radix-ui/react-primitive": "2.1.3",
+        "@radix-ui/react-use-controllable-state": "1.2.2",
+        "@radix-ui/react-use-layout-effect": "1.1.1",
+        "@radix-ui/react-use-previous": "1.1.1",
+        "@radix-ui/react-use-size": "1.1.1"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-slot": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.2.3.tgz",
+      "integrity": "sha512-aeNmHnBxbi2St0au6VBVC7JXFlhLlOnvIIlePNniyUNAClzmtAUEY8/pBiK3iHjufOlwA+c20/8jngo7xcrg8A==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-compose-refs": "1.1.2"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-switch": {
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-switch/-/react-switch-1.2.6.tgz",
+      "integrity": "sha512-bByzr1+ep1zk4VubeEVViV592vu2lHE2BZY5OnzehZqOOgogN80+mNtCqPkhn2gklJqOpxWgPoYTSnhBCqpOXQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.3",
+        "@radix-ui/react-compose-refs": "1.1.2",
+        "@radix-ui/react-context": "1.1.2",
+        "@radix-ui/react-primitive": "2.1.3",
+        "@radix-ui/react-use-controllable-state": "1.2.2",
+        "@radix-ui/react-use-previous": "1.1.1",
+        "@radix-ui/react-use-size": "1.1.1"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-tabs": {
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-tabs/-/react-tabs-1.1.13.tgz",
+      "integrity": "sha512-7xdcatg7/U+7+Udyoj2zodtI9H/IIopqo+YOIcZOq1nJwXWBZ9p8xiu5llXlekDbZkca79a/fozEYQXIA4sW6A==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.3",
+        "@radix-ui/react-context": "1.1.2",
+        "@radix-ui/react-direction": "1.1.1",
+        "@radix-ui/react-id": "1.1.1",
+        "@radix-ui/react-presence": "1.1.5",
+        "@radix-ui/react-primitive": "2.1.3",
+        "@radix-ui/react-roving-focus": "1.1.11",
+        "@radix-ui/react-use-controllable-state": "1.2.2"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-toast": {
+      "version": "1.2.15",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-toast/-/react-toast-1.2.15.tgz",
+      "integrity": "sha512-3OSz3TacUWy4WtOXV38DggwxoqJK4+eDkNMl5Z/MJZaoUPaP4/9lf81xXMe1I2ReTAptverZUpbPY4wWwWyL5g==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.3",
+        "@radix-ui/react-collection": "1.1.7",
+        "@radix-ui/react-compose-refs": "1.1.2",
+        "@radix-ui/react-context": "1.1.2",
+        "@radix-ui/react-dismissable-layer": "1.1.11",
+        "@radix-ui/react-portal": "1.1.9",
+        "@radix-ui/react-presence": "1.1.5",
+        "@radix-ui/react-primitive": "2.1.3",
+        "@radix-ui/react-use-callback-ref": "1.1.1",
+        "@radix-ui/react-use-controllable-state": "1.2.2",
+        "@radix-ui/react-use-layout-effect": "1.1.1",
+        "@radix-ui/react-visually-hidden": "1.2.3"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-toggle": {
+      "version": "1.1.10",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-toggle/-/react-toggle-1.1.10.tgz",
+      "integrity": "sha512-lS1odchhFTeZv3xwHH31YPObmJn8gOg7Lq12inrr0+BH/l3Tsq32VfjqH1oh80ARM3mlkfMic15n0kg4sD1poQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.3",
+        "@radix-ui/react-primitive": "2.1.3",
+        "@radix-ui/react-use-controllable-state": "1.2.2"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-toggle-group": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-toggle-group/-/react-toggle-group-1.1.11.tgz",
+      "integrity": "sha512-5umnS0T8JQzQT6HbPyO7Hh9dgd82NmS36DQr+X/YJ9ctFNCiiQd6IJAYYZ33LUwm8M+taCz5t2ui29fHZc4Y6Q==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.3",
+        "@radix-ui/react-context": "1.1.2",
+        "@radix-ui/react-direction": "1.1.1",
+        "@radix-ui/react-primitive": "2.1.3",
+        "@radix-ui/react-roving-focus": "1.1.11",
+        "@radix-ui/react-toggle": "1.1.10",
+        "@radix-ui/react-use-controllable-state": "1.2.2"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-toolbar": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-toolbar/-/react-toolbar-1.1.11.tgz",
+      "integrity": "sha512-4ol06/1bLoFu1nwUqzdD4Y5RZ9oDdKeiHIsntug54Hcr1pgaHiPqHFEaXI1IFP/EsOfROQZ8Mig9VTIRza6Tjg==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.3",
+        "@radix-ui/react-context": "1.1.2",
+        "@radix-ui/react-direction": "1.1.1",
+        "@radix-ui/react-primitive": "2.1.3",
+        "@radix-ui/react-roving-focus": "1.1.11",
+        "@radix-ui/react-separator": "1.1.7",
+        "@radix-ui/react-toggle-group": "1.1.11"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-tooltip": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-tooltip/-/react-tooltip-1.2.8.tgz",
+      "integrity": "sha512-tY7sVt1yL9ozIxvmbtN5qtmH2krXcBCfjEiCgKGLqunJHvgvZG2Pcl2oQ3kbcZARb1BGEHdkLzcYGO8ynVlieg==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.3",
+        "@radix-ui/react-compose-refs": "1.1.2",
+        "@radix-ui/react-context": "1.1.2",
+        "@radix-ui/react-dismissable-layer": "1.1.11",
+        "@radix-ui/react-id": "1.1.1",
+        "@radix-ui/react-popper": "1.2.8",
+        "@radix-ui/react-portal": "1.1.9",
+        "@radix-ui/react-presence": "1.1.5",
+        "@radix-ui/react-primitive": "2.1.3",
+        "@radix-ui/react-slot": "1.2.3",
+        "@radix-ui/react-use-controllable-state": "1.2.2",
+        "@radix-ui/react-visually-hidden": "1.2.3"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-use-callback-ref": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-use-callback-ref/-/react-use-callback-ref-1.1.1.tgz",
+      "integrity": "sha512-FkBMwD+qbGQeMu1cOHnuGB6x4yzPjho8ap5WtbEJ26umhgqVXbhekKUQO+hZEL1vU92a3wHwdp0HAcqAUF5iDg==",
+      "license": "MIT",
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-use-controllable-state": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-use-controllable-state/-/react-use-controllable-state-1.2.2.tgz",
+      "integrity": "sha512-BjasUjixPFdS+NKkypcyyN5Pmg83Olst0+c6vGov0diwTEo6mgdqVR6hxcEgFuh4QrAs7Rc+9KuGJ9TVCj0Zzg==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-use-effect-event": "0.0.2",
+        "@radix-ui/react-use-layout-effect": "1.1.1"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-use-effect-event": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-use-effect-event/-/react-use-effect-event-0.0.2.tgz",
+      "integrity": "sha512-Qp8WbZOBe+blgpuUT+lw2xheLP8q0oatc9UpmiemEICxGvFLYmHm9QowVZGHtJlGbS6A6yJ3iViad/2cVjnOiA==",
       "license": "MIT",
       "dependencies": {
-        "@jridgewell/resolve-uri": "^3.1.0",
-        "@jridgewell/sourcemap-codec": "^1.4.14"
+        "@radix-ui/react-use-layout-effect": "1.1.1"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@napi-rs/wasm-runtime": {
-      "version": "0.2.12",
-      "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-0.2.12.tgz",
-      "integrity": "sha512-ZVWUcfwY4E/yPitQJl481FjFo3K22D6qF0DuFH6Y/nbnE11GY5uguDxZMGXPQ8WQ0128MXQD7TnfHyK4oWoIJQ==",
-      "dev": true,
+    "node_modules/@radix-ui/react-use-escape-keydown": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-use-escape-keydown/-/react-use-escape-keydown-1.1.1.tgz",
+      "integrity": "sha512-Il0+boE7w/XebUHyBjroE+DbByORGR9KKmITzbR7MyQ4akpORYP/ZmbhAr0DG7RmmBqoOnZdy2QlvajJ2QA59g==",
       "license": "MIT",
-      "optional": true,
       "dependencies": {
-        "@emnapi/core": "^1.4.3",
-        "@emnapi/runtime": "^1.4.3",
-        "@tybys/wasm-util": "^0.10.0"
+        "@radix-ui/react-use-callback-ref": "1.1.1"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@oozcitak/dom": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@oozcitak/dom/-/dom-2.0.2.tgz",
-      "integrity": "sha512-GjpKhkSYC3Mj4+lfwEyI1dqnsKTgwGy48ytZEhm4A/xnH/8z9M3ZVXKr/YGQi3uCLs1AEBS+x5T2JPiueEDW8w==",
+    "node_modules/@radix-ui/react-use-is-hydrated": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-use-is-hydrated/-/react-use-is-hydrated-0.1.0.tgz",
+      "integrity": "sha512-U+UORVEq+cTnRIaostJv9AGdV3G6Y+zbVd+12e18jQ5A3c0xL03IhnHuiU4UV69wolOQp5GfR58NW/EgdQhwOA==",
       "license": "MIT",
       "dependencies": {
-        "@oozcitak/infra": "^2.0.2",
-        "@oozcitak/url": "^3.0.0",
-        "@oozcitak/util": "^10.0.0"
+        "use-sync-external-store": "^1.5.0"
       },
-      "engines": {
-        "node": ">=20.0"
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@oozcitak/infra": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@oozcitak/infra/-/infra-2.0.2.tgz",
-      "integrity": "sha512-2g+E7hoE2dgCz/APPOEK5s3rMhJvNxSMBrP+U+j1OWsIbtSpWxxlUjq1lU8RIsFJNYv7NMlnVsCuHcUzJW+8vA==",
+    "node_modules/@radix-ui/react-use-layout-effect": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-use-layout-effect/-/react-use-layout-effect-1.1.1.tgz",
+      "integrity": "sha512-RbJRS4UWQFkzHTTwVymMTUv8EqYhOp8dOOviLj2ugtTiXRaRQS7GLGxZTLL1jWhMeoSCf5zmcZkqTl9IiYfXcQ==",
       "license": "MIT",
-      "dependencies": {
-        "@oozcitak/util": "^10.0.0"
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
       },
-      "engines": {
-        "node": ">=20.0"
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@oozcitak/url": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@oozcitak/url/-/url-3.0.0.tgz",
-      "integrity": "sha512-ZKfET8Ak1wsLAiLWNfFkZc/BraDccuTJKR6svTYc7sVjbR+Iu0vtXdiDMY4o6jaFl5TW2TlS7jbLl4VovtAJWQ==",
+    "node_modules/@radix-ui/react-use-previous": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-use-previous/-/react-use-previous-1.1.1.tgz",
+      "integrity": "sha512-2dHfToCj/pzca2Ck724OZ5L0EVrr3eHRNsG/b3xQJLA2hZpVCS99bLAX+hm1IHXDEnzU6by5z/5MIY794/a8NQ==",
+      "license": "MIT",
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-use-rect": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-use-rect/-/react-use-rect-1.1.1.tgz",
+      "integrity": "sha512-QTYuDesS0VtuHNNvMh+CjlKJ4LJickCMUAqjlE3+j8w+RlRpwyX3apEQKGFzbZGdo7XNG1tXa+bQqIE7HIXT2w==",
       "license": "MIT",
       "dependencies": {
-        "@oozcitak/infra": "^2.0.2",
-        "@oozcitak/util": "^10.0.0"
+        "@radix-ui/rect": "1.1.1"
       },
-      "engines": {
-        "node": ">=20.0"
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@oozcitak/util": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/@oozcitak/util/-/util-10.0.0.tgz",
-      "integrity": "sha512-hAX0pT/73190NLqBPPWSdBVGtbY6VOhWYK3qqHqtXQ1gK7kS2yz4+ivsN07hpJ6I3aeMtKP6J6npsEKOAzuTLA==",
+    "node_modules/@radix-ui/react-use-size": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-use-size/-/react-use-size-1.1.1.tgz",
+      "integrity": "sha512-ewrXRDTAqAXlkl6t/fkXWNAhFX9I+CkKlw6zjEwk86RSPKwZr3xpBRso655aqYafwtnbpHLj6toFzmd6xdVptQ==",
       "license": "MIT",
-      "engines": {
-        "node": ">=20.0"
+      "dependencies": {
+        "@radix-ui/react-use-layout-effect": "1.1.1"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@pkgjs/parseargs": {
-      "version": "0.11.0",
-      "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
-      "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
-      "dev": true,
+    "node_modules/@radix-ui/react-visually-hidden": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-visually-hidden/-/react-visually-hidden-1.2.3.tgz",
+      "integrity": "sha512-pzJq12tEaaIhqjbzpCuv/OypJY/BPavOofm+dbab+MHLajy277+1lLm6JFcGgF5eskJ6mquGirhXY2GD/8u8Ug==",
       "license": "MIT",
-      "optional": true,
-      "engines": {
-        "node": ">=14"
+      "dependencies": {
+        "@radix-ui/react-primitive": "2.1.3"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
       }
     },
+    "node_modules/@radix-ui/rect": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@radix-ui/rect/-/rect-1.1.1.tgz",
+      "integrity": "sha512-HPwpGIzkl28mWyZqG52jiqDJ12waP11Pa1lGoiyUkIEuMLBP0oeK/C89esbXrxsky5we7dfd8U58nm0SgAWpVw==",
+      "license": "MIT"
+    },
     "node_modules/@rolldown/pluginutils": {
       "version": "1.0.0-beta.40",
       "resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.0-beta.40.tgz",
@@ -1984,6 +3533,15 @@
         "eslint": ">=9.0.0"
       }
     },
+    "node_modules/@tabby_ai/hijri-converter": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/@tabby_ai/hijri-converter/-/hijri-converter-1.0.5.tgz",
+      "integrity": "sha512-r5bClKrcIusDoo049dSL8CawnHR6mRdDwhlQuIgZRNty68q0x8k3Lf1BtPAMxRf/GgnHBnIO4ujd3+GQdLWzxQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
     "node_modules/@tailwindcss/node": {
       "version": "4.1.18",
       "resolved": "https://registry.npmjs.org/@tailwindcss/node/-/node-4.1.18.tgz",
@@ -3113,6 +4671,13 @@
         "@babel/types": "^7.28.2"
       }
     },
+    "node_modules/@types/canvas-confetti": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@types/canvas-confetti/-/canvas-confetti-1.9.0.tgz",
+      "integrity": "sha512-aBGj/dULrimR1XDZLtG9JwxX1b4HPRF6CX9Yfwh3NvstZEm1ZL7RBnel4keCPSqs1ANRu1u2Aoz9R+VmtjYuTg==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@types/chai": {
       "version": "5.2.3",
       "resolved": "https://registry.npmjs.org/@types/chai/-/chai-5.2.3.tgz",
@@ -4007,6 +5572,18 @@
       "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
       "license": "Python-2.0"
     },
+    "node_modules/aria-hidden": {
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/aria-hidden/-/aria-hidden-1.2.6.tgz",
+      "integrity": "sha512-ik3ZgC9dY/lYVVM++OISsaYDeg1tb0VtP5uL3ouh1koGOaUMDPpbFIei4JkFimWUFPn90sbMNMXQAIVOlnYKJA==",
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/aria-query": {
       "version": "5.3.0",
       "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz",
@@ -4212,6 +5789,16 @@
       ],
       "license": "CC-BY-4.0"
     },
+    "node_modules/canvas-confetti": {
+      "version": "1.9.4",
+      "resolved": "https://registry.npmjs.org/canvas-confetti/-/canvas-confetti-1.9.4.tgz",
+      "integrity": "sha512-yxQbJkAVrFXWNbTUjPqjF7G+g6pDotOUHGbkZq2NELZUMDpiJ85rIEazVb8GTaAptNW2miJAXbs1BtioA251Pw==",
+      "license": "ISC",
+      "funding": {
+        "type": "donate",
+        "url": "https://www.paypal.me/kirilvatev"
+      }
+    },
     "node_modules/chai": {
       "version": "5.3.3",
       "resolved": "https://registry.npmjs.org/chai/-/chai-5.3.3.tgz",
@@ -4502,6 +6089,22 @@
         "node": ">=20"
       }
     },
+    "node_modules/date-fns": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-4.1.0.tgz",
+      "integrity": "sha512-Ukq0owbQXxa/U3EGtsdVBkR1w7KOQ5gIBqdH2hkvknzZPYvBxb/aa6E8L7tmjFtkwZBu3UXBbjIgPo/Ez4xaNg==",
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/kossnocorp"
+      }
+    },
+    "node_modules/date-fns-jalali": {
+      "version": "4.1.0-0",
+      "resolved": "https://registry.npmjs.org/date-fns-jalali/-/date-fns-jalali-4.1.0-0.tgz",
+      "integrity": "sha512-hTIP/z+t+qKwBDcmmsnmjWTduxCg+5KfdqWQvb2X/8C9+knYY6epN/pfxdDuyVlSVeFz0sM5eEfwIUQ70U4ckg==",
+      "license": "MIT"
+    },
     "node_modules/debug": {
       "version": "4.4.3",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
@@ -4562,6 +6165,12 @@
         "node": ">=8"
       }
     },
+    "node_modules/detect-node-es": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/detect-node-es/-/detect-node-es-1.1.0.tgz",
+      "integrity": "sha512-ypdmJU/TbBby2Dxibuv7ZLW3Bs1QEmM7nHjEANfohJLvE0XVujisn1qPJcZxg+qDucsr+bP6fLD1rPS3AhJ7EQ==",
+      "license": "MIT"
+    },
     "node_modules/diff": {
       "version": "8.0.3",
       "resolved": "https://registry.npmjs.org/diff/-/diff-8.0.3.tgz",
@@ -5349,6 +6958,15 @@
         "node": ">=6.9.0"
       }
     },
+    "node_modules/get-nonce": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/get-nonce/-/get-nonce-1.0.1.tgz",
+      "integrity": "sha512-FJhYRoDaiatfEkUK8HKlicmu/3SGFD51q3itKDGoSTysQJBnfOcxU5GxnhE1E6soB76MbT0MBtnKJuXyAx+96Q==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/get-tsconfig": {
       "version": "4.13.1",
       "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.13.1.tgz",
@@ -6700,6 +8318,83 @@
         "node": ">=6"
       }
     },
+    "node_modules/radix-ui": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/radix-ui/-/radix-ui-1.4.3.tgz",
+      "integrity": "sha512-aWizCQiyeAenIdUbqEpXgRA1ya65P13NKn/W8rWkcN0OPkRDxdBVLWnIEDsS2RpwCK2nobI7oMUSmexzTDyAmA==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.3",
+        "@radix-ui/react-accessible-icon": "1.1.7",
+        "@radix-ui/react-accordion": "1.2.12",
+        "@radix-ui/react-alert-dialog": "1.1.15",
+        "@radix-ui/react-arrow": "1.1.7",
+        "@radix-ui/react-aspect-ratio": "1.1.7",
+        "@radix-ui/react-avatar": "1.1.10",
+        "@radix-ui/react-checkbox": "1.3.3",
+        "@radix-ui/react-collapsible": "1.1.12",
+        "@radix-ui/react-collection": "1.1.7",
+        "@radix-ui/react-compose-refs": "1.1.2",
+        "@radix-ui/react-context": "1.1.2",
+        "@radix-ui/react-context-menu": "2.2.16",
+        "@radix-ui/react-dialog": "1.1.15",
+        "@radix-ui/react-direction": "1.1.1",
+        "@radix-ui/react-dismissable-layer": "1.1.11",
+        "@radix-ui/react-dropdown-menu": "2.1.16",
+        "@radix-ui/react-focus-guards": "1.1.3",
+        "@radix-ui/react-focus-scope": "1.1.7",
+        "@radix-ui/react-form": "0.1.8",
+        "@radix-ui/react-hover-card": "1.1.15",
+        "@radix-ui/react-label": "2.1.7",
+        "@radix-ui/react-menu": "2.1.16",
+        "@radix-ui/react-menubar": "1.1.16",
+        "@radix-ui/react-navigation-menu": "1.2.14",
+        "@radix-ui/react-one-time-password-field": "0.1.8",
+        "@radix-ui/react-password-toggle-field": "0.1.3",
+        "@radix-ui/react-popover": "1.1.15",
+        "@radix-ui/react-popper": "1.2.8",
+        "@radix-ui/react-portal": "1.1.9",
+        "@radix-ui/react-presence": "1.1.5",
+        "@radix-ui/react-primitive": "2.1.3",
+        "@radix-ui/react-progress": "1.1.7",
+        "@radix-ui/react-radio-group": "1.3.8",
+        "@radix-ui/react-roving-focus": "1.1.11",
+        "@radix-ui/react-scroll-area": "1.2.10",
+        "@radix-ui/react-select": "2.2.6",
+        "@radix-ui/react-separator": "1.1.7",
+        "@radix-ui/react-slider": "1.3.6",
+        "@radix-ui/react-slot": "1.2.3",
+        "@radix-ui/react-switch": "1.2.6",
+        "@radix-ui/react-tabs": "1.1.13",
+        "@radix-ui/react-toast": "1.2.15",
+        "@radix-ui/react-toggle": "1.1.10",
+        "@radix-ui/react-toggle-group": "1.1.11",
+        "@radix-ui/react-toolbar": "1.1.11",
+        "@radix-ui/react-tooltip": "1.2.8",
+        "@radix-ui/react-use-callback-ref": "1.1.1",
+        "@radix-ui/react-use-controllable-state": "1.2.2",
+        "@radix-ui/react-use-effect-event": "0.0.2",
+        "@radix-ui/react-use-escape-keydown": "1.1.1",
+        "@radix-ui/react-use-is-hydrated": "0.1.0",
+        "@radix-ui/react-use-layout-effect": "1.1.1",
+        "@radix-ui/react-use-size": "1.1.1",
+        "@radix-ui/react-visually-hidden": "1.2.3"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/react": {
       "version": "19.2.4",
       "resolved": "https://registry.npmjs.org/react/-/react-19.2.4.tgz",
@@ -6709,6 +8404,28 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/react-day-picker": {
+      "version": "9.14.0",
+      "resolved": "https://registry.npmjs.org/react-day-picker/-/react-day-picker-9.14.0.tgz",
+      "integrity": "sha512-tBaoDWjPwe0M5pGrum4H0SR6Lyk+BO9oHnp9JbKpGKW2mlraNPgP9BMfsg5pWpwrssARmeqk7YBl2oXutZTaHA==",
+      "license": "MIT",
+      "dependencies": {
+        "@date-fns/tz": "^1.4.1",
+        "@tabby_ai/hijri-converter": "1.0.5",
+        "date-fns": "^4.1.0",
+        "date-fns-jalali": "4.1.0-0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "type": "individual",
+        "url": "https://github.com/sponsors/gpbl"
+      },
+      "peerDependencies": {
+        "react": ">=16.8.0"
+      }
+    },
     "node_modules/react-dom": {
       "version": "19.2.4",
       "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.4.tgz",
@@ -6738,6 +8455,75 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/react-remove-scroll": {
+      "version": "2.7.2",
+      "resolved": "https://registry.npmjs.org/react-remove-scroll/-/react-remove-scroll-2.7.2.tgz",
+      "integrity": "sha512-Iqb9NjCCTt6Hf+vOdNIZGdTiH1QSqr27H/Ek9sv/a97gfueI/5h1s3yRi1nngzMUaOOToin5dI1dXKdXiF+u0Q==",
+      "license": "MIT",
+      "dependencies": {
+        "react-remove-scroll-bar": "^2.3.7",
+        "react-style-singleton": "^2.2.3",
+        "tslib": "^2.1.0",
+        "use-callback-ref": "^1.3.3",
+        "use-sidecar": "^1.1.3"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/react-remove-scroll-bar": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/react-remove-scroll-bar/-/react-remove-scroll-bar-2.3.8.tgz",
+      "integrity": "sha512-9r+yi9+mgU33AKcj6IbT9oRCO78WriSj6t/cF8DWBZJ9aOGPOTEDvdUDz1FwKim7QXWwmHqtdHnRJfhAxEG46Q==",
+      "license": "MIT",
+      "dependencies": {
+        "react-style-singleton": "^2.2.2",
+        "tslib": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/react-style-singleton": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/react-style-singleton/-/react-style-singleton-2.2.3.tgz",
+      "integrity": "sha512-b6jSvxvVnyptAiLjbkWLE/lOnR4lfTtDAl+eUC7RZy+QQWc6wRzIV2CE6xBuMmDxc2qIihtDCZD5NPOFl7fRBQ==",
+      "license": "MIT",
+      "dependencies": {
+        "get-nonce": "^1.0.0",
+        "tslib": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/readdirp": {
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
@@ -7677,6 +9463,49 @@
         "punycode": "^2.1.0"
       }
     },
+    "node_modules/use-callback-ref": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/use-callback-ref/-/use-callback-ref-1.3.3.tgz",
+      "integrity": "sha512-jQL3lRnocaFtu3V00JToYz/4QkNWswxijDaCVNZRiRTO3HQDLsdu1ZtmIUvV4yPp+rvWm5j0y0TG/S61cuijTg==",
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/use-sidecar": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/use-sidecar/-/use-sidecar-1.1.3.tgz",
+      "integrity": "sha512-Fedw0aZvkhynoPYlA5WXrMCAMm+nSWdZt6lzJQ7Ok8S6Q+VsHmHpRWndVRJ8Be0ZbkfPc5LRYH+5XrzXcEeLRQ==",
+      "license": "MIT",
+      "dependencies": {
+        "detect-node-es": "^1.1.0",
+        "tslib": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/use-sync-external-store": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.6.0.tgz",
diff --git a/clients/web/package.json b/clients/web/package.json
index 6a3156d22..265ea82ad 100644
--- a/clients/web/package.json
+++ b/clients/web/package.json
@@ -3,9 +3,9 @@
   "private": true,
   "type": "module",
   "scripts": {
-    "dev": "vite dev --port 3000",
-    "build": "vite build",
-    "preview": "vite preview",
+    "dev": "doppler run -- vite dev --port 3000",
+    "build": "doppler run -- vite build",
+    "preview": "doppler run -- vite preview",
     "test": "vitest run",
     "lint": "eslint",
     "format": "prettier --write .",
@@ -14,6 +14,8 @@
   "dependencies": {
     "@base-ui/react": "^1.3.0",
     "@clerk/clerk-react": "^5.60.0",
+    "@dnd-kit/core": "^6.3.1",
+    "@dnd-kit/utilities": "^3.2.2",
     "@tailwindcss/vite": "^4.0.6",
     "@tanstack/react-devtools": "^0.7.0",
     "@tanstack/react-query": "^5.90.20",
@@ -22,10 +24,13 @@
     "@tanstack/react-router-devtools": "^1.132.0",
     "@tanstack/react-start": "^1.132.0",
     "@tanstack/router-plugin": "^1.132.0",
+    "canvas-confetti": "^1.9.4",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "lucide-react": "^0.561.0",
+    "radix-ui": "^1.4.3",
     "react": "^19.2.0",
+    "react-day-picker": "^9.14.0",
     "react-dom": "^19.2.0",
     "tailwind-merge": "^2.6.0",
     "tailwindcss": "^4.0.6",
@@ -36,6 +41,7 @@
     "@tanstack/eslint-config": "^0.3.0",
     "@testing-library/dom": "^10.4.0",
     "@testing-library/react": "^16.2.0",
+    "@types/canvas-confetti": "^1.9.0",
     "@types/node": "^22.10.2",
     "@types/react": "^19.2.0",
     "@types/react-dom": "^19.2.0",
diff --git a/clients/web/src/components/LogoutButton.tsx b/clients/web/src/components/LogoutButton.tsx
index 0782ce08d..ce4d15ac5 100644
--- a/clients/web/src/components/LogoutButton.tsx
+++ b/clients/web/src/components/LogoutButton.tsx
@@ -11,14 +11,14 @@ export function LogoutButton() {
       <button
         type="button"
         onClick={() => setOpen(true)}
-        className="flex w-full hover:cursor-pointer items-center gap-3 rounded-lg px-3 py-2 text-left text-sm text-gray-500 transition-colors hover:bg-gray-100 hover:text-gray-700"
+        className="flex items-center gap-2 rounded-lg border border-stroke-subtle px-4 py-2 text-sm font-medium text-danger transition-colors hover:bg-danger/5 hover:border-danger/30 hover:cursor-pointer"
       >
-        <LogOut className="size-5 shrink-0" />
-        Logout
+        <LogOut className="size-4 shrink-0" />
+        Log out
       </button>
 
       {open && (
-        <div className="fixed inset-0 z-50 flex items-center justify-center bg-black/30">
+        <div className="fixed inset-0 z-[60] flex items-center justify-center bg-black/30">
           <div className="relative w-full max-w-md rounded-2xl bg-white p-8 shadow-xl">
             <button
               type="button"
diff --git a/clients/web/src/components/SideBarWithContent.tsx b/clients/web/src/components/SideBarWithContent.tsx
index af311cee0..a105a4d8a 100644
--- a/clients/web/src/components/SideBarWithContent.tsx
+++ b/clients/web/src/components/SideBarWithContent.tsx
@@ -1,13 +1,34 @@
-import { Outlet } from "@tanstack/react-router";
+import { useEffect, useState } from "react";
+import { Outlet, useRouterState } from "@tanstack/react-router";
 import { Sidebar } from "./Sidebar";
+import { NotificationPanel } from "./notifications/NotificationPanel";
 
 export function SideBarWithContent() {
+  const [notifOpen, setNotifOpen] = useState(false);
+  const [sidebarExpanded, setSidebarExpanded] = useState(false);
+  const pathname = useRouterState({ select: (s) => s.location.pathname });
+
+  useEffect(() => {
+    setNotifOpen(false);
+  }, [pathname]);
+
   return (
     <div className="flex min-h-screen">
-      <Sidebar />
-      <main className="flex-1">
+      <Sidebar
+        notifOpen={notifOpen}
+        onNotifToggle={() => setNotifOpen((o) => !o)}
+        onHoverChange={setSidebarExpanded}
+      />
+      <main className="relative flex-1 overflow-auto">
+        {notifOpen && (
+          <div
+            className="absolute inset-0 z-40"
+            onClick={() => setNotifOpen(false)}
+          />
+        )}
         <Outlet />
       </main>
+      <NotificationPanel open={notifOpen} sidebarExpanded={sidebarExpanded} />
     </div>
   );
 }
diff --git a/clients/web/src/components/Sidebar.tsx b/clients/web/src/components/Sidebar.tsx
index d6f270e29..c62f6259e 100644
--- a/clients/web/src/components/Sidebar.tsx
+++ b/clients/web/src/components/Sidebar.tsx
@@ -1,90 +1,207 @@
 import { Link, useRouterState } from "@tanstack/react-router";
-import { UserButton, useUser } from "@clerk/clerk-react";
-import { Home, LayoutGrid, Octagon, Settings, UserRound } from "lucide-react";
-import { LogoutButton } from "./LogoutButton";
+import {
+  Bell,
+  Home,
+  LayoutGrid,
+  LogOut,
+  Octagon,
+  Settings,
+  UserRound,
+} from "lucide-react";
+import { useClerk, useUser } from "@clerk/clerk-react";
+import { useState } from "react";
+import { SettingsModal } from "./settings/SettingsModal";
+import { cn } from "@/lib/utils";
 
 function NavLink({
   to,
   icon: Icon,
-  children,
+  label,
 }: {
   to: string;
   icon: React.ElementType;
-  children: React.ReactNode;
+  label: string;
 }) {
   const pathname = useRouterState({ select: (s) => s.location.pathname });
   const isActive = pathname === to || (to !== "/" && pathname.startsWith(to));
+
   return (
     <Link
       to={to}
-      className={`flex items-center gap-3 rounded-lg px-3 py-2 text-sm transition-colors ${
+      className={cn(
+        "flex w-full items-center gap-4 rounded-md px-4 py-2 transition-colors",
         isActive
-          ? "bg-primary/10 font-semibold text-gray-900"
-          : "text-gray-500 hover:bg-gray-100 hover:text-gray-700"
-      }`}
+          ? "bg-bg-selected text-primary"
+          : "text-text-subtle hover:bg-bg-container",
+      )}
     >
       <Icon className="size-5 shrink-0" strokeWidth={isActive ? 2.5 : 2} />
-      {children}
+      <span className="whitespace-nowrap text-sm font-medium opacity-0 transition-opacity duration-150 group-hover:opacity-100">
+        {label}
+      </span>
     </Link>
   );
 }
 
-export function Sidebar() {
+function NavItem({
+  icon: Icon,
+  label,
+  active,
+  onClick,
+}: {
+  icon: React.ElementType;
+  label: string;
+  active?: boolean;
+  onClick?: () => void;
+}) {
+  return (
+    <button
+      type="button"
+      onClick={onClick}
+      className={cn(
+        "flex w-full items-center gap-4 rounded-md px-4 py-2 transition-colors",
+        active
+          ? "bg-bg-selected text-primary"
+          : "text-text-subtle hover:bg-bg-container",
+      )}
+    >
+      <Icon className="size-5 shrink-0" strokeWidth={active ? 2.5 : 2} />
+      <span className="whitespace-nowrap text-sm font-medium opacity-0 transition-opacity duration-150 group-hover:opacity-100">
+        {label}
+      </span>
+    </button>
+  );
+}
+
+type SidebarProps = {
+  notifOpen: boolean;
+  onNotifToggle: () => void;
+  onHoverChange: (hovered: boolean) => void;
+};
+
+export function Sidebar({
+  notifOpen,
+  onNotifToggle,
+  onHoverChange,
+}: SidebarProps) {
+  const { signOut } = useClerk();
   const { user } = useUser();
+  const [logoutOpen, setLogoutOpen] = useState(false);
+  const [settingsOpen, setSettingsOpen] = useState(false);
 
-  const displayName =
-    user?.fullName ??
-    [user?.firstName, user?.lastName].filter(Boolean).join(" ");
+  const avatarUrl = user?.imageUrl;
+  const initials = [user?.firstName?.[0], user?.lastName?.[0]]
+    .filter(Boolean)
+    .join("")
+    .toUpperCase();
 
   return (
-    <aside className="flex w-64 flex-col border-r border-stroke-subtle bg-white p-4">
-      {/* LOGO */}
-      <div className="mb-5 flex items-center gap-3">
-        <div className="flex size-8 shrink-0 items-center justify-center rounded-lg bg-primary">
-          <Octagon
-            className="size-3.5 text-white"
-            fill="white"
-            strokeWidth={1.5}
+    <>
+      <aside
+        className="group flex w-16.25 shrink-0 flex-col justify-between overflow-hidden border-r border-stroke-subtle bg-white py-5 transition-[width] duration-200 ease-in-out hover:w-52"
+        onMouseEnter={() => onHoverChange(true)}
+        onMouseLeave={() => onHoverChange(false)}
+      >
+        <div className="flex flex-col gap-5">
+          {/* Logo */}
+          <div className="flex items-center gap-3 px-4 py-1">
+            <div className="flex size-8 shrink-0 items-center justify-center rounded-lg bg-primary">
+              <Octagon
+                className="size-3.5 text-white"
+                fill="white"
+                strokeWidth={1.5}
+              />
+            </div>
+            <span className="whitespace-nowrap text-xl font-bold text-text-default opacity-0 transition-opacity duration-150 group-hover:opacity-100">
+              SelfServe
+            </span>
+          </div>
+
+          {/* Main nav */}
+          <nav className="flex flex-col gap-1 px-2">
+            <NavLink to="/home" icon={Home} label="Home" />
+            <NavLink to="/rooms" icon={LayoutGrid} label="Room" />
+            <NavLink to="/guests" icon={UserRound} label="Guest" />
+            <NavItem
+              icon={Bell}
+              label="Notifications"
+              active={notifOpen}
+              onClick={onNotifToggle}
+            />
+          </nav>
+        </div>
+
+        {/* Bottom */}
+        <div className="flex flex-col gap-1 px-2">
+          <NavItem
+            icon={Settings}
+            label="Settings"
+            onClick={() => setSettingsOpen(true)}
           />
+          <NavItem
+            icon={LogOut}
+            label="Logout"
+            onClick={() => setLogoutOpen(true)}
+          />
+
+          {/* Profile */}
+          <div className="mt-1 flex items-center gap-3 px-2 py-2">
+            {avatarUrl ? (
+              <img
+                src={avatarUrl}
+                alt={initials}
+                className="size-8 shrink-0 rounded-full object-cover"
+              />
+            ) : (
+              <div className="flex size-8 shrink-0 items-center justify-center rounded-full bg-bg-selected text-xs font-medium text-text-default">
+                {initials || "?"}
+              </div>
+            )}
+            <div className="flex flex-col opacity-0 transition-opacity duration-150 group-hover:opacity-100">
+              <span className="whitespace-nowrap text-xs font-medium text-text-default">
+                {user?.firstName} {user?.lastName}
+              </span>
+              <span className="whitespace-nowrap text-xs text-text-subtle">
+                Hotel Chain
+              </span>
+            </div>
+          </div>
         </div>
-        <span className="text-lg font-bold text-gray-900">SelfServe</span>
-      </div>
+      </aside>
 
-      {/* Main nav */}
-      <nav className="flex flex-1 flex-col gap-4">
-        <NavLink to="/home" icon={Home}>
-          Home
-        </NavLink>
-        <NavLink to="/rooms" icon={LayoutGrid}>
-          Room
-        </NavLink>
-        <NavLink to="/guests" icon={UserRound}>
-          Guest
-        </NavLink>
-      </nav>
+      <SettingsModal
+        open={settingsOpen}
+        onClose={() => setSettingsOpen(false)}
+      />
 
-      {/* Bottom section */}
-      <div className="mt-auto space-y-3">
-        <NavLink to="/settings" icon={Settings}>
-          Settings
-        </NavLink>
-        <LogoutButton />
-        <div className="flex items-center gap-3 pt-4">
-          <UserButton
-            appearance={{
-              elements: {
-                avatarBox: "size-10",
-              },
-            }}
-          />
-          <div className="min-w-0 flex-1">
-            <p className="truncate text-sm font-medium text-gray-700">
-              {displayName || "User"}
+      {logoutOpen && (
+        <div className="fixed inset-0 z-60 flex items-center justify-center bg-black/30">
+          <div className="w-full max-w-md rounded-2xl bg-white p-8 shadow-xl">
+            <h2 className="text-[20px] font-bold text-text-default">
+              Are you sure you want to log out?
+            </h2>
+            <p className="mt-2 text-[16px] text-text-secondary">
+              You'll be signed out and can log back in anytime.
             </p>
-            <p className="truncate text-xs text-gray-500">Hotel Chain</p>
+            <div className="mt-8 flex justify-end gap-3">
+              <button
+                type="button"
+                onClick={() => setLogoutOpen(false)}
+                className="px-4 py-2 text-[14px] font-medium text-text-secondary hover:text-text-default"
+              >
+                Cancel
+              </button>
+              <button
+                type="button"
+                onClick={() => signOut()}
+                className="rounded-lg bg-primary px-5 py-2 text-[14px] font-semibold text-white hover:bg-primary-hover"
+              >
+                Log out
+              </button>
+            </div>
           </div>
         </div>
-      </div>
-    </aside>
+      )}
+    </>
   );
 }
diff --git a/clients/web/src/components/guests/ActiveBookingCard.tsx b/clients/web/src/components/guests/ActiveBookingCard.tsx
new file mode 100644
index 000000000..c881f7bd3
--- /dev/null
+++ b/clients/web/src/components/guests/ActiveBookingCard.tsx
@@ -0,0 +1,67 @@
+import { CalendarDays, UsersRound } from "lucide-react";
+import type { Stay } from "@shared";
+import { cn } from "@/lib/utils";
+import { formatDate } from "@/utils/dates";
+
+type ActiveBookingCardProps = {
+  stay: Stay;
+  compact?: boolean;
+};
+
+export function ActiveBookingCard({ stay, compact }: ActiveBookingCardProps) {
+  return (
+    <div
+      className={cn(
+        "flex flex-col gap-2 rounded-lg border border-primary bg-bg-selected p-4",
+        compact && "flex-1 min-w-0",
+      )}
+    >
+      <div className="flex items-start justify-between">
+        <span className="text-xl font-bold text-primary">
+          Suite {stay.room_number}
+        </span>
+        {stay.group_size != null && (
+          <div className="flex items-center gap-1 text-primary">
+            <UsersRound className="size-[19px]" strokeWidth={1.5} />
+            <span className="text-xl font-bold">{stay.group_size}</span>
+          </div>
+        )}
+      </div>
+      {compact ? (
+        <div className="flex flex-col gap-1">
+          <div className="flex flex-col gap-1">
+            <span className="text-sm font-medium text-primary">Arrival:</span>
+            <div className="flex items-center gap-2 text-sm text-primary">
+              <CalendarDays className="size-3 shrink-0" strokeWidth={1.5} />
+              <span>{formatDate(stay.arrival_date)}</span>
+            </div>
+          </div>
+          <div className="flex flex-col gap-1">
+            <span className="text-sm font-medium text-primary">Departure:</span>
+            <div className="flex items-center gap-2 text-sm text-primary">
+              <CalendarDays className="size-3 shrink-0" strokeWidth={1.5} />
+              <span>{formatDate(stay.departure_date)}</span>
+            </div>
+          </div>
+        </div>
+      ) : (
+        <div className="flex gap-[72px]">
+          <div className="flex flex-1 flex-col gap-1">
+            <span className="text-sm font-medium text-primary">Arrival:</span>
+            <div className="flex items-center gap-2 text-sm text-primary">
+              <CalendarDays className="size-3 shrink-0" strokeWidth={1.5} />
+              <span>{formatDate(stay.arrival_date)}</span>
+            </div>
+          </div>
+          <div className="flex flex-1 flex-col gap-1">
+            <span className="text-sm font-medium text-primary">Departure:</span>
+            <div className="flex items-center gap-2 text-sm text-primary">
+              <CalendarDays className="size-3 shrink-0" strokeWidth={1.5} />
+              <span>{formatDate(stay.departure_date)}</span>
+            </div>
+          </div>
+        </div>
+      )}
+    </div>
+  );
+}
diff --git a/clients/web/src/components/guests/AssistanceChip.tsx b/clients/web/src/components/guests/AssistanceChip.tsx
new file mode 100644
index 000000000..39fcaf991
--- /dev/null
+++ b/clients/web/src/components/guests/AssistanceChip.tsx
@@ -0,0 +1,11 @@
+type AssistanceChipProps = {
+  label: string;
+};
+
+export function AssistanceChip({ label }: AssistanceChipProps) {
+  return (
+    <span className="inline-flex items-center rounded border border-high-priority bg-bg-high-priority px-2 py-1 text-xs text-high-priority">
+      {label}
+    </span>
+  );
+}
diff --git a/clients/web/src/components/guests/GuestBookingHistoryView.tsx b/clients/web/src/components/guests/GuestBookingHistoryView.tsx
new file mode 100644
index 000000000..5be271fb0
--- /dev/null
+++ b/clients/web/src/components/guests/GuestBookingHistoryView.tsx
@@ -0,0 +1,74 @@
+import { ChevronRight } from "lucide-react";
+import { ActiveBookingCard } from "./ActiveBookingCard";
+import { PastBookingCard } from "./PastBookingCard";
+import type { Stay } from "@shared";
+
+type GuestBookingHistoryViewProps = {
+  currentStays: Array<Stay>;
+  pastStays: Array<Stay>;
+  onBack: () => void;
+};
+
+export function GuestBookingHistoryView({
+  currentStays,
+  pastStays,
+  onBack,
+}: GuestBookingHistoryViewProps) {
+  const byYear = pastStays.reduce<Record<string, Array<Stay>>>((acc, stay) => {
+    const year = stay.arrival_date.slice(0, 4);
+    (acc[year] ??= []).push(stay);
+    return acc;
+  }, {});
+  const years = Object.keys(byYear).sort((a, b) => Number(b) - Number(a));
+
+  return (
+    <div className="flex flex-col gap-6 p-6">
+      {/* Breadcrumb */}
+      <div className="flex items-center gap-1 text-base">
+        <button
+          type="button"
+          aria-label="Visit Activity"
+          onClick={onBack}
+          className="text-text-default hover:underline"
+        >
+          Visit Activity
+        </button>
+        <ChevronRight className="size-3.5 text-text-default" strokeWidth={2} />
+        <span className="text-text-default">Booking History</span>
+      </div>
+
+      {/* Active stays */}
+      {currentStays.length > 0 && (
+        <section className="flex flex-col gap-4">
+          <h3 className="text-base font-medium text-text-default">
+            Active Bookings ({currentStays.length})
+          </h3>
+          <div className="flex flex-col gap-3">
+            {currentStays.map((stay) => (
+              <ActiveBookingCard
+                key={`active-${stay.room_number}`}
+                stay={stay}
+              />
+            ))}
+          </div>
+        </section>
+      )}
+
+      {/* Past stays by year */}
+      {years.length > 0 ? (
+        years.map((year) => (
+          <section key={year} className="flex flex-col gap-2">
+            <h3 className="text-sm font-medium text-text-default">{year}</h3>
+            <div className="flex flex-col gap-2">
+              {byYear[year].map((stay, i) => (
+                <PastBookingCard key={`${year}-${i}`} stay={stay} />
+              ))}
+            </div>
+          </section>
+        ))
+      ) : (
+        <p className="text-sm text-text-subtle">No booking history.</p>
+      )}
+    </div>
+  );
+}
diff --git a/clients/web/src/components/guests/GuestDetailsDrawer.tsx b/clients/web/src/components/guests/GuestDetailsDrawer.tsx
new file mode 100644
index 000000000..0a278e0ca
--- /dev/null
+++ b/clients/web/src/components/guests/GuestDetailsDrawer.tsx
@@ -0,0 +1,135 @@
+import { X } from "lucide-react";
+import {
+  useGetGuestsStaysId,
+  useGetRequestGuestId,
+  usePutGuestsId,
+} from "@shared";
+import { GuestProfileTab } from "./GuestProfileTab";
+import { GuestVisitActivityTab } from "./GuestVisitActivityTab";
+import { cn } from "@/lib/utils";
+import { Skeleton } from "@/components/ui/skeleton";
+
+export enum GuestDrawerTab {
+  Profile = "profile",
+  Activity = "activity",
+}
+
+type GuestDetailsDrawerProps = {
+  guestId: string;
+  activeTab: GuestDrawerTab;
+  onTabChange: (tab: GuestDrawerTab) => void;
+  onClose: () => void;
+};
+
+const TABS: Array<{ key: GuestDrawerTab; label: string }> = [
+  { key: GuestDrawerTab.Profile, label: "Profile" },
+  { key: GuestDrawerTab.Activity, label: "Visit Activity" },
+];
+
+export function GuestDetailsDrawer({
+  guestId,
+  activeTab,
+  onTabChange,
+  onClose,
+}: GuestDetailsDrawerProps) {
+  const {
+    data: guest,
+    isLoading,
+    isError,
+    refetch,
+  } = useGetGuestsStaysId(guestId);
+  const { data: requestsData } = useGetRequestGuestId(guestId);
+  const requests = (requestsData as any)?.items ?? requestsData ?? [];
+  const updateGuest = usePutGuestsId();
+
+  const handleSaveNotes = async (notes: string) => {
+    await updateGuest.mutateAsync({ id: guestId, data: { notes } });
+    await refetch();
+  };
+
+  return (
+    <div className="flex h-full flex-col">
+      {/* Header */}
+      <div className="flex shrink-0 items-center justify-between border-b border-stroke-subtle px-6 py-5">
+        <div className="min-w-0">
+          {isLoading ? (
+            <Skeleton className="h-6 w-48" />
+          ) : (
+            <h2 className="truncate text-lg font-semibold text-text-default">
+              {guest ? `${guest.first_name} ${guest.last_name}` : "Guest"}
+            </h2>
+          )}
+        </div>
+        <button
+          type="button"
+          aria-label="Close"
+          onClick={onClose}
+          className="ml-4 shrink-0 rounded-lg p-1.5 text-text-subtle transition-colors hover:bg-bg-container hover:text-text-default"
+        >
+          <X className="h-5 w-5" />
+        </button>
+      </div>
+
+      {/* Tabs */}
+      <div
+        className="flex shrink-0 border-b border-stroke-subtle px-6"
+        role="tablist"
+      >
+        {TABS.map(({ key, label }) => (
+          <button
+            key={key}
+            type="button"
+            role="tab"
+            aria-selected={activeTab === key}
+            onClick={() => onTabChange(key)}
+            className={cn(
+              "mr-6 border-b-2 py-3 text-sm font-medium transition-colors",
+              activeTab === key
+                ? "border-primary text-primary"
+                : "border-transparent text-text-subtle hover:text-text-default",
+            )}
+          >
+            {label}
+          </button>
+        ))}
+      </div>
+
+      {/* Content */}
+      <div className="min-h-0 flex-1 overflow-y-auto">
+        {isLoading && (
+          <div className="flex flex-col gap-4 p-6">
+            <Skeleton className="h-4 w-32" />
+            <Skeleton className="h-4 w-full" />
+            <Skeleton className="h-4 w-3/4" />
+            <Skeleton className="h-4 w-full" />
+          </div>
+        )}
+        {isError && (
+          <div className="p-6 text-sm text-text-subtle">
+            Failed to load guest details.
+          </div>
+        )}
+        {!isLoading && !isError && guest && (
+          <>
+            {activeTab === GuestDrawerTab.Profile && (
+              <GuestProfileTab
+                guest={guest}
+                onSaveNotes={handleSaveNotes}
+                isSavingNotes={updateGuest.isPending}
+              />
+            )}
+            {activeTab === GuestDrawerTab.Activity && (
+              <GuestVisitActivityTab
+                // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+                currentStays={guest.current_stays ?? []}
+                // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+                pastStays={guest.past_stays ?? []}
+                requests={requests}
+              />
+            )}
+          </>
+        )}
+      </div>
+    </div>
+  );
+}
diff --git a/clients/web/src/components/guests/GuestFilterPopover.tsx b/clients/web/src/components/guests/GuestFilterPopover.tsx
new file mode 100644
index 000000000..3042fab86
--- /dev/null
+++ b/clients/web/src/components/guests/GuestFilterPopover.tsx
@@ -0,0 +1,186 @@
+import { Filter } from "lucide-react";
+import { useCallback, useState } from "react";
+import { Button } from "@/components/ui/Button";
+import { cn } from "@/lib/utils";
+
+type GuestFilterPopoverProps = {
+  availableFloors: Array<number>;
+  availableGroupSizes: Array<number>;
+  selectedFloors: Array<number>;
+  selectedGroupSizes: Array<number>;
+  onApply: (floors: Array<number>, groupSizes: Array<number>) => void;
+};
+
+function FilterChip({
+  label,
+  selected,
+  onClick,
+}: {
+  label: string;
+  selected: boolean;
+  onClick: () => void;
+}) {
+  return (
+    <button
+      type="button"
+      onClick={onClick}
+      className={cn(
+        "rounded-lg border px-4 py-1.5 text-sm transition-colors",
+        selected
+          ? "border-primary bg-primary/10 text-primary"
+          : "border-stroke-subtle bg-white text-text-default hover:border-primary",
+      )}
+    >
+      {label}
+    </button>
+  );
+}
+
+function toggleItem(arr: Array<number>, item: number): Array<number> {
+  return arr.includes(item) ? arr.filter((v) => v !== item) : [...arr, item];
+}
+
+export function GuestFilterPopover({
+  availableFloors,
+  availableGroupSizes,
+  selectedFloors,
+  selectedGroupSizes,
+  onApply,
+}: GuestFilterPopoverProps) {
+  const [open, setOpen] = useState(false);
+  const [pendingFloors, setPendingFloors] =
+    useState<Array<number>>(selectedFloors);
+  const [pendingGroupSizes, setPendingGroupSizes] =
+    useState<Array<number>>(selectedGroupSizes);
+
+  const handleOpen = () => {
+    setPendingFloors(selectedFloors);
+    setPendingGroupSizes(selectedGroupSizes);
+    setOpen(true);
+  };
+
+  const handleClose = useCallback(() => {
+    setOpen(false);
+  }, []);
+
+  const handleApply = () => {
+    onApply(pendingFloors, pendingGroupSizes);
+    setOpen(false);
+  };
+
+  const handleReset = () => {
+    onApply([], []);
+    setOpen(false);
+  };
+
+  const activeFilterCount = selectedFloors.length + selectedGroupSizes.length;
+
+  return (
+    <div className="relative shrink-0">
+      <button
+        type="button"
+        onClick={open ? handleClose : handleOpen}
+        aria-expanded={open}
+        className={cn(
+          "flex h-11 items-center gap-2 rounded-lg border px-4 text-sm font-medium transition-colors",
+          activeFilterCount > 0
+            ? "border-primary bg-primary/5 text-primary"
+            : "border-stroke-subtle text-text-default hover:bg-primary/5",
+        )}
+      >
+        <Filter className="h-4 w-4" />
+        Filter
+        {activeFilterCount > 0 && (
+          <span className="flex h-5 w-5 items-center justify-center rounded-full bg-primary text-xs text-white">
+            {activeFilterCount}
+          </span>
+        )}
+      </button>
+
+      {open && (
+        <>
+          {/* Backdrop — captures click-outside */}
+          <div
+            className="fixed inset-0 z-40"
+            onClick={handleClose}
+            aria-hidden="true"
+          />
+          <div
+            role="dialog"
+            onKeyDown={(e) => {
+              if (e.key === "Escape") handleClose();
+            }}
+            className="absolute right-0 top-[calc(100%+0.5rem)] z-50 flex w-80 flex-col overflow-hidden rounded-2xl bg-white px-6 shadow-xl"
+          >
+            <div className="flex items-center justify-between pt-5">
+              <span className="text-base font-medium text-text-default">
+                Filters
+              </span>
+              <button
+                type="button"
+                onClick={handleReset}
+                className="text-sm text-text-subtle transition-colors hover:text-text-default"
+              >
+                Reset
+              </button>
+            </div>
+
+            <div className="flex flex-col gap-5 py-5">
+              {availableFloors.length > 0 && (
+                <section className="flex flex-col gap-3">
+                  <h3 className="text-sm font-medium text-text-default">
+                    Floor
+                  </h3>
+                  <div className="flex flex-wrap gap-2">
+                    {availableFloors.map((floor) => (
+                      <FilterChip
+                        key={floor}
+                        label={`Floor ${floor}`}
+                        selected={pendingFloors.includes(floor)}
+                        onClick={() =>
+                          setPendingFloors(toggleItem(pendingFloors, floor))
+                        }
+                      />
+                    ))}
+                  </div>
+                </section>
+              )}
+
+              {availableGroupSizes.length > 0 && (
+                <section className="flex flex-col gap-3">
+                  <h3 className="text-sm font-medium text-text-default">
+                    Group Size
+                  </h3>
+                  <div className="flex flex-wrap gap-2">
+                    {availableGroupSizes.map((size) => (
+                      <FilterChip
+                        key={size}
+                        label={String(size)}
+                        selected={pendingGroupSizes.includes(size)}
+                        onClick={() =>
+                          setPendingGroupSizes(
+                            toggleItem(pendingGroupSizes, size),
+                          )
+                        }
+                      />
+                    ))}
+                  </div>
+                </section>
+              )}
+            </div>
+
+            <div className="border-t border-stroke-subtle" />
+            <div className="flex justify-end gap-3 py-4">
+              <Button variant="secondary" onClick={handleClose}>
+                Cancel
+              </Button>
+              <Button variant="primary" onClick={handleApply}>
+                Apply
+              </Button>
+            </div>
+          </div>
+        </>
+      )}
+    </div>
+  );
+}
diff --git a/clients/web/src/components/guests/GuestListHeader.tsx b/clients/web/src/components/guests/GuestListHeader.tsx
new file mode 100644
index 000000000..3fc61a36c
--- /dev/null
+++ b/clients/web/src/components/guests/GuestListHeader.tsx
@@ -0,0 +1,37 @@
+import { GuestFilterPopover } from "./GuestFilterPopover";
+import { GuestSearchBar } from "./GuestSearchBar";
+
+type GuestListHeaderProps = {
+  searchTerm: string;
+  onSearchChange: (value: string) => void;
+  availableFloors: Array<number>;
+  availableGroupSizes: Array<number>;
+  selectedFloors: Array<number>;
+  selectedGroupSizes: Array<number>;
+  onApplyFilters: (floors: Array<number>, groupSizes: Array<number>) => void;
+};
+
+export function GuestListHeader({
+  searchTerm,
+  onSearchChange,
+  availableFloors,
+  availableGroupSizes,
+  selectedFloors,
+  selectedGroupSizes,
+  onApplyFilters,
+}: GuestListHeaderProps) {
+  return (
+    <div className="flex items-center gap-3">
+      <div className="min-w-0 flex-1">
+        <GuestSearchBar value={searchTerm} onChange={onSearchChange} />
+      </div>
+      <GuestFilterPopover
+        availableFloors={availableFloors}
+        availableGroupSizes={availableGroupSizes}
+        selectedFloors={selectedFloors}
+        selectedGroupSizes={selectedGroupSizes}
+        onApply={onApplyFilters}
+      />
+    </div>
+  );
+}
diff --git a/clients/web/src/components/guests/GuestNotesCard.tsx b/clients/web/src/components/guests/GuestNotesCard.tsx
index 1e4846c22..7f55074f4 100644
--- a/clients/web/src/components/guests/GuestNotesCard.tsx
+++ b/clients/web/src/components/guests/GuestNotesCard.tsx
@@ -1,13 +1,19 @@
-import { useState } from "react";
+import { useEffect, useState } from "react";
 
 type GuestNotesCardProps = {
-  initialNotes: string;
+  notes?: string;
+  onSave: (nextNotes: string) => Promise<void> | void;
 };
 
-export function GuestNotesCard({ initialNotes }: GuestNotesCardProps) {
+export function GuestNotesCard({ notes = "", onSave }: GuestNotesCardProps) {
   const [isEditing, setIsEditing] = useState(false);
-  const [notes, setNotes] = useState(initialNotes);
-  const [draft, setDraft] = useState(initialNotes);
+  const [draft, setDraft] = useState(notes);
+
+  useEffect(() => {
+    if (!isEditing) {
+      setDraft(notes);
+    }
+  }, [isEditing, notes]);
 
   const startEditing = () => {
     setDraft(notes);
@@ -19,8 +25,8 @@ export function GuestNotesCard({ initialNotes }: GuestNotesCardProps) {
     setIsEditing(false);
   };
 
-  const saveNotes = () => {
-    setNotes(draft);
+  const saveNotes = async () => {
+    await onSave(draft);
     setIsEditing(false);
   };
 
@@ -33,7 +39,7 @@ export function GuestNotesCard({ initialNotes }: GuestNotesCardProps) {
             <button
               type="button"
               onClick={startEditing}
-              className="h-[3vh] min-h-[3vh] bg-[#004fc5] px-[1vw] text-[1vw] text-white"
+              className="h-[3vh] min-h-[3vh] bg-primary px-[1vw] text-[1vw] text-white hover:bg-primary-hover"
             >
               Edit
             </button>
@@ -61,7 +67,7 @@ export function GuestNotesCard({ initialNotes }: GuestNotesCardProps) {
             <button
               type="button"
               onClick={saveNotes}
-              className="h-[3vh] min-h-[3vh] bg-[#004fc5] px-[1vw] text-[1vw] text-white"
+              className="h-[3vh] min-h-[3vh] bg-primary px-[1vw] text-[1vw] text-white hover:bg-primary-hover"
             >
               Save
             </button>
diff --git a/clients/web/src/components/guests/GuestProfileCard.tsx b/clients/web/src/components/guests/GuestProfileCard.tsx
index b1460b32a..c027a62a2 100644
--- a/clients/web/src/components/guests/GuestProfileCard.tsx
+++ b/clients/web/src/components/guests/GuestProfileCard.tsx
@@ -1,20 +1,29 @@
 import { UserRound } from "lucide-react";
-import type { GuestProfile } from "./guest-mocks";
+import { formatDate } from "../../utils/dates";
+import type { GuestWithStays } from "@shared";
 
 type GuestProfileCardProps = {
-  guest: GuestProfile;
+  guest: GuestWithStays;
 };
 
 function DetailRow({ label, value }: { label: string; value: string }) {
   return (
     <div className="grid grid-cols-[38%_1fr] items-center py-[1vh] text-[1vw]">
-      <p className="text-[#b6bac3]">{label}</p>
+      <p className="text-text-subtle">{label}</p>
       <p className="text-black">{value}</p>
     </div>
   );
 }
 
 export function GuestProfileCard({ guest }: GuestProfileCardProps) {
+  // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+  const currentStays = guest.current_stays ?? [];
+  const hasCurrentStay = currentStays.length > 0;
+  const currentStay = currentStays[0];
+  const phone = guest.phone?.trim() || "-";
+  const email = guest.email?.trim() || "-";
+  const pronouns = guest.pronouns?.trim() || "-";
+
   return (
     <section className="border border-black bg-white px-[1vw] py-[2vh]">
       <div className="mb-[2vh] flex items-start gap-[1.1vw]">
@@ -23,28 +32,38 @@ export function GuestProfileCard({ guest }: GuestProfileCardProps) {
         </div>
         <div>
           <p className="text-[2vw] font-medium leading-tight text-black">
-            {guest.preferredName}
+            {guest.first_name} {guest.last_name}
           </p>
-          <p className="text-[1vw] text-black">{guest.pronouns}</p>
         </div>
       </div>
 
-      <div className="border-b border-[#d3d8df] pb-[1vh]">
-        <DetailRow label="Government Name" value={guest.governmentName} />
-        <DetailRow label="Date of Birth" value={guest.dateOfBirth} />
-      </div>
-
       <div className="pt-[1vh]">
-        <DetailRow label="Room" value={guest.room} />
-        <DetailRow label="Group Size" value={String(guest.groupSize)} />
-        <DetailRow
-          label="Arrival"
-          value={`${guest.arrivalTime}  ${guest.arrivalDate}`}
-        />
-        <DetailRow
-          label="Departure"
-          value={`${guest.departureTime}  ${guest.departureDate}`}
-        />
+        <DetailRow label="Phone" value={phone} />
+        <DetailRow label="Email" value={email} />
+        <DetailRow label="Pronouns" value={pronouns} />
+        {hasCurrentStay ? (
+          <>
+            <DetailRow label="Room" value={String(currentStay.room_number)} />
+            <DetailRow
+              label="Group Size"
+              value={
+                currentStay.group_size != null
+                  ? String(currentStay.group_size)
+                  : "-"
+              }
+            />
+            <DetailRow
+              label="Arrival"
+              value={formatDate(currentStay.arrival_date)}
+            />
+            <DetailRow
+              label="Departure"
+              value={formatDate(currentStay.departure_date)}
+            />
+          </>
+        ) : (
+          <p className="text-[1vw] text-text-subtle">No active stay.</p>
+        )}
       </div>
     </section>
   );
diff --git a/clients/web/src/components/guests/GuestProfilePageSkeleton.tsx b/clients/web/src/components/guests/GuestProfilePageSkeleton.tsx
new file mode 100644
index 000000000..a7436c496
--- /dev/null
+++ b/clients/web/src/components/guests/GuestProfilePageSkeleton.tsx
@@ -0,0 +1,36 @@
+import { Skeleton } from "@/components/ui/skeleton";
+
+export function GuestProfilePageSkeleton() {
+  return (
+    <div className="grid gap-[2vh] xl:grid-cols-[minmax(0,45vw)_minmax(0,32vw)]">
+      <section className="border border-black bg-white px-[1vw] py-[2vh]">
+        <div className="mb-[2vh] flex items-start gap-[1.1vw]">
+          <Skeleton className="h-[3vw] w-[3vw] rounded-full" />
+          <div className="flex-1 space-y-[1vh]">
+            <Skeleton className="h-[3vh] w-[16vw]" />
+            <Skeleton className="h-[2vh] w-[10vw]" />
+          </div>
+        </div>
+        <div className="space-y-[1vh] pt-[1vh]">
+          <Skeleton className="h-[2.5vh] w-full" />
+          <Skeleton className="h-[2.5vh] w-full" />
+          <Skeleton className="h-[2.5vh] w-full" />
+        </div>
+      </section>
+
+      <div className="flex flex-col gap-[2vh]">
+        <section className="border border-black bg-white px-[1vw] py-[2vh]">
+          <Skeleton className="mb-[2vh] h-[3vh] w-[12vw]" />
+          <Skeleton className="h-[16vh] w-full" />
+        </section>
+        <section className="border border-black bg-white px-[1vw] py-[2vh]">
+          <Skeleton className="mb-[2vh] h-[3vh] w-[14vw]" />
+          <div className="space-y-[1vh]">
+            <Skeleton className="h-[6vh] w-full" />
+            <Skeleton className="h-[6vh] w-full" />
+          </div>
+        </section>
+      </div>
+    </div>
+  );
+}
diff --git a/clients/web/src/components/guests/GuestProfileTab.tsx b/clients/web/src/components/guests/GuestProfileTab.tsx
new file mode 100644
index 000000000..1ac919f5a
--- /dev/null
+++ b/clients/web/src/components/guests/GuestProfileTab.tsx
@@ -0,0 +1,176 @@
+import { useState } from "react";
+import { AssistanceChip } from "./AssistanceChip";
+import type { GuestWithStays } from "@shared";
+import { Button } from "@/components/ui/Button";
+import { cn } from "@/lib/utils";
+
+type GuestProfileTabProps = {
+  guest: GuestWithStays;
+  onSaveNotes: (notes: string) => Promise<void>;
+  isSavingNotes: boolean;
+};
+
+function AssistanceCategory({
+  title,
+  items,
+}: {
+  title: string;
+  items: Array<string>;
+}) {
+  if (items.length === 0) return null;
+  return (
+    <div className="flex flex-col gap-2">
+      <p className="text-sm font-medium text-text-secondary">{title}</p>
+      <div className="flex flex-wrap gap-2">
+        {items.map((item) => (
+          <AssistanceChip key={item} label={item} />
+        ))}
+      </div>
+    </div>
+  );
+}
+
+function InfoRow({ label, value }: { label: string; value: string }) {
+  return (
+    <div className="flex items-start gap-6">
+      <span className="w-40 shrink-0 text-base font-medium text-text-default whitespace-nowrap">
+        {label}
+      </span>
+      <span className="text-base text-text-default">{value}</span>
+    </div>
+  );
+}
+
+export function GuestProfileTab({
+  guest,
+  onSaveNotes,
+  isSavingNotes,
+}: GuestProfileTabProps) {
+  const [isEditing, setIsEditing] = useState(false);
+  const [draftNotes, setDraftNotes] = useState(guest.notes ?? "");
+  const [saveError, setSaveError] = useState(false);
+
+  const dndWindow =
+    guest.do_not_disturb_start && guest.do_not_disturb_end
+      ? `${guest.do_not_disturb_start} - ${guest.do_not_disturb_end}`
+      : "\u2014";
+
+  const accessibility = guest.assistance?.accessibility ?? [];
+  const dietary = guest.assistance?.dietary ?? [];
+  const medical = guest.assistance?.medical ?? [];
+  const hasAssistance =
+    accessibility.length > 0 || dietary.length > 0 || medical.length > 0;
+
+  const handleEdit = () => {
+    setDraftNotes(guest.notes ?? "");
+    setIsEditing(true);
+  };
+
+  const handleCancel = () => {
+    setIsEditing(false);
+    setDraftNotes(guest.notes ?? "");
+  };
+
+  const handleSave = async () => {
+    try {
+      setSaveError(false);
+      await onSaveNotes(draftNotes);
+      setIsEditing(false);
+    } catch {
+      setSaveError(true);
+    }
+  };
+
+  return (
+    <div className="flex flex-col gap-8 p-6">
+      {/* Vital Information */}
+      <section className="flex flex-col gap-4 border-b border-stroke-subtle pb-6">
+        <div className="flex flex-col gap-4">
+          <InfoRow
+            label="Government Name"
+            value={`${guest.first_name} ${guest.last_name}`}
+          />
+          <InfoRow label="Pronouns" value={guest.pronouns ?? "\u2014"} />
+          <InfoRow label="Do Not Disturb" value={dndWindow} />
+          <InfoRow
+            label="Housekeeping"
+            value={guest.housekeeping_cadence ?? "\u2014"}
+          />
+        </div>
+      </section>
+
+      {/* Specific Assistance */}
+      <section className="flex flex-col gap-4">
+        <h3 className="text-base font-medium text-text-default">
+          Specific Assistance
+        </h3>
+        {hasAssistance ? (
+          <div className="flex flex-col gap-2 rounded border border-stroke-subtle p-4">
+            <AssistanceCategory title="Accessibility" items={accessibility} />
+            <AssistanceCategory title="Dietary Restrictions" items={dietary} />
+            <AssistanceCategory title="Medical Needs" items={medical} />
+          </div>
+        ) : (
+          <p className="text-sm text-text-subtle">
+            No assistance needs recorded.
+          </p>
+        )}
+      </section>
+
+      {/* Notes */}
+      <section className="flex flex-col gap-2">
+        <div className="flex items-center justify-between">
+          <h3 className="text-base font-medium text-text-default">Notes</h3>
+          {!isEditing && (
+            <button
+              type="button"
+              aria-label="Edit notes"
+              onClick={handleEdit}
+              className="text-sm font-medium text-primary hover:underline"
+            >
+              Edit
+            </button>
+          )}
+        </div>
+
+        {isEditing ? (
+          <div className="flex flex-col gap-2">
+            <textarea
+              value={draftNotes}
+              onChange={(e) => setDraftNotes(e.target.value)}
+              rows={8}
+              className="w-full resize-none rounded-lg border border-primary p-4 text-base text-text-default placeholder:text-text-subtle focus:outline-none"
+              placeholder="Add notes about this guest\u2026"
+            />
+            {saveError && (
+              <p className="text-sm text-high-priority">
+                Failed to save notes. Please try again.
+              </p>
+            )}
+            <div className="flex justify-end gap-2">
+              <Button variant="secondary" onClick={handleCancel}>
+                Cancel
+              </Button>
+              <Button
+                variant="primary"
+                onClick={handleSave}
+                disabled={isSavingNotes}
+              >
+                {isSavingNotes ? "Saving\u2026" : "Save"}
+              </Button>
+            </div>
+          </div>
+        ) : (
+          <div
+            className={cn(
+              "rounded-lg border border-stroke-subtle p-4 text-base",
+              guest.notes ? "text-text-default" : "text-text-subtle",
+            )}
+          >
+            {guest.notes ?? "No notes yet."}
+          </div>
+        )}
+      </section>
+    </div>
+  );
+}
diff --git a/clients/web/src/components/guests/GuestQuickListTable.tsx b/clients/web/src/components/guests/GuestQuickListTable.tsx
index 3157e94b4..c7b4e6878 100644
--- a/clients/web/src/components/guests/GuestQuickListTable.tsx
+++ b/clients/web/src/components/guests/GuestQuickListTable.tsx
@@ -1,85 +1,87 @@
-import { UserRound } from "lucide-react";
-import type { GuestListItem } from "./guest-mocks";
+import { Accessibility, BriefcaseMedical, Utensils } from "lucide-react";
+import type { GuestWithBooking } from "@shared";
 
 type GuestQuickListTableProps = {
-  guests: Array<GuestListItem>;
-  groupFilter: string;
-  floorFilter: string;
-  onGroupFilterChange: (value: string) => void;
-  onFloorFilterChange: (value: string) => void;
+  guests: Array<GuestWithBooking>;
+  isLoading?: boolean;
   onGuestClick: (guestId: string) => void;
 };
 
-function avatarPill() {
-  return (
-    <div className="flex h-[2vw] w-[2vw] items-center justify-center rounded-full border border-black">
-      <UserRound className="h-[2vh] w-[2vh] text-black" />
-    </div>
-  );
-}
+const COL_CLASSES =
+  "grid-cols-[minmax(0,3fr)_minmax(0,2fr)_minmax(0,5fr)_minmax(5rem,1fr)]";
 
 export function GuestQuickListTable({
   guests,
-  groupFilter,
-  floorFilter,
-  onGroupFilterChange,
-  onFloorFilterChange,
+  isLoading = false,
   onGuestClick,
 }: GuestQuickListTableProps) {
   return (
     <section className="w-full">
-      <div className="mb-[1vh] grid grid-cols-[5fr_5fr_2fr_2fr_2fr] items-center gap-[1vw] px-[1vw] text-[1vw] text-black">
-        <p>Government Name</p>
-        <p>Preferred Name</p>
-        <select
-          value={groupFilter}
-          onChange={(event) => onGroupFilterChange(event.target.value)}
-          className="h-[3vh] min-h-[3vh] border border-black bg-white px-[1vw] text-[1vw]"
-          aria-label="Group filter"
-        >
-          <option value="all">Group</option>
-          <option value="1-2">1-2</option>
-          <option value="3-4">3-4</option>
-          <option value="5+">5+</option>
-        </select>
-        <select
-          value={floorFilter}
-          onChange={(event) => onFloorFilterChange(event.target.value)}
-          className="h-[3vh] min-h-[3vh] border border-black bg-white px-[1vw] text-[1vw]"
-          aria-label="Floor filter"
-        >
-          <option value="all">Floor</option>
-          <option value="1">1</option>
-          <option value="2">2</option>
-          <option value="3">3</option>
-          <option value="4">4</option>
-          <option value="5">5</option>
-        </select>
-        <p>Room</p>
+      <div
+        className={`mb-2 grid ${COL_CLASSES} items-center gap-4 px-4 py-2 text-sm font-medium text-primary`}
+      >
+        <p>Guest</p>
+        <p>Specific Needs</p>
+        <p>Active Bookings</p>
+        <p>Requests</p>
       </div>
 
-      <div className="overflow-hidden border border-black bg-white">
-        {guests.map((guest) => (
-          <button
-            key={guest.id}
-            type="button"
-            onClick={() => onGuestClick(guest.id)}
-            className="grid w-full grid-cols-[auto_5fr_5fr_2fr_2fr_2fr] items-center gap-[1vw] border-b border-black px-[1vw] py-[1vh] text-left last:border-b-0 hover:bg-neutral-50"
-          >
-            {avatarPill()}
-            <p className="truncate text-[1vw] text-black">
-              {guest.governmentName}
-            </p>
-            <p className="truncate text-[1vw] text-black">
-              {guest.preferredName}
-            </p>
-            <p className="text-[1vw] text-black">{guest.groupSize}</p>
-            <p className="text-[1vw] text-black">{guest.floor}</p>
-            <p className="text-[1vw] text-black">{guest.room}</p>
-          </button>
-        ))}
-        {guests.length === 0 && (
-          <div className="px-[1vw] py-[2vh] text-[1vw] text-neutral-600">
+      <div className="overflow-hidden rounded-xl border border-stroke-subtle bg-white">
+        {guests.map((guest) => {
+          const hasAccessibility = !!guest.assistance?.accessibility?.length;
+          const hasDietary = !!guest.assistance?.dietary?.length;
+          const hasMedical = !!guest.assistance?.medical?.length;
+
+          return (
+            <button
+              key={guest.id}
+              type="button"
+              onClick={() => onGuestClick(guest.id ?? "")}
+              className={`grid w-full ${COL_CLASSES} items-center gap-4 border-b border-stroke-subtle px-4 py-4 text-left last:border-b-0 hover:bg-bg-container`}
+            >
+              <p className="truncate text-sm font-medium text-primary">
+                {guest.first_name} {guest.last_name}
+              </p>
+
+              <div className="flex items-center gap-3">
+                <Accessibility
+                  className={`size-5 ${hasAccessibility ? "text-text-default" : "text-bg-disabled"}`}
+                  strokeWidth={1.5}
+                />
+                <Utensils
+                  className={`size-5 ${hasDietary ? "text-text-default" : "text-bg-disabled"}`}
+                  strokeWidth={1.5}
+                />
+                <BriefcaseMedical
+                  className={`size-5 ${hasMedical ? "text-text-default" : "text-bg-disabled"}`}
+                  strokeWidth={1.5}
+                />
+              </div>
+
+              <div className="flex min-w-0 flex-wrap gap-1.5">
+                {(guest.active_bookings?.length ?? 0) > 0 ? (
+                  guest.active_bookings!.map((booking, i) => (
+                    <span
+                      key={i}
+                      className="inline-flex items-center rounded bg-bg-selected px-2 py-1 text-xs text-primary"
+                    >
+                      Floor {booking.floor}, Suite {booking.room_number}
+                    </span>
+                  ))
+                ) : (
+                  <span className="text-sm text-text-subtle">None</span>
+                )}
+              </div>
+
+              <span className="text-sm text-primary">
+                {guest.request_count ?? 0}
+              </span>
+            </button>
+          );
+        })}
+
+        {!isLoading && guests.length === 0 && (
+          <div className="px-4 py-6 text-sm text-text-subtle">
             No guests match your current filters.
           </div>
         )}
diff --git a/clients/web/src/components/guests/GuestSearchBar.tsx b/clients/web/src/components/guests/GuestSearchBar.tsx
index edd35a1cf..93dbf8291 100644
--- a/clients/web/src/components/guests/GuestSearchBar.tsx
+++ b/clients/web/src/components/guests/GuestSearchBar.tsx
@@ -1,4 +1,4 @@
-import { Search } from "lucide-react";
+import { SearchBar } from "@/components/ui/SearchBar";
 
 type GuestSearchBarProps = {
   value: string;
@@ -7,15 +7,11 @@ type GuestSearchBarProps = {
 
 export function GuestSearchBar({ value, onChange }: GuestSearchBarProps) {
   return (
-    <label className="flex w-full items-center gap-[1vw] border border-black bg-white px-[1vw] py-[1vh]">
-      <input
-        type="text"
-        value={value}
-        onChange={(event) => onChange(event.target.value)}
-        placeholder="Search Guests"
-        className="w-full bg-transparent text-[1vw] text-black outline-none placeholder:text-black"
-      />
-      <Search className="h-[2vh] w-[2vh] text-black" />
-    </label>
+    <SearchBar
+      value={value}
+      onChange={onChange}
+      placeholder="Search Guests"
+      className="rounded-lg px-4 py-2.5"
+    />
   );
 }
diff --git a/clients/web/src/components/guests/GuestSpecialNeedsCard.tsx b/clients/web/src/components/guests/GuestSpecialNeedsCard.tsx
index d76ff5cf8..640e085c1 100644
--- a/clients/web/src/components/guests/GuestSpecialNeedsCard.tsx
+++ b/clients/web/src/components/guests/GuestSpecialNeedsCard.tsx
@@ -1,15 +1,19 @@
-import type { GuestProfile } from "./guest-mocks";
+type SpecialNeeds = {
+  dietaryRestrictions: string;
+  accessibilityNeeds: string;
+  medicalConditions: string;
+};
 
 type GuestSpecialNeedsCardProps = {
-  specialNeeds: GuestProfile["specialNeeds"];
+  specialNeeds: SpecialNeeds;
 };
 
 function SpecialNeedsRow({ label, value }: { label: string; value: string }) {
   const displayValue = value.trim().length > 0 ? value : "-";
   return (
     <div className="grid grid-cols-[48%_1fr] py-[1vh] text-[1vw]">
-      <p className="text-[#b6bac3]">{label}</p>
-      <p className={displayValue === "-" ? "text-[#b6bac3]" : "text-black"}>
+      <p className="text-text-subtle">{label}</p>
+      <p className={displayValue === "-" ? "text-text-subtle" : "text-black"}>
         {displayValue}
       </p>
     </div>
@@ -32,10 +36,6 @@ export function GuestSpecialNeedsCard({
         label="Accessibility Needs"
         value={specialNeeds.accessibilityNeeds}
       />
-      <SpecialNeedsRow
-        label="Sensory Sensitivities"
-        value={specialNeeds.sensorySensitivities}
-      />
       <SpecialNeedsRow
         label="Medical Conditions"
         value={specialNeeds.medicalConditions}
diff --git a/clients/web/src/components/guests/GuestVisitActivityTab.tsx b/clients/web/src/components/guests/GuestVisitActivityTab.tsx
new file mode 100644
index 000000000..ea2f94d86
--- /dev/null
+++ b/clients/web/src/components/guests/GuestVisitActivityTab.tsx
@@ -0,0 +1,93 @@
+import { useState } from "react";
+import { ChevronRight } from "lucide-react";
+import { ActiveBookingCard } from "./ActiveBookingCard";
+import { GuestBookingHistoryView } from "./GuestBookingHistoryView";
+import { PastBookingCard } from "./PastBookingCard";
+import { RequestCard } from "./RequestCard";
+import type { GuestRequest, Stay } from "@shared";
+
+type GuestVisitActivityTabProps = {
+  currentStays: Array<Stay>;
+  pastStays: Array<Stay>;
+  requests: Array<GuestRequest>;
+};
+
+export function GuestVisitActivityTab({
+  currentStays,
+  pastStays,
+  requests,
+}: GuestVisitActivityTabProps) {
+  const [showHistory, setShowHistory] = useState(false);
+
+  if (showHistory) {
+    return (
+      <GuestBookingHistoryView
+        currentStays={currentStays}
+        pastStays={pastStays}
+        onBack={() => setShowHistory(false)}
+      />
+    );
+  }
+
+  const hasActiveBookings = currentStays.length > 0;
+
+  return (
+    <div className="flex flex-col gap-6 p-6">
+      {/* Active Bookings or Previous Bookings */}
+      <section className="flex flex-col gap-4">
+        <div className="flex items-center justify-between">
+          <h3 className="text-base font-medium text-text-default">
+            {hasActiveBookings
+              ? `Active Bookings (${currentStays.length})`
+              : "Previous Bookings"}
+          </h3>
+          <button
+            type="button"
+            aria-label="View all bookings"
+            onClick={() => setShowHistory(true)}
+            className="flex items-center gap-1 text-base text-text-default hover:underline"
+          >
+            View All Bookings
+            <ChevronRight className="size-3.5" strokeWidth={2} />
+          </button>
+        </div>
+
+        {hasActiveBookings ? (
+          currentStays.length === 1 ? (
+            <ActiveBookingCard stay={currentStays[0]} />
+          ) : (
+            <div className="flex gap-5">
+              {currentStays.slice(0, 2).map((stay) => (
+                <ActiveBookingCard key={stay.room_number} stay={stay} compact />
+              ))}
+            </div>
+          )
+        ) : pastStays.length > 0 ? (
+          <div className="flex flex-col gap-2">
+            {pastStays.slice(0, 3).map((stay, i) => (
+              <PastBookingCard key={`past-${i}`} stay={stay} />
+            ))}
+          </div>
+        ) : (
+          <p className="text-sm text-text-subtle">No bookings.</p>
+        )}
+      </section>
+
+      {/* Requests */}
+      <section className="flex flex-col gap-4">
+        <h3 className="text-base font-medium text-text-default">
+          {requests.length > 0 ? `Requests (${requests.length})` : "Requests"}
+        </h3>
+        {requests.length > 0 ? (
+          <div className="flex flex-col gap-4">
+            {requests.map((req) => (
+              <RequestCard key={req.id ?? req.name} req={req} />
+            ))}
+          </div>
+        ) : (
+          <p className="text-base text-text-secondary">You're all caught up!</p>
+        )}
+      </section>
+    </div>
+  );
+}
diff --git a/clients/web/src/components/guests/HousekeepingPreferencesCard.tsx b/clients/web/src/components/guests/HousekeepingPreferencesCard.tsx
index 96609874e..2bbd3e40f 100644
--- a/clients/web/src/components/guests/HousekeepingPreferencesCard.tsx
+++ b/clients/web/src/components/guests/HousekeepingPreferencesCard.tsx
@@ -1,13 +1,16 @@
-import type { GuestProfile } from "./guest-mocks";
+type HousekeepingPreferences = {
+  frequency: string;
+  doNotDisturb: string;
+};
 
 type HousekeepingPreferencesCardProps = {
-  housekeeping: GuestProfile["housekeeping"];
+  housekeeping: HousekeepingPreferences;
 };
 
 function PreferenceRow({ label, value }: { label: string; value: string }) {
   return (
     <div className="grid grid-cols-[42%_1fr] py-[1vh] text-[1vw]">
-      <p className="text-[#b6bac3]">{label}</p>
+      <p className="text-text-subtle">{label}</p>
       <p className="text-black">{value}</p>
     </div>
   );
diff --git a/clients/web/src/components/guests/PastBookingCard.tsx b/clients/web/src/components/guests/PastBookingCard.tsx
new file mode 100644
index 000000000..6b5b99749
--- /dev/null
+++ b/clients/web/src/components/guests/PastBookingCard.tsx
@@ -0,0 +1,30 @@
+import { UsersRound } from "lucide-react";
+import type { Stay } from "@shared";
+import { formatDate } from "@/utils/dates";
+
+type PastBookingCardProps = {
+  stay: Stay;
+};
+
+export function PastBookingCard({ stay }: PastBookingCardProps) {
+  return (
+    <div className="flex items-center rounded-lg border border-text-subtle bg-bg-container p-4">
+      <div className="flex flex-1 flex-col gap-1">
+        <div className="flex items-center gap-2">
+          <span className="text-sm font-medium text-text-subtle">
+            Suite {stay.room_number}
+          </span>
+          {stay.group_size != null && (
+            <div className="flex items-center gap-0.5 text-text-subtle">
+              <UsersRound className="size-3" strokeWidth={1.5} />
+              <span className="text-sm font-medium">{stay.group_size}</span>
+            </div>
+          )}
+        </div>
+        <span className="text-sm text-text-subtle">
+          {formatDate(stay.arrival_date)} - {formatDate(stay.departure_date)}
+        </span>
+      </div>
+    </div>
+  );
+}
diff --git a/clients/web/src/components/guests/PreviousStaysCard.tsx b/clients/web/src/components/guests/PreviousStaysCard.tsx
index 2a2c9766d..8c0ff5915 100644
--- a/clients/web/src/components/guests/PreviousStaysCard.tsx
+++ b/clients/web/src/components/guests/PreviousStaysCard.tsx
@@ -1,7 +1,8 @@
-import type { PreviousStay } from "./guest-mocks";
+import { formatDate } from "../../utils/dates";
+import type { Stay } from "@shared";
 
 type PreviousStaysCardProps = {
-  stays: Array<PreviousStay>;
+  stays: Array<Stay>;
 };
 
 export function PreviousStaysCard({ stays }: PreviousStaysCardProps) {
@@ -11,19 +12,21 @@ export function PreviousStaysCard({ stays }: PreviousStaysCardProps) {
         Previous Stays
       </h2>
       <div className="flex flex-col gap-[1vh]">
-        {stays.map((stay) => (
+        {stays.map((stay, index) => (
           <article
-            key={stay.id}
+            key={`${stay.arrival_date}-${stay.room_number}-${index}`}
             className="rounded-[1vh] border border-black px-[1vw] py-[1vh]"
           >
             <p className="text-[1vw] text-black">
-              {stay.startDate} - {stay.endDate}
-            </p>
-            <p className="text-[1vw] text-black">
-              {stay.room} | Group size: {stay.groupSize}
+              {formatDate(stay.arrival_date)} -{" "}
+              {formatDate(stay.departure_date)}
             </p>
+            <p className="text-[1vw] text-black">Room {stay.room_number}</p>
           </article>
         ))}
+        {stays.length === 0 && (
+          <p className="text-[1vw] text-text-subtle">No previous stays.</p>
+        )}
       </div>
     </section>
   );
diff --git a/clients/web/src/components/guests/RequestCard.tsx b/clients/web/src/components/guests/RequestCard.tsx
new file mode 100644
index 000000000..e815e906c
--- /dev/null
+++ b/clients/web/src/components/guests/RequestCard.tsx
@@ -0,0 +1,90 @@
+import { Clock4, FlagIcon } from "lucide-react";
+import type { GuestRequest, RequestPriority } from "@shared";
+import { cn } from "@/lib/utils";
+
+const priorityConfig: Record<
+  Exclude<RequestPriority, "low">,
+  { label: string; containerClass: string; contentClass: string }
+> = {
+  high: {
+    label: "High Priority",
+    containerClass: "bg-bg-high-priority",
+    contentClass: "text-high-priority",
+  },
+  medium: {
+    label: "Medium Priority",
+    containerClass: "bg-bg-orange",
+    contentClass: "text-text-orange",
+  },
+};
+
+type RequestCardProps = {
+  req: GuestRequest;
+};
+
+export function RequestCard({ req }: RequestCardProps) {
+  const p = req.priority as RequestPriority | undefined;
+  const tags = [req.request_category, req.request_type].filter(Boolean);
+
+  return (
+    <div className="flex flex-col gap-2 rounded-lg border border-text-subtle bg-white px-4 py-6">
+      {/* Priority badge + name */}
+      <div className="flex items-center gap-2">
+        {(p === "high" || p === "medium") && (
+          <div
+            className={cn(
+              "inline-flex items-center gap-1 rounded px-2 py-1",
+              priorityConfig[p].containerClass,
+            )}
+          >
+            <FlagIcon
+              className={cn("size-4", priorityConfig[p].contentClass)}
+              strokeWidth={2}
+            />
+            <span className={cn("text-xs", priorityConfig[p].contentClass)}>
+              {priorityConfig[p].label}
+            </span>
+          </div>
+        )}
+        <span className="text-sm font-semibold text-text-default">
+          {req.name}
+        </span>
+      </div>
+
+      {/* Room + timestamp */}
+      <div className="flex items-center gap-2 text-xs text-text-default">
+        {req.room_number != null && <span>Suite {req.room_number}</span>}
+        {req.created_at && (
+          <div className="flex items-center gap-0.5">
+            <Clock4 className="size-2.5" strokeWidth={1.5} />
+            <span>
+              {new Date(req.created_at).toLocaleTimeString([], {
+                hour: "numeric",
+                minute: "2-digit",
+              })}
+            </span>
+          </div>
+        )}
+      </div>
+
+      {/* Category/type tags */}
+      {tags.length > 0 && (
+        <div className="flex flex-wrap gap-2">
+          {tags.map((tag) => (
+            <span
+              key={tag}
+              className="inline-flex items-center rounded border border-primary bg-bg-selected px-2 py-1 text-xs text-primary"
+            >
+              {tag}
+            </span>
+          ))}
+        </div>
+      )}
+
+      {/* Description */}
+      {req.description && (
+        <p className="text-sm text-text-subtle">{req.description}</p>
+      )}
+    </div>
+  );
+}
diff --git a/clients/web/src/components/guests/guest-mocks.ts b/clients/web/src/components/guests/guest-mocks.ts
deleted file mode 100644
index ae928ce48..000000000
--- a/clients/web/src/components/guests/guest-mocks.ts
+++ /dev/null
@@ -1,137 +0,0 @@
-export type GuestListItem = {
-  id: string;
-  governmentName: string;
-  preferredName: string;
-  groupSize: number;
-  floor: number;
-  room: string;
-};
-
-export type PreviousStay = {
-  id: string;
-  startDate: string;
-  endDate: string;
-  room: string;
-  groupSize: number;
-};
-
-export type GuestProfile = {
-  id: string;
-  governmentName: string;
-  preferredName: string;
-  pronouns: string;
-  dateOfBirth: string;
-  room: string;
-  groupSize: number;
-  arrivalTime: string;
-  arrivalDate: string;
-  departureTime: string;
-  departureDate: string;
-  notes: string;
-  specialNeeds: {
-    dietaryRestrictions: string;
-    accessibilityNeeds: string;
-    sensorySensitivities: string;
-    medicalConditions: string;
-  };
-  previousStays: Array<PreviousStay>;
-  housekeeping: {
-    frequency: string;
-    doNotDisturb: string;
-  };
-};
-
-export const guestListItems: Array<GuestListItem> = [
-  {
-    id: "monkey-d-luffy",
-    governmentName: "Monkey D. Luffy",
-    preferredName: "Luffy",
-    groupSize: 5,
-    floor: 3,
-    room: "Suite 300",
-  },
-  {
-    id: "roronoa-zoro",
-    governmentName: "Roronoa Zoro",
-    preferredName: "Zoro",
-    groupSize: 4,
-    floor: 4,
-    room: "Suite 401",
-  },
-  {
-    id: "nami",
-    governmentName: "Nami",
-    preferredName: "Nami",
-    groupSize: 2,
-    floor: 2,
-    room: "Suite 203",
-  },
-  {
-    id: "nico-robin",
-    governmentName: "Nico Robin",
-    preferredName: "Robin",
-    groupSize: 3,
-    floor: 5,
-    room: "Suite 502",
-  },
-  {
-    id: "usopp",
-    governmentName: "Usopp",
-    preferredName: "Usopp",
-    groupSize: 6,
-    floor: 3,
-    room: "Suite 318",
-  },
-  {
-    id: "sanji",
-    governmentName: "Vinsmoke Sanji",
-    preferredName: "Sanji",
-    groupSize: 1,
-    floor: 1,
-    room: "Suite 102",
-  },
-];
-
-export const guestProfilesById: Record<string, GuestProfile | undefined> = {
-  "monkey-d-luffy": {
-    id: "monkey-d-luffy",
-    governmentName: "Monkey D. Luffy",
-    preferredName: "Luffy",
-    pronouns: "he/him",
-    dateOfBirth: "03/21/2005",
-    room: "Suite 300",
-    groupSize: 5,
-    arrivalTime: "11:00 AM",
-    arrivalDate: "01/25/2026",
-    departureTime: "11:00 AM",
-    departureDate: "02/04/2026",
-    notes:
-      '"Wealth, fame, power...  Gold Roger, the King of the Pirates, obtained this and everything else the world had to offer and his dying words drove countless souls to the seas.""You want my treasure?  You can have it!  I left everything I gathered together in one place!  Now you just have to find it!""These words lured men to the Grand Line.  In pursuit of dreams greather than theyve ever dared to imagine!  This is the time known as the Great Pirate Era!"',
-    specialNeeds: {
-      dietaryRestrictions: "",
-      accessibilityNeeds: "",
-      sensorySensitivities: "",
-      medicalConditions: "",
-    },
-    previousStays: [
-      {
-        id: "stay-1",
-        startDate: "05/12/2024",
-        endDate: "05/20/2024",
-        room: "Suite 401",
-        groupSize: 5,
-      },
-      {
-        id: "stay-2",
-        startDate: "12/04/2023",
-        endDate: "12/11/2023",
-        room: "Suite 318",
-        groupSize: 4,
-      },
-    ],
-    housekeeping: {
-      frequency: "Daily",
-      doNotDisturb: "6:00 PM - 10:00 AM",
-    },
-  },
-};
diff --git a/clients/web/src/components/home/AssigneeFilterMenu.tsx b/clients/web/src/components/home/AssigneeFilterMenu.tsx
new file mode 100644
index 000000000..656503df3
--- /dev/null
+++ b/clients/web/src/components/home/AssigneeFilterMenu.tsx
@@ -0,0 +1,153 @@
+import { useState } from "react";
+import { Check, Search, X } from "lucide-react";
+import { useInfiniteQuery } from "@tanstack/react-query";
+import { useCustomInstance } from "@shared";
+import type { User } from "@shared";
+import { useDebounce } from "@/lib/utils";
+
+type SearchUsersResponse = {
+  users: Array<User>;
+  next_cursor: string;
+};
+
+type AssigneeFilterMenuProps = {
+  hotelId: string;
+  currentUserId?: string;
+  selectedUser: User | undefined;
+  anchor: { x: number; y: number };
+  onApply: (user: User | undefined) => void;
+  onClose: () => void;
+};
+
+export function AssigneeFilterMenu({
+  hotelId,
+  currentUserId,
+  selectedUser,
+  anchor,
+  onApply,
+  onClose,
+}: AssigneeFilterMenuProps) {
+  const [search, setSearch] = useState("");
+  const debouncedSearch = useDebounce(search);
+
+  const searchUsers = useCustomInstance<SearchUsersResponse>();
+  const { data, isLoading } = useInfiniteQuery({
+    queryKey: ["users", "search", hotelId, debouncedSearch],
+    queryFn: ({ pageParam }) =>
+      searchUsers({
+        url: "/users/search",
+        method: "POST",
+        data: {
+          hotel_id: hotelId,
+          cursor: pageParam || undefined,
+          q: debouncedSearch || undefined,
+        },
+      }),
+    initialPageParam: "",
+    getNextPageParam: (lastPage) => lastPage.next_cursor || undefined,
+    enabled: !!hotelId,
+  });
+
+  const users = data?.pages.flatMap((p) => p.users) ?? [];
+
+  const selectedName = selectedUser
+    ? `${selectedUser.first_name ?? ""} ${selectedUser.last_name ?? ""}`.trim()
+    : undefined;
+
+  return (
+    <>
+      <div className="fixed inset-0 z-40" onClick={onClose} />
+      <div
+        className="fixed z-50 w-64 bg-white border border-stroke-subtle rounded-lg shadow-md overflow-hidden"
+        style={{ left: anchor.x, top: anchor.y }}
+      >
+        {/* Header */}
+        <div className="flex items-center justify-between pl-4 pr-3 py-3 border-b border-stroke-subtle">
+          <div className="min-w-0 flex-1">
+            {selectedName && (
+              <span className="inline-flex items-center gap-1 bg-bg-container rounded px-2 py-1 text-sm text-text-default">
+                {selectedName}
+                <button
+                  type="button"
+                  onClick={() => onApply(undefined)}
+                  className="text-text-subtle hover:text-text-default"
+                >
+                  <X className="size-2" />
+                </button>
+              </span>
+            )}
+          </div>
+          <button
+            type="button"
+            onClick={() => onApply(undefined)}
+            className="shrink-0 text-sm text-text-subtle hover:text-text-default transition-colors"
+          >
+            Clear
+          </button>
+        </div>
+
+        {/* Search */}
+        <div className="flex items-center gap-2 px-4 py-3 border-b border-stroke-subtle">
+          <Search className="size-4 shrink-0 text-text-subtle" />
+          <input
+            type="text"
+            value={search}
+            onChange={(e) => setSearch(e.target.value)}
+            placeholder="Search..."
+            autoFocus
+            className="flex-1 text-sm text-text-default placeholder:text-text-subtle outline-none bg-transparent"
+          />
+        </div>
+
+        {/* Users list */}
+        <div className="max-h-52 overflow-y-auto">
+          {isLoading && (
+            <p className="px-4 py-3 text-sm text-text-subtle text-center">
+              Loading...
+            </p>
+          )}
+          {!isLoading && users.length === 0 && (
+            <p className="px-4 py-3 text-sm text-text-subtle text-center">
+              No staff found
+            </p>
+          )}
+          {users.map((user) => {
+            const isSelected = selectedUser?.id === user.id;
+            const isCurrentUser = user.id === currentUserId;
+            const name =
+              `${user.first_name ?? ""} ${user.last_name ?? ""}`.trim();
+            return (
+              <button
+                key={user.id}
+                type="button"
+                onClick={() => {
+                  onApply(isSelected ? undefined : user);
+                  onClose();
+                }}
+                className="flex items-center gap-3 w-full px-4 py-2 text-sm text-text-default hover:bg-bg-container transition-colors"
+              >
+                <span
+                  className={`shrink-0 size-4 rounded-sm border flex items-center justify-center transition-colors ${
+                    isSelected
+                      ? "bg-primary border-primary"
+                      : "border-stroke-default bg-white"
+                  }`}
+                >
+                  {isSelected && (
+                    <Check className="size-3 text-white" strokeWidth={3} />
+                  )}
+                </span>
+                <span>
+                  {name}
+                  {isCurrentUser && (
+                    <span className="text-text-subtle"> (You)</span>
+                  )}
+                </span>
+              </button>
+            );
+          })}
+        </div>
+      </div>
+    </>
+  );
+}
diff --git a/clients/web/src/components/home/CreateRequestDrawer.tsx b/clients/web/src/components/home/CreateRequestDrawer.tsx
new file mode 100644
index 000000000..8a2ded084
--- /dev/null
+++ b/clients/web/src/components/home/CreateRequestDrawer.tsx
@@ -0,0 +1,330 @@
+import { useState } from "react";
+import { Building2, Clock, DoorOpen, Flag, UserRound } from "lucide-react";
+import { useUser } from "@clerk/clerk-react";
+import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import {
+  REQUESTS_FEED_QUERY_KEY,
+  useGetUsersIdHook,
+  usePostRequestHook,
+  usePutRequestIdHook,
+} from "@shared";
+import type {
+  Department,
+  MakeRequest,
+  MakeRequestPriority,
+  Request,
+  RoomWithOptionalGuestBooking,
+  User,
+} from "@shared";
+import type { LucideIcon } from "lucide-react";
+import { Button } from "@/components/ui/Button";
+import { DrawerShell } from "@/components/ui/DrawerShell";
+import { AssigneePicker } from "@/components/ui/AssigneePicker";
+import { DepartmentPicker } from "@/components/ui/DepartmentPicker";
+import { RoomPicker } from "@/components/ui/RoomPicker";
+import { DeadlinePicker } from "@/components/ui/DeadlinePicker";
+import { ActivityFeed } from "@/components/requests/ActivityFeed";
+import { cn } from "@/lib/utils";
+
+const PRIORITIES: Array<MakeRequestPriority> = ["low", "medium", "high"];
+
+type FieldLabelProps = {
+  icon: LucideIcon;
+  label: string;
+};
+
+function FieldLabel({ icon: Icon, label }: FieldLabelProps) {
+  return (
+    <div className="flex w-28 shrink-0 items-center gap-1.5">
+      <Icon className="size-4 text-text-subtle" />
+      <span className="text-sm text-text-subtle">{label}</span>
+    </div>
+  );
+}
+
+type RequestForm = {
+  name: string;
+  description: string;
+  priority: MakeRequestPriority;
+  deadline: Date | undefined;
+  user_id: string | undefined;
+  room_id: string | undefined;
+  department: string | undefined;
+};
+
+type CreateRequestDrawerProps = {
+  onClose: () => void;
+  // Create mode
+  initialData?: {
+    name?: string;
+    description?: string;
+    priority?: MakeRequestPriority;
+    room_id?: string;
+    guest_id?: string;
+    user_id?: string;
+    department_id?: string;
+  };
+  // Edit mode — pass an existing request to pre-populate and use PUT
+  existingRequest?: Request;
+};
+
+export function CreateRequestDrawer({
+  onClose,
+  initialData,
+  existingRequest,
+}: CreateRequestDrawerProps) {
+  const isEditMode = !!existingRequest;
+
+  const [form, setForm] = useState<RequestForm>({
+    name: existingRequest?.name ?? initialData?.name ?? "",
+    description: existingRequest?.description ?? initialData?.description ?? "",
+    priority: existingRequest?.priority ?? initialData?.priority ?? "medium",
+    deadline: existingRequest?.scheduled_time
+      ? new Date(existingRequest.scheduled_time)
+      : undefined,
+    user_id: existingRequest?.user_id ?? undefined,
+    room_id: existingRequest?.room_id ?? undefined,
+    department:
+      existingRequest?.department ?? initialData?.department_id ?? undefined,
+  });
+
+  const [pickers, setPickers] = useState<{
+    assignee: User | undefined;
+    room: RoomWithOptionalGuestBooking | undefined;
+    department: Department | undefined;
+  }>({ assignee: undefined, room: undefined, department: undefined });
+
+  const [hasPendingChanges, setHasPendingChanges] = useState(false);
+
+  function updateForm(updater: (f: RequestForm) => RequestForm) {
+    setForm(updater);
+    setHasPendingChanges(true);
+  }
+
+  const queryClient = useQueryClient();
+  const { user: clerkUser } = useUser();
+  const getUsersId = useGetUsersIdHook();
+  const postRequest = usePostRequestHook();
+  const putRequestId = usePutRequestIdHook();
+
+  const { data: backendUser } = useQuery({
+    queryKey: ["user", clerkUser?.id],
+    queryFn: () => getUsersId(clerkUser!.id),
+    enabled: !!clerkUser?.id,
+  });
+
+  const sharedInvalidation = () => {
+    queryClient.invalidateQueries({ queryKey: REQUESTS_FEED_QUERY_KEY });
+    if (existingRequest?.id) {
+      queryClient.invalidateQueries({
+        queryKey: ["request", existingRequest.id],
+      });
+    }
+  };
+
+  const { mutate: createRequest, isPending: isCreating } = useMutation({
+    mutationFn: (data: MakeRequest) => postRequest(data),
+    onMutate: async () => {
+      await queryClient.cancelQueries({ queryKey: REQUESTS_FEED_QUERY_KEY });
+    },
+    onError: () => sharedInvalidation(),
+    onSuccess: () => onClose(),
+    onSettled: () => sharedInvalidation(),
+  });
+
+  const { mutate: updateRequest, isPending: isUpdating } = useMutation({
+    mutationFn: (data: Parameters<typeof putRequestId>[1]) =>
+      putRequestId(existingRequest!.id!, data),
+    onSuccess: () => {
+      setHasPendingChanges(false);
+    },
+    onSettled: () => sharedInvalidation(),
+  });
+
+  const isPending = isCreating || isUpdating;
+
+  function handleSubmit() {
+    if (!form.name.trim() || isPending) return;
+
+    if (existingRequest) {
+      updateRequest({
+        name: form.name.trim(),
+        priority: form.priority,
+        description: form.description.trim() || undefined,
+        user_id: form.user_id,
+        room_id: form.room_id,
+        department: form.department,
+        scheduled_time:
+          form.deadline?.toISOString() ?? existingRequest.scheduled_time,
+      });
+    } else {
+      if (!backendUser?.hotel_id) return;
+      createRequest({
+        name: form.name.trim(),
+        hotel_id: backendUser.hotel_id,
+        priority: form.priority,
+        status: "pending",
+        request_type: "general",
+        description: form.description.trim() || undefined,
+        user_id: form.user_id ?? initialData?.user_id,
+        room_id: form.room_id ?? initialData?.room_id,
+        department: form.department,
+        guest_id: initialData?.guest_id,
+        scheduled_time: form.deadline?.toISOString(),
+      });
+    }
+  }
+
+  const isDirty = isEditMode && hasPendingChanges;
+
+  const canSubmit = isEditMode
+    ? isDirty && !!form.name.trim()
+    : !!form.name.trim();
+  const buttonLabel = isPending
+    ? isEditMode
+      ? "Saving..."
+      : "Creating..."
+    : isEditMode
+      ? "Save Changes"
+      : "Create Request";
+
+  const titleInput = (
+    <input
+      type="text"
+      value={form.name}
+      onChange={(e) => updateForm((f) => ({ ...f, name: e.target.value }))}
+      onKeyDown={(e) => e.key === "Enter" && handleSubmit()}
+      placeholder="New Request"
+      className="w-full bg-transparent text-left text-3xl font-bold text-text-default placeholder:text-text-subtle outline-none"
+      autoFocus={!isEditMode}
+    />
+  );
+
+  return (
+    <DrawerShell title={titleInput} onClose={onClose}>
+      <div className="flex flex-col gap-4">
+        {/* Assignee */}
+        <div className="flex items-center gap-8">
+          <FieldLabel icon={UserRound} label="Assignee" />
+          {backendUser?.hotel_id && (
+            <AssigneePicker
+              hotelId={backendUser.hotel_id}
+              selectedUser={pickers.assignee}
+              initialUserId={
+                pickers.assignee
+                  ? undefined
+                  : (existingRequest?.user_id ?? initialData?.user_id)
+              }
+              onSelect={(user) => {
+                setPickers((p) => ({ ...p, assignee: user }));
+                updateForm((f) => ({ ...f, user_id: user.id }));
+              }}
+            />
+          )}
+        </div>
+
+        {/* Deadline */}
+        <div className="flex items-center gap-8">
+          <FieldLabel icon={Clock} label="Deadline" />
+          <DeadlinePicker
+            selectedDate={form.deadline}
+            onSelect={(date) => updateForm((f) => ({ ...f, deadline: date }))}
+          />
+        </div>
+
+        {/* Priority */}
+        <div className="flex items-center gap-8">
+          <FieldLabel icon={Flag} label="Priority" />
+          <div className="flex items-center gap-1">
+            {PRIORITIES.map((p) => (
+              <button
+                key={p}
+                type="button"
+                onClick={() => updateForm((f) => ({ ...f, priority: p }))}
+                className={cn(
+                  "rounded px-2 py-0.5 text-xs capitalize transition-colors",
+                  form.priority === p
+                    ? "bg-primary text-white"
+                    : "text-text-subtle hover:text-text-default",
+                )}
+              >
+                {p}
+              </button>
+            ))}
+          </div>
+        </div>
+
+        {/* Room */}
+        <div className="flex items-center gap-8">
+          <FieldLabel icon={DoorOpen} label="Room" />
+          <RoomPicker
+            selectedRoom={pickers.room}
+            initialRoomId={
+              pickers.room
+                ? undefined
+                : (existingRequest?.room_id ?? initialData?.room_id)
+            }
+            onSelect={(r) => {
+              setPickers((p) => ({ ...p, room: r }));
+              updateForm((f) => ({ ...f, room_id: r.id }));
+            }}
+          />
+        </div>
+
+        {/* Department */}
+        <div className="flex items-center gap-8">
+          <FieldLabel icon={Building2} label="Department" />
+          {backendUser?.hotel_id && (
+            <DepartmentPicker
+              hotelId={backendUser.hotel_id}
+              selectedDepartment={pickers.department}
+              initialDepartmentId={
+                pickers.department
+                  ? undefined
+                  : (existingRequest?.department ?? initialData?.department_id)
+              }
+              onSelect={(d) => {
+                setPickers((p) => ({ ...p, department: d }));
+                updateForm((f) => ({ ...f, department: d?.id }));
+              }}
+            />
+          )}
+        </div>
+      </div>
+
+      <div className="flex flex-col gap-1">
+        <span className="text-xs text-text-subtle">Description</span>
+        <textarea
+          value={form.description}
+          onChange={(e) =>
+            updateForm((f) => ({ ...f, description: e.target.value }))
+          }
+          placeholder="Add a description..."
+          rows={3}
+          className="resize-none bg-transparent text-sm text-text-default placeholder:text-text-subtle outline-none"
+        />
+      </div>
+
+      <Button
+        variant={canSubmit ? "primary" : "secondary"}
+        onClick={handleSubmit}
+        disabled={!canSubmit || isPending}
+        className="mt-auto w-auto self-end"
+      >
+        {buttonLabel}
+      </Button>
+
+      {isEditMode && (
+        <div className="flex flex-col gap-4">
+          <span className="text-base font-bold text-text-default">
+            Activity
+          </span>
+          <ActivityFeed
+            requestId={existingRequest.id!}
+            hotelId={existingRequest.hotel_id}
+          />
+        </div>
+      )}
+    </DrawerShell>
+  );
+}
diff --git a/clients/web/src/components/home/DeleteViewModal.tsx b/clients/web/src/components/home/DeleteViewModal.tsx
new file mode 100644
index 000000000..2eedef078
--- /dev/null
+++ b/clients/web/src/components/home/DeleteViewModal.tsx
@@ -0,0 +1,55 @@
+import { X } from "lucide-react";
+import type { View } from "@shared/types/views";
+
+type DeleteViewModalProps = {
+  view: View | null;
+  isPending: boolean;
+  onConfirm: () => void;
+  onCancel: () => void;
+};
+
+export function DeleteViewModal({
+  view,
+  isPending,
+  onConfirm,
+  onCancel,
+}: DeleteViewModalProps) {
+  if (!view) return null;
+
+  return (
+    <div className="fixed inset-0 z-[60] flex items-center justify-center bg-black/30">
+      <div className="relative w-full max-w-md rounded-2xl bg-white p-8 shadow-xl">
+        <button
+          type="button"
+          onClick={onCancel}
+          className="absolute right-5 top-5 text-text-secondary hover:text-text-default"
+        >
+          <X className="size-5" />
+        </button>
+        <h2 className="text-[20px] font-bold text-text-default">
+          Delete {view.display_name}?
+        </h2>
+        <p className="mt-2 text-[16px] text-text-secondary">
+          This view will be permanently deleted and cannot be recovered.
+        </p>
+        <div className="mt-8 flex justify-end gap-3">
+          <button
+            type="button"
+            onClick={onCancel}
+            className="rounded-lg border border-stroke-subtle px-5 py-2.5 text-sm font-medium text-text-secondary hover:bg-bg-selected hover:text-text-default transition-colors"
+          >
+            Cancel
+          </button>
+          <button
+            type="button"
+            onClick={onConfirm}
+            disabled={isPending}
+            className="rounded-lg bg-danger px-5 py-2.5 text-sm font-semibold text-white hover:opacity-90 transition-opacity disabled:opacity-50"
+          >
+            Delete
+          </button>
+        </div>
+      </div>
+    </div>
+  );
+}
diff --git a/clients/web/src/components/home/DepartmentFilterMenu.tsx b/clients/web/src/components/home/DepartmentFilterMenu.tsx
new file mode 100644
index 000000000..552bc8d07
--- /dev/null
+++ b/clients/web/src/components/home/DepartmentFilterMenu.tsx
@@ -0,0 +1,107 @@
+import { Check, X } from "lucide-react";
+import { useGetDepartments } from "@shared";
+import { cn } from "@/lib/utils";
+
+type DepartmentFilterMenuProps = {
+  hotelId: string;
+  selectedNames: Array<string>;
+  anchor: { x: number; y: number };
+  onApply: (names: Array<string>) => void;
+  onClose: () => void;
+};
+
+export function DepartmentFilterMenu({
+  hotelId,
+  selectedNames,
+  anchor,
+  onApply,
+  onClose,
+}: DepartmentFilterMenuProps) {
+  const { data: departments = [], isLoading } = useGetDepartments(hotelId);
+
+  function toggle(name: string) {
+    onApply(
+      selectedNames.includes(name)
+        ? selectedNames.filter((d) => d !== name)
+        : [...selectedNames, name],
+    );
+  }
+
+  return (
+    <>
+      <div className="fixed inset-0 z-40" onClick={onClose} />
+      <div
+        className="fixed z-50 w-64 bg-white border border-stroke-subtle rounded-lg shadow-md overflow-hidden"
+        style={{ left: anchor.x, top: anchor.y }}
+      >
+        {/* Header */}
+        <div className="flex items-start justify-between pl-4 pr-3 py-3 border-b border-stroke-subtle min-h-[48px]">
+          <div className="flex flex-wrap gap-1 flex-1 min-w-0">
+            {selectedNames.map((name) => (
+              <span
+                key={name}
+                className="inline-flex items-center gap-1 bg-bg-container rounded px-2 py-1 text-sm text-text-default"
+              >
+                {name}
+                <button
+                  type="button"
+                  onClick={() => toggle(name)}
+                  className="text-text-subtle hover:text-text-default"
+                >
+                  <X className="size-2" />
+                </button>
+              </span>
+            ))}
+          </div>
+          <button
+            type="button"
+            onClick={() => onApply([])}
+            className="shrink-0 text-sm text-text-subtle hover:text-text-default transition-colors ml-2"
+          >
+            Clear
+          </button>
+        </div>
+
+        {/* Departments list */}
+        <div className="max-h-52 overflow-y-auto">
+          {isLoading && (
+            <p className="px-4 py-3 text-sm text-text-subtle text-center">
+              Loading...
+            </p>
+          )}
+          {!isLoading && departments.length === 0 && (
+            <p className="px-4 py-3 text-sm text-text-subtle text-center">
+              No departments found
+            </p>
+          )}
+          {departments.map((dept) => {
+            const isSelected = selectedNames.includes(dept.name);
+            return (
+              <button
+                key={dept.id}
+                type="button"
+                onClick={() => toggle(dept.name)}
+                className={cn(
+                  "flex items-center gap-3 w-full px-4 py-2 text-sm text-text-default hover:bg-bg-container transition-colors",
+                )}
+              >
+                <span
+                  className={`shrink-0 size-4 rounded-sm border flex items-center justify-center transition-colors ${
+                    isSelected
+                      ? "bg-primary border-primary"
+                      : "border-stroke-default bg-white"
+                  }`}
+                >
+                  {isSelected && (
+                    <Check className="size-3 text-white" strokeWidth={3} />
+                  )}
+                </span>
+                {dept.name}
+              </button>
+            );
+          })}
+        </div>
+      </div>
+    </>
+  );
+}
diff --git a/clients/web/src/components/home/FilterSortMenu.tsx b/clients/web/src/components/home/FilterSortMenu.tsx
new file mode 100644
index 000000000..ad34b102d
--- /dev/null
+++ b/clients/web/src/components/home/FilterSortMenu.tsx
@@ -0,0 +1,85 @@
+import { Check, X } from "lucide-react";
+
+type FilterSortMenuProps = {
+  options: Array<{ label: string; value: string }>;
+  selected: string | undefined;
+  anchor: { x: number; y: number };
+  onApply: (value: string | undefined) => void;
+  onClose: () => void;
+};
+
+export function FilterSortMenu({
+  options,
+  selected,
+  anchor,
+  onApply,
+  onClose,
+}: FilterSortMenuProps) {
+  const selectedLabel = options.find((o) => o.value === selected)?.label;
+
+  return (
+    <>
+      <div className="fixed inset-0 z-40" onClick={onClose} />
+      <div
+        className="fixed z-50 w-56 bg-white border border-stroke-subtle rounded-lg shadow-md overflow-hidden"
+        style={{ left: anchor.x, top: anchor.y }}
+      >
+        {/* Header */}
+        <div className="flex items-center justify-between pl-4 pr-3 py-3 border-b border-stroke-subtle">
+          <div className="min-w-0 flex-1">
+            {selectedLabel && (
+              <span className="inline-flex items-center gap-1 bg-bg-container rounded px-2 py-1 text-sm text-text-default">
+                {selectedLabel}
+                <button
+                  type="button"
+                  onClick={() => onApply(undefined)}
+                  className="text-text-subtle hover:text-text-default"
+                >
+                  <X className="size-2" />
+                </button>
+              </span>
+            )}
+          </div>
+          <button
+            type="button"
+            onClick={() => onApply(undefined)}
+            className="shrink-0 text-sm text-text-subtle hover:text-text-default transition-colors"
+          >
+            Clear
+          </button>
+        </div>
+
+        {/* Options */}
+        <div>
+          {options.map((option) => {
+            const isSelected = selected === option.value;
+            return (
+              <button
+                key={option.value}
+                type="button"
+                onClick={() => {
+                  onApply(option.value);
+                  onClose();
+                }}
+                className="flex items-center gap-3 w-full px-4 py-2 text-sm text-text-default hover:bg-bg-container transition-colors"
+              >
+                <span
+                  className={`shrink-0 size-4 rounded-sm border flex items-center justify-center transition-colors ${
+                    isSelected
+                      ? "bg-primary border-primary"
+                      : "border-stroke-default bg-white"
+                  }`}
+                >
+                  {isSelected && (
+                    <Check className="size-3 text-white" strokeWidth={3} />
+                  )}
+                </span>
+                {option.label}
+              </button>
+            );
+          })}
+        </div>
+      </div>
+    </>
+  );
+}
diff --git a/clients/web/src/components/home/FloorFilterMenu.tsx b/clients/web/src/components/home/FloorFilterMenu.tsx
new file mode 100644
index 000000000..7ae88a6bf
--- /dev/null
+++ b/clients/web/src/components/home/FloorFilterMenu.tsx
@@ -0,0 +1,102 @@
+import { Check, X } from "lucide-react";
+import { useGetRoomsFloors } from "@shared";
+
+type FloorFilterMenuProps = {
+  selectedFloors: Array<number>;
+  anchor: { x: number; y: number };
+  onApply: (floors: Array<number>) => void;
+  onClose: () => void;
+};
+
+export function FloorFilterMenu({
+  selectedFloors,
+  anchor,
+  onApply,
+  onClose,
+}: FloorFilterMenuProps) {
+  const { data: floors = [], isLoading } = useGetRoomsFloors();
+
+  function toggle(floor: number) {
+    onApply(
+      selectedFloors.includes(floor)
+        ? selectedFloors.filter((f) => f !== floor)
+        : [...selectedFloors, floor],
+    );
+  }
+
+  return (
+    <>
+      <div className="fixed inset-0 z-40" onClick={onClose} />
+      <div
+        className="fixed z-50 w-56 bg-white border border-stroke-subtle rounded-lg shadow-md overflow-hidden"
+        style={{ left: anchor.x, top: anchor.y }}
+      >
+        {/* Header */}
+        <div className="flex items-start justify-between pl-4 pr-3 py-3 border-b border-stroke-subtle min-h-[48px]">
+          <div className="flex flex-wrap gap-1 flex-1 min-w-0">
+            {selectedFloors.map((floor) => (
+              <span
+                key={floor}
+                className="inline-flex items-center gap-1 bg-bg-container rounded px-2 py-1 text-sm text-text-default"
+              >
+                Floor {floor}
+                <button
+                  type="button"
+                  onClick={() => toggle(floor)}
+                  className="text-text-subtle hover:text-text-default"
+                >
+                  <X className="size-2" />
+                </button>
+              </span>
+            ))}
+          </div>
+          <button
+            type="button"
+            onClick={() => onApply([])}
+            className="shrink-0 text-sm text-text-subtle hover:text-text-default transition-colors ml-2"
+          >
+            Clear
+          </button>
+        </div>
+
+        {/* Floors list */}
+        <div className="max-h-52 overflow-y-auto">
+          {isLoading && (
+            <p className="px-4 py-3 text-sm text-text-subtle text-center">
+              Loading...
+            </p>
+          )}
+          {!isLoading && floors.length === 0 && (
+            <p className="px-4 py-3 text-sm text-text-subtle text-center">
+              No floors found
+            </p>
+          )}
+          {floors.map((floor) => {
+            const isSelected = selectedFloors.includes(floor);
+            return (
+              <button
+                key={floor}
+                type="button"
+                onClick={() => toggle(floor)}
+                className="flex items-center gap-3 w-full px-4 py-2 text-sm text-text-default hover:bg-bg-container transition-colors"
+              >
+                <span
+                  className={`shrink-0 size-4 rounded-sm border flex items-center justify-center transition-colors ${
+                    isSelected
+                      ? "bg-primary border-primary"
+                      : "border-stroke-default bg-white"
+                  }`}
+                >
+                  {isSelected && (
+                    <Check className="size-3 text-white" strokeWidth={3} />
+                  )}
+                </span>
+                Floor {floor}
+              </button>
+            );
+          })}
+        </div>
+      </div>
+    </>
+  );
+}
diff --git a/clients/web/src/components/home/HomeFilterBar.tsx b/clients/web/src/components/home/HomeFilterBar.tsx
index 9ec771c0a..a0d25fc9c 100644
--- a/clients/web/src/components/home/HomeFilterBar.tsx
+++ b/clients/web/src/components/home/HomeFilterBar.tsx
@@ -1,51 +1,352 @@
-import { ChevronDown, LayoutGrid } from "lucide-react";
-
-const FILTER_PILLS = [
-  { label: "Grouping", value: "Departments" },
-  { label: "Assignee", value: "All" },
-  { label: "Priority", value: "All" },
-  { label: "Location", value: "All" },
-  { label: "Deadline", value: "All" },
+import { Check, ChevronDown, LayoutGrid, User, X } from "lucide-react";
+import { useRef, useState } from "react";
+import { FilterSortMenu } from "./FilterSortMenu";
+import { AssigneeFilterMenu } from "./AssigneeFilterMenu";
+import { DepartmentFilterMenu } from "./DepartmentFilterMenu";
+import { FloorFilterMenu } from "./FloorFilterMenu";
+import { PriorityFilterMenu } from "./PriorityFilterMenu";
+import type { RequestFeedSort, User as UserModel } from "@shared";
+import { cn } from "@/lib/utils";
+
+const SORT_OPTIONS: Array<{ label: string; value: string }> = [
+  { label: "Priority", value: "priority" },
+  { label: "Newest", value: "newest" },
+  { label: "Oldest", value: "oldest" },
 ];
 
-export function HomeFilterBar() {
+type HomeFilterBarProps = {
+  sort?: RequestFeedSort;
+  onSortChange?: (sort: RequestFeedSort | undefined) => void;
+  selectedUser?: UserModel;
+  onUserChange?: (user: UserModel | undefined) => void;
+  selectedPriorities?: Array<string>;
+  onPrioritiesChange?: (priorities: Array<string>) => void;
+  selectedDepartments?: Array<string>;
+  onDepartmentsChange?: (departments: Array<string>) => void;
+  selectedFloors?: Array<number>;
+  onFloorsChange?: (floors: Array<number>) => void;
+  hotelId?: string;
+  currentUserId?: string;
+  onClearAll?: () => void;
+  onSaveView?: (name: string) => void;
+};
+
+const SORT_LABELS: Record<RequestFeedSort, string> = {
+  priority: "Priority",
+  newest: "Newest",
+  oldest: "Oldest",
+};
+
+type FilterChipProps = {
+  label: string;
+  active?: boolean;
+  activeValue?: string;
+  icon?: "grid" | "user";
+  onClick?: () => void;
+  ref?: React.Ref<HTMLButtonElement>;
+};
+
+function FilterChip({
+  label,
+  active,
+  activeValue,
+  icon = "grid",
+  onClick,
+  ref,
+}: FilterChipProps) {
+  return (
+    <button
+      ref={ref}
+      type="button"
+      onClick={onClick}
+      className={cn(
+        "flex items-center gap-2 rounded-lg border px-3 py-1.5 text-sm whitespace-nowrap transition-colors",
+        active
+          ? "bg-[#edf5f1] border-primary text-primary"
+          : "bg-white border-stroke-default text-text-secondary hover:bg-bg-container",
+      )}
+    >
+      {icon === "user" ? (
+        <User className="size-[13px]" />
+      ) : (
+        <LayoutGrid className="size-[13px]" />
+      )}
+      <span>
+        {active && activeValue ? (
+          <>
+            {label}: <span className="font-bold">{activeValue}</span>
+          </>
+        ) : (
+          label
+        )}
+      </span>
+      <ChevronDown className="size-[11px]" />
+    </button>
+  );
+}
+
+type SaveViewButtonProps = {
+  onSave?: (name: string) => void;
+};
+
+function SaveViewButton({ onSave }: SaveViewButtonProps) {
+  const [saving, setSaving] = useState(false);
+  const [name, setName] = useState("");
+
+  function submit() {
+    if (!name.trim()) return;
+    onSave?.(name.trim());
+    setName("");
+    setSaving(false);
+  }
+
+  function cancel() {
+    setName("");
+    setSaving(false);
+  }
+
+  if (!saving) {
+    return (
+      <button
+        type="button"
+        onClick={() => setSaving(true)}
+        className="rounded border border-stroke-default px-2 py-1 text-sm text-text-secondary hover:bg-bg-container transition-colors"
+      >
+        Save as New View
+      </button>
+    );
+  }
+
+  return (
+    <div className="flex items-center gap-1">
+      <input
+        autoFocus
+        type="text"
+        value={name}
+        onChange={(e) => setName(e.target.value)}
+        onKeyDown={(e) => {
+          if (e.key === "Enter") submit();
+          if (e.key === "Escape") cancel();
+        }}
+        placeholder="View name"
+        className="rounded border border-stroke-default px-2 py-1 text-sm text-text-default outline-none focus:border-primary w-32"
+      />
+      <button
+        type="button"
+        disabled={!name.trim()}
+        onClick={submit}
+        className="rounded p-1 text-primary hover:bg-[#edf5f1] transition-colors disabled:opacity-40"
+      >
+        <Check className="size-4" />
+      </button>
+      <button
+        type="button"
+        onClick={cancel}
+        className="rounded p-1 text-text-secondary hover:bg-bg-container transition-colors"
+      >
+        <X className="size-4" />
+      </button>
+    </div>
+  );
+}
+
+export function HomeFilterBar({
+  sort,
+  onSortChange,
+  selectedUser,
+  onUserChange,
+  selectedPriorities = [],
+  onPrioritiesChange,
+  selectedDepartments = [],
+  onDepartmentsChange,
+  selectedFloors = [],
+  onFloorsChange,
+  hotelId,
+  currentUserId,
+  onClearAll,
+  onSaveView,
+}: HomeFilterBarProps) {
+  const [sortMenuOpen, setSortMenuOpen] = useState(false);
+  const [assigneeMenuOpen, setAssigneeMenuOpen] = useState(false);
+  const [priorityMenuOpen, setPriorityMenuOpen] = useState(false);
+  const [departmentMenuOpen, setDepartmentMenuOpen] = useState(false);
+  const [floorMenuOpen, setFloorMenuOpen] = useState(false);
+  const [menuAnchor, setMenuAnchor] = useState({ x: 0, y: 0 });
+  const sortButtonRef = useRef<HTMLButtonElement>(null);
+  const assigneeButtonRef = useRef<HTMLButtonElement>(null);
+  const priorityButtonRef = useRef<HTMLButtonElement>(null);
+  const departmentButtonRef = useRef<HTMLButtonElement>(null);
+  const floorButtonRef = useRef<HTMLButtonElement>(null);
+
+  function openSortMenu() {
+    if (sortButtonRef.current) {
+      const rect = sortButtonRef.current.getBoundingClientRect();
+      setMenuAnchor({ x: rect.left, y: rect.bottom + 6 });
+    }
+    setSortMenuOpen(true);
+  }
+
+  function openAssigneeMenu() {
+    if (!hotelId) return;
+    if (assigneeButtonRef.current) {
+      const rect = assigneeButtonRef.current.getBoundingClientRect();
+      setMenuAnchor({ x: rect.left, y: rect.bottom + 6 });
+    }
+    setAssigneeMenuOpen(true);
+  }
+
+  function openPriorityMenu() {
+    if (priorityButtonRef.current) {
+      const rect = priorityButtonRef.current.getBoundingClientRect();
+      setMenuAnchor({ x: rect.left, y: rect.bottom + 6 });
+    }
+    setPriorityMenuOpen(true);
+  }
+
+  function openDepartmentMenu() {
+    if (!hotelId) return;
+    if (departmentButtonRef.current) {
+      const rect = departmentButtonRef.current.getBoundingClientRect();
+      setMenuAnchor({ x: rect.left, y: rect.bottom + 6 });
+    }
+    setDepartmentMenuOpen(true);
+  }
+
+  function openFloorMenu() {
+    if (floorButtonRef.current) {
+      const rect = floorButtonRef.current.getBoundingClientRect();
+      setMenuAnchor({ x: rect.left, y: rect.bottom + 6 });
+    }
+    setFloorMenuOpen(true);
+  }
+
+  const activeSortLabel = sort ? SORT_LABELS[sort] : undefined;
+  const activeAssigneeName = selectedUser
+    ? `${selectedUser.first_name ?? ""} ${selectedUser.last_name ?? ""}`.trim()
+    : undefined;
+  const activePriorityLabel =
+    selectedPriorities.length === 1
+      ? selectedPriorities[0].charAt(0).toUpperCase() +
+        selectedPriorities[0].slice(1)
+      : selectedPriorities.length > 1
+        ? `${selectedPriorities.length} priorities`
+        : undefined;
+  const activeDepartmentLabel =
+    selectedDepartments.length === 1
+      ? selectedDepartments[0]
+      : selectedDepartments.length > 1
+        ? `${selectedDepartments.length} departments`
+        : undefined;
+  const activeFloorLabel =
+    selectedFloors.length === 1
+      ? `Floor ${selectedFloors[0]}`
+      : selectedFloors.length > 1
+        ? `${selectedFloors.length} floors`
+        : undefined;
+
   return (
-    <div className="flex items-center justify-between px-6 py-3 border-b border-stroke-subtle">
-      <div className="flex items-center gap-2">
-        {FILTER_PILLS.map((pill) => (
+    <>
+      <div className="flex items-start justify-between px-6 py-2 border-b border-stroke-subtle">
+        <div className="flex flex-1 flex-wrap items-center gap-3 min-w-0 mr-4">
+          <FilterChip
+            ref={sortButtonRef}
+            label="Sorting"
+            active={!!activeSortLabel}
+            activeValue={activeSortLabel}
+            onClick={openSortMenu}
+          />
+          <FilterChip
+            ref={assigneeButtonRef}
+            label="Assignee"
+            active={!!activeAssigneeName}
+            activeValue={activeAssigneeName}
+            icon="user"
+            onClick={openAssigneeMenu}
+          />
+          <FilterChip
+            ref={departmentButtonRef}
+            label="Department"
+            active={selectedDepartments.length > 0}
+            activeValue={activeDepartmentLabel}
+            onClick={openDepartmentMenu}
+          />
+          <FilterChip
+            ref={priorityButtonRef}
+            label="Priority"
+            active={selectedPriorities.length > 0}
+            activeValue={activePriorityLabel}
+            onClick={openPriorityMenu}
+          />
+          <FilterChip
+            ref={floorButtonRef}
+            label="Floor"
+            active={selectedFloors.length > 0}
+            activeValue={activeFloorLabel}
+            onClick={openFloorMenu}
+          />
+        </div>
+        <div className="flex shrink-0 items-center gap-3 pt-1">
           <button
-            key={pill.label}
             type="button"
-            className="flex items-center gap-1.5 bg-request-completed-secondary rounded-full border border-primary px-3 py-1 text-xs font-medium text-primary hover:bg-primary/5 transition-colors"
+            onClick={onClearAll}
+            className="text-sm text-text-secondary hover:text-text-default transition-colors"
           >
-            <LayoutGrid className="size-3" />
-            <span>
-              {pill.label}: <span className="font-semibold">{pill.value}</span>
-            </span>
-            <ChevronDown className="size-3" />
+            Clear All
           </button>
-        ))}
-        <button
-          type="button"
-          className="text-xs font-medium text-text-subtle hover:text-text-default transition-colors px-2"
-        >
-          + Filter
-        </button>
-      </div>
-      <div className="flex items-center gap-3">
-        <button
-          type="button"
-          className="text-sm text-text-subtle hover:text-text-default transition-colors"
-        >
-          Reset
-        </button>
-        <button
-          type="button"
-          className="rounded-lg border border-text-default px-4 py-1.5 text-sm font-medium text-text-default hover:bg-zinc-50 transition-colors"
-        >
-          Save as New View
-        </button>
+          <SaveViewButton onSave={onSaveView} />
+        </div>
       </div>
-    </div>
+
+      {sortMenuOpen && (
+        <FilterSortMenu
+          options={SORT_OPTIONS}
+          selected={sort}
+          anchor={menuAnchor}
+          onApply={(value) =>
+            onSortChange?.(value as RequestFeedSort | undefined)
+          }
+          onClose={() => setSortMenuOpen(false)}
+        />
+      )}
+
+      {assigneeMenuOpen && hotelId && (
+        <AssigneeFilterMenu
+          hotelId={hotelId}
+          currentUserId={currentUserId}
+          selectedUser={selectedUser}
+          anchor={menuAnchor}
+          onApply={(user) => onUserChange?.(user)}
+          onClose={() => setAssigneeMenuOpen(false)}
+        />
+      )}
+
+      {priorityMenuOpen && (
+        <PriorityFilterMenu
+          selectedPriorities={selectedPriorities}
+          anchor={menuAnchor}
+          onApply={(priorities) => onPrioritiesChange?.(priorities)}
+          onClose={() => setPriorityMenuOpen(false)}
+        />
+      )}
+
+      {departmentMenuOpen && hotelId && (
+        <DepartmentFilterMenu
+          hotelId={hotelId}
+          selectedNames={selectedDepartments}
+          anchor={menuAnchor}
+          onApply={(names) => onDepartmentsChange?.(names)}
+          onClose={() => setDepartmentMenuOpen(false)}
+        />
+      )}
+
+      {floorMenuOpen && (
+        <FloorFilterMenu
+          selectedFloors={selectedFloors}
+          anchor={menuAnchor}
+          onApply={(floors) => onFloorsChange?.(floors)}
+          onClose={() => setFloorMenuOpen(false)}
+        />
+      )}
+    </>
   );
 }
diff --git a/clients/web/src/components/home/HomeHeader.tsx b/clients/web/src/components/home/HomeHeader.tsx
deleted file mode 100644
index 45781ef2e..000000000
--- a/clients/web/src/components/home/HomeHeader.tsx
+++ /dev/null
@@ -1,10 +0,0 @@
-export function HomeHeader() {
-  return (
-    <header className="px-6 py-5 flex-row gap-1.5 border-b border-stroke-subtle">
-      <h1 className="text-2xl font-semibold text-text-default">Home</h1>
-      <h2 className="text-sm font-medium text-text-subtle">
-        Overview of all tasks currently at play
-      </h2>
-    </header>
-  );
-}
diff --git a/clients/web/src/components/home/HomeToolbar.tsx b/clients/web/src/components/home/HomeToolbar.tsx
index e20021d5d..5ce108d60 100644
--- a/clients/web/src/components/home/HomeToolbar.tsx
+++ b/clients/web/src/components/home/HomeToolbar.tsx
@@ -1,60 +1,246 @@
-import { ArrowDownUp, LayoutGrid, Plus, Search, Settings } from "lucide-react";
+import { useLayoutEffect, useRef, useState } from "react";
+import { Trash2 } from "lucide-react";
+import type { View } from "@shared/types/views";
 import { cn } from "@/lib/utils";
+import { FilterListIcon } from "@/icons/filter-list";
+import { SearchIcon } from "@/icons/search";
+import { SettingsIcon } from "@/icons/settings";
+import { TabIcon } from "@/icons/tab";
+import { SearchBar } from "@/components/ui/SearchBar";
+import {
+  ContextMenu,
+  ContextMenuContent,
+  ContextMenuItem,
+  ContextMenuTrigger,
+} from "@/components/ui/context-menu";
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuTrigger,
+} from "@/components/ui/dropdown-menu";
 
 type HomeToolbarProps = {
   className?: string;
+  onCreateRequest?: () => void;
+  views?: Array<View>;
+  activeViewId?: string;
+  filtersOpen?: boolean;
+  filtersActive?: boolean;
+  onToggleFilters?: () => void;
+  onSelectView?: (view: View | undefined) => void;
+  onDeleteView?: (view: View) => void;
+  searchOpen?: boolean;
+  searchValue?: string;
+  onSearchOpenChange?: (open: boolean) => void;
+  onSearchChange?: (value: string) => void;
 };
 
-const TABS = ["Departments", "View 2", "View 3"];
+const DEPARTMENTS_KEY = "__departments__";
+
+export function HomeToolbar({
+  className,
+  onCreateRequest,
+  views = [],
+  activeViewId,
+  filtersOpen = false,
+  filtersActive = false,
+  onToggleFilters,
+  onSelectView,
+  onDeleteView,
+  searchOpen = false,
+  searchValue = "",
+  onSearchOpenChange,
+  onSearchChange,
+}: HomeToolbarProps) {
+  const tabsRef = useRef<HTMLDivElement>(null);
+  const tabButtonRefs = useRef<Map<string, HTMLButtonElement>>(new Map());
+  const [underline, setUnderline] = useState({
+    left: 0,
+    width: 0,
+    ready: false,
+  });
+
+  const activeKey = activeViewId ?? DEPARTMENTS_KEY;
+  const activeView = views.find((v) => v.id === activeViewId);
+
+  useLayoutEffect(() => {
+    const activeTab = tabButtonRefs.current.get(activeKey);
+    const container = tabsRef.current;
+    if (!activeTab || !container) return;
+    const containerRect = container.getBoundingClientRect();
+    const tabRect = activeTab.getBoundingClientRect();
+    setUnderline({
+      left: tabRect.left - containerRect.left,
+      width: tabRect.width,
+      ready: true,
+    });
+  }, [activeKey]);
+
+  function setTabRef(key: string) {
+    return (el: HTMLButtonElement | null) => {
+      if (el) tabButtonRefs.current.set(key, el);
+      else tabButtonRefs.current.delete(key);
+    };
+  }
 
-export function HomeToolbar({ className }: HomeToolbarProps) {
   return (
-    <div className={cn("px-6", className)}>
-      <div className="flex items-center justify-between border-b border-stroke-subtle">
-        <div className="flex items-center">
-          {TABS.map((tab, i) => (
-            <button
-              key={tab}
-              type="button"
-              className={`flex items-center gap-2 px-4 py-3 text-sm font-medium transition-colors ${
-                i === 0
-                  ? "text-text-default border-b-2 border-text-default"
-                  : "text-text-subtle hover:text-text-default"
-              }`}
-            >
-              <LayoutGrid className="size-4" />
-              {tab}
-            </button>
-          ))}
-        </div>
-        <div className="flex items-center gap-4">
+    <div className={cn("px-6 border-b border-stroke-subtle", className)}>
+      <div className="flex items-end justify-between">
+        <div ref={tabsRef} className="relative flex items-start">
           <button
+            ref={setTabRef(DEPARTMENTS_KEY)}
             type="button"
-            className="text-text-subtle hover:text-text-default transition-colors"
+            onClick={() => onSelectView?.(undefined)}
+            className={cn(
+              "flex items-center gap-2 px-3 py-2 text-sm transition-colors",
+              activeViewId === undefined
+                ? "text-text-default"
+                : "text-text-subtle hover:text-text-default",
+            )}
           >
-            <ArrowDownUp className="size-4" />
-          </button>
-          <button
-            type="button"
-            className="text-text-subtle hover:text-text-default transition-colors"
-          >
-            <Search className="size-4" />
-          </button>
-          <button
-            type="button"
-            className="text-text-subtle hover:text-text-default transition-colors"
-          >
-            <Settings className="size-4" />
+            <TabIcon className="size-4" />
+            Departments
           </button>
+
+          {views.map((view) => {
+            const isActive = view.id === activeViewId;
+            return (
+              <ContextMenu key={view.id}>
+                <ContextMenuTrigger asChild>
+                  <button
+                    ref={setTabRef(view.id)}
+                    type="button"
+                    onClick={() => onSelectView?.(view)}
+                    className={cn(
+                      "flex items-center gap-2 px-3 py-2 text-sm transition-colors",
+                      isActive
+                        ? "text-text-default"
+                        : "text-text-subtle hover:text-text-default",
+                    )}
+                  >
+                    <TabIcon className="size-4" />
+                    {view.display_name}
+                  </button>
+                </ContextMenuTrigger>
+
+                <ContextMenuContent>
+                  <ContextMenuItem
+                    variant="destructive"
+                    onSelect={() => onDeleteView?.(view)}
+                  >
+                    <Trash2 />
+                    Delete view
+                  </ContextMenuItem>
+                </ContextMenuContent>
+              </ContextMenu>
+            );
+          })}
+
+          {underline.ready && (
+            <div
+              className="absolute bottom-0 h-0.5 bg-text-default transition-all duration-200 ease-out"
+              style={{ left: underline.left, width: underline.width }}
+            />
+          )}
+        </div>
+
+        <div className="flex items-center gap-6 py-2">
+          <div className="flex items-center gap-6">
+            <button
+              type="button"
+              onClick={onToggleFilters}
+              className={cn(
+                "relative rounded p-1 transition-colors",
+                filtersOpen
+                  ? "bg-primary-container text-primary"
+                  : filtersActive
+                    ? "text-primary hover:bg-primary-container"
+                    : "text-text-subtle hover:text-text-default",
+              )}
+            >
+              <FilterListIcon className="size-6" />
+              {filtersActive && (
+                <span className="absolute -top-0.5 -right-0.5 size-1.5 rounded-full bg-primary" />
+              )}
+            </button>
+
+            <button
+              type="button"
+              onClick={() => {
+                if (searchOpen) onSearchChange?.("");
+                onSearchOpenChange?.(!searchOpen);
+              }}
+              className={cn(
+                "relative rounded p-2 transition-colors",
+                searchOpen
+                  ? "bg-primary-container text-primary"
+                  : searchValue
+                    ? "text-primary hover:bg-primary-container"
+                    : "text-text-subtle hover:text-text-default",
+              )}
+            >
+              <SearchIcon className="size-4" />
+            </button>
+
+            {activeView ? (
+              <DropdownMenu>
+                <DropdownMenuTrigger asChild>
+                  <button
+                    type="button"
+                    className="text-text-subtle hover:text-text-default transition-colors"
+                  >
+                    <SettingsIcon className="size-4" />
+                  </button>
+                </DropdownMenuTrigger>
+                <DropdownMenuContent align="end" className="w-auto min-w-36">
+                  <DropdownMenuItem
+                    variant="destructive"
+                    onSelect={() => onDeleteView?.(activeView)}
+                  >
+                    <Trash2 />
+                    Delete view
+                  </DropdownMenuItem>
+                </DropdownMenuContent>
+              </DropdownMenu>
+            ) : (
+              <button
+                type="button"
+                className="text-text-subtle hover:text-text-default transition-colors"
+              >
+                <SettingsIcon className="size-4" />
+              </button>
+            )}
+          </div>
+
           <button
             type="button"
-            className="flex items-center gap-2 rounded-lg bg-primary px-4 py-2 text-sm font-medium text-white hover:bg-primary-hover transition-colors"
+            onClick={onCreateRequest}
+            className="rounded bg-primary px-6 py-2.5 text-sm text-white hover:bg-primary-hover transition-colors"
           >
-            <Plus className="size-4" />
             Create Task
           </button>
         </div>
       </div>
+
+      <div
+        className={cn(
+          "grid transition-all duration-200 ease-out",
+          searchOpen
+            ? "grid-rows-[1fr] pb-3 pt-2 opacity-100"
+            : "grid-rows-[0fr] opacity-0",
+        )}
+      >
+        <div className="overflow-hidden">
+          <SearchBar
+            value={searchValue}
+            onChange={(value) => onSearchChange?.(value)}
+            placeholder="Search tasks..."
+            autoFocus={searchOpen}
+            className="w-full max-w-sm"
+          />
+        </div>
+      </div>
     </div>
   );
 }
diff --git a/clients/web/src/components/home/HomeViewsBar.tsx b/clients/web/src/components/home/HomeViewsBar.tsx
new file mode 100644
index 000000000..dcf8864ed
--- /dev/null
+++ b/clients/web/src/components/home/HomeViewsBar.tsx
@@ -0,0 +1,50 @@
+import { X } from "lucide-react";
+import type { View } from "@shared/types/views";
+import { cn } from "@/lib/utils";
+
+type HomeViewsBarProps = {
+  views: Array<View>;
+  activeViewId?: string;
+  onApply: (view: View) => void;
+  onDelete: (id: string) => void;
+};
+
+export function HomeViewsBar({
+  views,
+  activeViewId,
+  onApply,
+  onDelete,
+}: HomeViewsBarProps) {
+  if (views.length === 0) return null;
+
+  return (
+    <div className="flex items-center gap-2 px-6 py-2 border-b border-stroke-subtle overflow-x-auto shrink-0">
+      {views.map((view) => (
+        <div
+          key={view.id}
+          className={cn(
+            "flex items-center gap-1 rounded-full border px-3 py-1 text-sm whitespace-nowrap transition-colors",
+            view.id === activeViewId
+              ? "bg-[#edf5f1] border-primary text-primary"
+              : "bg-white border-stroke-default text-text-secondary hover:bg-bg-container",
+          )}
+        >
+          <button
+            type="button"
+            onClick={() => onApply(view)}
+            className="leading-none"
+          >
+            {view.display_name}
+          </button>
+          <button
+            type="button"
+            onClick={() => onDelete(view.id)}
+            className="ml-0.5 rounded-full p-0.5 hover:bg-black/10 transition-colors"
+          >
+            <X className="size-3" />
+          </button>
+        </div>
+      ))}
+    </div>
+  );
+}
diff --git a/clients/web/src/components/home/PriorityFilterMenu.tsx b/clients/web/src/components/home/PriorityFilterMenu.tsx
new file mode 100644
index 000000000..3f64a88c7
--- /dev/null
+++ b/clients/web/src/components/home/PriorityFilterMenu.tsx
@@ -0,0 +1,99 @@
+import { Check, X } from "lucide-react";
+
+const PRIORITY_OPTIONS: Array<{ value: string; label: string }> = [
+  { value: "high", label: "High" },
+  { value: "medium", label: "Medium" },
+  { value: "low", label: "Low" },
+];
+
+type PriorityFilterMenuProps = {
+  selectedPriorities: Array<string>;
+  anchor: { x: number; y: number };
+  onApply: (priorities: Array<string>) => void;
+  onClose: () => void;
+};
+
+export function PriorityFilterMenu({
+  selectedPriorities,
+  anchor,
+  onApply,
+  onClose,
+}: PriorityFilterMenuProps) {
+  function toggle(value: string) {
+    onApply(
+      selectedPriorities.includes(value)
+        ? selectedPriorities.filter((p) => p !== value)
+        : [...selectedPriorities, value],
+    );
+  }
+
+  return (
+    <>
+      <div className="fixed inset-0 z-40" onClick={onClose} />
+      <div
+        className="fixed z-50 w-56 bg-white border border-stroke-subtle rounded-lg shadow-md overflow-hidden"
+        style={{ left: anchor.x, top: anchor.y }}
+      >
+        {/* Header */}
+        <div className="flex items-start justify-between pl-4 pr-3 py-3 border-b border-stroke-subtle min-h-[48px]">
+          <div className="flex flex-wrap gap-1 flex-1 min-w-0">
+            {selectedPriorities.map((value) => {
+              const label =
+                PRIORITY_OPTIONS.find((o) => o.value === value)?.label ?? value;
+              return (
+                <span
+                  key={value}
+                  className="inline-flex items-center gap-1 bg-bg-container rounded px-2 py-1 text-sm text-text-default"
+                >
+                  {label}
+                  <button
+                    type="button"
+                    onClick={() => toggle(value)}
+                    className="text-text-subtle hover:text-text-default"
+                  >
+                    <X className="size-2" />
+                  </button>
+                </span>
+              );
+            })}
+          </div>
+          <button
+            type="button"
+            onClick={() => onApply([])}
+            className="shrink-0 text-sm text-text-subtle hover:text-text-default transition-colors ml-2"
+          >
+            Clear
+          </button>
+        </div>
+
+        {/* Options */}
+        <div>
+          {PRIORITY_OPTIONS.map((option) => {
+            const isSelected = selectedPriorities.includes(option.value);
+            return (
+              <button
+                key={option.value}
+                type="button"
+                onClick={() => toggle(option.value)}
+                className="flex items-center gap-3 w-full px-4 py-2 text-sm text-text-default hover:bg-bg-container transition-colors"
+              >
+                <span
+                  className={`shrink-0 size-4 rounded-sm border flex items-center justify-center transition-colors ${
+                    isSelected
+                      ? "bg-primary border-primary"
+                      : "border-stroke-default bg-white"
+                  }`}
+                >
+                  {isSelected && (
+                    <Check className="size-3 text-white" strokeWidth={3} />
+                  )}
+                </span>
+                {option.label}
+              </button>
+            );
+          })}
+        </div>
+      </div>
+    </>
+  );
+}
diff --git a/clients/web/src/components/notifications/FilterPopover.tsx b/clients/web/src/components/notifications/FilterPopover.tsx
new file mode 100644
index 000000000..3ba6e7b9d
--- /dev/null
+++ b/clients/web/src/components/notifications/FilterPopover.tsx
@@ -0,0 +1,86 @@
+import { useState } from "react";
+import type { RefObject } from "react";
+import { FilterChip } from "@/components/rooms/FilterChip";
+import { Button } from "@/components/ui/Button";
+import { useClickOutside } from "@/hooks/use-click-outside";
+
+const STATUS_CHIPS = ["All", "Unread"] as const;
+const DATE_CHIPS = ["Standard", "Deluxe", "Suite", "Accessible"] as const;
+
+type FilterPopoverProps = {
+  onClose: () => void;
+  containerRef: RefObject<HTMLDivElement | null>;
+};
+
+export function FilterPopover({ onClose, containerRef }: FilterPopoverProps) {
+  useClickOutside(containerRef, onClose);
+
+  const [activeStatus, setActiveStatus] = useState("All");
+  const [activeDates, setActiveDates] = useState<Set<string>>(new Set());
+
+  function toggleDate(chip: string) {
+    setActiveDates((prev) => {
+      const next = new Set(prev);
+      next.has(chip) ? next.delete(chip) : next.add(chip);
+      return next;
+    });
+  }
+
+  function handleReset() {
+    setActiveStatus("All");
+    setActiveDates(new Set());
+  }
+
+  return (
+    <div className="absolute right-0 top-8 z-10 w-80 rounded-xl bg-bg-primary shadow-[0px_2px_4px_0px_rgba(0,0,0,0.25)]">
+      <div className="flex flex-col gap-5 px-6 py-5">
+        <div className="flex items-center justify-between">
+          <span className="text-base font-semibold text-text-default">
+            All Filters
+          </span>
+          <button
+            type="button"
+            onClick={handleReset}
+            className="text-sm text-text-subtle hover:text-text-default"
+          >
+            Reset
+          </button>
+        </div>
+
+        <div className="flex flex-wrap gap-2">
+          {STATUS_CHIPS.map((chip) => (
+            <FilterChip
+              key={chip}
+              label={chip}
+              isSelected={activeStatus === chip}
+              onToggle={() => setActiveStatus(chip)}
+            />
+          ))}
+        </div>
+
+        <div className="flex flex-col gap-3">
+          <span className="text-sm font-semibold text-text-subtle">Date</span>
+          <div className="flex flex-wrap gap-2">
+            {DATE_CHIPS.map((chip) => (
+              <FilterChip
+                key={chip}
+                label={chip}
+                isSelected={activeDates.has(chip)}
+                onToggle={() => toggleDate(chip)}
+              />
+            ))}
+          </div>
+        </div>
+      </div>
+
+      <div className="flex gap-3 border-t border-stroke-subtle px-5 py-5">
+        <Button variant="secondary" onClick={onClose} className="flex-1">
+          Cancel
+        </Button>
+        <Button variant="primary" onClick={onClose} className="flex-1">
+          Select
+        </Button>
+      </div>
+    </div>
+  );
+}
diff --git a/clients/web/src/components/notifications/MorePopover.tsx b/clients/web/src/components/notifications/MorePopover.tsx
new file mode 100644
index 000000000..9327a9b6e
--- /dev/null
+++ b/clients/web/src/components/notifications/MorePopover.tsx
@@ -0,0 +1,38 @@
+import { useMarkAllNotificationsRead } from "@shared";
+import type { RefObject } from "react";
+import { useClickOutside } from "@/hooks/use-click-outside";
+
+type MorePopoverProps = {
+  onClose: () => void;
+  containerRef: RefObject<HTMLDivElement | null>;
+};
+
+export function MorePopover({ onClose, containerRef }: MorePopoverProps) {
+  useClickOutside(containerRef, onClose);
+
+  const { mutate: markAllRead } = useMarkAllNotificationsRead();
+
+  return (
+    <div className="absolute right-0 top-8 z-10 w-52 rounded-xl bg-bg-primary px-6 py-5 shadow-[0px_2px_4px_0px_rgba(0,0,0,0.25)]">
+      <div className="flex flex-col gap-2">
+        <button
+          type="button"
+          onClick={() => {
+            markAllRead();
+            onClose();
+          }}
+          className="rounded-sm border border-stroke-default bg-bg-primary px-4 py-2 text-sm text-text-secondary hover:bg-bg-container"
+        >
+          Mark all as read
+        </button>
+        <button
+          type="button"
+          onClick={onClose}
+          className="rounded-sm border border-stroke-default bg-bg-primary px-4 py-2 text-sm text-text-secondary hover:bg-bg-container"
+        >
+          Delete all
+        </button>
+      </div>
+    </div>
+  );
+}
diff --git a/clients/web/src/components/notifications/NotificationItem.tsx b/clients/web/src/components/notifications/NotificationItem.tsx
new file mode 100644
index 000000000..515aa3b56
--- /dev/null
+++ b/clients/web/src/components/notifications/NotificationItem.tsx
@@ -0,0 +1,41 @@
+import { formatTimestamp } from "./notification.utils";
+import type { Notification } from "@shared";
+import { cn } from "@/lib/utils";
+
+type NotificationItemProps = {
+  item: Notification;
+};
+
+export function NotificationItem({ item }: NotificationItemProps) {
+  const isUnread = !item.read_at;
+  const timestamp = formatTimestamp(item.created_at, isUnread);
+
+  return (
+    <div className="flex flex-col gap-1 border-b border-stroke-disabled pb-3">
+      <div className="flex items-center justify-between">
+        <div className="flex items-center gap-4">
+          <div className="size-4 shrink-0 rounded-sm border border-text-subtle" />
+          <span className="text-sm font-semibold text-text-default">
+            {item.title}
+          </span>
+        </div>
+        <div className="flex items-center gap-2.5">
+          <span
+            className={cn(
+              "text-xs",
+              isUnread ? "text-primary" : "text-text-subtle",
+            )}
+          >
+            {timestamp}
+          </span>
+          {isUnread && (
+            <div className="size-1.5 shrink-0 rounded-full bg-primary" />
+          )}
+        </div>
+      </div>
+      <div className="flex flex-col gap-2 pl-8 pr-5">
+        <p className="text-xs leading-snug text-text-secondary">{item.body}</p>
+      </div>
+    </div>
+  );
+}
diff --git a/clients/web/src/components/notifications/NotificationPanel.tsx b/clients/web/src/components/notifications/NotificationPanel.tsx
new file mode 100644
index 000000000..479df8e6a
--- /dev/null
+++ b/clients/web/src/components/notifications/NotificationPanel.tsx
@@ -0,0 +1,109 @@
+import { Filter, MoreVertical, Search } from "lucide-react";
+import { useRef, useState } from "react";
+import { useGetNotifications } from "@shared";
+import { groupNotifications } from "./notification.utils";
+import { NotificationItem } from "./NotificationItem";
+import { FilterPopover } from "./FilterPopover";
+import { MorePopover } from "./MorePopover";
+import { cn } from "@/lib/utils";
+
+type NotificationPanelProps = {
+  open: boolean;
+  sidebarExpanded: boolean;
+};
+
+export function NotificationPanel({
+  open,
+  sidebarExpanded,
+}: NotificationPanelProps) {
+  const [filterOpen, setFilterOpen] = useState(false);
+  const [moreOpen, setMoreOpen] = useState(false);
+  const filterContainerRef = useRef<HTMLDivElement>(null);
+  const moreContainerRef = useRef<HTMLDivElement>(null);
+
+  const { data: notifications = [] } = useGetNotifications();
+  const groups = groupNotifications(notifications);
+
+  if (!open) return null;
+
+  return (
+    <div
+      className={cn(
+        "fixed top-0 z-50 flex h-screen w-100 flex-col gap-4 overflow-y-auto border-r border-stroke-subtle bg-bg-primary py-8 shadow-[4px_0px_8px_0px_rgba(0,0,0,0.1)] transition-[left] duration-200",
+        sidebarExpanded ? "left-52" : "left-16.25",
+      )}
+    >
+      {/* Header */}
+      <div className="flex flex-col gap-3 border-b border-stroke-subtle px-6 pb-0">
+        <div className="flex items-center justify-between">
+          <span className="text-sm font-medium text-text-default">Inbox</span>
+          <div className="flex items-center gap-3.5 text-text-subtle">
+            <button type="button" className="hover:text-text-default">
+              <Search className="size-4" strokeWidth={2} />
+            </button>
+
+            <div className="relative" ref={filterContainerRef}>
+              <button
+                type="button"
+                onClick={() => {
+                  setFilterOpen((o) => !o);
+                  setMoreOpen(false);
+                }}
+                className={cn(
+                  "hover:text-text-default",
+                  filterOpen && "text-primary",
+                )}
+              >
+                <Filter className="size-3.5" strokeWidth={2} />
+              </button>
+              {filterOpen && (
+                <FilterPopover
+                  onClose={() => setFilterOpen(false)}
+                  containerRef={filterContainerRef}
+                />
+              )}
+            </div>
+
+            <div className="relative" ref={moreContainerRef}>
+              <button
+                type="button"
+                onClick={() => {
+                  setMoreOpen((o) => !o);
+                  setFilterOpen(false);
+                }}
+                className={cn(
+                  "hover:text-text-default",
+                  moreOpen && "text-primary",
+                )}
+              >
+                <MoreVertical className="size-4" strokeWidth={2} />
+              </button>
+              {moreOpen && (
+                <MorePopover
+                  onClose={() => setMoreOpen(false)}
+                  containerRef={moreContainerRef}
+                />
+              )}
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <div className="flex flex-col gap-6 px-6">
+        {groups.length === 0 && (
+          <p className="text-sm text-text-subtle">No notifications</p>
+        )}
+        {groups.map((group) => (
+          <div key={group.label} className="flex flex-col gap-1">
+            <span className="mb-1 text-xs text-primary">{group.label}</span>
+            <div className="flex flex-col gap-4">
+              {group.items.map((item) => (
+                <NotificationItem key={item.id} item={item} />
+              ))}
+            </div>
+          </div>
+        ))}
+      </div>
+    </div>
+  );
+}
diff --git a/clients/web/src/components/notifications/notification.types.ts b/clients/web/src/components/notifications/notification.types.ts
new file mode 100644
index 000000000..840d2b6a2
--- /dev/null
+++ b/clients/web/src/components/notifications/notification.types.ts
@@ -0,0 +1,6 @@
+import type { Notification } from "@shared";
+
+export type NotificationGroup = {
+  label: string;
+  items: Array<Notification>;
+};
diff --git a/clients/web/src/components/notifications/notification.utils.ts b/clients/web/src/components/notifications/notification.utils.ts
new file mode 100644
index 000000000..14fa8e55a
--- /dev/null
+++ b/clients/web/src/components/notifications/notification.utils.ts
@@ -0,0 +1,42 @@
+import type { Notification } from "@shared";
+import type { NotificationGroup } from "./notification.types";
+
+function startOfDay(date: Date): Date {
+  return new Date(date.getFullYear(), date.getMonth(), date.getDate());
+}
+
+export function formatTimestamp(createdAt: string, isUnread: boolean): string {
+  const diffMs = Date.now() - new Date(createdAt).getTime();
+  const mins = Math.floor(diffMs / 60_000);
+  const hours = Math.floor(diffMs / 3_600_000);
+  const days = Math.floor(diffMs / 86_400_000);
+
+  const relative =
+    mins < 60 ? `${mins}m` : hours < 24 ? `${hours}h` : `${days}d`;
+  return isUnread ? `Updated ${relative} ago` : relative;
+}
+
+export function groupNotifications(
+  notifications: Array<Notification>,
+): Array<NotificationGroup> {
+  const todayStart = startOfDay(new Date());
+  const weekStart = new Date(todayStart);
+  weekStart.setDate(weekStart.getDate() - 7);
+
+  const today: Array<Notification> = [];
+  const thisWeek: Array<Notification> = [];
+  const older: Array<Notification> = [];
+
+  for (const n of notifications) {
+    const created = new Date(n.created_at);
+    if (created >= todayStart) today.push(n);
+    else if (created >= weekStart) thisWeek.push(n);
+    else older.push(n);
+  }
+
+  const groups: Array<NotificationGroup> = [];
+  if (today.length > 0) groups.push({ label: "Today", items: today });
+  if (thisWeek.length > 0) groups.push({ label: "This Week", items: thisWeek });
+  if (older.length > 0) groups.push({ label: "Older", items: older });
+  return groups;
+}
diff --git a/clients/web/src/components/onboarding/EmployeeRoleStep.tsx b/clients/web/src/components/onboarding/EmployeeRoleStep.tsx
new file mode 100644
index 000000000..5b2fbe2f7
--- /dev/null
+++ b/clients/web/src/components/onboarding/EmployeeRoleStep.tsx
@@ -0,0 +1,52 @@
+import { LeftPanel } from "./LeftPanel";
+import { ROLES } from "./onboardingMocks";
+import { RoleCard } from "./RoleCard";
+import type { OnboardingFormData } from "./types";
+
+type EmployeeRoleStepProps = {
+  formData: OnboardingFormData;
+  updateForm: (updates: Partial<OnboardingFormData>) => void;
+  onNext: () => void;
+  onBack: () => void;
+};
+
+export function EmployeeRoleStep({
+  formData,
+  updateForm,
+  onNext,
+}: EmployeeRoleStepProps) {
+  return (
+    <div className="flex w-screen h-screen">
+      <LeftPanel />
+      <div className="flex-1 flex justify-center items-start pt-[clamp(5rem,19.45vh,11.9375rem)] px-[clamp(2.5rem,9.6vw,8.25rem)] overflow-hidden">
+        <div className="w-full max-w-[41.4375rem] h-[clamp(25rem,66.4vh,40.75rem)] overflow-hidden rounded-[1.5rem] box-border border border-text-default bg-bg-primary flex flex-col items-center p-12 gap-12">
+          {/* Header */}
+          <div className="flex flex-col gap-2 text-center">
+            <h1 className="text-text-default text-2xl font-normal leading-8 m-0">
+              Employee Role
+            </h1>
+            <p className="text-text-subtle text-base font-normal leading-6 m-0">
+              Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+            </p>
+          </div>
+
+          {/* 2x2 grid */}
+          <div className="grid grid-cols-2 gap-4 w-full flex-1">
+            {ROLES.map((role) => (
+              <RoleCard
+                key={role.id}
+                label={role.label}
+                description={role.description}
+                selected={formData.employeeRole === role.id}
+                onSelect={() => {
+                  updateForm({ employeeRole: role.id });
+                  onNext();
+                }}
+              />
+            ))}
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+}
diff --git a/clients/web/src/components/onboarding/InviteTeamStep.tsx b/clients/web/src/components/onboarding/InviteTeamStep.tsx
new file mode 100644
index 000000000..26a155aa5
--- /dev/null
+++ b/clients/web/src/components/onboarding/InviteTeamStep.tsx
@@ -0,0 +1,80 @@
+import { useState } from "react";
+import { LeftPanel } from "./LeftPanel";
+import type { OnboardingFormData } from "./types";
+
+type InviteTeamStepProps = {
+  formData: OnboardingFormData;
+  updateForm: (updates: Partial<OnboardingFormData>) => void;
+};
+
+export function InviteTeamStep({ formData, updateForm }: InviteTeamStepProps) {
+  const [invited, setInvited] = useState(false);
+
+  return (
+    <div className="flex w-screen h-screen">
+      <LeftPanel />
+      <div className="flex-1 flex justify-center items-start pt-[clamp(5rem,19.45vh,11.9375rem)] px-[clamp(2.5rem,9.6vw,8.25rem)] overflow-hidden">
+        <div className="w-full max-w-[41.4375rem] h-[clamp(28.125rem,63.64vh,39.0625rem)] overflow-hidden border border-text-default rounded-[1.5rem] bg-bg-primary box-border flex items-center justify-center">
+          <div className="w-[90%] max-w-[35.4375rem] flex flex-col items-center gap-6">
+            {/* Logo */}
+            <div className="w-20 h-20 border border-text-default rounded-lg bg-bg-primary shrink-0" />
+
+            {/* Header */}
+            <div className="flex flex-col items-center gap-2 text-center">
+              <h1 className="font-normal text-[clamp(1.25rem,2.5vw,1.5rem)] leading-8 text-text-heading m-0">
+                Invite your team
+              </h1>
+              <p className="font-normal text-[clamp(0.8125rem,1.6vw,1rem)] leading-6 text-text-muted m-0">
+                SelfServe is better when the whole staff is connected.
+              </p>
+            </div>
+
+            {/* Email input */}
+            <div className="flex flex-col gap-2 w-full">
+              <div className="w-full flex items-center gap-2 bg-bg-input rounded-lg px-3 py-2 box-border">
+                <div className="w-6 h-6 rounded-full bg-bg-avatar shrink-0" />
+                <input
+                  type="email"
+                  value={formData.inviteEmail}
+                  onChange={(e) => updateForm({ inviteEmail: e.target.value })}
+                  placeholder="Enter email address..."
+                  className="flex-1 bg-transparent border-none outline-none text-sm"
+                />
+                <button
+                  onClick={() => setInvited(true)}
+                  className="text-sm font-semibold text-text-heading bg-transparent border-none"
+                >
+                  Invite
+                </button>
+              </div>
+              {invited && (
+                <p className="text-xs text-success-stroke text-center m-0">
+                  Invite sent!
+                </p>
+              )}
+              <p className="text-xs text-text-muted text-center m-0">
+                You can also do this later from your settings.
+              </p>
+            </div>
+
+            {/* Actions */}
+            <div className="flex flex-col gap-3 items-center w-full">
+              <button
+                onClick={() => console.log("Go to dashboard")}
+                className="w-full h-14 rounded-[0.875rem] bg-primary text-bg-primary border-none text-base"
+              >
+                Go to Dashboard
+              </button>
+              <button
+                onClick={() => console.log("Skip for now")}
+                className="text-sm text-text-muted bg-transparent border-none"
+              >
+                Skip for now
+              </button>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+}
diff --git a/clients/web/src/components/onboarding/LeftPanel.tsx b/clients/web/src/components/onboarding/LeftPanel.tsx
new file mode 100644
index 000000000..97b3ef2d5
--- /dev/null
+++ b/clients/web/src/components/onboarding/LeftPanel.tsx
@@ -0,0 +1,15 @@
+export function LeftPanel() {
+  return (
+    <div className="relative bg-bg-primary shrink-0 w-[36.47vw] h-screen border-r border-text-default overflow-hidden">
+      <div className="absolute bottom-[11.6vh] left-[9.8%] w-[78.8%] flex flex-col gap-2">
+        <span className="font-bold text-[1.5rem] leading-8 tracking-[-0.070625rem]">
+          SelfServe
+        </span>
+        <p className="font-medium italic text-[clamp(0.75rem,1.5vw,1.25rem)] leading-[1.6] m-0">
+          Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec risus
+          nunc, ullamcorper vitae risus vel, tristique vehicula lectus.
+        </p>
+      </div>
+    </div>
+  );
+}
diff --git a/clients/web/src/components/onboarding/OnboardingPage.tsx b/clients/web/src/components/onboarding/OnboardingPage.tsx
new file mode 100644
index 000000000..3fe2be050
--- /dev/null
+++ b/clients/web/src/components/onboarding/OnboardingPage.tsx
@@ -0,0 +1,83 @@
+import { useState } from "react";
+import { WelcomeStep } from "./WelcomeStep";
+import { RoleSelectionStep } from "./RoleSelectionStep";
+import { EmployeeRoleStep } from "./EmployeeRoleStep";
+import { PropertyDetailsStep } from "./PropertyDetailsStep";
+import { InviteTeamStep } from "./InviteTeamStep";
+import type { OnboardingFormData } from "./types";
+
+const INITIAL_FORM_DATA: OnboardingFormData = {
+  role: null,
+  employeeRole: null,
+  hotelName: "",
+  numberOfRooms: "",
+  propertyType: "",
+  inviteEmail: "",
+};
+
+type Step =
+  | "welcome"
+  | "role"
+  | "employeeRole"
+  | "propertyDetails"
+  | "inviteTeam";
+
+export function OnboardingPage() {
+  const [currentStep, setCurrentStep] = useState<Step>("welcome");
+  const [formData, setFormData] =
+    useState<OnboardingFormData>(INITIAL_FORM_DATA);
+
+  const updateForm = (updates: Partial<OnboardingFormData>) => {
+    setFormData((prev) => ({ ...prev, ...updates }));
+  };
+
+  const handleRoleSelected = (role: string) => {
+    updateForm({ role });
+    if (role === "employee") {
+      setCurrentStep("employeeRole");
+    } else {
+      setCurrentStep("propertyDetails");
+    }
+  };
+
+  const renderStep = () => {
+    switch (currentStep) {
+      case "welcome":
+        return <WelcomeStep onNext={() => setCurrentStep("role")} />;
+      case "role":
+        return (
+          <RoleSelectionStep
+            formData={formData}
+            updateForm={updateForm}
+            onNext={handleRoleSelected}
+          />
+        );
+      case "employeeRole":
+        return (
+          <EmployeeRoleStep
+            formData={formData}
+            updateForm={updateForm}
+            onNext={() => setCurrentStep("propertyDetails")}
+            onBack={() => setCurrentStep("role")}
+          />
+        );
+      case "propertyDetails":
+        return (
+          <PropertyDetailsStep
+            formData={formData}
+            updateForm={updateForm}
+            onNext={() => setCurrentStep("inviteTeam")}
+            onBack={() =>
+              setCurrentStep(
+                formData.role === "employee" ? "employeeRole" : "role",
+              )
+            }
+          />
+        );
+      case "inviteTeam":
+        return <InviteTeamStep formData={formData} updateForm={updateForm} />;
+    }
+  };
+
+  return <div>{renderStep()}</div>;
+}
diff --git a/clients/web/src/components/onboarding/PropertyDetailsStep.tsx b/clients/web/src/components/onboarding/PropertyDetailsStep.tsx
new file mode 100644
index 000000000..ac8dfc31f
--- /dev/null
+++ b/clients/web/src/components/onboarding/PropertyDetailsStep.tsx
@@ -0,0 +1,116 @@
+import { LeftPanel } from "./LeftPanel";
+import type { OnboardingFormData } from "./types";
+
+type PropertyDetailsStepProps = {
+  formData: OnboardingFormData;
+  updateForm: (updates: Partial<OnboardingFormData>) => void;
+  onNext: () => void;
+  onBack: () => void;
+};
+
+const PROPERTY_TYPES = [
+  "Hotel",
+  "Motel",
+  "Resort",
+  "Bed & Breakfast",
+  "Hostel",
+];
+
+export function PropertyDetailsStep({
+  formData,
+  updateForm,
+  onNext,
+  onBack,
+}: PropertyDetailsStepProps) {
+  const isValid =
+    formData.hotelName && formData.numberOfRooms && formData.propertyType;
+
+  return (
+    <div className="flex w-screen h-screen">
+      <LeftPanel />
+      <div className="flex-1 flex justify-center items-start pt-[clamp(5rem,19.45vh,11.9375rem)] px-[clamp(2.5rem,9.6vw,8.25rem)] overflow-hidden">
+        <div className="w-full max-w-[41.4375rem] h-[clamp(31.25rem,71.79vh,44.0625rem)] overflow-hidden border border-[var(--color-text-default)] rounded-[1.5rem] bg-[var(--color-bg-primary)] flex flex-col items-center justify-center p-12 box-border">
+          <div className="w-[16.0425rem] flex flex-col items-center gap-8">
+            {/* Header */}
+            <div className="flex flex-col gap-1 text-center">
+              <h1 className="font-normal text-[clamp(1.25rem,2.5vw,1.5rem)] leading-8 text-[var(--color-text-heading)] m-0">
+                Property Details
+              </h1>
+              <p className="font-normal text-[clamp(0.8125rem,1.6vw,1rem)] leading-6 text-[var(--color-text-muted)] m-0">
+                Lorem ipsum dolor sit amet.
+              </p>
+            </div>
+
+            {/* Form fields */}
+            <div className="flex flex-col gap-4 w-full">
+              <div className="flex flex-col gap-1">
+                <label className="text-sm text-[var(--color-text-heading)]">
+                  Hotel Name
+                </label>
+                <input
+                  type="text"
+                  value={formData.hotelName}
+                  onChange={(e) => updateForm({ hotelName: e.target.value })}
+                  placeholder="Lorem ipsum dolor sit amet"
+                  className="border border-[var(--color-stroke-subtle)] rounded-lg px-3 py-2 text-sm outline-none w-full box-border"
+                />
+              </div>
+              <div className="flex flex-col gap-1">
+                <label className="text-sm text-[var(--color-text-heading)]">
+                  Number of Rooms
+                </label>
+                <input
+                  type="number"
+                  value={formData.numberOfRooms}
+                  onChange={(e) =>
+                    updateForm({ numberOfRooms: e.target.value })
+                  }
+                  placeholder="e.g. 150"
+                  className="border border-[var(--color-stroke-subtle)] rounded-lg px-3 py-2 text-sm outline-none w-full box-border"
+                />
+              </div>
+              <div className="flex flex-col gap-1">
+                <label className="text-sm text-[var(--color-text-heading)]">
+                  Property Type
+                </label>
+                <select
+                  value={formData.propertyType}
+                  onChange={(e) => updateForm({ propertyType: e.target.value })}
+                  className="border border-[var(--color-stroke-subtle)] rounded-lg px-3 py-2 text-sm outline-none bg-[var(--color-bg-primary)] w-full box-border"
+                >
+                  <option value="">Select a type</option>
+                  {PROPERTY_TYPES.map((t) => (
+                    <option key={t} value={t}>
+                      {t}
+                    </option>
+                  ))}
+                </select>
+              </div>
+            </div>
+
+            {/* Actions */}
+            <div className="flex flex-col gap-3 items-center w-full">
+              <button
+                onClick={onNext}
+                disabled={!isValid}
+                className={`w-full h-14 rounded-[0.875rem] text-[var(--color-bg-primary)] border-none text-base ${
+                  isValid
+                    ? "bg-[var(--color-primary)] cursor-pointer"
+                    : "bg-[var(--color-primary-hover)] cursor-not-allowed"
+                }`}
+              >
+                Continue
+              </button>
+              <button
+                onClick={onBack}
+                className="text-sm text-[var(--color-text-muted)] bg-transparent border-none"
+              >
+                ‹ Back
+              </button>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+}
diff --git a/clients/web/src/components/onboarding/RoleCard.tsx b/clients/web/src/components/onboarding/RoleCard.tsx
new file mode 100644
index 000000000..e76bba2cf
--- /dev/null
+++ b/clients/web/src/components/onboarding/RoleCard.tsx
@@ -0,0 +1,28 @@
+type RoleCardProps = {
+  label: string;
+  description: string;
+  selected: boolean;
+  onSelect: () => void;
+};
+
+export function RoleCard({
+  label,
+  description,
+  selected,
+  onSelect,
+}: RoleCardProps) {
+  return (
+    <button
+      onClick={onSelect}
+      className={`p-4 rounded-xl border-2 text-left transition-colors w-full bg-bg-primary
+        ${selected ? "border-primary" : "border-stroke-subtle hover:border-stroke-default"}`}
+    >
+      <p className="text-[clamp(0.75rem,1.2vw,1rem)] font-medium text-text-default m-0">
+        {label}
+      </p>
+      <p className="text-[clamp(0.625rem,1vw,0.875rem)] text-text-subtle mt-1 m-0">
+        {description}
+      </p>
+    </button>
+  );
+}
diff --git a/clients/web/src/components/onboarding/RoleSelectionStep.tsx b/clients/web/src/components/onboarding/RoleSelectionStep.tsx
new file mode 100644
index 000000000..59ff511de
--- /dev/null
+++ b/clients/web/src/components/onboarding/RoleSelectionStep.tsx
@@ -0,0 +1,62 @@
+import { LeftPanel } from "./LeftPanel";
+import { RoleCard } from "./RoleCard";
+import type { OnboardingFormData } from "./types";
+
+type RoleSelectionStepProps = {
+  formData: OnboardingFormData;
+  updateForm: (updates: Partial<OnboardingFormData>) => void;
+  onNext: (role: string) => void;
+};
+
+const ROLES = [
+  {
+    id: "manager",
+    label: "Manager",
+    description: "Lorem ipsum dolor sit amet, consectetur adipiscing elit.",
+  },
+  {
+    id: "employee",
+    label: "Employee",
+    description: "Lorem ipsum dolor sit amet, consectetur adipiscing elit.",
+  },
+];
+
+export function RoleSelectionStep({
+  formData,
+  onNext,
+}: RoleSelectionStepProps) {
+  return (
+    <div className="flex w-screen h-screen">
+      <LeftPanel />
+      <div className="flex-1 flex justify-center items-start pt-[clamp(5rem,19.45vh,11.9375rem)] px-[clamp(2.5rem,9.6vw,8.25rem)] overflow-hidden">
+        <div className="w-full max-w-[40.1875rem] h-[clamp(25rem,50.1vh,30.75rem)] overflow-hidden border border-text-default rounded-[1.5rem] bg-bg-primary flex flex-col items-center py-[clamp(1.5rem,4.9vh,3rem)] px-[2.375rem] gap-4 box-border">
+          {/* Logo */}
+          <div className="w-20 h-20 border border-text-default rounded-lg bg-bg-primary shrink-0" />
+
+          {/* Title */}
+          <span className="font-normal text-[clamp(1.25rem,2.5vw,1.5rem)] leading-8 text-text-heading text-center">
+            Role
+          </span>
+
+          {/* Subtitle */}
+          <span className="font-normal text-[clamp(0.8125rem,1.6vw,1rem)] leading-6 text-text-muted text-center -mt-2">
+            Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+          </span>
+
+          {/* Role cards grid */}
+          <div className="grid grid-cols-2 gap-4 w-full flex-1">
+            {ROLES.map((role) => (
+              <RoleCard
+                key={role.id}
+                label={role.label}
+                description={role.description}
+                selected={formData.role === role.id}
+                onSelect={() => onNext(role.id)}
+              />
+            ))}
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+}
diff --git a/clients/web/src/components/onboarding/WelcomeStep.tsx b/clients/web/src/components/onboarding/WelcomeStep.tsx
new file mode 100644
index 000000000..402092780
--- /dev/null
+++ b/clients/web/src/components/onboarding/WelcomeStep.tsx
@@ -0,0 +1,35 @@
+import { LeftPanel } from "./LeftPanel";
+
+type WelcomeStepProps = {
+  onNext: () => void;
+};
+
+export function WelcomeStep({ onNext }: WelcomeStepProps) {
+  return (
+    <div className="flex w-screen h-screen">
+      <LeftPanel />
+      <div className="flex-1 flex justify-center items-start pt-[clamp(5rem,19.45vh,11.9375rem)] px-[clamp(2.5rem,9.6vw,8.25rem)] overflow-hidden">
+        <div className="w-full max-w-[38.5625rem] h-[clamp(31.25rem,70.37vh,43.1875rem)] border border-text-default rounded-[1.5rem] bg-bg-primary flex flex-col items-center pt-[clamp(5rem,21.79vh,13.375rem)] pb-12 px-12 box-border gap-[clamp(1rem,6.21vh,3.8125rem)]">
+          {/* Logo */}
+          <div className="w-20 h-20 border border-text-default rounded-lg bg-bg-primary shrink-0" />
+
+          {/* Welcome + Button */}
+          <div className="w-[72.45%] flex flex-col items-center gap-4">
+            <h1 className="font-normal text-[clamp(1.375rem,2.5vw,1.875rem)] leading-[1.2] tracking-[-0.021875rem] text-center m-0">
+              Welcome
+            </h1>
+            <button
+              onClick={() => {
+                console.log("Start clicked");
+                onNext();
+              }}
+              className="w-full h-14 rounded-[0.875rem] bg-primary text-bg-primary border-none text-base"
+            >
+              Start ›
+            </button>
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+}
diff --git a/clients/web/src/components/onboarding/onboardingMocks.ts b/clients/web/src/components/onboarding/onboardingMocks.ts
new file mode 100644
index 000000000..f25b35696
--- /dev/null
+++ b/clients/web/src/components/onboarding/onboardingMocks.ts
@@ -0,0 +1,30 @@
+export const ROLES = [
+  {
+    id: "manager",
+    label: "Manager",
+    description: "Oversees operations and staff.",
+  },
+  {
+    id: "front_desk",
+    label: "Front Desk",
+    description: "Handles guest check-ins and requests.",
+  },
+  {
+    id: "housekeeping",
+    label: "Housekeeping",
+    description: "Manages room cleaning and maintenance.",
+  },
+  {
+    id: "maintenance",
+    label: "Maintenance",
+    description: "Handles repairs and facilities.",
+  },
+];
+
+export const PROPERTY_TYPES = [
+  "Hotel",
+  "Motel",
+  "Resort",
+  "Bed & Breakfast",
+  "Hostel",
+];
diff --git a/clients/web/src/components/onboarding/types.ts b/clients/web/src/components/onboarding/types.ts
new file mode 100644
index 000000000..57b09b223
--- /dev/null
+++ b/clients/web/src/components/onboarding/types.ts
@@ -0,0 +1,8 @@
+export interface OnboardingFormData {
+  role: string | null;
+  employeeRole: string | null;
+  hotelName: string;
+  numberOfRooms: string;
+  propertyType: string;
+  inviteEmail: string;
+}
diff --git a/clients/web/src/components/profile/NotesFromManagerCard.tsx b/clients/web/src/components/profile/NotesFromManagerCard.tsx
new file mode 100644
index 000000000..1cf9d22a7
--- /dev/null
+++ b/clients/web/src/components/profile/NotesFromManagerCard.tsx
@@ -0,0 +1,9 @@
+export function NotesFromManagerCard() {
+  return (
+    <section className="h-full rounded-lg border border-stroke-subtle bg-white p-6">
+      <h2 className="text-sm font-medium text-text-default">
+        Notes from Manager
+      </h2>
+    </section>
+  );
+}
diff --git a/clients/web/src/components/profile/PhoneNumberInput.tsx b/clients/web/src/components/profile/PhoneNumberInput.tsx
new file mode 100644
index 000000000..9348c5e64
--- /dev/null
+++ b/clients/web/src/components/profile/PhoneNumberInput.tsx
@@ -0,0 +1,41 @@
+export type PhoneNumberInputProps = {
+  value: string;
+  onChange: (value: string) => void;
+  onKeyDown?: React.KeyboardEventHandler<HTMLInputElement>;
+};
+
+export function formatPhoneNumber(raw: string): string {
+  const digits = raw.replace(/\D/g, "").slice(0, 10);
+  if (digits.length <= 3) return digits;
+  if (digits.length <= 6) return `(${digits.slice(0, 3)}) ${digits.slice(3)}`;
+  return `(${digits.slice(0, 3)}) ${digits.slice(3, 6)}-${digits.slice(6)}`;
+}
+
+function unformatPhoneNumber(formatted: string): string {
+  return formatted.replace(/\D/g, "");
+}
+
+export function PhoneNumberInput({
+  value,
+  onChange,
+  onKeyDown,
+}: PhoneNumberInputProps) {
+  const formatted = formatPhoneNumber(unformatPhoneNumber(value));
+
+  const handleChange: React.ChangeEventHandler<HTMLInputElement> = (e) => {
+    const digits = unformatPhoneNumber(e.target.value);
+    onChange(digits);
+  };
+
+  return (
+    <input
+      autoFocus
+      type="tel"
+      value={formatted}
+      onChange={handleChange}
+      onKeyDown={onKeyDown}
+      placeholder="(555) 555-5555"
+      className="text-sm text-text-subtle border-b pb-0.5 border-stroke-default bg-transparent outline-none"
+    />
+  );
+}
diff --git a/clients/web/src/components/profile/ProfileHero.tsx b/clients/web/src/components/profile/ProfileHero.tsx
new file mode 100644
index 000000000..fba426082
--- /dev/null
+++ b/clients/web/src/components/profile/ProfileHero.tsx
@@ -0,0 +1,114 @@
+import { useRef } from "react";
+import { Camera, Loader2 } from "lucide-react";
+
+import { Skeleton } from "@/components/ui/skeleton";
+import { cn, hashNameToColor } from "@/lib/utils";
+
+type ProfileHeroProps = {
+  firstName: string;
+  lastName: string;
+  avatarUrl: string | undefined;
+  onPickFile?: (file: File) => void;
+  isUploading?: boolean;
+};
+
+export function ProfileHero({
+  firstName,
+  lastName,
+  avatarUrl,
+  onPickFile,
+  isUploading = false,
+}: ProfileHeroProps) {
+  const displayName = [firstName, lastName].filter(Boolean).join(" ") || "User";
+  const fileInputRef = useRef<HTMLInputElement>(null);
+  const isInteractive = !!onPickFile;
+
+  return (
+    <div className="flex items-center gap-11 mb-6 pl-4">
+      <div
+        className={cn(
+          "group relative size-30 overflow-hidden rounded-full",
+          isInteractive ? "cursor-pointer" : "",
+        )}
+        onClick={() => {
+          if (isInteractive) {
+            fileInputRef.current?.click();
+          }
+        }}
+      >
+        {avatarUrl ? (
+          <img
+            src={avatarUrl}
+            alt={displayName}
+            className="size-full object-cover"
+          />
+        ) : (
+          <div
+            className={cn(
+              "flex size-full items-center justify-center",
+              hashNameToColor(displayName),
+            )}
+          >
+            <span className="text-[40px] font-semibold">
+              {displayName.charAt(0)}
+            </span>
+          </div>
+        )}
+
+        {isInteractive && (
+          <div
+            className={cn(
+              "absolute inset-0 flex items-center justify-center bg-black/40 transition-opacity",
+              isUploading ? "opacity-100" : "opacity-0 group-hover:opacity-100",
+            )}
+          >
+            {isUploading ? (
+              <Loader2 className="size-6 animate-spin text-white" />
+            ) : (
+              <Camera className="size-6 text-white" />
+            )}
+          </div>
+        )}
+
+        {isInteractive && (
+          <input
+            ref={fileInputRef}
+            type="file"
+            accept="image/jpeg,image/png,image/webp"
+            className="hidden"
+            onChange={(event) => {
+              const file = event.target.files?.[0];
+              if (file) {
+                onPickFile(file);
+              }
+              event.target.value = "";
+            }}
+          />
+        )}
+      </div>
+
+      <div>
+        <h2 className="text-[40px] font-bold text-text-default leading-none">
+          {firstName}
+        </h2>
+        <h2 className="text-[40px] font-bold text-text-default leading-none">
+          {lastName}
+        </h2>
+        <p className="pt-1 text-base font-bold text-primary">Hotel Chain</p>
+      </div>
+    </div>
+  );
+}
+
+export function ProfileHeroSkeleton() {
+  return (
+    <div className="flex items-center gap-11 mb-6 pl-4">
+      <Skeleton className="size-30 rounded-full" />
+      <div className="flex flex-col gap-2">
+        <Skeleton className="h-10 w-48" />
+        <Skeleton className="h-10 w-36" />
+        <Skeleton className="h-4 w-24 mt-1" />
+      </div>
+    </div>
+  );
+}
diff --git a/clients/web/src/components/profile/ProfileInfoCard.tsx b/clients/web/src/components/profile/ProfileInfoCard.tsx
new file mode 100644
index 000000000..96b73ea9b
--- /dev/null
+++ b/clients/web/src/components/profile/ProfileInfoCard.tsx
@@ -0,0 +1,159 @@
+import { useState } from "react";
+import { Check, Pencil, X } from "lucide-react";
+import { useMutation, useQueryClient } from "@tanstack/react-query";
+import { useCustomInstance } from "@shared";
+import { PhoneNumberInput, formatPhoneNumber } from "./PhoneNumberInput";
+import type { User } from "@shared";
+import { Skeleton } from "@/components/ui/skeleton";
+
+function DetailRow({ label, value }: { label: string; value: string }) {
+  return (
+    <div className="group grid grid-cols-[40%_1fr_auto] items-center py-3">
+      <p className="text-sm font-medium text-text-default">{label}</p>
+      <p className="text-sm text-text-subtle">{value}</p>
+      <div className="w-8" />
+    </div>
+  );
+}
+
+function PhoneNumberDetailRow({
+  label,
+  value,
+  onSave,
+}: {
+  label: string;
+  value: string;
+  onSave: (value: string) => void;
+}) {
+  const [isEditing, setIsEditing] = useState(false);
+  const [draft, setDraft] = useState(value);
+
+  const handleSave = () => {
+    onSave(draft);
+    setIsEditing(false);
+  };
+
+  const handleCancel = () => {
+    setDraft(value);
+    setIsEditing(false);
+  };
+
+  if (isEditing) {
+    return (
+      <div className="grid grid-cols-[40%_1fr_auto] items-center py-3 gap-2">
+        <p className="text-sm font-medium text-text-default">{label}</p>
+        <PhoneNumberInput
+          value={draft}
+          onChange={setDraft}
+          onKeyDown={(e) => {
+            if (e.key === "Enter") handleSave();
+            if (e.key === "Escape") handleCancel();
+          }}
+        />
+        <div className="flex gap-1">
+          <button
+            type="button"
+            onClick={handleSave}
+            className="flex items-center justify-center rounded-md p-1 hover:bg-bg-selected cursor-pointer"
+          >
+            <Check className="size-4 text-primary" />
+          </button>
+          <button
+            type="button"
+            onClick={handleCancel}
+            className="flex items-center justify-center rounded-md p-1 hover:bg-bg-selected cursor-pointer"
+          >
+            <X className="size-4 text-text-subtle" />
+          </button>
+        </div>
+      </div>
+    );
+  }
+
+  return (
+    <div className="group grid grid-cols-[40%_1fr_auto] items-center py-3">
+      <p className="text-sm font-medium text-text-default">{label}</p>
+      <p className="text-sm text-text-subtle">{value}</p>
+      <button
+        type="button"
+        onClick={() => setIsEditing(true)}
+        className="flex items-center justify-center rounded-md p-1 opacity-0 group-hover:opacity-100 transition-opacity hover:bg-bg-selected cursor-pointer"
+      >
+        <Pencil className="size-4 text-text-subtle" />
+      </button>
+    </div>
+  );
+}
+
+type ProfileInfoCardProps = {
+  userId: string;
+  governmentName: string;
+  email: string;
+  phoneNumber: string;
+  department: string;
+};
+
+export function ProfileInfoCard({
+  userId,
+  governmentName,
+  email,
+  phoneNumber,
+  department,
+}: ProfileInfoCardProps) {
+  const queryClient = useQueryClient();
+  const request = useCustomInstance<User>();
+
+  const { mutate: updateUser } = useMutation({
+    mutationFn: (phone_number: string) =>
+      request({
+        url: `/users/${userId}`,
+        method: "PUT",
+        data: { phone_number },
+      }),
+    onMutate: async (phone_number) => {
+      await queryClient.cancelQueries({ queryKey: ["user", userId] });
+      const previous = queryClient.getQueryData<User>(["user", userId]);
+      queryClient.setQueryData<User>(["user", userId], (old) => ({
+        ...old,
+        phone_number,
+      }));
+      return { previous };
+    },
+    onError: (_err, _vars, context) => {
+      queryClient.setQueryData(["user", userId], context?.previous);
+    },
+    onSettled: () => {
+      queryClient.invalidateQueries({ queryKey: ["user", userId] });
+    },
+  });
+
+  return (
+    <section className="rounded-lg border border-stroke-subtle bg-white p-6">
+      <div className="divide-y divide-stroke-subtle">
+        <DetailRow label="Government Name" value={governmentName} />
+        <DetailRow label="Email" value={email} />
+        <PhoneNumberDetailRow
+          label="Phone Number"
+          value={formatPhoneNumber(phoneNumber)}
+          onSave={(val) => updateUser(val)}
+        />
+        <DetailRow label="Department" value={department} />
+      </div>
+    </section>
+  );
+}
+
+export function ProfileInfoCardSkeleton() {
+  return (
+    <section className="h-56 rounded-lg border border-stroke-subtle bg-white p-6">
+      <div className="divide-y divide-stroke-subtle">
+        {Array.from({ length: 4 }).map((_, i) => (
+          <div key={i} className="grid grid-cols-[40%_1fr] items-center py-3">
+            <Skeleton className="h-4 w-28" />
+            <Skeleton className="h-4 w-36" />
+          </div>
+        ))}
+      </div>
+    </section>
+  );
+}
diff --git a/clients/web/src/components/requests/ActivityFeed.tsx b/clients/web/src/components/requests/ActivityFeed.tsx
new file mode 100644
index 000000000..dd89b8f3e
--- /dev/null
+++ b/clients/web/src/components/requests/ActivityFeed.tsx
@@ -0,0 +1,304 @@
+import { useEffect, useRef } from "react";
+import { useGetDepartments, useGetRequestActivity, useGetUser } from "@shared";
+import type { RequestActivityItem } from "@shared";
+import { useRoomById } from "@/hooks/use-room-by-id";
+import {
+  cn,
+  formatFullDate,
+  formatTimeAgo,
+  getInitials,
+  hashNameToColor,
+} from "@/lib/utils";
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipProvider,
+  TooltipTrigger,
+} from "@/components/ui/tooltip";
+import { PriorityTag } from "@/components/ui/PriorityTag";
+
+function Pill({
+  children,
+  className,
+}: {
+  children: React.ReactNode;
+  className: string;
+}) {
+  return (
+    <span
+      className={cn(
+        "inline-flex items-center rounded px-1.5 py-0.5 text-xs font-medium",
+        className,
+      )}
+    >
+      {children}
+    </span>
+  );
+}
+
+const STATUS_PILL: Record<string, string> = {
+  pending: "bg-request-pending-secondary text-request-pending",
+  "in progress": "bg-request-assigned-secondary text-request-assigned",
+  completed: "bg-request-completed-secondary text-request-completed",
+  archived: "bg-bg-disabled text-text-subtle",
+};
+
+function StatusPill({ value }: { value: string }) {
+  return (
+    <Pill className={STATUS_PILL[value] ?? "bg-bg-container text-text-default"}>
+      {capitalize(value)}
+    </Pill>
+  );
+}
+
+function buildDescription(
+  item: RequestActivityItem,
+  actorName: string,
+  targetName: string | undefined,
+): React.ReactNode {
+  const actor = <strong>{actorName}</strong>;
+
+  switch (item.type) {
+    case "created":
+      return <>{actor} created this request</>;
+    case "status_changed":
+      return <>{actor} changed status</>;
+    case "priority_changed":
+      return <>{actor} changed priority</>;
+    case "assigned":
+      return (
+        <>
+          {actor} assigned to <strong>{targetName ?? "someone"}</strong>
+        </>
+      );
+    case "unassigned":
+      return <>{actor} removed assignee</>;
+    case "name_changed":
+    case "title_changed":
+      return <>{actor} renamed request</>;
+    case "description_changed":
+      return <>{actor} updated the description</>;
+    case "department_changed":
+      return <>{actor} changed department</>;
+    case "room_changed":
+      return <>{actor} changed room</>;
+    default:
+      return <>{actor} updated request</>;
+  }
+}
+
+function EmptyPill() {
+  return <Pill className="bg-bg-container text-text-subtle italic">Empty</Pill>;
+}
+
+function buildDetail(
+  item: RequestActivityItem,
+  deptById: Record<string, string>,
+): React.ReactNode | null {
+  if (item.old_value && item.new_value) {
+    if (item.type === "status_changed") {
+      return (
+        <>
+          <StatusPill value={item.old_value} />
+          <span className="text-text-subtle">to</span>
+          <StatusPill value={item.new_value} />
+        </>
+      );
+    }
+    if (item.type === "priority_changed") {
+      return (
+        <>
+          <PriorityTag priority={item.old_value} />
+          <span className="text-text-subtle">to</span>
+          <PriorityTag priority={item.new_value} />
+        </>
+      );
+    }
+    if (item.type === "name_changed" || item.type === "title_changed") {
+      return (
+        <Pill className="bg-bg-container text-text-default">
+          {item.new_value}
+        </Pill>
+      );
+    }
+  }
+  if (item.type === "department_changed" && item.new_value) {
+    const oldName = item.old_value
+      ? (deptById[item.old_value] ?? item.old_value)
+      : null;
+    const newName = deptById[item.new_value] ?? item.new_value;
+    return (
+      <>
+        {oldName ? (
+          <Pill className="bg-bg-container text-text-default">{oldName}</Pill>
+        ) : (
+          <EmptyPill />
+        )}
+        <span className="text-text-subtle">to</span>
+        <Pill className="bg-bg-container text-text-default">{newName}</Pill>
+      </>
+    );
+  }
+  return null;
+}
+
+function RoomChangedDetail({ oldId, newId }: { oldId: string; newId: string }) {
+  const { data: oldRoom } = useRoomById(oldId || undefined);
+  const { data: newRoom } = useRoomById(newId || undefined);
+  const newLabel =
+    newRoom?.room_number != null ? String(newRoom.room_number) : newId;
+  return (
+    <>
+      {oldId ? (
+        <Pill className="bg-bg-container text-text-default">
+          {oldRoom?.room_number != null ? String(oldRoom.room_number) : oldId}
+        </Pill>
+      ) : (
+        <EmptyPill />
+      )}
+      <span className="text-text-subtle">to</span>
+      <Pill className="bg-bg-container text-text-default">Room {newLabel}</Pill>
+    </>
+  );
+}
+
+function capitalize(s: string): string {
+  return s.charAt(0).toUpperCase() + s.slice(1);
+}
+
+type ActivityRowProps = {
+  item: RequestActivityItem;
+  isLast: boolean;
+  deptById: Record<string, string>;
+};
+
+function ActivityRow({ item, isLast, deptById }: ActivityRowProps) {
+  const { data: actor } = useGetUser(item.changed_by ?? undefined);
+  const { data: target } = useGetUser(
+    item.type === "assigned" && item.new_value ? item.new_value : undefined,
+  );
+
+  const actorName = actor
+    ? [actor.first_name, actor.last_name].filter(Boolean).join(" ")
+    : "Member";
+  const targetName = target?.first_name;
+  const detail =
+    item.type === "room_changed" &&
+    item.old_value != null &&
+    item.new_value != null ? (
+      <RoomChangedDetail oldId={item.old_value} newId={item.new_value} />
+    ) : (
+      buildDetail(item, deptById)
+    );
+
+  return (
+    <div className={cn("flex gap-4", !isLast && "mb-2")}>
+      {/* Avatar + timeline line */}
+      <div className="flex flex-col items-center">
+        {actor?.profile_picture ? (
+          <img
+            src={actor.profile_picture}
+            alt={actorName}
+            className="size-8 shrink-0 rounded-full object-cover"
+          />
+        ) : (
+          <div
+            className={cn(
+              "flex size-8 shrink-0 items-center justify-center rounded-full text-xs font-semibold",
+              hashNameToColor(actorName),
+            )}
+          >
+            {getInitials(actorName)}
+          </div>
+        )}
+        {!isLast && <div className="mt-2 w-px flex-1 bg-stroke-disabled" />}
+      </div>
+
+      {/* Content */}
+      <div
+        className={cn(
+          "flex min-w-0 flex-1 items-start justify-between gap-4",
+          !isLast && "pb-7",
+        )}
+      >
+        <div className="flex flex-col gap-1">
+          <div className="flex min-h-8 items-center">
+            <p className="text-sm text-text-default">
+              {buildDescription(item, actorName, targetName)}
+            </p>
+          </div>
+          {detail && (
+            <div className="flex items-center gap-1.5 text-xs">{detail}</div>
+          )}
+        </div>
+        <TooltipProvider>
+          <Tooltip>
+            <TooltipTrigger asChild>
+              <span className="shrink-0 text-xs text-text-subtle cursor-default pt-0.5">
+                {formatTimeAgo(item.timestamp)}
+              </span>
+            </TooltipTrigger>
+            <TooltipContent>{formatFullDate(item.timestamp)}</TooltipContent>
+          </Tooltip>
+        </TooltipProvider>
+      </div>
+    </div>
+  );
+}
+
+type ActivityFeedProps = {
+  requestId: string;
+  hotelId: string | undefined;
+};
+
+export function ActivityFeed({ requestId, hotelId }: ActivityFeedProps) {
+  const { data, fetchNextPage, hasNextPage, isFetchingNextPage, isPending } =
+    useGetRequestActivity(requestId);
+  const { data: departments } = useGetDepartments(hotelId);
+  const deptById: Record<string, string> = {};
+  for (const d of departments ?? []) {
+    deptById[d.id] = d.name;
+  }
+
+  const sentinelRef = useRef<HTMLDivElement>(null);
+
+  useEffect(() => {
+    const el = sentinelRef.current;
+    if (!el || !hasNextPage || isFetchingNextPage) return;
+    const observer = new IntersectionObserver(
+      ([entry]) => {
+        if (entry.isIntersecting) fetchNextPage();
+      },
+      { threshold: 0.1 },
+    );
+    observer.observe(el);
+    return () => observer.disconnect();
+  }, [fetchNextPage, hasNextPage, isFetchingNextPage]);
+
+  const items = data?.pages.flatMap((p) => p.items) ?? [];
+
+  if (isPending) {
+    return <p className="text-sm text-text-subtle py-2">Loading...</p>;
+  }
+
+  if (items.length === 0) {
+    return <p className="text-sm text-text-subtle py-2">No activity yet.</p>;
+  }
+
+  return (
+    <div className="pl-3">
+      {items.map((item, i) => (
+        <ActivityRow
+          key={`${item.type}-${item.timestamp}-${i}`}
+          item={item}
+          isLast={i === items.length - 1 && !hasNextPage}
+          deptById={deptById}
+        />
+      ))}
+      {isFetchingNextPage && (
+        <p className="text-xs text-text-subtle pl-10">Loading more...</p>
+      )}
+      <div ref={sentinelRef} className="h-1 shrink-0" />
+    </div>
+  );
+}
diff --git a/clients/web/src/components/requests/GeneratedRequestDrawer.tsx b/clients/web/src/components/requests/GeneratedRequestDrawer.tsx
new file mode 100644
index 000000000..7ad53c99d
--- /dev/null
+++ b/clients/web/src/components/requests/GeneratedRequestDrawer.tsx
@@ -0,0 +1,46 @@
+import type { Request } from "@shared";
+import { DrawerShell } from "@/components/ui/DrawerShell";
+
+type GeneratedRequestDrawerProps = {
+  request: Request | null;
+  onClose: () => void;
+};
+
+function Field({ label, value }: { label: string; value?: string | number }) {
+  return (
+    <div className="flex flex-col gap-2">
+      <span className="text-xs text-text-default uppercase tracking-wide">
+        {label}
+      </span>
+      <span className="text-sm text-text-default">{value ?? "—"}</span>
+    </div>
+  );
+}
+
+export function GeneratedRequestDrawer({
+  request,
+  onClose,
+}: GeneratedRequestDrawerProps) {
+  if (!request) return null;
+
+  return (
+    <DrawerShell title={request.name ?? "Generated Request"} onClose={onClose}>
+      <Field label="Room ID" value={request.room_id} />
+      <Field label="Status" value={request.status} />
+      <Field label="Priority" value={request.priority} />
+      <Field label="Type" value={request.request_type} />
+      <Field label="Category" value={request.request_category} />
+      <Field label="Department" value={request.department} />
+      <Field label="Description" value={request.description} />
+      <Field label="Notes" value={request.notes} />
+      <Field
+        label="Estimated Completion"
+        value={
+          request.estimated_completion_time
+            ? `${request.estimated_completion_time} min`
+            : undefined
+        }
+      />
+    </DrawerShell>
+  );
+}
diff --git a/clients/web/src/components/requests/KanbanColumn.tsx b/clients/web/src/components/requests/KanbanColumn.tsx
index 585c4043b..299e2c988 100644
--- a/clients/web/src/components/requests/KanbanColumn.tsx
+++ b/clients/web/src/components/requests/KanbanColumn.tsx
@@ -1,17 +1,34 @@
-import { ChefHat, MoreHorizontal, Plus } from "lucide-react";
+import { useDroppable } from "@dnd-kit/core";
+import { Building2, MoreHorizontal, Plus } from "lucide-react";
 import type { ReactNode } from "react";
+import { cn } from "@/lib/utils";
 
 type KanbanColumnProps = {
   title: string;
   children: ReactNode;
+  droppableId: string;
+  onCreateRequest?: () => void;
 };
 
-export function KanbanColumn({ title, children }: KanbanColumnProps) {
+export function KanbanColumn({
+  title,
+  children,
+  droppableId,
+  onCreateRequest,
+}: KanbanColumnProps) {
+  const { setNodeRef, isOver } = useDroppable({ id: droppableId });
+
   return (
-    <div className="flex flex-col gap-3 rounded-t-2xl border border-b-0 border-stroke-subtle bg-white p-4 h-full">
+    <div
+      ref={setNodeRef}
+      className={cn(
+        "flex flex-col gap-3 rounded-t-2xl border border-b-0 border-stroke-subtle bg-white p-4 h-full min-w-[22rem] transition-colors duration-150",
+        isOver && "bg-bg-selected",
+      )}
+    >
       <div className="flex items-center justify-between">
         <div className="flex items-center gap-2">
-          <ChefHat className="size-5 text-text-default" />
+          <Building2 className="size-5 text-text-default" />
           <span className="text-base font-semibold text-text-default">
             {title}
           </span>
@@ -19,6 +36,7 @@ export function KanbanColumn({ title, children }: KanbanColumnProps) {
         <div className="flex items-center gap-2">
           <button
             type="button"
+            onClick={onCreateRequest}
             className="text-text-subtle hover:text-text-default transition-colors"
           >
             <Plus className="size-4" />
@@ -31,8 +49,8 @@ export function KanbanColumn({ title, children }: KanbanColumnProps) {
           </button>
         </div>
       </div>
-      <div className="flex flex-col gap-3 overflow-y-auto flex-1">
-        {children}
+      <div className="overflow-y-auto flex-1 min-h-0 pb-24">
+        <div className="flex flex-col gap-3">{children}</div>
       </div>
     </div>
   );
diff --git a/clients/web/src/components/requests/RequestCard.tsx b/clients/web/src/components/requests/RequestCard.tsx
index 82b995fd8..6aed72b8d 100644
--- a/clients/web/src/components/requests/RequestCard.tsx
+++ b/clients/web/src/components/requests/RequestCard.tsx
@@ -1,24 +1,33 @@
 import type { ReactNode } from "react";
+import type { RequestStatus } from "@shared";
 import { cn } from "@/lib/utils";
 
-export type RequestStatus = "pending" | "completed";
-
 type RequestCardProps = {
   status: RequestStatus;
   children: ReactNode;
   className?: string;
+  onClick?: () => void;
 };
 
 const accentClass: Record<RequestStatus, string> = {
   pending: "bg-request-pending",
+  "in progress": "bg-request-assigned",
   completed: "bg-request-completed",
+  archived: "bg-bg-disabled",
 };
 
-export function RequestCard({ status, children, className }: RequestCardProps) {
+export function RequestCard({
+  status,
+  children,
+  className,
+  onClick,
+}: RequestCardProps) {
   return (
     <div
+      onClick={onClick}
       className={cn(
-        "relative flex flex-col rounded-xl border border-stroke-disabled bg-white pt-3 pb-4 pl-4 shadow-sm overflow-hidden",
+        "relative flex flex-col rounded-xl border border-stroke-disabled bg-white pt-3 pb-4 pl-4 pr-4 shadow-sm overflow-hidden",
+        onClick && "cursor-pointer",
         className,
       )}
     >
diff --git a/clients/web/src/components/requests/RequestCardItem.tsx b/clients/web/src/components/requests/RequestCardItem.tsx
index c5de21246..5f06cd1cc 100644
--- a/clients/web/src/components/requests/RequestCardItem.tsx
+++ b/clients/web/src/components/requests/RequestCardItem.tsx
@@ -1,51 +1,176 @@
-import { Home, MapPin } from "lucide-react";
-import type { RequestStatus } from "@/components/requests/RequestCard";
+import { Home, MapPin, Trash2 } from "lucide-react";
+import confetti from "canvas-confetti";
+import { useQuery } from "@tanstack/react-query";
+import {
+  useCompleteTask,
+  useDeleteTask,
+  useGetUsersIdHook,
+  useMarkTaskPending,
+} from "@shared";
+import { useDraggable } from "@dnd-kit/core";
+import { TaskStatusToggle } from "./TaskStatusToggle";
+import type { RequestFeedItem } from "@shared";
 import { RequestCard } from "@/components/requests/RequestCard";
 import { RequestCardTimestamp } from "@/components/requests/RequestCardTimestamp";
+import {
+  ContextMenu,
+  ContextMenuContent,
+  ContextMenuItem,
+  ContextMenuTrigger,
+} from "@/components/ui/context-menu";
+import { cn } from "@/lib/utils";
+
+export function formatRequestTime(isoString?: string): string {
+  if (!isoString) return "";
+  const date = new Date(isoString);
+  const today = new Date();
+  const timeStr = date.toLocaleTimeString("en-US", {
+    hour: "numeric",
+    minute: "2-digit",
+  });
+  if (date.toDateString() === today.toDateString()) {
+    return `Today, ${timeStr}`;
+  }
+  return (
+    date.toLocaleDateString("en-US", { month: "short", day: "numeric" }) +
+    `, ${timeStr}`
+  );
+}
 
 type RequestCardItemProps = {
-  status: RequestStatus;
-  time: string;
-  title: string;
-  assignees: Array<string>;
-  location: string;
-  department: string;
+  onClick?: () => void;
+  request: RequestFeedItem;
 };
 
-export function RequestCardItem({
-  status,
-  time,
-  title,
-  assignees,
-  location,
-  department,
-}: RequestCardItemProps) {
+export function RequestCardItem({ request, onClick }: RequestCardItemProps) {
+  const status = request.status;
+
+  const { attributes, listeners, setNodeRef, isDragging } = useDraggable({
+    id: request.id,
+    data: { request },
+  });
+
+  const getUserById = useGetUsersIdHook();
+  const { data: assignee } = useQuery({
+    queryKey: ["user", request.user_id],
+    queryFn: () => getUserById(request.user_id!),
+    enabled: !!request.user_id,
+  });
+
+  const { mutate: deleteTask } = useDeleteTask();
+  const { mutate: completeTask, isPending: isCompleting } = useCompleteTask();
+  const { mutate: markTaskPending, isPending: isMarkingPending } =
+    useMarkTaskPending();
+
+  const assigneeName = assignee
+    ? `${assignee.first_name ?? ""} ${assignee.last_name ?? ""}`.trim()
+    : null;
+
+  const roomLabel =
+    request.room_number != null
+      ? request.floor != null
+        ? `Floor ${request.floor}, Room ${request.room_number}`
+        : `Room ${request.room_number}`
+      : null;
+
+  const tags = [assigneeName].filter(Boolean) as Array<string>;
+  const hasBottomRow = roomLabel || request.department_name;
+
+  const launchGreenConfetti = (target: HTMLElement) => {
+    const rect = target.getBoundingClientRect();
+    confetti({
+      particleCount: 70,
+      spread: 70,
+      origin: {
+        x: (rect.left + rect.width / 2) / window.innerWidth,
+        y: (rect.top + rect.height / 2) / window.innerHeight,
+      },
+      colors: ["#22c55e", "#16a34a", "#86efac"],
+    });
+  };
+
   return (
-    <RequestCard status={status} className="w-81.25">
-      <RequestCardTimestamp status={status} time={time} />
-      <span className="text-base font-medium text-text-default pt-3">
-        {title}
-      </span>
-      <div className="flex gap-1 pt-1">
-        {assignees.map((name) => (
-          <span
-            key={name}
-            className="rounded-md bg-stroke-disabled px-2 py-1 text-[11px] text-text-secondary"
+    <ContextMenu>
+      <ContextMenuTrigger asChild>
+        <div
+          ref={setNodeRef}
+          className={cn(
+            "relative touch-none cursor-grab active:cursor-grabbing",
+            isDragging && "opacity-30",
+          )}
+          {...attributes}
+          {...listeners}
+          onPointerDown={(e) => {
+            if (e.button !== 0 || !listeners) return;
+            listeners.onPointerDown(e);
+          }}
+        >
+          <TaskStatusToggle
+            status={request.status}
+            isPending={isCompleting || isMarkingPending}
+            onComplete={() => completeTask(request.id)}
+            onMarkPending={() => markTaskPending(request.id)}
+            onCelebrate={launchGreenConfetti}
+          />
+          <RequestCard
+            status={status}
+            className="w-full"
+            onClick={isDragging ? undefined : onClick}
           >
-            {name}
-          </span>
-        ))}
-      </div>
-      <div className="flex items-center gap-3 text-xs text-text-secondary pt-2">
-        <span className="flex items-center gap-1">
-          <MapPin className="size-4 color-text-secondary" />
-          {location}
-        </span>
-        <span className="flex items-center gap-1">
-          <Home className="size-4 color-text-secondary" />
-          {department}
-        </span>
-      </div>
-    </RequestCard>
+            <RequestCardTimestamp
+              status={status}
+              time={formatRequestTime(request.created_at)}
+            />
+
+            <div className="mt-3 flex flex-col gap-2">
+              <div className="flex flex-col gap-1">
+                <span className="text-base font-medium leading-snug text-text-default">
+                  {request.name}
+                </span>
+
+                {tags.length > 0 && (
+                  <div className="flex flex-wrap gap-1">
+                    {tags.map((tag) => (
+                      <span
+                        key={tag}
+                        className="rounded px-2 py-1 text-[11px] tracking-[-0.11px] text-text-secondary bg-stroke-disabled"
+                      >
+                        {tag}
+                      </span>
+                    ))}
+                  </div>
+                )}
+              </div>
+
+              {hasBottomRow && (
+                <div className="flex items-center gap-3">
+                  {roomLabel && (
+                    <span className="flex items-center gap-1 text-xs text-text-subtle">
+                      <MapPin className="size-3 shrink-0" />
+                      {roomLabel}
+                    </span>
+                  )}
+                  {request.department_name && (
+                    <span className="flex items-center gap-1 text-xs text-text-subtle">
+                      <Home className="size-3 shrink-0" />
+                      {request.department_name}
+                    </span>
+                  )}
+                </div>
+              )}
+            </div>
+          </RequestCard>
+        </div>
+      </ContextMenuTrigger>
+      <ContextMenuContent>
+        <ContextMenuItem
+          variant="destructive"
+          onSelect={() => deleteTask(request.id)}
+        >
+          <Trash2 />
+          Delete
+        </ContextMenuItem>
+      </ContextMenuContent>
+    </ContextMenu>
   );
 }
diff --git a/clients/web/src/components/requests/RequestCardTimestamp.tsx b/clients/web/src/components/requests/RequestCardTimestamp.tsx
index be99dff4d..9f9bc05be 100644
--- a/clients/web/src/components/requests/RequestCardTimestamp.tsx
+++ b/clients/web/src/components/requests/RequestCardTimestamp.tsx
@@ -1,6 +1,6 @@
 import { cva } from "class-variance-authority";
 import { Clock } from "lucide-react";
-import type { RequestStatus } from "@/components/requests/RequestCard";
+import type { RequestStatus } from "@shared";
 import { cn } from "@/lib/utils";
 
 type RequestCardTimestampProps = {
@@ -15,7 +15,9 @@ const timestampVariants = cva(
     variants: {
       status: {
         pending: "bg-request-pending-secondary text-request-pending",
+        "in progress": "bg-request-assigned-secondary text-request-assigned",
         completed: "bg-request-completed-secondary text-request-completed",
+        archived: "bg-bg-disabled text-text-subtle",
       },
     },
     defaultVariants: {
diff --git a/clients/web/src/components/requests/TaskStatusToggle.tsx b/clients/web/src/components/requests/TaskStatusToggle.tsx
new file mode 100644
index 000000000..c56529ced
--- /dev/null
+++ b/clients/web/src/components/requests/TaskStatusToggle.tsx
@@ -0,0 +1,62 @@
+import { Check } from "lucide-react";
+import { RequestStatus } from "@shared";
+import { cn } from "@/lib/utils";
+
+type TaskStatusToggleProps = {
+  status: RequestStatus;
+  isPending?: boolean;
+  onComplete: () => void;
+  onMarkPending: () => void;
+  onCelebrate?: (target: HTMLElement) => void;
+  className?: string;
+};
+
+export function TaskStatusToggle({
+  status,
+  isPending = false,
+  onComplete,
+  onMarkPending,
+  onCelebrate,
+  className,
+}: TaskStatusToggleProps) {
+  const isCompleted = status === RequestStatus.completed;
+
+  return (
+    <button
+      type="button"
+      disabled={isPending}
+      onClick={(e) => {
+        e.stopPropagation();
+
+        if (isCompleted) {
+          onMarkPending();
+          return;
+        }
+
+        onCelebrate?.(e.currentTarget);
+        onComplete();
+      }}
+      onPointerDown={(e) => {
+        e.stopPropagation();
+      }}
+      className={cn(
+        "absolute top-2 right-2 z-10 flex size-4 items-center justify-center rounded-full shadow-sm transition disabled:opacity-50",
+        isCompleted
+          ? "bg-primary text-white hover:bg-primary-hover"
+          : "border border-stroke-subtle bg-transparent text-primary hover:bg-primary-container",
+        className,
+      )}
+      aria-label={
+        isCompleted ? "Mark task as pending" : "Mark task as completed"
+      }
+    >
+      <Check
+        className={cn(
+          "size-2.5 transition-opacity duration-150",
+          isCompleted ? "opacity-100" : "opacity-0",
+        )}
+        strokeWidth={3}
+      />
+    </button>
+  );
+}
diff --git a/clients/web/src/components/requests/ViewRequestDrawer.tsx b/clients/web/src/components/requests/ViewRequestDrawer.tsx
new file mode 100644
index 000000000..80d11af61
--- /dev/null
+++ b/clients/web/src/components/requests/ViewRequestDrawer.tsx
@@ -0,0 +1,171 @@
+import { GripHorizontal } from "lucide-react";
+import { useQuery } from "@tanstack/react-query";
+import { useGetUsersIdHook } from "@shared";
+import type { Request } from "@shared";
+import { DrawerShell } from "@/components/ui/DrawerShell";
+import { useRoomById } from "@/hooks/use-room-by-id";
+import { ActivityFeed } from "@/components/requests/ActivityFeed";
+import { cn } from "@/lib/utils";
+
+const PRIORITY_COLORS: Record<string, string> = {
+  low: "text-info-default",
+  medium: "text-warning-default",
+  high: "text-danger-default",
+};
+
+const STATUS_COLORS: Record<string, string> = {
+  pending: "text-warning-default",
+  assigned: "text-info-default",
+  completed: "text-success-default",
+};
+
+function formatDate(isoString: string): string {
+  const date = new Date(isoString);
+  return date.toLocaleDateString("en-US", {
+    month: "short",
+    day: "numeric",
+    year: "numeric",
+    hour: "numeric",
+    minute: "2-digit",
+  });
+}
+
+type FieldRowProps = {
+  label: string;
+  value: string;
+  valueClassName?: string;
+};
+
+function FieldRow({ label, value, valueClassName }: FieldRowProps) {
+  return (
+    <div className="flex items-center gap-8">
+      <div className="flex w-36 shrink-0 items-center gap-1">
+        <GripHorizontal className="size-4.5 text-text-subtle" />
+        <span className="text-sm text-text-subtle whitespace-nowrap">
+          {label}
+        </span>
+      </div>
+      <span
+        className={cn(
+          "rounded-md px-2 py-1 text-sm text-text-subtle",
+          valueClassName,
+        )}
+      >
+        {value}
+      </span>
+    </div>
+  );
+}
+
+type ViewRequestDrawerProps = {
+  request: Request | null;
+  onClose: () => void;
+};
+
+export function ViewRequestDrawer({
+  request,
+  onClose,
+}: ViewRequestDrawerProps) {
+  const getUserById = useGetUsersIdHook();
+  const { data: assignee } = useQuery({
+    queryKey: ["user", request?.user_id],
+    queryFn: () => getUserById(request!.user_id!),
+    enabled: !!request?.user_id,
+  });
+
+  const { data: room } = useRoomById(request?.room_id);
+  if (!request) {
+    return (
+      <DrawerShell title="" onClose={onClose}>
+        <div className="flex flex-col gap-4">
+          {Array.from({ length: 6 }).map((_, i) => (
+            <div
+              key={i}
+              className="h-7 animate-pulse rounded-md bg-bg-disabled"
+            />
+          ))}
+        </div>
+      </DrawerShell>
+    );
+  }
+
+  const assigneeName = assignee
+    ? `${assignee.first_name ?? ""} ${assignee.last_name ?? ""}`.trim()
+    : null;
+
+  const roomLabel = room
+    ? `Floor ${room.floor}, Room ${room.room_number}`
+    : null;
+
+  return (
+    <DrawerShell title={request.name ?? "Untitled Request"} onClose={onClose}>
+      <div className="flex flex-col gap-4">
+        {request.status && (
+          <FieldRow
+            label="Status"
+            value={request.status}
+            valueClassName={cn("capitalize", STATUS_COLORS[request.status])}
+          />
+        )}
+        {request.priority && (
+          <FieldRow
+            label="Priority"
+            value={request.priority}
+            valueClassName={cn("capitalize", PRIORITY_COLORS[request.priority])}
+          />
+        )}
+        {assigneeName && <FieldRow label="Assignee" value={assigneeName} />}
+        {roomLabel && <FieldRow label="Room" value={roomLabel} />}
+        {request.department && (
+          <FieldRow label="Department" value={request.department} />
+        )}
+        {request.request_type && (
+          <FieldRow label="Type" value={request.request_type} />
+        )}
+        {request.request_category && (
+          <FieldRow label="Category" value={request.request_category} />
+        )}
+        {request.scheduled_time && (
+          <FieldRow
+            label="Scheduled"
+            value={formatDate(request.scheduled_time)}
+          />
+        )}
+        {request.estimated_completion_time && (
+          <FieldRow
+            label="Est. Completion"
+            value={`${request.estimated_completion_time} min`}
+          />
+        )}
+        {request.created_at && (
+          <FieldRow label="Created" value={formatDate(request.created_at)} />
+        )}
+        {request.completed_at && (
+          <FieldRow
+            label="Completed"
+            value={formatDate(request.completed_at)}
+          />
+        )}
+      </div>
+
+      {request.description && (
+        <div className="flex flex-col gap-1">
+          <span className="text-xs text-text-subtle">Description</span>
+          <p className="text-sm text-text-default">{request.description}</p>
+        </div>
+      )}
+
+      {request.notes && (
+        <div className="flex flex-col gap-1">
+          <span className="text-xs text-text-subtle">Notes</span>
+          <p className="text-sm text-text-default">{request.notes}</p>
+        </div>
+      )}
+
+      <div className="flex flex-col gap-4">
+        <span className="text-base font-bold text-text-default">Activity</span>
+        <ActivityFeed requestId={request.id!} hotelId={request.hotel_id} />
+      </div>
+    </DrawerShell>
+  );
+}
diff --git a/clients/web/src/components/rooms/FilterChip.tsx b/clients/web/src/components/rooms/FilterChip.tsx
index f53dd31cd..060937734 100644
--- a/clients/web/src/components/rooms/FilterChip.tsx
+++ b/clients/web/src/components/rooms/FilterChip.tsx
@@ -19,10 +19,10 @@ export function FilterChip({
       onClick={onToggle}
       className={cn(
         className,
-        "rounded-lg border px-4 py-1.5 text-sm font-medium transition-colors",
+        "rounded border px-4 py-2 text-sm transition-colors",
         isSelected
           ? "border-primary bg-primary/10 text-primary"
-          : "border-stroke-subtle bg-white text-text-default hover:border-primary",
+          : "border-stroke-default bg-white text-text-secondary hover:border-primary hover:text-primary",
       )}
     >
       {label}
diff --git a/clients/web/src/components/rooms/FilterSection.tsx b/clients/web/src/components/rooms/FilterSection.tsx
index 4278a70ec..34dafafa3 100644
--- a/clients/web/src/components/rooms/FilterSection.tsx
+++ b/clients/web/src/components/rooms/FilterSection.tsx
@@ -1,29 +1,33 @@
 import { FilterChip } from "@/components/rooms/FilterChip";
 
-type FilterSectionProps = {
+type Option<T extends string> = {
+  value: T;
+  label: string;
+};
+
+type FilterSectionProps<T extends string> = {
   title: string;
-  chips: Array<string>;
-  selectedChips: Set<string>;
-  onToggle: (chip: string) => void;
+  options: Array<Option<T>>;
+  selectedValues: Set<T>;
+  onToggle: (value: T) => void;
 };
 
-export function FilterSection({
+export function FilterSection<T extends string>({
   title,
-  chips,
-  selectedChips,
+  options,
+  selectedValues,
   onToggle,
-}: FilterSectionProps) {
+}: FilterSectionProps<T>) {
   return (
     <div className="flex flex-col gap-3">
-      <span className="text-sm font-medium text-text-subtle">{title}</span>
+      <span className="text-sm text-text-subtle">{title}</span>
       <div className="flex flex-wrap gap-2">
-        {chips.map((chip) => (
+        {options.map((option) => (
           <FilterChip
-            key={chip}
-            label={chip}
-            isSelected={selectedChips.has(chip)}
-            onToggle={() => onToggle(chip)}
-            className="h-8"
+            key={option.value}
+            label={option.label}
+            isSelected={selectedValues.has(option.value)}
+            onToggle={() => onToggle(option.value)}
           />
         ))}
       </div>
diff --git a/clients/web/src/components/rooms/FilterTag.tsx b/clients/web/src/components/rooms/FilterTag.tsx
new file mode 100644
index 000000000..a8cc545bf
--- /dev/null
+++ b/clients/web/src/components/rooms/FilterTag.tsx
@@ -0,0 +1,34 @@
+import { X } from "lucide-react";
+import { cn } from "@/lib/utils";
+
+type FilterTagProps = {
+  label: string;
+  onRemove: () => void;
+  className?: string;
+};
+
+export function FilterTag({ label, onRemove, className }: FilterTagProps) {
+  return (
+    <div
+      className={cn(
+        "inline-flex max-w-full min-w-0 items-center justify-center gap-2 rounded border border-stroke-subtle bg-bg-primary px-2 py-1 text-text-default",
+        className,
+      )}
+    >
+      <span className="min-w-0 truncate text-sm leading-tight font-normal">
+        {label}
+      </span>
+      <button
+        type="button"
+        onClick={onRemove}
+        className={cn(
+          "inline-flex size-4 items-center justify-center text-text-subtle transition-colors",
+          "hover:text-text-default",
+          "focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary focus-visible:ring-offset-1 focus-visible:ring-offset-white",
+        )}
+      >
+        <X className="size-4" strokeWidth={2} aria-hidden />
+      </button>
+    </div>
+  );
+}
diff --git a/clients/web/src/components/rooms/FloorDropdown.tsx b/clients/web/src/components/rooms/FloorDropdown.tsx
new file mode 100644
index 000000000..f0a5b66d3
--- /dev/null
+++ b/clients/web/src/components/rooms/FloorDropdown.tsx
@@ -0,0 +1,86 @@
+import { ChevronDown } from "lucide-react";
+import { useGetRoomsFloors } from "@shared";
+import { Button } from "../ui/Button";
+import { useDropdown } from "../../hooks/use-dropdown";
+import { FloorDropdownOptions } from "./FloorDropdownOptions";
+import { FloorDropdownSearch } from "./FloorDropdownSearch";
+
+type FloorDropdownProps = {
+  selected?: Array<number>;
+  onChangeSelectedFloors?: (floors: Array<number>) => void;
+};
+
+function getFloorLabel(selected: Array<number>) {
+  switch (selected.length) {
+    case 0:
+      return "All Floors";
+    case 1:
+      return `Floor ${selected[0]}`;
+    default:
+      return `${selected.length} floors selected`;
+  }
+}
+
+export function FloorDropdown({
+  selected = [],
+  onChangeSelectedFloors,
+}: FloorDropdownProps) {
+  const { data: floors } = useGetRoomsFloors();
+  const floorList = floors ?? [];
+
+  const {
+    open,
+    search,
+    pending,
+    searchProps,
+    triggerProps,
+    toggle,
+    selectProps,
+    cancelProps,
+  } = useDropdown<number>({
+    selected,
+    onChangeSelectedItems: onChangeSelectedFloors,
+  });
+
+  const filtered = floorList.filter((f) =>
+    `floor ${f}`.includes(search.trim().toLowerCase()),
+  );
+
+  return (
+    <div className="relative min-w-0 w-full max-w-56.25 bg-bg-primary rounded-md border border-stroke-subtle">
+      <button
+        type="button"
+        {...triggerProps}
+        className={`flex w-full min-w-0 items-center justify-between text-sm text-text-default px-4 py-2 ${open ? "rounded-t-md" : "rounded-md"}`}
+      >
+        <span className="text-sm truncate">{getFloorLabel(selected)}</span>
+        <ChevronDown
+          className={`h-4 w-4 shrink-0 transition-transform duration-200 ${open ? "rotate-180" : ""}`}
+          strokeWidth={2.5}
+        />
+      </button>
+
+      {open && (
+        <div className="absolute left-0 top-full z-10 w-full bg-bg-primary rounded-b-md shadow-md">
+          <FloorDropdownSearch {...searchProps} />
+
+          <FloorDropdownOptions
+            floors={filtered}
+            pending={pending}
+            search={search}
+            onToggle={toggle}
+          />
+
+          <div className="flex justify-end gap-3 border-t border-stroke-subtle p-3">
+            <Button variant="secondary" {...cancelProps}>
+              Cancel
+            </Button>
+            <Button variant="primary" {...selectProps}>
+              Select
+            </Button>
+          </div>
+        </div>
+      )}
+    </div>
+  );
+}
diff --git a/clients/web/src/components/rooms/FloorDropdownOptions.tsx b/clients/web/src/components/rooms/FloorDropdownOptions.tsx
new file mode 100644
index 000000000..c7b6bc3ce
--- /dev/null
+++ b/clients/web/src/components/rooms/FloorDropdownOptions.tsx
@@ -0,0 +1,38 @@
+type FloorDropdownOptionsProps = {
+  floors: Array<number>;
+  pending: Array<number>;
+  search: string;
+  onToggle: (floor: number) => void;
+};
+
+export function FloorDropdownOptions({
+  floors,
+  pending,
+  search,
+  onToggle,
+}: FloorDropdownOptionsProps) {
+  return (
+    <div className="flex flex-col max-h-28 overflow-y-auto">
+      {floors.length === 0 ? (
+        <p className="px-4 py-2 text-sm text-text-subtle">
+          No floors match "{search}"
+        </p>
+      ) : (
+        floors.map((floor) => (
+          <label
+            key={floor}
+            className="flex items-center gap-3 px-4 py-2 text-sm cursor-pointer hover:bg-bg-selected"
+          >
+            <input
+              type="checkbox"
+              checked={pending.includes(floor)}
+              onChange={() => onToggle(floor)}
+              className="accent-black"
+            />
+            Floor {floor}
+          </label>
+        ))
+      )}
+    </div>
+  );
+}
diff --git a/clients/web/src/components/rooms/FloorDropdownSearch.tsx b/clients/web/src/components/rooms/FloorDropdownSearch.tsx
new file mode 100644
index 000000000..17e2426a1
--- /dev/null
+++ b/clients/web/src/components/rooms/FloorDropdownSearch.tsx
@@ -0,0 +1,29 @@
+import { Search, X } from "lucide-react";
+
+type FloorDropdownSearchProps = {
+  value: string;
+  onChange: (value: string) => void;
+};
+
+export const FloorDropdownSearch = ({
+  value,
+  onChange,
+}: FloorDropdownSearchProps) => {
+  return (
+    <div className="flex items-center gap-3 border-y border-stroke-subtle px-4 py-3">
+      <Search className="h-5 w-5 shrink-0 text-text-subtle" strokeWidth={2.5} />
+      <input
+        type="text"
+        value={value}
+        onChange={(e) => onChange(e.target.value)}
+        placeholder="Search..."
+        className="flex-1 bg-transparent text-sm outline-none placeholder:text-text-subtle"
+      />
+      {value && (
+        <button type="button" onClick={() => onChange("")}>
+          <X className="h-5 w-5 text-text-subtle hover:text-text-default" />
+        </button>
+      )}
+    </div>
+  );
+};
diff --git a/clients/web/src/components/rooms/FloorFilterDropdown.tsx b/clients/web/src/components/rooms/FloorFilterDropdown.tsx
deleted file mode 100644
index 7066591dd..000000000
--- a/clients/web/src/components/rooms/FloorFilterDropdown.tsx
+++ /dev/null
@@ -1,74 +0,0 @@
-import { useState } from "react";
-import { ChevronDown } from "lucide-react";
-
-const FLOOR_OPTIONS = [1, 2, 3, 4, 5];
-
-type FloorFilterDropdownProps = {
-  selected: Array<number>;
-  onChange: (selected: Array<number>) => void;
-};
-
-function getLabel(selected: Array<number>): string {
-  if (selected.length === 0) return "All floors";
-  if (selected.length === 1) return `Floor ${selected[0]}`;
-  return "Multiple floors";
-}
-
-export function FloorFilterDropdown({
-  selected,
-  onChange,
-}: FloorFilterDropdownProps) {
-  const [open, setOpen] = useState(false);
-
-  const toggle = (floor: number) => {
-    onChange(
-      selected.includes(floor)
-        ? selected.filter((f) => f !== floor)
-        : [...selected, floor],
-    );
-  };
-
-  return (
-    <div
-      className="relative inline-block"
-      onBlur={(e) => {
-        if (!e.currentTarget.contains(e.relatedTarget)) {
-          setOpen(false);
-        }
-      }}
-    >
-      <button
-        type="button"
-        onClick={() => setOpen((o) => !o)}
-        className="flex w-75 h-11 items-center justify-between rounded-md border border-stroke-subtle bg-white px-3 py-2 text-sm font-medium text-text-default transition-colors hover:bg-gray-50"
-      >
-        <span>{getLabel(selected)}</span>
-        <ChevronDown
-          className={`h-4 w-4 shrink-0 transition-transform ${open ? "rotate-180" : ""}`}
-        />
-      </button>
-
-      {open && (
-        <div
-          className="absolute left-0 top-full z-50 mt-1 w-full rounded-md border border-gray-200 bg-white py-1 shadow-lg"
-          tabIndex={-1}
-        >
-          {FLOOR_OPTIONS.map((floor) => (
-            <label
-              key={floor}
-              className="flex cursor-pointer items-center gap-2 px-3 py-2 text-sm text-text-default hover:bg-gray-100"
-            >
-              <input
-                type="checkbox"
-                checked={selected.includes(floor)}
-                onChange={() => toggle(floor)}
-                className="h-4 w-4 rounded border-gray-300 text-blue-600 focus:ring-blue-500"
-              />
-              Floor {floor}
-            </label>
-          ))}
-        </div>
-      )}
-    </div>
-  );
-}
diff --git a/clients/web/src/components/rooms/OrderByDropdown.tsx b/clients/web/src/components/rooms/OrderByDropdown.tsx
new file mode 100644
index 000000000..618c2fc97
--- /dev/null
+++ b/clients/web/src/components/rooms/OrderByDropdown.tsx
@@ -0,0 +1,78 @@
+import { ChevronDown } from "lucide-react";
+import { useState } from "react";
+import { cn } from "@/lib/utils";
+
+export type RoomSortOption = "ascending" | "descending" | "urgency";
+
+type OrderByDropdownProps = {
+  sortOption: RoomSortOption;
+  setSortOption: (option: RoomSortOption) => void;
+};
+
+const OPTIONS: Array<{ label: string; value: RoomSortOption }> = [
+  { label: "Ascending", value: "ascending" },
+  { label: "Descending", value: "descending" },
+  { label: "Urgency", value: "urgency" },
+];
+
+export function OrderByDropdown({
+  sortOption,
+  setSortOption,
+}: OrderByDropdownProps) {
+  const [open, setOpen] = useState(false);
+  const currentLabel =
+    OPTIONS.find((o) => o.value === sortOption)?.label ?? "Ascending";
+
+  return (
+    <div
+      className="relative w-30.5"
+      onBlur={(e) => {
+        if (!e.currentTarget.contains(e.relatedTarget)) setOpen(false);
+      }}
+    >
+      <button
+        type="button"
+        className={cn(
+          "flex w-full items-center justify-between pl-3 pr-2 py-2 text-left bg-bg-primary border border-stroke-subtle",
+          open ? "rounded-t border-b-stroke-disabled" : "rounded",
+        )}
+        onClick={() => setOpen((o) => !o)}
+        aria-expanded={open}
+      >
+        <span className="truncate text-base text-text-default">
+          {currentLabel}
+        </span>
+        <ChevronDown
+          className={cn(
+            "h-3 w-3 shrink-0 transition-transform",
+            open && "rotate-180",
+          )}
+        />
+      </button>
+
+      {open && (
+        <div className="absolute left-0 top-full z-10 flex w-full flex-col gap-1 rounded-b border border-t-0 border-stroke-subtle bg-bg-primary p-1 shadow-sm">
+          {OPTIONS.map((option) => {
+            const isSelected = option.value === sortOption;
+            return (
+              <button
+                key={option.value}
+                type="button"
+                className={cn(
+                  "flex items-center rounded px-3 py-1 text-left text-base text-text-default",
+                  isSelected ? "bg-bg-selected" : "hover:bg-bg-container",
+                )}
+                onClick={() => {
+                  setSortOption(option.value);
+                  setOpen(false);
+                }}
+              >
+                {option.label}
+              </button>
+            );
+          })}
+        </div>
+      )}
+    </div>
+  );
+}
diff --git a/clients/web/src/components/rooms/OverviewCard.tsx b/clients/web/src/components/rooms/OverviewCard.tsx
index c13af6c7e..ec3913586 100644
--- a/clients/web/src/components/rooms/OverviewCard.tsx
+++ b/clients/web/src/components/rooms/OverviewCard.tsx
@@ -1,10 +1,13 @@
 import type { ReactNode } from "react";
+import { UrgentIcon } from "@/icons/urgent";
 import { cn } from "@/lib/utils";
 
 export type OverviewCardColumn = {
   field: string;
   value: ReactNode;
+  valueSecondary?: ReactNode;
   description: string;
+  urgent?: boolean;
 };
 
 type OverviewCardProps = {
@@ -19,23 +22,53 @@ export function OverviewCard({
   className = "",
 }: OverviewCardProps) {
   return (
-    <section className={cn("bg-white px-[1vw] py-[1.5vh]", className)}>
-      <h2 className="text-md font-medium text-text-default">{title}</h2>
+    <section className={cn("flex w-full min-w-0 flex-col", className)}>
+      <h2 className="my-2 shrink-0 text-sm font-medium leading-tight text-neutral-400">
+        {title}
+      </h2>
 
-      <div className="mt-[1vh] h-[0.125vh] w-full bg-stroke-subtle" />
+      <div className="h-0.5 w-full shrink-0 bg-stroke-subtle" />
 
-      <div className="mt-[1.8vh] grid grid-cols-3 gap-[1.7vw]">
+      <div className="mt-0 flex flex-wrap items-start justify-between gap-y-2">
         {columns.map((col) => (
-          <div key={col.field} className="flex flex-col gap-[1vw]">
-            <div className="text-sm font-medium leading-tight text-text-default">
-              {col.field}
+          <div
+            key={col.field}
+            className="flex min-h-px min-w-px flex-1 flex-col gap-1 p-4"
+          >
+            <div className="text-sm leading-tight text-text-default">
+              {col.urgent ? (
+                <span className="inline-flex gap-0.5">
+                  <UrgentIcon
+                    className="h-4.5 w-4.5 shrink-0 text-text-default"
+                    aria-hidden
+                  />
+                  {col.field}
+                </span>
+              ) : (
+                col.field
+              )}
             </div>
 
-            <div className="text-4xl font-semibold tracking-tight text-text-default">
-              {col.value}
+            <div
+              className={cn(
+                "inline-flex max-w-full min-w-0 flex-nowrap items-center gap-x-1 leading-[1.4] tracking-[-0.32px]",
+                col.valueSecondary != null && "whitespace-nowrap",
+              )}
+            >
+              <span className="text-2xl lg:text-[32px] font-bold text-text-default">
+                {col.value}
+              </span>
+              {col.valueSecondary != null && (
+                <span className="text-[11px] font-medium tracking-normal text-text-subtle">
+                  {" / "}
+                  {col.valueSecondary}
+                </span>
+              )}
             </div>
 
-            <div className="text-sm text-text-default">{col.description}</div>
+            <div className="text-sm leading-tight text-neutral-400">
+              {col.description}
+            </div>
           </div>
         ))}
       </div>
diff --git a/clients/web/src/components/rooms/RoomAccordion.tsx b/clients/web/src/components/rooms/RoomAccordion.tsx
new file mode 100644
index 000000000..70d6a7238
--- /dev/null
+++ b/clients/web/src/components/rooms/RoomAccordion.tsx
@@ -0,0 +1,41 @@
+import type { ReactNode } from "react";
+import {
+  Accordion,
+  AccordionContent,
+  AccordionItem,
+  AccordionTrigger,
+} from "@/components/ui/accordion";
+import { cn } from "@/lib/utils";
+
+export type RoomAccordionItem = {
+  value: string;
+  trigger: string;
+  content: ReactNode;
+};
+
+type RoomAccordionProps = {
+  items: Array<RoomAccordionItem>;
+  defaultValue?: Array<string>;
+  className?: string;
+};
+
+export function RoomAccordion({
+  items,
+  defaultValue,
+  className,
+}: RoomAccordionProps) {
+  return (
+    <Accordion
+      multiple
+      className={cn("mx-auto w-full px-8", className)}
+      defaultValue={defaultValue}
+    >
+      {items.map((item) => (
+        <AccordionItem key={item.value} value={item.value}>
+          <AccordionTrigger>{item.trigger}</AccordionTrigger>
+          <AccordionContent>{item.content}</AccordionContent>
+        </AccordionItem>
+      ))}
+    </Accordion>
+  );
+}
diff --git a/clients/web/src/components/rooms/RoomCard.tsx b/clients/web/src/components/rooms/RoomCard.tsx
index 7dee5390c..e346c4880 100644
--- a/clients/web/src/components/rooms/RoomCard.tsx
+++ b/clients/web/src/components/rooms/RoomCard.tsx
@@ -1,43 +1,80 @@
-import type { Room } from "@/components/rooms/RoomsList";
+import { BookingStatus } from "@shared/api/rooms";
+import { UserRoundCheckIcon, UserRoundXIcon } from "lucide-react";
+import { TagRow } from "./TagRow";
+import type { RoomWithOptionalGuestBooking } from "@shared";
+import { CheckBubbleIcon } from "@/icons/check-bubble";
 import { cn } from "@/lib/utils";
+import { Tag } from "@/components/ui/Tag";
+
+function formatGuestNames(
+  guests: RoomWithOptionalGuestBooking["guests"] | undefined,
+): string {
+  const names =
+    guests
+      ?.map((guest) =>
+        `${guest.first_name ?? ""} ${guest.last_name ?? ""}`.trim(),
+      )
+      .filter(Boolean) ?? [];
+
+  return names.length > 0
+    ? "Occupied: " + names.join(", ")
+    : "Occupied: " + "—";
+}
 
 type RoomCardProps = {
-  room: Room;
+  room: RoomWithOptionalGuestBooking;
   isSelected?: boolean;
   onClick: () => void;
 };
 
 export function RoomCard({ room, isSelected = false, onClick }: RoomCardProps) {
+  const isOccupied = room.booking_status === BookingStatus.BookingStatusActive;
   return (
     <button
       type="button"
       onClick={onClick}
       className={cn(
-        "flex flex-col items-start gap-[1.5vh] flex-1 min-w-0 w-full min-h-[11vh] text-left rounded-md border px-[0.6vw] py-[0.9vh] transition-colors",
+        "flex flex-col bg-bg-primary items-start flex-1 min-w-0 w-full min-h-30 text-left rounded-md border gap-2 px-5 py-4 transition-colors",
         isSelected
-          ? "border-stroke-subtle bg-white shadow-sm"
-          : "border-zinc-200 hover:bg-selected",
+          ? "border-stroke-subtle bg-bg-selected shadow-sm"
+          : "border-stroke-subtle hover:bg-bg-selected cursor-pointer",
       )}
     >
-      <span className="text-xl font-bold text-zinc-900 ">
-        Room {room.room_number}
-      </span>
-      <span className="text-sm font-light text-zinc-500">{room.room_type}</span>
-      <span className="text-xs font-medium text-zinc-900">
-        Jane Doe, John Doe
-      </span>
-      {room.tags && room.tags.length > 0 && (
-        <div className="flex flex-wrap gap-[0.4vh]">
-          {room.tags.map((tag) => (
-            <span
-              key={tag}
-              className="inline-flex items-center px-[2vw] py-[0.5vh] rounded text-xs font-medium bg-primary text-white"
-            >
-              {tag}
-            </span>
-          ))}
+      <div className="flex w-full items-start justify-between gap-2">
+        <div className="flex min-w-0 items-start gap-2">
+          <span className="text-xl font-bold text-text-default">
+            Room {room.room_number}
+          </span>
+          {!isOccupied ? (
+            <Tag
+              icon={CheckBubbleIcon}
+              label="Available"
+              className="border-0 bg-primary-container text-primary"
+              iconClassName="size-4 text-primary"
+              labelClassName="text-sm leading-5"
+            />
+          ) : null}
         </div>
-      )}
+        {isOccupied ? (
+          <Tag
+            icon={UserRoundCheckIcon}
+            label={formatGuestNames(room.guests)}
+            className="ml-auto border-0 bg-neutral-20 text-text-secondary"
+            iconClassName="size-4 text-text-secondary"
+            labelClassName="text-sm leading-[1.25]"
+          />
+        ) : (
+          <Tag
+            icon={UserRoundXIcon}
+            label={"Vacant"}
+            className="ml-auto border-0 bg-neutral-20 text-text-secondary"
+            iconClassName="size-4 text-text-secondary"
+            labelClassName="text-sm leading-[1.25]"
+          />
+        )}
+      </div>
+      <span className="text-sm text-text-subtle">{room.suite_type}</span>
+      <TagRow room={room} />
     </button>
   );
 }
diff --git a/clients/web/src/components/rooms/RoomDetailsDrawer.tsx b/clients/web/src/components/rooms/RoomDetailsDrawer.tsx
index 8b99a704c..713383843 100644
--- a/clients/web/src/components/rooms/RoomDetailsDrawer.tsx
+++ b/clients/web/src/components/rooms/RoomDetailsDrawer.tsx
@@ -1,107 +1,58 @@
-import { DiamondIcon, X } from "lucide-react";
-import { TaskCard } from "./TaskCard";
-import type { Room } from "@/components/rooms/RoomsList";
+import { useAssignRequestToSelf, useGetRequestRoomId } from "@shared";
+import type { RoomWithOptionalGuestBooking } from "@shared";
+import { DrawerShell } from "@/components/ui/DrawerShell";
+import { RoomAccordion } from "@/components/rooms/RoomAccordion";
+import { RoomRequestList } from "@/components/rooms/RoomRequestList";
+import { RoomTabBar } from "@/components/rooms/RoomTabBar";
 
 type RoomDetailsDrawerProps = {
-  room: Room | null;
+  room: RoomWithOptionalGuestBooking | null;
   onClose: () => void;
 };
 
 export function RoomDetailsDrawer({ room, onClose }: RoomDetailsDrawerProps) {
+  const { data } = useGetRequestRoomId(room?.id ?? "", {
+    query: { enabled: room?.id != null },
+  });
+  const { mutate: assignRequestToSelf } = useAssignRequestToSelf(room?.id);
+
   if (!room) return null;
 
-  return (
-    <aside className="fixed top-0 right-0 z-50 flex h-full w-full max-w-[45vw] flex-col border-l border-zinc-200 bg-white">
-      <header className="flex items-center justify-between px-[2.5vw] py-[2.2vh]">
-        <h2 className="text-3xl font-bold">Room {room.room_number}</h2>
-        <button type="button" onClick={onClose} className="p-[0.6vw]">
-          <X />
-        </button>
-      </header>
+  const assignedItems = (data?.assigned ?? []).map((r) => ({
+    ...r,
+    isAssigned: true,
+  }));
+  const unassignedItems = data?.unassigned ?? [];
 
-      <div className="flex-1 overflow-y-auto px-[2.5vw] py-[2.5vh]">
-        <div className="flex flex-col gap-[2.5vh]">
-          <section>
-            <h3 className="text-lg font-bold">Guests (2)</h3>
-            <hr className="my-[1vh] border-zinc-200" />
-            <div className="flex flex-col gap-[0.5vh] text-sm">
-              <span>Jane Doe</span>
-              <span>John Doe</span>
-            </div>
-          </section>
+  const roomAccordionItems = [
+    {
+      value: "Your Tasks",
+      trigger: "Your Tasks",
+      content: <RoomRequestList requests={assignedItems} />,
+    },
+    {
+      value: "Unassigned Tasks",
+      trigger: "Unassigned Tasks",
+      content: (
+        <RoomRequestList
+          onAssignToSelf={assignRequestToSelf}
+          requests={unassignedItems}
+        />
+      ),
+    },
+  ];
 
-          <section>
-            <h3 className="text-lg font-bold">Details</h3>
-            <hr className="my-[1vh] border-zinc-200" />
-            <div className="flex flex-col gap-[1.5vh]">
-              <div>
-                <h4 className="mb-[0.5vh] text-md font-medium">Room status</h4>
-                <div className="flex flex-col gap-[0.9vh]">
-                  <span className="flex w-full items-center gap-[0.5vh] rounded-md px-[1.2vw] py-[1vh] text-sm bg-zinc-50">
-                    <DiamondIcon className="w-[1.8vh]" /> Needs cleaning
-                  </span>
-                  <span className="flex w-full items-center gap-[0.5vh] rounded-md px-[1.2vw] py-[1vh] text-sm bg-zinc-50">
-                    <DiamondIcon className="w-[1.8vh]" /> Late checkout approved
-                  </span>
-                </div>
-              </div>
-              <div>
-                <h4 className="mb-[0.5vh] text-md font-medium">
-                  Room features
-                </h4>
-                <div className="flex flex-wrap gap-[0.9vh]">
-                  <span className="flex items-center gap-[0.4vw] rounded-md p-[0.5vh] text-sm bg-zinc-50">
-                    <DiamondIcon className="h-[1.8vh] w-[1.8vh] shrink-0" />{" "}
-                    Room Size: 500 sq ft
-                  </span>
-                  <span className="flex items-center gap-[0.4vw] rounded-md p-[0.5vh] text-sm bg-zinc-50">
-                    <DiamondIcon className="h-[1.8vh] w-[1.8vh] shrink-0" />{" "}
-                    Bed: queen
-                  </span>
-                  <span className="flex items-center gap-[0.4vw] rounded-md p-[0.5vh] text-sm bg-zinc-50">
-                    <DiamondIcon className="h-[1.8vh] w-[1.8vh] shrink-0" /> Bar
-                    / Lounge
-                  </span>
-                  <span className="flex items-center gap-[0.4vw] rounded-md p-[0.5vh] text-sm bg-zinc-50">
-                    <DiamondIcon className="h-[1.8vh] w-[1.8vh] shrink-0" /> 1
-                    bathroom
-                  </span>
-                  <span className="flex items-center gap-[0.4vw] rounded-md p-[0.5vh] text-sm bg-zinc-50">
-                    <DiamondIcon className="h-[1.8vh] w-[1.8vh] shrink-0" /> 1
-                    toilet
-                  </span>
-                </div>
-              </div>
-            </div>
-          </section>
-          <section>
-            <h3 className="text-lg font-bold">Issues</h3>
-            <hr className="my-[1vh] border-zinc-200" />
-            <div className="flex flex-col gap-[0.5vh]">
-              <h4 className="mb-[0.5vh] text-md font-medium">
-                Guest Complaints
-              </h4>
-              <span className="text-sm font-light text-zinc-400">
-                No guest complaints
-              </span>
-              <h4 className="mb-[0.5vh] text-md font-medium">
-                Maintenance Issues
-              </h4>
-              <span className="text-sm font-light text-zinc-400">
-                No maintenance issues
-              </span>
-            </div>
-          </section>
-          <section>
-            <h3 className="text-lg font-bold">Tasks</h3>
-            <hr className="my-[1vh] border-zinc-200" />
-            <div className="flex flex-col gap-[0.5vh] py-[0.5vh]">
-              <TaskCard task="Clean room" onAssign={() => {}} />
-              <TaskCard task="Make bed" onAssign={() => {}} />
-            </div>
-          </section>
-        </div>
-      </div>
-    </aside>
+  return (
+    <DrawerShell
+      title={`Room ${room.room_number}`}
+      onClose={onClose}
+      className="px-2 py-0"
+    >
+      <RoomTabBar />
+      <RoomAccordion
+        items={roomAccordionItems}
+        defaultValue={["Your Tasks", "Unassigned Tasks"]}
+      />
+    </DrawerShell>
   );
 }
diff --git a/clients/web/src/components/rooms/RoomRequestCard.tsx b/clients/web/src/components/rooms/RoomRequestCard.tsx
new file mode 100644
index 000000000..430d8b40f
--- /dev/null
+++ b/clients/web/src/components/rooms/RoomRequestCard.tsx
@@ -0,0 +1,76 @@
+import { MapPinIcon, Maximize2Icon, StoreIcon } from "lucide-react";
+
+import type { GuestRequest, RequestPriority } from "@shared";
+import { Button } from "@/components/ui/Button";
+import { Tag } from "@/components/ui/Tag";
+import { cn } from "@/lib/utils";
+
+export type RoomRequestCardProps = GuestRequest & {
+  isAssigned?: boolean;
+  onAssignToSelf?: () => void;
+  onExpand?: () => void;
+  className?: string;
+};
+
+export function RoomRequestCard({
+  name,
+  room_number,
+  request_category,
+  request_type,
+  priority,
+  isAssigned,
+  onAssignToSelf,
+  onExpand,
+  className = "",
+}: RoomRequestCardProps) {
+  const department = request_category ?? request_type;
+  const p = priority as RequestPriority | undefined;
+
+  return (
+    <div
+      className={cn(
+        "flex flex-col gap-3 rounded border border-stroke-disabled bg-bg-primary px-3 py-4",
+        className,
+      )}
+    >
+      <div className="flex flex-col gap-2">
+        <div className="flex items-start justify-between gap-2">
+          <span className="text-base font-medium leading-snug tracking-tight text-text-default">
+            {name}
+          </span>
+          <button
+            type="button"
+            onClick={onExpand}
+            className="shrink-0 text-text-subtle hover:text-text-default"
+            aria-label="Expand request"
+          >
+            <Maximize2Icon className="size-[1.125rem]" strokeWidth={1.5} />
+          </button>
+        </div>
+
+        {room_number != null && (
+          <div className="flex items-center gap-1">
+            <MapPinIcon
+              className="size-3 shrink-0 text-text-subtle"
+              strokeWidth={1.5}
+            />
+            <span className="text-xs text-text-subtle">
+              {`Room ${room_number}`}
+            </span>
+          </div>
+        )}
+
+        <div className="flex flex-wrap items-center gap-3">
+          <Tag priority={p === "high" || p === "medium" ? p : undefined} />
+          {department && <Tag label={department} icon={StoreIcon} />}
+        </div>
+      </div>
+
+      {!isAssigned && (
+        <Button variant="primary" className="w-full" onClick={onAssignToSelf}>
+          Assign to Self
+        </Button>
+      )}
+    </div>
+  );
+}
diff --git a/clients/web/src/components/rooms/RoomRequestList.tsx b/clients/web/src/components/rooms/RoomRequestList.tsx
new file mode 100644
index 000000000..8b78064ac
--- /dev/null
+++ b/clients/web/src/components/rooms/RoomRequestList.tsx
@@ -0,0 +1,54 @@
+import type { GuestRequest } from "@shared";
+import { cn } from "@/lib/utils";
+import { RoomRequestCard } from "@/components/rooms/RoomRequestCard";
+
+export type RoomRequestItem = GuestRequest & { isAssigned?: boolean };
+
+type RoomRequestListProps = {
+  title?: string;
+  requests: Array<RoomRequestItem>;
+  onAssignToSelf?: (id: string) => void;
+  onExpand?: (id: string) => void;
+  className?: string;
+};
+
+export function RoomRequestList({
+  title,
+  requests,
+  onAssignToSelf,
+  onExpand,
+  className = "",
+}: RoomRequestListProps) {
+  const showHeader = title != null && title !== "";
+
+  return (
+    <section className={cn("flex w-full min-w-0 flex-col", className)}>
+      {showHeader ? (
+        <>
+          <h2 className="my-2 shrink-0 text-sm font-medium leading-tight text-neutral-400">
+            {title} ({requests.length})
+          </h2>
+          <div className="h-0.5 w-full shrink-0 bg-stroke-subtle" />
+        </>
+      ) : null}
+
+      <div
+        className={cn(
+          "flex flex-col gap-2 overflow-y-auto flex-1 min-h-0",
+          showHeader && "mt-3",
+        )}
+      >
+        {requests.map((item) => (
+          <RoomRequestCard
+            key={item.id}
+            {...item}
+            onAssignToSelf={
+              onAssignToSelf ? () => onAssignToSelf(item.id ?? "") : undefined
+            }
+            onExpand={onExpand ? () => onExpand(item.id ?? "") : undefined}
+          />
+        ))}
+      </div>
+    </section>
+  );
+}
diff --git a/clients/web/src/components/rooms/RoomTabBar.tsx b/clients/web/src/components/rooms/RoomTabBar.tsx
new file mode 100644
index 000000000..5f06810df
--- /dev/null
+++ b/clients/web/src/components/rooms/RoomTabBar.tsx
@@ -0,0 +1,41 @@
+import { BedDouble, ClipboardCheck, UserRound } from "lucide-react";
+
+type RoomTab = {
+  id: "tasks" | "guest-info" | "room-details";
+  label: string;
+  icon: typeof ClipboardCheck;
+};
+
+const roomTabs: Array<RoomTab> = [
+  { id: "tasks", label: "Tasks and Issues", icon: ClipboardCheck },
+  { id: "guest-info", label: "Guest Information", icon: UserRound },
+  { id: "room-details", label: "Room Details", icon: BedDouble },
+];
+
+export function RoomTabBar() {
+  return (
+    <div className="py-3 border-b border-stroke-subtle">
+      <div className="flex items-start px-8">
+        {roomTabs.map(({ id, label, icon: Icon }) => {
+          const isActive = id === "tasks";
+
+          return (
+            <button
+              key={id}
+              type="button"
+              className={[
+                "inline-flex items-center justify-center gap-2 border-b-2 px-3 py-3 text-sm leading-5",
+                isActive
+                  ? "border-primary text-primary"
+                  : "border-transparent text-neutral-750",
+              ].join(" ")}
+            >
+              <Icon className="size-4" />
+              <span>{label}</span>
+            </button>
+          );
+        })}
+      </div>
+    </div>
+  );
+}
diff --git a/clients/web/src/components/rooms/RoomsFilterPopover.tsx b/clients/web/src/components/rooms/RoomsFilterPopover.tsx
index 3b47718d4..4fc0ebbf9 100644
--- a/clients/web/src/components/rooms/RoomsFilterPopover.tsx
+++ b/clients/web/src/components/rooms/RoomsFilterPopover.tsx
@@ -1,33 +1,52 @@
 import { useState } from "react";
-import { Filter } from "lucide-react";
+import type {
+  RoomAdvancedFilter,
+  RoomAttributeFilter,
+  RoomStatusFilter,
+} from "@shared/api/rooms";
+import type { RoomFilters } from "@/hooks/use-rooms-filters";
 import {
   Popover,
   PopoverContent,
   PopoverTrigger,
 } from "@/components/ui/popover";
 import { FilterSection } from "@/components/rooms/FilterSection";
+import { FilterIcon } from "@/icons/filter";
+import { cn } from "@/lib/utils";
 
-const STATUS_CHIPS = [
-  "Occupied",
-  "Vacant",
-  "Reserved",
-  "Out of Order",
-  "Needs Cleaning",
-  "Open Tasks",
+export const STATUS_OPTIONS: Array<{ value: RoomStatusFilter; label: string }> =
+  [
+    { value: "occupied", label: "Occupied" },
+    { value: "vacant", label: "Vacant" },
+    { value: "open-tasks", label: "Open Tasks" },
+  ];
+
+export const ATTRIBUTE_OPTIONS: Array<{
+  value: RoomAttributeFilter;
+  label: string;
+}> = [
+  { value: "standard", label: "Standard" },
+  { value: "deluxe", label: "Deluxe" },
+  { value: "suite", label: "Suite" },
+  { value: "accessible", label: "Accessible" },
 ];
-const ATTRIBUTE_CHIPS = ["Standard", "Deluxe", "Suite", "Accessible"];
-const ADVANCED_CHIPS = [
-  "Arrivals Today",
-  "Departures Today",
-  "Late Checkouts",
-  "Early Check-ins",
+
+export const ADVANCED_OPTIONS: Array<{
+  value: RoomAdvancedFilter;
+  label: string;
+}> = [
+  { value: "arrivals-today", label: "Arrivals Today" },
+  { value: "departures-today", label: "Departures Today" },
 ];
 
-const INITIAL_SELECTED = new Set<string>(["Occupied", "Open Tasks"]);
+type RoomsFilterPopoverProps = {
+  filters: RoomFilters;
+  onApply: (filters: RoomFilters) => void;
+};
 
 function FilterPopoverHeader({ onReset }: { onReset: () => void }) {
   return (
-    <div className="flex items-center justify-between pt-5">
+    <div className="flex items-center justify-between">
       <span className="text-base font-medium text-text-default">
         All Filters
       </span>
@@ -44,104 +63,155 @@ function FilterPopoverHeader({ onReset }: { onReset: () => void }) {
 
 function FilterPopoverFooter({
   onCancel,
-  onSelect,
+  onApply,
 }: {
   onCancel: () => void;
-  onSelect: () => void;
+  onApply: () => void;
 }) {
   return (
-    <>
-      <div className="border-t border-stroke-subtle" />
-      <div className="flex gap-3 py-5 justify-center">
-        <button
-          type="button"
-          onClick={onCancel}
-          className="text-sm font-base rounded-sm text-text-default bg-bg-container hover:bg-primary/5 transition-colors h-10 w-47 text-center"
-        >
-          Cancel
-        </button>
-        <button
-          type="button"
-          onClick={onSelect}
-          className="text-sm font-base rounded-sm text-white bg-primary hover:bg-primary/90 transition-colors h-10 w-47 text-center"
-        >
-          Select
-        </button>
-      </div>
-    </>
+    <div className="flex gap-3 px-3 py-5 border-t border-stroke-subtle">
+      <button
+        type="button"
+        onClick={onCancel}
+        className="flex-1 h-10 rounded text-sm text-primary bg-white hover:bg-primary/5 transition-colors"
+      >
+        Cancel
+      </button>
+      <button
+        type="button"
+        onClick={onApply}
+        className="flex-1 h-10 rounded text-sm text-white bg-primary hover:bg-primary-hover transition-colors"
+      >
+        Apply Filters
+      </button>
+    </div>
   );
 }
 
-export function RoomsFilterPopover() {
+function toDraft(filters: RoomFilters) {
+  return {
+    status: new Set(filters.status),
+    attributes: new Set(filters.attributes),
+    advanced: new Set(filters.advanced),
+  };
+}
+
+export function RoomsFilterPopover({
+  filters,
+  onApply,
+}: RoomsFilterPopoverProps) {
   const [open, setOpen] = useState(false);
-  const [selectedChips, setSelectedChips] =
-    useState<Set<string>>(INITIAL_SELECTED);
-  const [pendingChips, setPendingChips] =
-    useState<Set<string>>(INITIAL_SELECTED);
-
-  const toggle = (chip: string) => {
-    setPendingChips((prev) => {
-      const next = new Set(prev);
-      next.has(chip) ? next.delete(chip) : next.add(chip);
-      return next;
+  const [draft, setDraft] = useState(() => toDraft(filters));
+
+  const toggleStatus = (value: RoomStatusFilter) => {
+    setDraft((prev) => {
+      const next = new Set(prev.status);
+      next.has(value) ? next.delete(value) : next.add(value);
+      return { ...prev, status: next };
+    });
+  };
+
+  const toggleAttribute = (value: RoomAttributeFilter) => {
+    setDraft((prev) => {
+      const next = new Set(prev.attributes);
+      next.has(value) ? next.delete(value) : next.add(value);
+      return { ...prev, attributes: next };
+    });
+  };
+
+  const toggleAdvanced = (value: RoomAdvancedFilter) => {
+    setDraft((prev) => {
+      const next = new Set(prev.advanced);
+      next.has(value) ? next.delete(value) : next.add(value);
+      return { ...prev, advanced: next };
     });
   };
 
-  const handleSelect = () => {
-    setSelectedChips(new Set(pendingChips));
+  const handleApply = () => {
+    onApply({
+      status: [...draft.status],
+      attributes: [...draft.attributes],
+      advanced: [...draft.advanced],
+    });
     setOpen(false);
   };
 
   const handleCancel = () => {
-    setPendingChips(new Set(selectedChips));
+    setDraft(toDraft(filters));
+    setOpen(false);
   };
 
   const handleReset = () => {
-    setPendingChips(new Set());
+    setDraft({ status: new Set(), attributes: new Set(), advanced: new Set() });
   };
 
+  const appliedCount =
+    filters.status.length + filters.attributes.length + filters.advanced.length;
+  const filtersActive = appliedCount > 0;
+
   return (
     <Popover
       open={open}
       onOpenChange={(next) => {
-        if (!next) setPendingChips(new Set(selectedChips));
+        if (next) {
+          setDraft(toDraft(filters));
+        }
         setOpen(next);
       }}
     >
-      <PopoverTrigger>
-        <button
-          type="button"
-          className="flex items-center gap-2 rounded-lg border border-stroke-subtle px-4 py-2 text-sm font-medium text-text-default hover:bg-primary/5 transition-colors h-11 w-22.75"
-        >
-          <Filter className="h-4 w-4 text-text-default" />
-          Filter
-        </button>
+      <PopoverTrigger
+        className={cn(
+          "flex items-center gap-2 rounded border border-primary px-3 py-2 text-base tracking-[-0.01em] transition-colors shrink-0",
+          filtersActive ? "w-30" : "w-21",
+          filtersActive
+            ? "bg-primary text-white hover:bg-primary-hover"
+            : "bg-white text-primary hover:bg-primary/5",
+        )}
+        aria-label={
+          filtersActive
+            ? `Filter, ${appliedCount} applied`
+            : "Open room filters"
+        }
+      >
+        <FilterIcon
+          className={cn(
+            "size-[18px] shrink-0",
+            filtersActive ? "text-white" : "text-primary",
+          )}
+        />
+        {filtersActive ? `Filter (${appliedCount})` : "Filter"}
       </PopoverTrigger>
-      <PopoverContent sideOffset={8} align="start" className="px-6 w-115.75">
-        <FilterPopoverHeader onReset={handleReset} />
-
-        <div className="flex flex-col gap-5 pt-3 pb-5">
-          <FilterSection
-            title="Status"
-            chips={STATUS_CHIPS}
-            selectedChips={pendingChips}
-            onToggle={toggle}
-          />
-          <FilterSection
-            title="Room Attributes"
-            chips={ATTRIBUTE_CHIPS}
-            selectedChips={pendingChips}
-            onToggle={toggle}
-          />
-          <FilterSection
-            title="Advanced"
-            chips={ADVANCED_CHIPS}
-            selectedChips={pendingChips}
-            onToggle={toggle}
-          />
+      <PopoverContent
+        sideOffset={8}
+        align="center"
+        className="rounded-lg shadow-md w-115.75"
+      >
+        <div className="flex flex-col gap-3 px-6 py-5">
+          <FilterPopoverHeader onReset={handleReset} />
+
+          <div className="flex flex-col gap-5">
+            <FilterSection
+              title="Status"
+              options={STATUS_OPTIONS}
+              selectedValues={draft.status}
+              onToggle={toggleStatus}
+            />
+            <FilterSection
+              title="Room Attributes"
+              options={ATTRIBUTE_OPTIONS}
+              selectedValues={draft.attributes}
+              onToggle={toggleAttribute}
+            />
+            <FilterSection
+              title="Advanced"
+              options={ADVANCED_OPTIONS}
+              selectedValues={draft.advanced}
+              onToggle={toggleAdvanced}
+            />
+          </div>
         </div>
 
-        <FilterPopoverFooter onCancel={handleCancel} onSelect={handleSelect} />
+        <FilterPopoverFooter onCancel={handleCancel} onApply={handleApply} />
       </PopoverContent>
     </Popover>
   );
diff --git a/clients/web/src/components/rooms/RoomsHeader.tsx b/clients/web/src/components/rooms/RoomsHeader.tsx
deleted file mode 100644
index b6e06a62d..000000000
--- a/clients/web/src/components/rooms/RoomsHeader.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-import type { RoomFilters } from "@/routes/_protected/rooms.index";
-import { FloorFilterDropdown } from "@/components/rooms/FloorFilterDropdown";
-import { RoomsFilterPopover } from "@/components/rooms/RoomsFilterPopover";
-
-type RoomsHeaderProps = {
-  roomFilters: RoomFilters;
-  onRoomFilterChange: <TKey extends keyof RoomFilters>(
-    key: TKey,
-    value: RoomFilters[TKey],
-  ) => void;
-};
-
-export function RoomsHeader({
-  roomFilters,
-  onRoomFilterChange,
-}: RoomsHeaderProps) {
-  return (
-    <header className="z-30 bg-bg-container px-16 py-6 flex items-center gap-3">
-      <FloorFilterDropdown
-        selected={roomFilters.floor}
-        onChange={(values) => onRoomFilterChange("floor", values)}
-      />
-      <RoomsFilterPopover />
-    </header>
-  );
-}
diff --git a/clients/web/src/components/rooms/RoomsList.tsx b/clients/web/src/components/rooms/RoomsList.tsx
index f6b02eb09..a195b7063 100644
--- a/clients/web/src/components/rooms/RoomsList.tsx
+++ b/clients/web/src/components/rooms/RoomsList.tsx
@@ -1,34 +1,27 @@
+import type { RoomWithOptionalGuestBooking } from "@shared";
 import { RoomCard } from "@/components/rooms/RoomCard";
 
-export type Room = {
-  id: string;
-  room_number: string;
-  floor: number;
-  room_type: string;
-  tags?: Array<string>;
-};
-
 type RoomsListProps = {
-  rooms: Array<Room>;
-  onRoomSelect: (roomId: string) => void;
-  selectedRoomId?: string | null;
+  rooms: Array<RoomWithOptionalGuestBooking>;
+  onRoomSelect: (room: RoomWithOptionalGuestBooking) => void;
+  selectedRoomNumber?: number | null;
 };
 
 export function RoomsList({
   rooms,
   onRoomSelect,
-  selectedRoomId = null,
+  selectedRoomNumber = null,
 }: RoomsListProps) {
   return (
-    <section className="flex-1 min-h-0 p-[2vw] flex flex-col  overflow-hidden">
+    <section className="flex-1 min-h-0 flex flex-col overflow-hidden">
       <nav className="flex-1 min-h-0">
-        <ul className="flex flex-col gap-[0.55vh] h-full overflow-y-auto min-h-0 [&::-webkit-scrollbar]:hidden">
-          {rooms.map((room: Room) => (
-            <li key={room.id} className="min-w-0">
+        <ul className="flex flex-col gap-4 h-full overflow-y-auto min-h-0 pb-24 [&::-webkit-scrollbar]:hidden">
+          {rooms.map((room) => (
+            <li key={room.room_number} className="min-w-0">
               <RoomCard
                 room={room}
-                isSelected={selectedRoomId === room.id}
-                onClick={() => onRoomSelect(room.id)}
+                isSelected={selectedRoomNumber === room.room_number}
+                onClick={() => onRoomSelect(room)}
               />
             </li>
           ))}
diff --git a/clients/web/src/components/rooms/RoomsOverview.tsx b/clients/web/src/components/rooms/RoomsOverview.tsx
index e8298724d..53188200f 100644
--- a/clients/web/src/components/rooms/RoomsOverview.tsx
+++ b/clients/web/src/components/rooms/RoomsOverview.tsx
@@ -1,59 +1,85 @@
-import type { Room } from "@/components/rooms/RoomsList";
+import { useAssignRequestToSelf } from "@shared";
+import type { RoomWithOptionalGuestBooking } from "@shared";
 import { OverviewCard } from "@/components/rooms/OverviewCard";
+import { RoomRequestList } from "@/components/rooms/RoomRequestList";
+import { useUnassignedTasks } from "@/hooks/use-unassigned-tasks";
 
 type RoomsOverviewProps = {
-  rooms: Array<Room>;
+  rooms: Array<RoomWithOptionalGuestBooking>;
 };
-
+// TODO: Replace with hifi (this is just to confirm the data is correct for us to ship rooms list)
 export function RoomsOverview({ rooms }: RoomsOverviewProps) {
+  const { tasks: unassignedTasks } = useUnassignedTasks();
+  const { mutate: onAssignToSelf } = useAssignRequestToSelf(undefined);
   const totalRooms = rooms.length;
-  const hasTag = (room: Room, tag: string) => (room.tags ?? []).includes(tag);
 
-  const occupiedRooms = rooms.filter((r) => hasTag(r, "occupied")).length;
-  const cleaningRooms = rooms.filter((r) => hasTag(r, "cleaning")).length;
+  const occupiedRooms = rooms.filter(
+    (r) => r.booking_status === "active",
+  ).length;
+  const cleaningRooms = rooms.filter(
+    (r) => r.room_status === "cleaning",
+  ).length;
   const cleaningOnlyRooms = rooms.filter(
-    (r) => hasTag(r, "cleaning") && !hasTag(r, "occupied"),
+    (r) => r.room_status === "cleaning" && r.booking_status !== "active",
   ).length;
   const occupiedAndCleaningRooms = rooms.filter(
-    (r) => hasTag(r, "occupied") && hasTag(r, "cleaning"),
+    (r) => r.booking_status === "active" && r.room_status === "cleaning",
   ).length;
   const vacantRooms = totalRooms - occupiedRooms;
 
   return (
-    <aside className="w-1/4 shrink-0 min-h-0 overflow-y-auto bg-white p-[2vw]">
-      <div className="flex flex-col gap-[2.2vh]">
-        <OverviewCard
-          title="Tasks"
-          columns={[
-            { field: "Urgent", value: 0, description: "Tasks" },
-            {
-              field: "Unassigned",
-              value: cleaningOnlyRooms,
-              description: "Tasks",
-            },
-            { field: "Pending", value: cleaningRooms, description: "Tasks" },
-          ]}
-        />
+    <aside className="w-full max-w-[24.875rem] shrink-0 min-h-0 flex flex-col px-6">
+      <div className="flex flex-col flex-1 min-h-0">
+        <div className="shrink-0">
+          <OverviewCard
+            title="Tasks"
+            columns={[
+              {
+                field: "Urgent",
+                value: 0,
+                description: "Tasks",
+                urgent: true,
+              },
+              {
+                field: "Unassigned",
+                value: cleaningOnlyRooms,
+                description: "Tasks",
+              },
+              {
+                field: "Pending",
+                value: cleaningRooms,
+                description: "Tasks",
+              },
+            ]}
+          />
 
-        <OverviewCard
-          title="Guest Flow"
-          columns={[
-            {
-              field: "Floor Occupancy",
-              value: vacantRooms,
-              description: "Rooms left",
-            },
-            {
-              field: "Expected Arrivals",
-              value: vacantRooms,
-              description: "Guests",
-            },
-            {
-              field: "Expected Departures",
-              value: occupiedAndCleaningRooms,
-              description: "Guests",
-            },
-          ]}
+          <OverviewCard
+            title="Guest Flow"
+            columns={[
+              {
+                field: "Floor Occupancy",
+                value: occupiedRooms,
+                valueSecondary: totalRooms,
+                description: "Rooms occupied",
+              },
+              {
+                field: "Expected Arrivals",
+                value: vacantRooms,
+                description: "Guests",
+              },
+              {
+                field: "Expected Departures",
+                value: occupiedAndCleaningRooms,
+                description: "Guests",
+              },
+            ]}
+          />
+        </div>
+        <RoomRequestList
+          title="Unassigned Tasks"
+          onAssignToSelf={onAssignToSelf}
+          requests={unassignedTasks}
+          className="flex-1 min-h-0"
         />
       </div>
     </aside>
diff --git a/clients/web/src/components/rooms/RoomsToolbar.tsx b/clients/web/src/components/rooms/RoomsToolbar.tsx
new file mode 100644
index 000000000..5b7c6fce9
--- /dev/null
+++ b/clients/web/src/components/rooms/RoomsToolbar.tsx
@@ -0,0 +1,137 @@
+import { SearchBar } from "../ui/SearchBar";
+import { FloorDropdown } from "./FloorDropdown";
+import { OrderByDropdown } from "./OrderByDropdown";
+import type { RoomSortOption } from "./OrderByDropdown";
+import type { RoomFilters, RoomsPageFilters } from "@/hooks/use-rooms-filters";
+import type {
+  RoomAdvancedFilter,
+  RoomAttributeFilter,
+  RoomStatusFilter,
+} from "@shared/api/rooms";
+import { FilterTag } from "@/components/rooms/FilterTag";
+import {
+  ADVANCED_OPTIONS,
+  ATTRIBUTE_OPTIONS,
+  RoomsFilterPopover,
+  STATUS_OPTIONS,
+} from "@/components/rooms/RoomsFilterPopover";
+
+export type { RoomsPageFilters };
+
+type RoomsToolbarProps = {
+  searchTerm: string;
+  onChangeSearchTerm: (value: string) => void;
+  filters: RoomsPageFilters;
+  onChangeFloors: (floors: Array<number>) => void;
+  onApplyFilters: (filters: RoomFilters) => void;
+  onRemoveStatus: (value: RoomStatusFilter) => void;
+  onRemoveAttribute: (value: RoomAttributeFilter) => void;
+  onRemoveAdvanced: (value: RoomAdvancedFilter) => void;
+  sortOption: RoomSortOption;
+  setSortOption: (option: RoomSortOption) => void;
+};
+
+export function RoomsToolbar({
+  searchTerm,
+  onChangeSearchTerm,
+  filters,
+  onChangeFloors,
+  onApplyFilters,
+  onRemoveStatus,
+  onRemoveAttribute,
+  onRemoveAdvanced,
+  sortOption,
+  setSortOption,
+}: RoomsToolbarProps) {
+  const hasActiveFilterTags =
+    filters.floors.length > 0 ||
+    filters.status.length > 0 ||
+    filters.attributes.length > 0 ||
+    filters.advanced.length > 0;
+
+  return (
+    <div className="flex w-full flex-col">
+      <div className="flex items-center gap-3">
+        <div className="flex min-w-0 flex-1 flex-wrap items-center gap-3">
+          <SearchBar
+            value={searchTerm}
+            onChange={onChangeSearchTerm}
+            placeholder="Search for a room..."
+            className="w-56.25"
+          />
+          <FloorDropdown
+            selected={filters.floors}
+            onChangeSelectedFloors={onChangeFloors}
+          />
+          <RoomsFilterPopover
+            filters={{
+              status: filters.status,
+              attributes: filters.attributes,
+              advanced: filters.advanced,
+            }}
+            onApply={onApplyFilters}
+          />
+        </div>
+        <div className="flex shrink-0 items-center gap-2">
+          <span className="whitespace-nowrap text-sm text-text-subtle">
+            Sort by:
+          </span>
+          <OrderByDropdown
+            sortOption={sortOption}
+            setSortOption={setSortOption}
+          />
+        </div>
+      </div>
+      {hasActiveFilterTags ? (
+        <div className="flex flex-wrap gap-2 py-3">
+          {filters.floors.map((floor) => (
+            <FilterTag
+              key={`floor-${floor}`}
+              label={`Floor ${floor}`}
+              onRemove={() =>
+                onChangeFloors(
+                  filters.floors.filter((value) => value !== floor),
+                )
+              }
+            />
+          ))}
+          {filters.status.map((value) => {
+            const label =
+              STATUS_OPTIONS.find((o) => o.value === value)?.label ?? value;
+            return (
+              <FilterTag
+                key={`status-${value}`}
+                label={label}
+                onRemove={() => onRemoveStatus(value)}
+              />
+            );
+          })}
+          {filters.attributes.map((value) => {
+            const label =
+              ATTRIBUTE_OPTIONS.find((o) => o.value === value)?.label ?? value;
+            return (
+              <FilterTag
+                key={`attribute-${value}`}
+                label={label}
+                onRemove={() => onRemoveAttribute(value)}
+              />
+            );
+          })}
+          {filters.advanced.map((value) => {
+            const label =
+              ADVANCED_OPTIONS.find((o) => o.value === value)?.label ?? value;
+            return (
+              <FilterTag
+                key={`advanced-${value}`}
+                label={label}
+                onRemove={() => onRemoveAdvanced(value)}
+              />
+            );
+          })}
+        </div>
+      ) : (
+        <div className="h-3" />
+      )}
+    </div>
+  );
+}
diff --git a/clients/web/src/components/rooms/SortByContainer.tsx b/clients/web/src/components/rooms/SortByContainer.tsx
new file mode 100644
index 000000000..e5502eda2
--- /dev/null
+++ b/clients/web/src/components/rooms/SortByContainer.tsx
@@ -0,0 +1,19 @@
+import { OrderByDropdown } from "./OrderByDropdown";
+import type { RoomSortOption } from "./OrderByDropdown";
+
+type SortByContainerProps = {
+  sortOption: RoomSortOption;
+  setSortOption: (option: RoomSortOption) => void;
+};
+
+export function SortByContainer({
+  sortOption,
+  setSortOption,
+}: SortByContainerProps) {
+  return (
+    <span className="text-sm text-text-subtle flex items-center gap-1 pt-6">
+      Sort by:{" "}
+      <OrderByDropdown sortOption={sortOption} setSortOption={setSortOption} />
+    </span>
+  );
+}
diff --git a/clients/web/src/components/rooms/TagRow.tsx b/clients/web/src/components/rooms/TagRow.tsx
new file mode 100644
index 000000000..87f347ec7
--- /dev/null
+++ b/clients/web/src/components/rooms/TagRow.tsx
@@ -0,0 +1,24 @@
+import type { RoomWithOptionalGuestBooking } from "@shared";
+import { Tag } from "@/components/ui/Tag";
+import { useRoomStatus } from "@/hooks/use-room-status";
+
+export function TagRow({ room }: { room: RoomWithOptionalGuestBooking }) {
+  const rows = useRoomStatus(room);
+
+  if (rows.length === 0) return null;
+
+  return (
+    <div className="flex flex-row flex-wrap gap-2 pt-1">
+      {rows[0].map((t) => (
+        <Tag
+          key={t.key}
+          label={t.label}
+          icon={t.icon}
+          iconClassName={t.iconClassName}
+          priority={t.priority}
+          className={t.className}
+        />
+      ))}
+    </div>
+  );
+}
diff --git a/clients/web/src/components/rooms/TaskCard.tsx b/clients/web/src/components/rooms/TaskCard.tsx
deleted file mode 100644
index b26be6833..000000000
--- a/clients/web/src/components/rooms/TaskCard.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import { DiamondIcon } from "lucide-react";
-
-type TaskCardProps = {
-  task: string;
-  onAssign: () => void;
-};
-export function TaskCard({ task, onAssign }: TaskCardProps) {
-  return (
-    <div className="flex flex-col gap-[1.5vh] rounded-md border border-zinc-200 p-[1vw]">
-      <div className="flex items-center gap-[0.4vw]">
-        <DiamondIcon className="h-[1.8vh] w-[1.8vh] shrink-0" />
-        <span className="text-md font-bold">{task}</span>
-      </div>
-      <button
-        type="button"
-        className="w-full rounded-md border border-zinc-200 bg-primary py-[1vh] text-sm font-medium text-white active:bg-primary-hover"
-        onClick={onAssign}
-      >
-        Assign to self
-      </button>
-    </div>
-  );
-}
diff --git a/clients/web/src/components/settings/DepartmentPicker.tsx b/clients/web/src/components/settings/DepartmentPicker.tsx
new file mode 100644
index 000000000..5369e6b84
--- /dev/null
+++ b/clients/web/src/components/settings/DepartmentPicker.tsx
@@ -0,0 +1,85 @@
+import { useState } from "react";
+import { ChevronDown } from "lucide-react";
+import {
+  useAddEmployeeDepartment,
+  useGetDepartments,
+  useRemoveEmployeeDepartment,
+} from "@shared";
+import {
+  DropdownMenu,
+  DropdownMenuCheckboxItem,
+  DropdownMenuContent,
+  DropdownMenuTrigger,
+} from "@/components/ui/dropdown-menu";
+
+type DepartmentPickerProps = {
+  memberId: string;
+  hotelId: string;
+  departmentNames: Array<string>;
+  isAdmin?: boolean;
+};
+
+export function DepartmentPicker({
+  memberId,
+  hotelId,
+  departmentNames,
+  isAdmin = false,
+}: DepartmentPickerProps) {
+  const [selected, setSelected] = useState<Set<string>>(
+    new Set(departmentNames),
+  );
+
+  const { data } = useGetDepartments(hotelId);
+  const departments = data ?? [];
+  const { mutate: addDept } = useAddEmployeeDepartment(hotelId);
+  const { mutate: removeDept } = useRemoveEmployeeDepartment(hotelId);
+
+  const label = selected.size > 0 ? [...selected].join(", ") : "—";
+
+  function toggle(deptId: string, deptName: string, checked: boolean) {
+    if (checked) {
+      setSelected((prev) => new Set([...prev, deptName]));
+      addDept({ employeeId: memberId, departmentId: deptId });
+    } else {
+      setSelected((prev) => {
+        const next = new Set(prev);
+        next.delete(deptName);
+        return next;
+      });
+      removeDept({ employeeId: memberId, departmentId: deptId });
+    }
+  }
+
+  if (!isAdmin) {
+    return (
+      <span className="px-2 py-1 text-sm text-text-secondary truncate">
+        {label}
+      </span>
+    );
+  }
+
+  return (
+    <DropdownMenu>
+      <DropdownMenuTrigger className="flex w-full items-center justify-between rounded-md px-2 py-1 text-sm text-text-secondary hover:bg-bg-selected transition-colors outline-none">
+        <span className="min-w-0 truncate">{label}</span>
+        <ChevronDown className="size-3 shrink-0 text-text-subtle opacity-70" />
+      </DropdownMenuTrigger>
+      <DropdownMenuContent align="end" className="w-56">
+        {departments.length === 0 ? (
+          <p className="px-1.5 py-1 text-xs text-text-subtle">No departments</p>
+        ) : (
+          departments.map((dept) => (
+            <DropdownMenuCheckboxItem
+              key={dept.id}
+              checked={selected.has(dept.name)}
+              onCheckedChange={(checked) => toggle(dept.id, dept.name, checked)}
+              onSelect={(e) => e.preventDefault()}
+            >
+              {dept.name}
+            </DropdownMenuCheckboxItem>
+          ))
+        )}
+      </DropdownMenuContent>
+    </DropdownMenu>
+  );
+}
diff --git a/clients/web/src/components/settings/DepartmentsTab.tsx b/clients/web/src/components/settings/DepartmentsTab.tsx
new file mode 100644
index 000000000..1c7fb7033
--- /dev/null
+++ b/clients/web/src/components/settings/DepartmentsTab.tsx
@@ -0,0 +1,270 @@
+import { useState } from "react";
+import { Building2, Check, Pencil, Plus, Trash2, X } from "lucide-react";
+import { useUser } from "@clerk/clerk-react";
+import { useQuery } from "@tanstack/react-query";
+import {
+  useCreateDepartment,
+  useDeleteDepartment,
+  useGetDepartments,
+  useGetUsersIdHook,
+  useUpdateDepartment,
+} from "@shared";
+import { useIsAdmin } from "@/hooks/use-is-admin";
+
+export function DepartmentsTab() {
+  const [editingId, setEditingId] = useState<string | null>(null);
+  const [editingName, setEditingName] = useState("");
+  const [isAdding, setIsAdding] = useState(false);
+  const [newName, setNewName] = useState("");
+  const [deletingId, setDeletingId] = useState<string | null>(null);
+
+  const { isAdmin } = useIsAdmin();
+
+  const { user: clerkUser } = useUser();
+  const getCurrentUser = useGetUsersIdHook();
+
+  const { data: currentUser } = useQuery({
+    queryKey: ["user", clerkUser?.id],
+    queryFn: () => getCurrentUser(clerkUser!.id),
+    enabled: !!clerkUser?.id,
+  });
+
+  const hotelId = currentUser?.hotel_id;
+
+  const { data, isLoading } = useGetDepartments(hotelId);
+  const departments = data ?? [];
+  const { mutate: createDepartment, isPending: isCreating } =
+    useCreateDepartment(hotelId);
+  const { mutate: updateDepartment, isPending: isUpdating } =
+    useUpdateDepartment(hotelId);
+  const { mutate: deleteDepartment, isPending: isDeleting } =
+    useDeleteDepartment(hotelId);
+
+  function confirmEdit() {
+    if (!editingName.trim() || !editingId || isUpdating) return;
+    updateDepartment(
+      { id: editingId, name: editingName.trim() },
+      {
+        onSuccess: () => {
+          setEditingId(null);
+          setEditingName("");
+        },
+      },
+    );
+  }
+
+  function confirmAdd() {
+    if (!newName.trim() || isCreating) return;
+    createDepartment(newName.trim(), {
+      onSuccess: () => {
+        setNewName("");
+        setIsAdding(false);
+      },
+    });
+  }
+
+  const deletingDept = departments.find((d) => d.id === deletingId);
+
+  const rowGrid = isAdmin
+    ? "grid grid-cols-[1fr_5rem] items-center gap-x-4"
+    : "grid grid-cols-[1fr] items-center";
+
+  return (
+    <div>
+      {/* Toolbar */}
+      <div className="mb-4 flex items-center justify-between">
+        <p className="text-sm text-text-subtle">
+          {departments.length} department{departments.length !== 1 ? "s" : ""}
+        </p>
+        {isAdmin && (
+          <button
+            type="button"
+            onClick={() => setIsAdding(true)}
+            disabled={isAdding}
+            className="flex items-center gap-1.5 rounded-md px-2.5 py-1.5 text-sm font-medium text-text-default hover:bg-bg-selected transition-colors disabled:opacity-50"
+          >
+            <Plus className="size-4" />
+            New department
+          </button>
+        )}
+      </div>
+
+      {isLoading ? (
+        <div className="py-12 text-center text-sm text-text-subtle">
+          Loading…
+        </div>
+      ) : departments.length === 0 && !isAdding ? (
+        <div className="flex flex-col items-center gap-2 py-12 text-text-subtle">
+          <Building2 className="size-7 opacity-40" />
+          <p className="text-sm">No departments yet. Add one to get started.</p>
+        </div>
+      ) : (
+        <div className="overflow-hidden rounded-lg border border-stroke-subtle">
+          {/* Column headers */}
+          <div
+            className={`${rowGrid} border-b border-stroke-subtle bg-bg-selected px-3 py-2`}
+          >
+            <p className="text-xs font-medium text-text-subtle">Name</p>
+            {isAdmin && <span />}
+          </div>
+
+          {/* Rows */}
+          <div className="divide-y divide-stroke-subtle">
+            {departments.map((dept) => (
+              <div key={dept.id} className={`${rowGrid} px-3 py-2.5 group`}>
+                <div>
+                  {editingId === dept.id ? (
+                    <div className="flex items-center gap-1.5">
+                      <input
+                        type="text"
+                        value={editingName}
+                        onChange={(e) => setEditingName(e.target.value)}
+                        onKeyDown={(e) => {
+                          if (e.key === "Enter") confirmEdit();
+                          if (e.key === "Escape") {
+                            setEditingId(null);
+                            setEditingName("");
+                          }
+                        }}
+                        autoFocus
+                        className="flex-1 border-b border-stroke-default bg-transparent py-0.5 text-sm text-text-default focus:outline-none"
+                      />
+                      <button
+                        type="button"
+                        onClick={confirmEdit}
+                        disabled={isUpdating}
+                        className="rounded p-1.5 text-text-subtle hover:bg-bg-selected hover:text-text-default transition-colors disabled:opacity-50"
+                      >
+                        <Check className="size-4" />
+                      </button>
+                      <button
+                        type="button"
+                        onClick={() => {
+                          setEditingId(null);
+                          setEditingName("");
+                        }}
+                        className="rounded p-1.5 text-text-subtle hover:bg-bg-selected hover:text-text-default transition-colors"
+                      >
+                        <X className="size-4" />
+                      </button>
+                    </div>
+                  ) : (
+                    <span className="text-sm text-text-default">
+                      {dept.name}
+                    </span>
+                  )}
+                </div>
+
+                {isAdmin && editingId !== dept.id && (
+                  <div className="flex items-center gap-1 opacity-0 group-hover:opacity-100 transition-opacity">
+                    <button
+                      type="button"
+                      onClick={() => {
+                        setEditingId(dept.id);
+                        setEditingName(dept.name);
+                      }}
+                      className="rounded p-1.5 text-text-subtle hover:bg-bg-selected hover:text-text-default transition-colors"
+                    >
+                      <Pencil className="size-4" />
+                    </button>
+                    <button
+                      type="button"
+                      onClick={() => setDeletingId(dept.id)}
+                      className="rounded p-1 text-danger hover:bg-bg-selected transition-colors"
+                    >
+                      <Trash2 className="size-4" />
+                    </button>
+                  </div>
+                )}
+              </div>
+            ))}
+
+            {/* Inline add form */}
+            {isAdding && (
+              <div className={`${rowGrid} px-3 py-2.5`}>
+                <div className="flex items-center gap-1.5">
+                  <input
+                    type="text"
+                    value={newName}
+                    onChange={(e) => setNewName(e.target.value)}
+                    onKeyDown={(e) => {
+                      if (e.key === "Enter") confirmAdd();
+                      if (e.key === "Escape") {
+                        setNewName("");
+                        setIsAdding(false);
+                      }
+                    }}
+                    placeholder="Department name"
+                    autoFocus
+                    className="flex-1 border-b border-stroke-default bg-transparent py-0.5 text-sm text-text-default placeholder:text-text-subtle focus:outline-none"
+                  />
+                  <button
+                    type="button"
+                    onClick={confirmAdd}
+                    disabled={isCreating}
+                    className="rounded p-1.5 text-text-subtle hover:bg-bg-selected hover:text-text-default transition-colors disabled:opacity-50"
+                  >
+                    <Check className="size-4" />
+                  </button>
+                  <button
+                    type="button"
+                    onClick={() => {
+                      setNewName("");
+                      setIsAdding(false);
+                    }}
+                    className="rounded p-1.5 text-text-subtle hover:bg-bg-selected hover:text-text-default transition-colors"
+                  >
+                    <X className="size-4" />
+                  </button>
+                </div>
+                <span />
+              </div>
+            )}
+          </div>
+        </div>
+      )}
+
+      {deletingId && (
+        <div className="fixed inset-0 z-[60] flex items-center justify-center bg-black/30">
+          <div className="relative w-full max-w-md rounded-2xl bg-white p-8 shadow-xl">
+            <button
+              type="button"
+              onClick={() => setDeletingId(null)}
+              className="absolute right-5 top-5 text-text-secondary hover:text-text-default"
+            >
+              <X className="size-5" />
+            </button>
+            <h2 className="text-[20px] font-bold text-text-default">
+              Delete {deletingDept?.name}?
+            </h2>
+            <p className="mt-2 text-[16px] text-text-secondary">
+              This department will be permanently removed. Members won't be
+              deleted.
+            </p>
+            <div className="mt-8 flex justify-end gap-3">
+              <button
+                type="button"
+                onClick={() => setDeletingId(null)}
+                className="rounded-lg border border-stroke-subtle px-5 py-2.5 text-sm font-medium text-text-secondary hover:bg-bg-selected hover:text-text-default transition-colors"
+              >
+                Cancel
+              </button>
+              <button
+                type="button"
+                onClick={() =>
+                  deleteDepartment(deletingId, {
+                    onSuccess: () => setDeletingId(null),
+                  })
+                }
+                disabled={isDeleting}
+                className="rounded-lg bg-danger px-5 py-2.5 text-sm font-semibold text-white hover:opacity-90 transition-opacity disabled:opacity-50"
+              >
+                Delete
+              </button>
+            </div>
+          </div>
+        </div>
+      )}
+    </div>
+  );
+}
diff --git a/clients/web/src/components/settings/InviteMemberModal.tsx b/clients/web/src/components/settings/InviteMemberModal.tsx
new file mode 100644
index 000000000..0cbbb194b
--- /dev/null
+++ b/clients/web/src/components/settings/InviteMemberModal.tsx
@@ -0,0 +1,139 @@
+import { useState } from "react";
+import { Mail } from "lucide-react";
+import { useOrganization } from "@clerk/clerk-react";
+import { isClerkAPIResponseError } from "@clerk/shared/error";
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+} from "@/components/ui/dialog";
+import { Button } from "@/components/ui/Button";
+
+type InviteMemberModalProps = {
+  open: boolean;
+  onClose: () => void;
+};
+
+export function InviteMemberModal({ open, onClose }: InviteMemberModalProps) {
+  const { organization } = useOrganization();
+  const [email, setEmail] = useState("");
+  const [error, setError] = useState<string | null>(null);
+  const [success, setSuccess] = useState(false);
+  const [isLoading, setIsLoading] = useState(false);
+
+  function handleOpenChange(opened: boolean) {
+    if (!opened) handleClose();
+  }
+
+  function handleClose() {
+    setEmail("");
+    setError(null);
+    setSuccess(false);
+    onClose();
+  }
+
+  async function handleSubmit() {
+    if (!organization || !email) return;
+
+    setError(null);
+    setIsLoading(true);
+
+    try {
+      await organization.inviteMember({
+        emailAddress: email,
+        role: "org:member",
+      });
+      setSuccess(true);
+      setEmail("");
+    } catch (err: unknown) {
+      if (isClerkAPIResponseError(err)) {
+        setError(err.errors[0]?.longMessage ?? "Failed to send invite");
+      } else {
+        setError("Failed to send invite");
+      }
+    } finally {
+      setIsLoading(false);
+    }
+  }
+
+  return (
+    <Dialog open={open} onOpenChange={handleOpenChange}>
+      <DialogContent
+        className="max-w-xl sm:max-w-xl bg-white p-12 ring-0 shadow-lg"
+        showCloseButton={false}
+      >
+        <DialogHeader className="gap-2">
+          <DialogTitle className="text-2xl font-bold">
+            Invite member
+          </DialogTitle>
+          <DialogDescription className="text-sm">
+            They'll receive an email to join your workspace.
+          </DialogDescription>
+        </DialogHeader>
+
+        {success ? (
+          <div className="rounded-lg border border-stroke-subtle bg-bg-container px-4 py-3 text-base text-text-default">
+            Invite sent successfully.
+          </div>
+        ) : (
+          <div className="flex flex-col gap-3 py-1">
+            <div className="relative">
+              <Mail className="absolute left-4 top-1/2 size-4 -translate-y-1/2 text-text-subtle" />
+              <input
+                type="email"
+                placeholder="name@example.com"
+                value={email}
+                onChange={(e) => setEmail(e.target.value)}
+                onKeyDown={(e) => e.key === "Enter" && handleSubmit()}
+                className="w-full rounded-md border border-stroke-subtle bg-transparent py-3 pl-10 pr-4 text-base text-text-default placeholder:text-text-subtle focus:border-stroke-default focus:outline-none transition-colors"
+              />
+            </div>
+            {error && <p className="text-sm text-red-500">{error}</p>}
+          </div>
+        )}
+
+        <DialogFooter className="border-0 bg-transparent p-0 sm:justify-center gap-3 pt-2">
+          {success ? (
+            <>
+              <Button
+                variant="secondary"
+                className="h-12 w-44 text-base"
+                onClick={() => setSuccess(false)}
+              >
+                Invite another
+              </Button>
+              <Button
+                variant="primary"
+                className="h-12 w-44 text-base"
+                onClick={handleClose}
+              >
+                Done
+              </Button>
+            </>
+          ) : (
+            <>
+              <Button
+                variant="secondary"
+                className="h-12 w-44 text-base"
+                onClick={handleClose}
+              >
+                Cancel
+              </Button>
+              <Button
+                variant="primary"
+                className="h-12 w-44 text-base"
+                onClick={handleSubmit}
+                disabled={isLoading || !email}
+              >
+                {isLoading ? "Sending..." : "Send invite"}
+              </Button>
+            </>
+          )}
+        </DialogFooter>
+      </DialogContent>
+    </Dialog>
+  );
+}
diff --git a/clients/web/src/components/settings/MemberDetailPanel.tsx b/clients/web/src/components/settings/MemberDetailPanel.tsx
new file mode 100644
index 000000000..eba194792
--- /dev/null
+++ b/clients/web/src/components/settings/MemberDetailPanel.tsx
@@ -0,0 +1,142 @@
+import { ArrowLeft, Check, ChevronDown } from "lucide-react";
+import { DepartmentPicker } from "./DepartmentPicker";
+import type { Member } from "./MembersTab";
+import { cn, getInitials, hashNameToColor } from "@/lib/utils";
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuTrigger,
+} from "@/components/ui/dropdown-menu";
+
+type Role = "Admin" | "Member";
+
+const ROLES: Array<{ role: Role; description: string }> = [
+  { role: "Admin", description: "Can manage members and most settings" },
+  { role: "Member", description: "Can view and use workspace content" },
+];
+
+type MemberDetailPanelProps = {
+  member: Member;
+  note: string;
+  onNoteChange: (note: string) => void;
+  onRoleChange: (role: Role) => void;
+  onBack: () => void;
+  isAdmin?: boolean;
+};
+
+export function MemberDetailPanel({
+  member,
+  note,
+  onNoteChange,
+  onRoleChange,
+  onBack,
+  isAdmin = false,
+}: MemberDetailPanelProps) {
+  return (
+    <div className="flex h-full flex-col overflow-y-auto p-12">
+      {/* Back button */}
+      <button
+        type="button"
+        onClick={onBack}
+        className="mb-8 flex items-center gap-1.5 self-start rounded-md px-2 py-1.5 text-sm text-text-subtle hover:bg-bg-selected hover:text-text-default transition-colors"
+      >
+        <ArrowLeft className="size-3.5" />
+        Members
+      </button>
+
+      {/* Hero */}
+      <div className="mb-8 flex items-center gap-5">
+        {member.avatarUrl ? (
+          <img
+            src={member.avatarUrl}
+            alt={member.name}
+            className="size-20 rounded-full object-cover"
+          />
+        ) : (
+          <div
+            className={cn(
+              "flex size-20 shrink-0 items-center justify-center rounded-full text-2xl font-semibold",
+              hashNameToColor(member.name),
+            )}
+          >
+            {getInitials(member.name)}
+          </div>
+        )}
+        <div>
+          <h2 className="text-2xl font-bold text-text-default">
+            {member.name}
+          </h2>
+          <p className="text-sm text-text-subtle">{member.email}</p>
+        </div>
+      </div>
+
+      {/* Info rows */}
+      <div className="mb-8 divide-y divide-stroke-subtle/50 border-y border-stroke-subtle/50">
+        <div className="flex items-center justify-between py-3">
+          <span className="text-sm text-text-subtle">Departments</span>
+          <DepartmentPicker
+            memberId={member.id}
+            hotelId={member.hotelId}
+            departmentNames={member.departments}
+            isAdmin={isAdmin}
+          />
+        </div>
+
+        <div className="flex items-center justify-between py-3">
+          <span className="text-sm text-text-subtle">Role</span>
+          {isAdmin ? (
+            <DropdownMenu>
+              <DropdownMenuTrigger className="flex items-center gap-1 rounded-md px-2 py-1 text-sm text-text-secondary hover:bg-bg-selected transition-colors outline-none">
+                {member.role}
+                <ChevronDown className="size-3 text-text-subtle opacity-70" />
+              </DropdownMenuTrigger>
+              <DropdownMenuContent align="end" className="w-56">
+                {ROLES.map(({ role: r, description }) => (
+                  <DropdownMenuItem
+                    key={r}
+                    onClick={() => onRoleChange(r)}
+                    className="flex items-start gap-3 px-3 py-2.5"
+                  >
+                    <div className="flex-1">
+                      <p className="text-sm font-medium text-text-default">
+                        {r}
+                      </p>
+                      <p className="text-xs text-text-subtle">{description}</p>
+                    </div>
+                    {r === member.role && (
+                      <Check className="mt-0.5 size-3.5 shrink-0 text-text-subtle" />
+                    )}
+                  </DropdownMenuItem>
+                ))}
+              </DropdownMenuContent>
+            </DropdownMenu>
+          ) : (
+            <span className="px-2 py-1 text-sm text-text-secondary">
+              {member.role}
+            </span>
+          )}
+        </div>
+
+        <div className="flex items-center justify-between py-3">
+          <span className="text-sm text-text-subtle">Joined</span>
+          <span className="text-sm font-medium text-text-default">
+            {member.joinedAt}
+          </span>
+        </div>
+      </div>
+
+      {/* Notes */}
+      <div>
+        <p className="mb-2 text-sm font-medium text-text-default">Notes</p>
+        <textarea
+          value={note}
+          onChange={(e) => onNoteChange(e.target.value)}
+          placeholder="Add a note about this member..."
+          rows={5}
+          className="w-full resize-none rounded-lg border border-stroke-subtle bg-transparent p-3 text-sm text-text-default placeholder:text-text-subtle focus:border-stroke-default focus:outline-none transition-colors"
+        />
+      </div>
+    </div>
+  );
+}
diff --git a/clients/web/src/components/settings/MembersTab.tsx b/clients/web/src/components/settings/MembersTab.tsx
new file mode 100644
index 000000000..b193dbc00
--- /dev/null
+++ b/clients/web/src/components/settings/MembersTab.tsx
@@ -0,0 +1,303 @@
+import { useInfiniteQuery, useQuery } from "@tanstack/react-query";
+import { useEffect, useState } from "react";
+import { Check, ChevronDown, Search, UserPlus } from "lucide-react";
+import { useUser } from "@clerk/clerk-react";
+import { useCustomInstance, useGetUsersIdHook } from "@shared";
+import { InviteMemberModal } from "./InviteMemberModal";
+import { DepartmentPicker } from "./DepartmentPicker";
+import type { User } from "@shared";
+import { cn, getInitials, hashNameToColor } from "@/lib/utils";
+import { useIsAdmin } from "@/hooks/use-is-admin";
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuTrigger,
+} from "@/components/ui/dropdown-menu";
+
+type Role = "Admin" | "Member";
+
+type UserPage = {
+  users: Array<User> | null;
+  next_cursor: string;
+};
+
+export type Member = {
+  id: string;
+  name: string;
+  email: string;
+  avatarUrl?: string;
+  role: Role;
+  departments: Array<string>;
+  hotelId: string;
+  joinedAt: string;
+};
+
+const ROLES: Array<{ role: Role; description: string }> = [
+  { role: "Admin", description: "Can manage members and most settings" },
+  { role: "Member", description: "Can view and use workspace content" },
+];
+
+const ROW_GRID = "grid grid-cols-[1fr_12rem_8rem_7rem] items-center gap-x-4";
+
+const SEARCH_DEBOUNCE_MS = 200;
+
+function toMember(user: User): Member {
+  const fullName =
+    [user.first_name, user.last_name].filter(Boolean).join(" ") || "Unknown";
+  return {
+    id: user.id!,
+    name: fullName,
+    email: user.primary_email ?? "",
+    avatarUrl: user.profile_picture ?? undefined,
+    role: user.role === "Admin" ? "Admin" : "Member",
+    departments: user.departments ?? [],
+    hotelId: user.hotel_id ?? "",
+    joinedAt: user.created_at
+      ? new Date(user.created_at).toLocaleDateString("en-US", {
+          month: "short",
+          day: "numeric",
+          year: "numeric",
+        })
+      : "",
+  };
+}
+
+function MemberAvatar({ member }: { member: Member }) {
+  if (member.avatarUrl) {
+    return (
+      <img
+        src={member.avatarUrl}
+        alt={member.name}
+        className="size-8 rounded-full object-cover"
+      />
+    );
+  }
+  return (
+    <div
+      className={cn(
+        "flex size-8 items-center justify-center rounded-full text-xs font-semibold",
+        hashNameToColor(member.name),
+      )}
+    >
+      {getInitials(member.name)}
+    </div>
+  );
+}
+
+type RolePickerProps = {
+  role: Role;
+  onChange: (role: Role) => void;
+};
+
+function RolePicker({ role, onChange }: RolePickerProps) {
+  return (
+    <DropdownMenu>
+      <DropdownMenuTrigger className="flex w-full items-center justify-between rounded-md px-2 py-1 text-sm text-text-secondary hover:bg-bg-selected transition-colors outline-none">
+        {role}
+        <ChevronDown className="size-3 text-text-subtle opacity-70" />
+      </DropdownMenuTrigger>
+      <DropdownMenuContent align="end" className="w-56">
+        {ROLES.map(({ role: roleOption, description }) => (
+          <DropdownMenuItem
+            key={roleOption}
+            onClick={() => onChange(roleOption)}
+            className="flex items-start gap-3 px-3 py-2.5"
+          >
+            <div className="flex-1">
+              <p className="text-sm font-medium text-text-default">
+                {roleOption}
+              </p>
+              <p className="text-xs text-text-subtle">{description}</p>
+            </div>
+            {roleOption === role && (
+              <Check className="mt-0.5 size-3.5 shrink-0 text-text-subtle" />
+            )}
+          </DropdownMenuItem>
+        ))}
+      </DropdownMenuContent>
+    </DropdownMenu>
+  );
+}
+
+type MemberRowProps = {
+  member: Member;
+  onSelect: (member: Member) => void;
+  isAdmin: boolean;
+};
+
+function MemberRow({ member, onSelect, isAdmin }: MemberRowProps) {
+  return (
+    <div className={cn(ROW_GRID, "py-2")}>
+      <button
+        type="button"
+        onClick={() => onSelect(member)}
+        className="group inline-flex items-center gap-2.5 cursor-pointer"
+      >
+        <MemberAvatar member={member} />
+        <div className="min-w-0 text-left">
+          <p className="truncate text-sm font-medium text-text-default leading-tight group-hover:underline">
+            {member.name}
+          </p>
+          <p className="truncate text-xs text-text-subtle">{member.email}</p>
+        </div>
+      </button>
+
+      <DepartmentPicker
+        memberId={member.id}
+        hotelId={member.hotelId}
+        departmentNames={member.departments}
+        isAdmin={isAdmin}
+      />
+
+      <span className="text-xs text-text-subtle">{member.joinedAt}</span>
+
+      {isAdmin ? (
+        <RolePicker role={member.role} onChange={() => {}} />
+      ) : (
+        <span className="pl-2 text-sm text-text-secondary">{member.role}</span>
+      )}
+    </div>
+  );
+}
+
+type MembersTabProps = {
+  onSelectMember: (member: Member) => void;
+};
+
+export function MembersTab({ onSelectMember }: MembersTabProps) {
+  const [searchInput, setSearchInput] = useState("");
+  const [debouncedSearch, setDebouncedSearch] = useState("");
+  const [inviteOpen, setInviteOpen] = useState(false);
+
+  const { isAdmin } = useIsAdmin();
+
+  useEffect(() => {
+    const timer = setTimeout(
+      () => setDebouncedSearch(searchInput),
+      SEARCH_DEBOUNCE_MS,
+    );
+    return () => clearTimeout(timer);
+  }, [searchInput]);
+
+  const { user: clerkUser } = useUser();
+  const getCurrentUser = useGetUsersIdHook();
+  const searchUsers = useCustomInstance<UserPage>();
+
+  const { data: currentUser } = useQuery({
+    queryKey: ["user", clerkUser?.id],
+    queryFn: () => getCurrentUser(clerkUser!.id),
+    enabled: !!clerkUser?.id,
+  });
+
+  const hotelId = currentUser?.hotel_id;
+
+  const {
+    data: membersPages,
+    fetchNextPage,
+    hasNextPage,
+    isFetchingNextPage,
+    isLoading,
+  } = useInfiniteQuery({
+    queryKey: ["hotel-members", hotelId, debouncedSearch],
+    queryFn: ({ pageParam }: { pageParam: string }) =>
+      searchUsers({
+        url: "/users/search",
+        method: "POST",
+        data: {
+          hotel_id: hotelId!,
+          cursor: pageParam || undefined,
+          q: debouncedSearch || undefined,
+        },
+      }),
+    enabled: !!hotelId,
+    initialPageParam: "",
+    getNextPageParam: (lastPage) => lastPage.next_cursor || undefined,
+  });
+
+  const allMembers =
+    membersPages?.pages.flatMap((page) => (page.users ?? []).map(toMember)) ??
+    [];
+
+  return (
+    <div>
+      <InviteMemberModal
+        open={inviteOpen}
+        onClose={() => setInviteOpen(false)}
+      />
+
+      {/* Toolbar */}
+      <div className="mb-4 flex items-center justify-between">
+        <p className="text-sm text-text-subtle">
+          {allMembers.length} member{allMembers.length !== 1 ? "s" : ""}
+        </p>
+        {isAdmin && (
+          <button
+            type="button"
+            onClick={() => setInviteOpen(true)}
+            className="flex items-center gap-1.5 rounded-md px-2.5 py-1.5 text-sm font-medium text-text-default hover:bg-bg-selected transition-colors"
+          >
+            <UserPlus className="size-3.5" />
+            Add members
+          </button>
+        )}
+      </div>
+
+      {/* Search */}
+      <div className="relative mb-3">
+        <Search className="absolute left-3 top-1/2 size-3.5 -translate-y-1/2 text-text-subtle" />
+        <input
+          type="text"
+          placeholder="Filter by name or email..."
+          value={searchInput}
+          onChange={(e) => setSearchInput(e.target.value)}
+          className="w-full rounded-md border border-stroke-subtle bg-transparent py-1.5 pl-8 pr-3 text-sm text-text-default placeholder:text-text-subtle focus:outline-none focus:border-stroke-default transition-colors"
+        />
+      </div>
+
+      {/* Column headers */}
+      <div className={cn(ROW_GRID, "pb-1.5 border-b border-stroke-subtle")}>
+        <p className="text-xs font-medium text-text-subtle">User</p>
+        <p className="text-xs font-medium text-text-subtle">Departments</p>
+        <p className="text-xs font-medium text-text-subtle">Joined</p>
+        <p className="pl-2 text-xs font-medium text-text-subtle">Role</p>
+      </div>
+
+      {/* Rows */}
+      <div className="pt-1">
+        {isLoading ? (
+          <p className="py-10 text-center text-sm text-text-subtle">
+            Loading members...
+          </p>
+        ) : allMembers.length === 0 ? (
+          <p className="py-10 text-center text-sm text-text-subtle">
+            No members match your search.
+          </p>
+        ) : (
+          allMembers.map((member) => (
+            <MemberRow
+              key={member.id}
+              member={member}
+              onSelect={onSelectMember}
+              isAdmin={isAdmin}
+            />
+          ))
+        )}
+      </div>
+
+      {/* Load more */}
+      {hasNextPage && (
+        <div className="mt-3 flex justify-center">
+          <button
+            type="button"
+            onClick={() => fetchNextPage()}
+            disabled={isFetchingNextPage}
+            className="text-xs text-text-subtle hover:text-text-default transition-colors disabled:opacity-50"
+          >
+            {isFetchingNextPage ? "Loading..." : "Load more"}
+          </button>
+        </div>
+      )}
+    </div>
+  );
+}
diff --git a/clients/web/src/components/settings/ProfileTab.tsx b/clients/web/src/components/settings/ProfileTab.tsx
new file mode 100644
index 000000000..0407e770c
--- /dev/null
+++ b/clients/web/src/components/settings/ProfileTab.tsx
@@ -0,0 +1,82 @@
+import { useUser } from "@clerk/clerk-react";
+import { useQuery } from "@tanstack/react-query";
+import { useGetUsersIdHook } from "@shared";
+import { Skeleton } from "@/components/ui/skeleton";
+import {
+  ProfileHero,
+  ProfileHeroSkeleton,
+} from "@/components/profile/ProfileHero";
+import {
+  ProfileInfoCard,
+  ProfileInfoCardSkeleton,
+} from "@/components/profile/ProfileInfoCard";
+import { NotesFromManagerCard } from "@/components/profile/NotesFromManagerCard";
+import { LogoutButton } from "@/components/LogoutButton";
+import { useProfilePicture } from "@/hooks/use-profile-picture";
+
+export function ProfileTab() {
+  const { user: clerkUser } = useUser();
+  const getUsersId = useGetUsersIdHook();
+  const {
+    profilePicUrl,
+    isLoading: isProfilePictureLoading,
+    handleUpload,
+  } = useProfilePicture(clerkUser?.id ?? "");
+
+  const { data: user, isLoading } = useQuery({
+    queryKey: ["user", clerkUser?.id],
+    queryFn: () => getUsersId(clerkUser!.id),
+    enabled: !!clerkUser?.id,
+  });
+
+  const firstName = user?.first_name ?? "";
+  const lastName = user?.last_name ?? "";
+  const displayName = [firstName, lastName].filter(Boolean).join(" ") || "User";
+  const avatarUrl =
+    profilePicUrl ?? user?.profile_picture ?? clerkUser?.imageUrl;
+
+  if (isLoading) {
+    return (
+      <>
+        <ProfileHeroSkeleton />
+        <div className="flex items-stretch gap-4">
+          <div className="flex-1">
+            <ProfileInfoCardSkeleton />
+          </div>
+          <div className="flex-1">
+            <Skeleton className="h-56 rounded-lg" />
+          </div>
+        </div>
+      </>
+    );
+  }
+
+  return (
+    <>
+      <ProfileHero
+        firstName={firstName}
+        lastName={lastName}
+        avatarUrl={avatarUrl}
+        onPickFile={handleUpload}
+        isUploading={isProfilePictureLoading}
+      />
+      <div className="flex items-stretch gap-4">
+        <div className="flex-1">
+          <ProfileInfoCard
+            userId={clerkUser!.id}
+            governmentName={displayName}
+            email={user?.primary_email ?? "—"}
+            phoneNumber={user?.phone_number ?? "—"}
+            department={user?.department ?? "—"}
+          />
+        </div>
+        <div className="flex-1">
+          <NotesFromManagerCard />
+        </div>
+      </div>
+      <div className="mt-6">
+        <LogoutButton />
+      </div>
+    </>
+  );
+}
diff --git a/clients/web/src/components/settings/SettingsContentPanel.tsx b/clients/web/src/components/settings/SettingsContentPanel.tsx
new file mode 100644
index 000000000..d332406d0
--- /dev/null
+++ b/clients/web/src/components/settings/SettingsContentPanel.tsx
@@ -0,0 +1,88 @@
+import { useEffect, useState } from "react";
+import { X } from "lucide-react";
+import { ProfileTab } from "./ProfileTab";
+import { MembersTab } from "./MembersTab";
+import { MemberDetailPanel } from "./MemberDetailPanel";
+import { DepartmentsTab } from "./DepartmentsTab";
+import type { Member } from "./MembersTab";
+import type { SettingsTab } from "./SettingsNav";
+import { DialogTitle } from "@/components/ui/dialog";
+import { cn } from "@/lib/utils";
+import { useIsAdmin } from "@/hooks/use-is-admin";
+
+type SettingsContentPanelProps = {
+  activeTab: SettingsTab;
+  title: string;
+  onClose: () => void;
+};
+
+export function SettingsContentPanel({
+  activeTab,
+  title,
+  onClose,
+}: SettingsContentPanelProps) {
+  const [selectedMember, setSelectedMember] = useState<Member | null>(null);
+  const [memberNotes, setMemberNotes] = useState<Record<string, string>>({});
+
+  const { isAdmin } = useIsAdmin();
+
+  useEffect(() => {
+    setSelectedMember(null);
+  }, [activeTab]);
+
+  function handleRoleChange(role: "Admin" | "Member") {
+    setSelectedMember((prev) => (prev ? { ...prev, role } : null));
+  }
+
+  return (
+    <div className="relative flex-1 overflow-hidden">
+      {/* Close button — always on top */}
+      <button
+        type="button"
+        onClick={onClose}
+        className="absolute right-4 top-4 z-20 rounded-md p-1.5 text-text-subtle hover:bg-bg-selected hover:text-text-default"
+      >
+        <X className="size-4" />
+      </button>
+
+      {/* Main scrollable content */}
+      <div className="h-full overflow-y-auto p-12">
+        <div className="mb-8">
+          <DialogTitle className="text-3xl font-bold text-text-default">
+            {title}
+          </DialogTitle>
+        </div>
+
+        {activeTab === "profile" && <ProfileTab />}
+        {activeTab === "members" && (
+          <MembersTab onSelectMember={setSelectedMember} />
+        )}
+        {activeTab === "departments" && <DepartmentsTab />}
+      </div>
+
+      {/* Member detail panel — slides in over content */}
+      <div
+        className={cn(
+          "absolute inset-0 z-10 bg-white transition-transform duration-300 ease-in-out",
+          selectedMember ? "translate-x-0" : "translate-x-full",
+        )}
+      >
+        {selectedMember && (
+          <MemberDetailPanel
+            member={selectedMember}
+            note={memberNotes[selectedMember.id] ?? ""}
+            onNoteChange={(note) =>
+              setMemberNotes((prev) => ({
+                ...prev,
+                [selectedMember.id]: note,
+              }))
+            }
+            onRoleChange={handleRoleChange}
+            onBack={() => setSelectedMember(null)}
+            isAdmin={isAdmin}
+          />
+        )}
+      </div>
+    </div>
+  );
+}
diff --git a/clients/web/src/components/settings/SettingsModal.tsx b/clients/web/src/components/settings/SettingsModal.tsx
new file mode 100644
index 000000000..40b8eccd0
--- /dev/null
+++ b/clients/web/src/components/settings/SettingsModal.tsx
@@ -0,0 +1,45 @@
+import { useState } from "react";
+import { useUser } from "@clerk/clerk-react";
+import { Dialog as DialogPrimitive } from "radix-ui";
+import { SettingsNav } from "./SettingsNav";
+import { SettingsContentPanel } from "./SettingsContentPanel";
+import type { SettingsTab } from "./SettingsNav";
+
+type SettingsModalProps = {
+  open: boolean;
+  onClose: () => void;
+};
+
+const tabTitles: Record<SettingsTab, string> = {
+  profile: "",
+  members: "Members",
+  departments: "Departments",
+};
+
+export function SettingsModal({ open, onClose }: SettingsModalProps) {
+  const { user } = useUser();
+  const [activeTab, setActiveTab] = useState<SettingsTab>("profile");
+
+  const displayName =
+    user?.fullName ??
+    [user?.firstName, user?.lastName].filter(Boolean).join(" ");
+
+  const title =
+    activeTab === "profile" ? displayName || "User" : tabTitles[activeTab];
+
+  return (
+    <DialogPrimitive.Root open={open} onOpenChange={(o) => !o && onClose()}>
+      <DialogPrimitive.Portal>
+        <DialogPrimitive.Overlay className="fixed inset-0 z-50 bg-black/40 data-open:animate-in data-open:fade-in-0 data-closed:animate-out data-closed:fade-out-0 duration-300 ease-out" />
+        <DialogPrimitive.Content className="fixed left-1/2 top-1/2 z-50 flex h-[90vh] w-[90vw] -translate-x-1/2 -translate-y-1/2 overflow-hidden rounded-xl bg-white shadow-2xl outline-none duration-300 ease-out data-open:animate-in data-open:fade-in-0 data-open:zoom-in-90 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-90">
+          <SettingsNav activeTab={activeTab} onTabChange={setActiveTab} />
+          <SettingsContentPanel
+            activeTab={activeTab}
+            title={title}
+            onClose={onClose}
+          />
+        </DialogPrimitive.Content>
+      </DialogPrimitive.Portal>
+    </DialogPrimitive.Root>
+  );
+}
diff --git a/clients/web/src/components/settings/SettingsNav.tsx b/clients/web/src/components/settings/SettingsNav.tsx
new file mode 100644
index 000000000..f1544c3d5
--- /dev/null
+++ b/clients/web/src/components/settings/SettingsNav.tsx
@@ -0,0 +1,93 @@
+import { useUser } from "@clerk/clerk-react";
+import { useGetUsersIdHook } from "@shared";
+import { useQuery } from "@tanstack/react-query";
+import { Building2, Users } from "lucide-react";
+import { useProfilePicture } from "@/hooks/use-profile-picture";
+import { cn } from "@/lib/utils";
+
+export type SettingsTab = "profile" | "members" | "departments";
+
+type SettingsNavProps = {
+  activeTab: SettingsTab;
+  onTabChange: (tab: SettingsTab) => void;
+};
+
+export function SettingsNav({ activeTab, onTabChange }: SettingsNavProps) {
+  const { user } = useUser();
+  const getUsersId = useGetUsersIdHook();
+  const { profilePicUrl } = useProfilePicture(user?.id ?? "");
+  const { data: appUser } = useQuery({
+    queryKey: ["user", user?.id],
+    queryFn: () => getUsersId(user!.id),
+    enabled: !!user?.id,
+  });
+
+  const displayName =
+    user?.fullName ??
+    [user?.firstName, user?.lastName].filter(Boolean).join(" ");
+  const avatarUrl = profilePicUrl ?? appUser?.profile_picture ?? user?.imageUrl;
+  const initials = [user?.firstName?.[0], user?.lastName?.[0]]
+    .filter(Boolean)
+    .join("")
+    .toUpperCase();
+
+  return (
+    <div className="w-64 shrink-0 overflow-y-auto border-r border-stroke-subtle p-4">
+      <p className="px-2 pb-1 pt-2 text-xs font-medium text-text-secondary">
+        Account
+      </p>
+
+      <button
+        type="button"
+        onClick={() => onTabChange("profile")}
+        className={cn(
+          "mb-0.5 flex w-full items-center gap-2.5 rounded-md px-2 py-1.5",
+          activeTab === "profile" && "bg-bg-selected",
+        )}
+      >
+        {avatarUrl ? (
+          <img
+            src={avatarUrl}
+            alt={displayName || "User"}
+            className="size-6 rounded-sm object-cover"
+          />
+        ) : (
+          <div className="flex size-6 shrink-0 items-center justify-center rounded-sm bg-primary text-xs font-semibold text-white">
+            {initials || "?"}
+          </div>
+        )}
+        <span className="truncate text-sm text-text-default">
+          {displayName || "User"}
+        </span>
+      </button>
+
+      <p className="px-2 pb-1 pt-4 text-xs font-medium text-text-secondary">
+        Workspace
+      </p>
+
+      <button
+        type="button"
+        onClick={() => onTabChange("members")}
+        className={cn(
+          "mb-0.5 flex w-full items-center gap-2.5 rounded-md px-2 py-1.5",
+          activeTab === "members" && "bg-bg-selected",
+        )}
+      >
+        <Users className="size-4 shrink-0 text-text-subtle" />
+        <span className="text-sm text-text-default">Members</span>
+      </button>
+
+      <button
+        type="button"
+        onClick={() => onTabChange("departments")}
+        className={cn(
+          "flex w-full items-center gap-2.5 rounded-md px-2 py-1.5",
+          activeTab === "departments" && "bg-bg-selected",
+        )}
+      >
+        <Building2 className="size-4 shrink-0 text-text-subtle" />
+        <span className="text-sm text-text-default">Departments</span>
+      </button>
+    </div>
+  );
+}
diff --git a/clients/web/src/components/ui/AssigneePicker.tsx b/clients/web/src/components/ui/AssigneePicker.tsx
new file mode 100644
index 000000000..1525fbd42
--- /dev/null
+++ b/clients/web/src/components/ui/AssigneePicker.tsx
@@ -0,0 +1,152 @@
+import { useRef, useState } from "react";
+import { useInfiniteQuery, useQuery } from "@tanstack/react-query";
+import { useCustomInstance, useGetUsersIdHook } from "@shared";
+import type { User } from "@shared";
+import {
+  Popover,
+  PopoverContent,
+  PopoverTrigger,
+} from "@/components/ui/popover";
+import { SearchBar } from "@/components/ui/SearchBar";
+import { cn, useDebounce } from "@/lib/utils";
+import { UserAvatar } from "@/components/ui/UserAvatar";
+
+type SearchUsersResponse = {
+  users: Array<User>;
+  next_cursor: string;
+};
+
+type AssigneePickerProps = {
+  hotelId: string;
+  selectedUser?: User;
+  initialUserId?: string;
+  onSelect: (user: User) => void;
+};
+
+export function AssigneePicker({
+  hotelId,
+  selectedUser,
+  initialUserId,
+  onSelect,
+}: AssigneePickerProps) {
+  const [open, setOpen] = useState(false);
+  const [search, setSearch] = useState("");
+  const debouncedSearch = useDebounce(search);
+  const loadMoreRef = useRef<HTMLButtonElement>(null);
+
+  const searchUsers = useCustomInstance<SearchUsersResponse>();
+  const getUsersId = useGetUsersIdHook();
+
+  const { data: initialUser } = useQuery({
+    queryKey: ["user", initialUserId],
+    queryFn: () => getUsersId(initialUserId!),
+    enabled: !!initialUserId && !selectedUser,
+  });
+
+  const displayUser = selectedUser ?? initialUser;
+
+  const { data, fetchNextPage, hasNextPage, isFetchingNextPage, isLoading } =
+    useInfiniteQuery({
+      queryKey: ["users", "search", hotelId, debouncedSearch],
+      queryFn: ({ pageParam }) =>
+        searchUsers({
+          url: "/users/search",
+          method: "POST",
+          data: {
+            hotel_id: hotelId,
+            cursor: pageParam || undefined,
+            q: debouncedSearch || undefined,
+          },
+        }),
+      initialPageParam: "",
+      getNextPageParam: (lastPage) => lastPage.next_cursor || undefined,
+      enabled: open && !!hotelId,
+    });
+
+  const users = data?.pages.flatMap((p) => p.users) ?? [];
+
+  function handleSelect(user: User) {
+    onSelect(user);
+    setOpen(false);
+    setSearch("");
+  }
+
+  const triggerLabel = displayUser
+    ? `${displayUser.first_name ?? ""} ${displayUser.last_name ?? ""}`.trim()
+    : "Unassigned";
+
+  return (
+    <Popover open={open} onOpenChange={setOpen}>
+      <PopoverTrigger
+        className={cn(
+          "flex items-center gap-2 rounded-md px-2 py-1 text-sm transition-colors hover:bg-bg-selected",
+          displayUser ? "text-text-default" : "text-text-subtle",
+        )}
+      >
+        {displayUser && <UserAvatar user={displayUser} />}
+        {triggerLabel}
+      </PopoverTrigger>
+      <PopoverContent
+        align="start"
+        side="bottom"
+        sideOffset={6}
+        className="w-72 p-0"
+      >
+        <div className="border-b border-stroke-subtle p-2">
+          <SearchBar
+            value={search}
+            onChange={setSearch}
+            placeholder="Search by name..."
+            autoFocus
+          />
+        </div>
+        <div className="flex max-h-60 flex-col overflow-y-auto">
+          {isLoading && (
+            <p className="px-3 py-4 text-center text-sm text-text-subtle">
+              Loading...
+            </p>
+          )}
+          {!isLoading && users.length === 0 && (
+            <p className="px-3 py-4 text-center text-sm text-text-subtle">
+              No staff found
+            </p>
+          )}
+          {users.map((user) => (
+            <button
+              key={user.id}
+              type="button"
+              onClick={() => handleSelect(user)}
+              className={cn(
+                "flex items-center gap-2.5 px-3 py-2 text-left transition-colors hover:bg-bg-selected",
+                displayUser?.id === user.id && "bg-bg-selected",
+              )}
+            >
+              <UserAvatar user={user} />
+              <div className="min-w-0">
+                <p className="truncate text-sm text-text-default">
+                  {user.first_name} {user.last_name}
+                </p>
+                {user.role && (
+                  <p className="truncate text-xs text-text-subtle">
+                    {user.role}
+                  </p>
+                )}
+              </div>
+            </button>
+          ))}
+          {hasNextPage && (
+            <button
+              ref={loadMoreRef}
+              type="button"
+              onClick={() => fetchNextPage()}
+              disabled={isFetchingNextPage}
+              className="px-3 py-2 text-center text-xs text-text-subtle transition-colors hover:text-text-default disabled:opacity-50"
+            >
+              {isFetchingNextPage ? "Loading..." : "Load more"}
+            </button>
+          )}
+        </div>
+      </PopoverContent>
+    </Popover>
+  );
+}
diff --git a/clients/web/src/components/ui/Button.tsx b/clients/web/src/components/ui/Button.tsx
new file mode 100644
index 000000000..5fac03361
--- /dev/null
+++ b/clients/web/src/components/ui/Button.tsx
@@ -0,0 +1,31 @@
+import type { ButtonHTMLAttributes } from "react";
+import { cn } from "@/lib/utils";
+
+type ButtonVariant = "primary" | "secondary";
+
+type ButtonProps = ButtonHTMLAttributes<HTMLButtonElement> & {
+  variant?: ButtonVariant;
+};
+
+const variantStyles: Record<ButtonVariant, string> = {
+  primary: "bg-primary text-white hover:bg-primary-hover",
+  secondary: "bg-bg-container text-text-default hover:bg-bg-selected",
+};
+
+export function Button({
+  variant = "secondary",
+  className = "",
+  ...props
+}: ButtonProps) {
+  return (
+    <button
+      type="button"
+      className={cn(
+        "px-6 py-2.5 w-33 h-10 text-sm rounded-sm disabled:opacity-50 disabled:pointer-events-none",
+        variantStyles[variant],
+        className,
+      )}
+      {...props}
+    />
+  );
+}
diff --git a/clients/web/src/components/ui/DeadlinePicker.tsx b/clients/web/src/components/ui/DeadlinePicker.tsx
new file mode 100644
index 000000000..7c4cd282f
--- /dev/null
+++ b/clients/web/src/components/ui/DeadlinePicker.tsx
@@ -0,0 +1,255 @@
+import { useState } from "react";
+import { DayPicker } from "react-day-picker";
+import { ChevronLeft, ChevronRight, Clock, RefreshCw } from "lucide-react";
+import {
+  Popover,
+  PopoverContent,
+  PopoverTrigger,
+} from "@/components/ui/popover";
+import { Button } from "@/components/ui/Button";
+import { cn } from "@/lib/utils";
+
+type TimeSlot = { hour: number; minute: number };
+
+const TIME_SLOTS: Array<TimeSlot> = [];
+for (let h = 1; h <= 12; h++) {
+  for (const m of [0, 15, 30, 45]) {
+    TIME_SLOTS.push({ hour: h, minute: m });
+  }
+}
+
+type DeadlinePickerProps = {
+  selectedDate?: Date;
+  onSelect: (date: Date | undefined) => void;
+};
+
+export function DeadlinePicker({
+  selectedDate,
+  onSelect,
+}: DeadlinePickerProps) {
+  const [open, setOpen] = useState(false);
+  const today = new Date();
+
+  const [tempDate, setTempDate] = useState<Date | undefined>(selectedDate);
+  const [tempTime, setTempTime] = useState<TimeSlot | undefined>();
+  const [period, setPeriod] = useState<"AM" | "PM">("AM");
+  const [month, setMonth] = useState(selectedDate ?? today);
+
+  function handleClear() {
+    setTempDate(undefined);
+    setTempTime(undefined);
+    onSelect(undefined);
+  }
+
+  function handleConfirm() {
+    if (!tempDate) return;
+    const result = new Date(tempDate);
+    if (tempTime) {
+      let h = tempTime.hour % 12;
+      if (period === "PM") h += 12;
+      result.setHours(h, tempTime.minute, 0, 0);
+    }
+    onSelect(result);
+    setOpen(false);
+  }
+
+  const hasTime =
+    !!selectedDate &&
+    (selectedDate.getHours() !== 0 || selectedDate.getMinutes() !== 0);
+
+  const triggerLabel = selectedDate
+    ? hasTime
+      ? selectedDate.toLocaleString("en-US", {
+          month: "short",
+          day: "numeric",
+          year: "numeric",
+          hour: "numeric",
+          minute: "2-digit",
+        })
+      : selectedDate.toLocaleDateString("en-US", {
+          month: "short",
+          day: "numeric",
+          year: "numeric",
+        })
+    : "Empty";
+
+  return (
+    <Popover open={open} onOpenChange={setOpen}>
+      <PopoverTrigger
+        className={cn(
+          "rounded-md px-2 py-1 text-sm transition-colors hover:bg-bg-selected",
+          selectedDate ? "text-text-default" : "text-text-subtle",
+        )}
+      >
+        {triggerLabel}
+      </PopoverTrigger>
+
+      <PopoverContent
+        align="start"
+        side="bottom"
+        sideOffset={6}
+        className="w-[26rem] overflow-hidden rounded-xl border border-stroke-subtle p-0 shadow-lg"
+      >
+        {/* Static header */}
+        <div className="flex items-center justify-between border-b border-stroke-subtle px-4 py-3">
+          <span className="text-sm text-text-subtle">Select Deadline</span>
+          <button
+            type="button"
+            onClick={handleClear}
+            className="text-sm text-text-subtle hover:text-text-default"
+          >
+            Clear
+          </button>
+        </div>
+
+        {/* Calendar */}
+        <DayPicker
+          mode="single"
+          selected={tempDate}
+          onSelect={setTempDate}
+          month={month}
+          onMonthChange={setMonth}
+          components={{
+            MonthCaption: ({ calendarMonth }) => (
+              <div className="mb-1 flex items-center justify-between px-2 py-1.5">
+                <button
+                  type="button"
+                  onClick={() =>
+                    setMonth(
+                      new Date(
+                        calendarMonth.date.getFullYear(),
+                        calendarMonth.date.getMonth() - 1,
+                        1,
+                      ),
+                    )
+                  }
+                  className="rounded p-0.5 hover:bg-bg-selected"
+                >
+                  <ChevronLeft className="size-4" />
+                </button>
+                <span className="text-sm font-medium">
+                  {calendarMonth.date.toLocaleDateString("en-US", {
+                    month: "long",
+                    year: "numeric",
+                  })}
+                </span>
+                <button
+                  type="button"
+                  onClick={() =>
+                    setMonth(
+                      new Date(
+                        calendarMonth.date.getFullYear(),
+                        calendarMonth.date.getMonth() + 1,
+                        1,
+                      ),
+                    )
+                  }
+                  className="rounded p-0.5 hover:bg-bg-selected"
+                >
+                  <ChevronRight className="size-4" />
+                </button>
+              </div>
+            ),
+            Nav: () => <span />,
+          }}
+          classNames={{
+            root: "px-4 pb-2 pt-1",
+            months: "flex flex-col",
+            month: "flex flex-col gap-2",
+            month_caption: "",
+            caption_label: "",
+            nav: "",
+            button_previous: "",
+            button_next: "",
+            month_grid: "w-full border-collapse",
+            weekdays: "flex",
+            weekday:
+              "flex-1 py-1 text-center text-xs font-medium text-text-subtle",
+            week: "flex mt-1",
+            day: "flex-1 text-center",
+            day_button:
+              "w-full rounded-full py-1 text-sm transition-colors hover:bg-bg-selected",
+            selected:
+              "[&>button]:bg-primary [&>button]:text-white [&>button]:hover:bg-primary-hover",
+            today: "[&>button]:font-medium [&>button]:text-primary",
+            outside: "[&>button]:text-text-subtle opacity-40",
+            disabled: "opacity-30",
+            hidden: "invisible",
+          }}
+        />
+
+        {/* Time selector */}
+        <div className="border-t border-stroke-subtle px-3 pt-2">
+          <div className="mb-2 flex items-center justify-between">
+            <div className="flex items-center gap-1.5 text-sm text-text-subtle">
+              <Clock className="size-4" />
+              Select Time
+            </div>
+            <div className="flex overflow-hidden rounded-md border border-stroke-subtle">
+              {(["AM", "PM"] as const).map((p) => (
+                <button
+                  key={p}
+                  type="button"
+                  onClick={() => setPeriod(p)}
+                  className={cn(
+                    "px-2.5 py-0.5 text-xs font-medium transition-colors",
+                    period === p
+                      ? "bg-primary text-white"
+                      : "text-text-subtle hover:text-text-default",
+                  )}
+                >
+                  {p}
+                </button>
+              ))}
+            </div>
+          </div>
+          <div className="grid max-h-28 grid-cols-4 gap-1 overflow-y-auto pb-2">
+            {TIME_SLOTS.map((slot) => {
+              const label = `${slot.hour % 12 || 12}:${slot.minute.toString().padStart(2, "0")}`;
+              const isSelected =
+                tempTime?.hour === slot.hour && tempTime.minute === slot.minute;
+              return (
+                <button
+                  key={`${slot.hour}-${slot.minute}`}
+                  type="button"
+                  onClick={() => setTempTime(slot)}
+                  className={cn(
+                    "rounded border border-stroke-subtle px-1 py-1 text-xs transition-colors hover:bg-bg-selected",
+                    isSelected &&
+                      "border-primary bg-primary text-white hover:bg-primary-hover",
+                  )}
+                >
+                  {label}
+                </button>
+              );
+            })}
+          </div>
+        </div>
+
+        {/* Recurring row */}
+        <div className="flex items-center justify-between border-t border-stroke-subtle px-3 py-2">
+          <div className="flex items-center gap-1.5 text-sm text-text-subtle">
+            <RefreshCw className="size-4" />
+            Recurring
+          </div>
+          <ChevronRight className="size-4 text-text-subtle" />
+        </div>
+
+        {/* Footer */}
+        <div className="flex gap-2 border-t border-stroke-subtle p-3">
+          <Button className="flex-1" onClick={() => setOpen(false)}>
+            Cancel
+          </Button>
+          <Button
+            variant="primary"
+            className="flex-1"
+            disabled={!tempDate}
+            onClick={handleConfirm}
+          >
+            Select
+          </Button>
+        </div>
+      </PopoverContent>
+    </Popover>
+  );
+}
diff --git a/clients/web/src/components/ui/DepartmentPicker.tsx b/clients/web/src/components/ui/DepartmentPicker.tsx
new file mode 100644
index 000000000..4cb1aca55
--- /dev/null
+++ b/clients/web/src/components/ui/DepartmentPicker.tsx
@@ -0,0 +1,103 @@
+import { useState } from "react";
+import { useGetDepartments } from "@shared";
+import type { Department } from "@shared";
+import {
+  Popover,
+  PopoverContent,
+  PopoverTrigger,
+} from "@/components/ui/popover";
+import { SearchBar } from "@/components/ui/SearchBar";
+import { cn } from "@/lib/utils";
+
+type DepartmentPickerProps = {
+  hotelId: string;
+  selectedDepartment?: Department;
+  initialDepartmentId?: string;
+  onSelect: (department: Department | undefined) => void;
+};
+
+export function DepartmentPicker({
+  hotelId,
+  selectedDepartment,
+  initialDepartmentId,
+  onSelect,
+}: DepartmentPickerProps) {
+  const [open, setOpen] = useState(false);
+  const [search, setSearch] = useState("");
+
+  const { data: allDepartments = [], isLoading } = useGetDepartments(hotelId);
+
+  const initialDepartment =
+    !selectedDepartment && initialDepartmentId
+      ? allDepartments.find((d) => d.id === initialDepartmentId)
+      : undefined;
+
+  const departments = allDepartments.filter((d) =>
+    search ? d.name.toLowerCase().includes(search.toLowerCase()) : true,
+  );
+
+  const displayDepartment = selectedDepartment ?? initialDepartment;
+
+  function handleSelect(department: Department) {
+    onSelect(displayDepartment?.id === department.id ? undefined : department);
+    setOpen(false);
+    setSearch("");
+  }
+
+  const triggerLabel = displayDepartment?.name ?? "No department";
+
+  return (
+    <Popover open={open} onOpenChange={setOpen}>
+      <PopoverTrigger
+        className={cn(
+          "flex items-center gap-2 rounded-md px-2 py-1 text-sm transition-colors hover:bg-bg-selected",
+          displayDepartment ? "text-text-default" : "text-text-subtle",
+        )}
+      >
+        {triggerLabel}
+      </PopoverTrigger>
+      <PopoverContent
+        align="start"
+        side="bottom"
+        sideOffset={6}
+        className="w-72 p-0"
+      >
+        <div className="border-b border-stroke-subtle p-2">
+          <SearchBar
+            value={search}
+            onChange={setSearch}
+            placeholder="Search departments..."
+            autoFocus
+          />
+        </div>
+        <div className="flex max-h-60 flex-col overflow-y-auto">
+          {isLoading && (
+            <p className="px-3 py-4 text-center text-sm text-text-subtle">
+              Loading...
+            </p>
+          )}
+          {!isLoading && departments.length === 0 && (
+            <p className="px-3 py-4 text-center text-sm text-text-subtle">
+              No departments found
+            </p>
+          )}
+          {departments.map((department) => (
+            <button
+              key={department.id}
+              type="button"
+              onClick={() => handleSelect(department)}
+              className={cn(
+                "flex items-center gap-2.5 px-3 py-2 text-left transition-colors hover:bg-bg-selected",
+                displayDepartment?.id === department.id && "bg-bg-selected",
+              )}
+            >
+              <p className="truncate text-sm text-text-default">
+                {department.name}
+              </p>
+            </button>
+          ))}
+        </div>
+      </PopoverContent>
+    </Popover>
+  );
+}
diff --git a/clients/web/src/components/ui/DrawerShell.tsx b/clients/web/src/components/ui/DrawerShell.tsx
new file mode 100644
index 000000000..840860827
--- /dev/null
+++ b/clients/web/src/components/ui/DrawerShell.tsx
@@ -0,0 +1,40 @@
+import { X } from "lucide-react";
+import type { ReactNode } from "react";
+import { cn } from "@/lib/utils";
+
+type DrawerShellProps = {
+  title: ReactNode;
+  onClose: () => void;
+  children: ReactNode;
+  className?: string;
+};
+
+export function DrawerShell({
+  title,
+  onClose,
+  children,
+  className,
+}: DrawerShellProps) {
+  return (
+    <aside className="flex h-full w-full flex-col">
+      <header className="flex flex-col pl-5 pr-6 pt-5 pb-4">
+        <button
+          type="button"
+          onClick={onClose}
+          className="self-start rounded p-1 hover:bg-bg-selected"
+        >
+          <X className="size-5" />
+        </button>
+        <div className="mt-2 px-5">{title}</div>
+      </header>
+      <div
+        className={cn(
+          "flex flex-col gap-4 overflow-y-auto px-10 py-2",
+          className,
+        )}
+      >
+        {children}
+      </div>
+    </aside>
+  );
+}
diff --git a/clients/web/src/components/ui/GlobalTaskInput.tsx b/clients/web/src/components/ui/GlobalTaskInput.tsx
new file mode 100644
index 000000000..23abb5e2b
--- /dev/null
+++ b/clients/web/src/components/ui/GlobalTaskInput.tsx
@@ -0,0 +1,124 @@
+import { useRef, useState } from "react";
+import { ArrowUp, Loader, Sparkles } from "lucide-react";
+import { useUser } from "@clerk/clerk-react";
+import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import { useGetUsersIdHook, usePostRequestGenerateHook } from "@shared";
+import type { Request } from "@shared";
+
+type GlobalTaskInputProps = {
+  onRequestGenerated: (request: Request) => void;
+};
+
+const fallbackHotelId = "a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11";
+const hotelIdPattern =
+  /^([0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|org_.+)$/i;
+
+// Persist input text across route navigations (SPA module state)
+let persistedValue = "";
+
+export function GlobalTaskInput({ onRequestGenerated }: GlobalTaskInputProps) {
+  const [value, setValue] = useState(persistedValue);
+  const textareaRef = useRef<HTMLTextAreaElement>(null);
+
+  const handleChange = (next: string) => {
+    persistedValue = next;
+    setValue(next);
+    if (textareaRef.current) {
+      textareaRef.current.style.height = "auto";
+      textareaRef.current.style.height = `${textareaRef.current.scrollHeight}px`;
+    }
+  };
+
+  const { user: clerkUser } = useUser();
+  const getUsersId = useGetUsersIdHook();
+  const postRequestGenerate = usePostRequestGenerateHook();
+  const queryClient = useQueryClient();
+
+  const { data: backendUser } = useQuery({
+    queryKey: ["user", clerkUser?.id],
+    queryFn: () => getUsersId(clerkUser!.id),
+    enabled: !!clerkUser?.id,
+  });
+  const hotelId = backendUser?.hotel_id?.trim() || fallbackHotelId;
+  const hasValidHotelId = hotelIdPattern.test(hotelId);
+
+  const { mutate: generateRequest, isPending } = useMutation({
+    mutationFn: (rawText: string) => {
+      if (!hasValidHotelId) {
+        throw new Error("Unable to create request right now.");
+      }
+
+      return postRequestGenerate({
+        hotel_id: hotelId,
+        raw_text: rawText,
+      });
+    },
+    onSuccess: (result) => {
+      if (!result.request) return;
+      onRequestGenerated(result.request);
+      handleChange("");
+      if (textareaRef.current) textareaRef.current.style.height = "auto";
+      queryClient.invalidateQueries({ queryKey: ["requests", "kanban"] });
+    },
+    onError: (error) => {
+      console.error("[GlobalTaskInput] onError", error);
+    },
+  });
+
+  const handleSubmit = () => {
+    if (!value.trim() || isPending) return;
+    if (!hasValidHotelId) return;
+    generateRequest(value.trim());
+  };
+
+  const containerStyle = {
+    boxShadow:
+      "-10px -5px 30px 0px rgba(168,205,185,0.25), 10px 5px 30px 0px rgba(168,205,185,0.25)",
+  };
+
+  if (isPending) {
+    return (
+      <div
+        className="absolute bottom-6 left-1/2 -translate-x-1/2 z-50 w-[684px] min-h-[58px] flex items-center gap-[13px] rounded-lg bg-white border border-stroke-subtle px-6 py-3"
+        style={containerStyle}
+      >
+        <Loader className="size-6 shrink-0 text-text-subtle animate-spin [animation-duration:2s]" />
+        <span className="text-sm text-text-subtle">Creating tasks...</span>
+      </div>
+    );
+  }
+
+  return (
+    <div
+      className="absolute bottom-6 left-1/2 -translate-x-1/2 z-50 w-[684px] min-h-[58px] flex items-center gap-[13px] rounded-lg bg-white border border-stroke-subtle px-6 py-3"
+      style={containerStyle}
+    >
+      <Sparkles className="size-6 shrink-0 text-primary" />
+      <textarea
+        ref={textareaRef}
+        value={value}
+        onChange={(e) => handleChange(e.target.value)}
+        onKeyDown={(e) => {
+          if (e.key === "Enter" && !e.shiftKey) {
+            e.preventDefault();
+            handleSubmit();
+          }
+        }}
+        placeholder="Start typing to create new task..."
+        rows={1}
+        className="flex-1 bg-transparent text-sm text-text-default placeholder:text-text-subtle outline-none resize-none overflow-hidden"
+      />
+      <button
+        type="button"
+        onClick={handleSubmit}
+        className={`flex size-8 shrink-0 items-center justify-center rounded-full cursor-pointer transition-colors ${
+          value.trim() && hasValidHotelId ? "bg-primary" : "bg-bg-selected"
+        }`}
+      >
+        <ArrowUp
+          className={`size-4 ${value.trim() && hasValidHotelId ? "text-white" : "text-primary"}`}
+        />
+      </button>
+    </div>
+  );
+}
diff --git a/clients/web/src/components/ui/NoUserInfo.tsx b/clients/web/src/components/ui/NoUserInfo.tsx
new file mode 100644
index 000000000..9b945536e
--- /dev/null
+++ b/clients/web/src/components/ui/NoUserInfo.tsx
@@ -0,0 +1,10 @@
+export default function NoOrgPage() {
+  return (
+    <div className="flex flex-col items-center justify-center min-h-screen px-8 text-center">
+      <h1 className="text-2xl font-semibold mb-4">
+        We had trouble loading your information, please contact your
+        administrator.
+      </h1>
+    </div>
+  );
+}
diff --git a/clients/web/src/components/ui/PageShell.tsx b/clients/web/src/components/ui/PageShell.tsx
index aa82b7681..1e828a842 100644
--- a/clients/web/src/components/ui/PageShell.tsx
+++ b/clients/web/src/components/ui/PageShell.tsx
@@ -2,48 +2,76 @@ import type { ReactNode } from "react";
 import { cn } from "@/lib/utils";
 
 type PageShellProps = {
-  header: ReactNode;
+  header?: {
+    title: string;
+    description: string;
+  };
+  headerBorder?: boolean;
+  subHeader?: ReactNode;
   drawer?: ReactNode;
   drawerOpen?: boolean;
   children: ReactNode;
+  bottomBar?: ReactNode;
+  contentClassName?: string;
+  bodyClassName?: string;
 };
 
 export function PageShell({
   header,
+  headerBorder = true,
+  subHeader,
   drawer,
   drawerOpen = false,
   children,
+  bottomBar,
+  contentClassName,
+  bodyClassName,
 }: PageShellProps) {
-  const hasDrawer = !!drawer;
+  const hasDrawer = drawer !== undefined;
 
   return (
-    <main className="flex h-screen overflow-hidden">
-      <div
-        className={cn(
-          "shrink-0 flex flex-col overflow-hidden transition-[flex-basis] duration-300 ease-in-out",
-          hasDrawer && drawerOpen ? "basis-2/5" : "basis-full",
-        )}
-      >
-        <header className="shrink-0 bg-gray-100 h-[10vh] px-[4vw]">
-          {header}
-        </header>
+    <main className="relative flex h-screen w-full min-w-0 overflow-hidden">
+      <div className="flex flex-1 flex-col min-w-0 overflow-hidden">
+        {header ? (
+          <header
+            className={cn(
+              "shrink-0 bg-white px-6 pt-4 flex flex-col gap-1.5",
+              headerBorder ? "pb-3 border-b border-stroke-subtle" : "pb-0",
+            )}
+          >
+            <h1 className="text-2xl font-bold tracking-tight text-text-default">
+              {header.title}
+            </h1>
+            <h2 className="text-sm text-text-subtle">{header.description}</h2>
+          </header>
+        ) : null}
 
-        <section className="flex-1 min-h-0 overflow-auto bg-white-100 px-[4vw] py-[2vh]">
-          <div className="mx-auto flex w-full max-w-[94vw] flex-col">
+        {subHeader ? (
+          <div className="shrink-0 bg-white">{subHeader}</div>
+        ) : null}
+
+        <section
+          className={cn(
+            "flex-1 min-h-0 overflow-auto bg-neutral-10 px-6 py-4",
+            bodyClassName,
+          )}
+        >
+          <div className={cn("flex flex-col mx-auto w-full", contentClassName)}>
             {children}
           </div>
         </section>
       </div>
 
+      {bottomBar}
+
       {hasDrawer && (
         <aside
           className={cn(
-            "shrink-0 overflow-hidden transition-[flex-basis] duration-300 ease-in-out shadow-xl shadow-black/25 px-[4vw] py-[3vh]",
-            drawerOpen ? "basis-3/5" : "basis-0",
+            "fixed inset-y-0 right-0 z-50 h-full w-153 overflow-hidden bg-white shadow-xl shadow-black/25 transition-transform duration-300 ease-in-out",
+            drawerOpen ? "translate-x-0" : "translate-x-full",
           )}
         >
-          {/* Nested div to a fixed width to avoid animation issues */}
-          <div className="h-full w-[60vw]">{drawer}</div>
+          <div className="h-full w-full">{drawer}</div>
         </aside>
       )}
     </main>
diff --git a/clients/web/src/components/ui/PriorityTag.tsx b/clients/web/src/components/ui/PriorityTag.tsx
new file mode 100644
index 000000000..117972ae5
--- /dev/null
+++ b/clients/web/src/components/ui/PriorityTag.tsx
@@ -0,0 +1,73 @@
+import { Flag } from "lucide-react";
+import type { RequestPriority } from "@shared";
+import { cn } from "@/lib/utils";
+
+type PriorityConfig = {
+  containerClass: string;
+  textClass: string;
+  iconClass: string;
+  label: string;
+};
+
+const PRIORITY_CONFIG: Record<RequestPriority, PriorityConfig> = {
+  high: {
+    containerClass: "bg-priority-high-secondary",
+    textClass: "text-priority-high",
+    iconClass: "stroke-priority-high",
+    label: "High Priority",
+  },
+  medium: {
+    containerClass: "bg-priority-medium-secondary",
+    textClass: "text-priority-medium",
+    iconClass: "stroke-priority-medium",
+    label: "Medium Priority",
+  },
+  low: {
+    containerClass: "bg-priority-low-secondary",
+    textClass: "text-priority-low",
+    iconClass: "stroke-priority-low",
+    label: "Low Priority",
+  },
+};
+
+type PriorityTagProps = {
+  priority: string;
+  dimmed?: boolean;
+  className?: string;
+};
+
+export function PriorityTag({
+  priority,
+  dimmed = false,
+  className,
+}: PriorityTagProps) {
+  const config =
+    (PRIORITY_CONFIG as Record<string, PriorityConfig>)[
+      priority.toLowerCase()
+    ] ?? PRIORITY_CONFIG.low;
+
+  return (
+    <div
+      className={cn(
+        "inline-flex items-center gap-1 rounded px-2 py-1",
+        config.containerClass,
+        className,
+      )}
+    >
+      <Flag
+        className={cn(
+          "size-3",
+          dimmed ? "stroke-bg-disabled" : config.iconClass,
+        )}
+      />
+      <span
+        className={cn(
+          "text-xs",
+          dimmed ? "text-text-subtle" : config.textClass,
+        )}
+      >
+        {config.label}
+      </span>
+    </div>
+  );
+}
diff --git a/clients/web/src/components/ui/RoomPicker.tsx b/clients/web/src/components/ui/RoomPicker.tsx
new file mode 100644
index 000000000..929755201
--- /dev/null
+++ b/clients/web/src/components/ui/RoomPicker.tsx
@@ -0,0 +1,117 @@
+import { useState } from "react";
+import { useQuery } from "@tanstack/react-query";
+import { usePostRoomsHook } from "@shared";
+import type { RoomWithOptionalGuestBooking } from "@shared";
+import {
+  Popover,
+  PopoverContent,
+  PopoverTrigger,
+} from "@/components/ui/popover";
+import { SearchBar } from "@/components/ui/SearchBar";
+import { cn, useDebounce } from "@/lib/utils";
+
+type RoomPickerProps = {
+  selectedRoom?: RoomWithOptionalGuestBooking;
+  initialRoomId?: string;
+  onSelect: (room: RoomWithOptionalGuestBooking) => void;
+};
+
+export function RoomPicker({
+  selectedRoom,
+  initialRoomId,
+  onSelect,
+}: RoomPickerProps) {
+  const [open, setOpen] = useState(false);
+  const [search, setSearch] = useState("");
+  const debouncedSearch = useDebounce(search);
+
+  const postRooms = usePostRoomsHook();
+
+  const { data, isLoading } = useQuery({
+    queryKey: ["rooms", "picker"],
+    queryFn: () => postRooms({ limit: 200 }),
+    enabled: open || !!initialRoomId,
+  });
+
+  const allRooms = data?.items ?? [];
+
+  const rooms = allRooms.filter((room) =>
+    debouncedSearch ? String(room.room_number).includes(debouncedSearch) : true,
+  );
+
+  const displayRoom =
+    selectedRoom ??
+    (initialRoomId ? allRooms.find((r) => r.id === initialRoomId) : undefined);
+
+  function handleSelect(room: RoomWithOptionalGuestBooking) {
+    onSelect(room);
+    setOpen(false);
+    setSearch("");
+  }
+
+  const triggerLabel = displayRoom
+    ? `Room ${displayRoom.room_number}`
+    : "No room";
+
+  return (
+    <Popover open={open} onOpenChange={setOpen}>
+      <PopoverTrigger
+        className={cn(
+          "flex items-center gap-2 rounded-md px-2 py-1 text-sm transition-colors hover:bg-bg-selected",
+          displayRoom ? "text-text-default" : "text-text-subtle",
+        )}
+      >
+        {triggerLabel}
+      </PopoverTrigger>
+      <PopoverContent
+        align="start"
+        side="bottom"
+        sideOffset={6}
+        className="w-72 p-0"
+      >
+        <div className="border-b border-stroke-subtle p-2">
+          <SearchBar
+            value={search}
+            onChange={setSearch}
+            placeholder="Search by room number..."
+            autoFocus
+          />
+        </div>
+        <div className="flex max-h-60 flex-col overflow-y-auto">
+          {isLoading && (
+            <p className="px-3 py-4 text-center text-sm text-text-subtle">
+              Loading...
+            </p>
+          )}
+          {!isLoading && rooms.length === 0 && (
+            <p className="px-3 py-4 text-center text-sm text-text-subtle">
+              No rooms found
+            </p>
+          )}
+          {rooms.map((room) => (
+            <button
+              key={room.id}
+              type="button"
+              onClick={() => handleSelect(room)}
+              className={cn(
+                "flex items-center gap-2.5 px-3 py-2 text-left transition-colors hover:bg-bg-selected",
+                displayRoom?.id === room.id && "bg-bg-selected",
+              )}
+            >
+              <div className="min-w-0">
+                <p className="truncate text-sm text-text-default">
+                  Room {room.room_number}
+                </p>
+                {room.floor !== undefined && (
+                  <p className="truncate text-xs text-text-subtle">
+                    Floor {room.floor}
+                  </p>
+                )}
+              </div>
+            </button>
+          ))}
+        </div>
+      </PopoverContent>
+    </Popover>
+  );
+}
diff --git a/clients/web/src/components/ui/SearchBar.tsx b/clients/web/src/components/ui/SearchBar.tsx
new file mode 100644
index 000000000..4e031943e
--- /dev/null
+++ b/clients/web/src/components/ui/SearchBar.tsx
@@ -0,0 +1,55 @@
+import { Search } from "lucide-react";
+import type { InputHTMLAttributes, ReactNode } from "react";
+import { cn } from "@/lib/utils";
+
+type SearchBarProps = Omit<
+  InputHTMLAttributes<HTMLInputElement>,
+  "value" | "onChange"
+> & {
+  value: string;
+  onChange: (value: string) => void;
+  className?: string;
+  inputClassName?: string;
+  iconClassName?: string;
+  icon?: ReactNode;
+};
+
+export function SearchBar({
+  value,
+  onChange,
+  placeholder = "Search for a room...",
+  className,
+  inputClassName,
+  iconClassName,
+  icon,
+  ...inputProps
+}: SearchBarProps) {
+  return (
+    <label
+      className={cn(
+        "flex w-full items-center justify-between rounded-[4px] border border-stroke-subtle bg-bg-primary px-3 py-2",
+        className,
+      )}
+    >
+      <input
+        type="text"
+        value={value}
+        onChange={(event) => onChange(event.target.value)}
+        placeholder={placeholder}
+        className={cn(
+          "w-full bg-transparent text-sm text-text-default outline-none placeholder:text-text-subtle",
+          inputClassName,
+        )}
+        {...inputProps}
+      />
+      <span
+        className={cn(
+          "ml-2 flex shrink-0 items-center text-text-subtle",
+          iconClassName,
+        )}
+      >
+        {icon ?? <Search className="size-4" strokeWidth={2} />}
+      </span>
+    </label>
+  );
+}
diff --git a/clients/web/src/components/ui/Tag.tsx b/clients/web/src/components/ui/Tag.tsx
new file mode 100644
index 000000000..a29e0f760
--- /dev/null
+++ b/clients/web/src/components/ui/Tag.tsx
@@ -0,0 +1,91 @@
+import { FlagIcon } from "lucide-react";
+import type { LucideIcon } from "lucide-react";
+import type { ComponentType, SVGProps } from "react";
+
+import { cn } from "@/lib/utils";
+
+type TagPriority = "high" | "medium";
+
+type TagIcon = LucideIcon | ComponentType<SVGProps<SVGSVGElement>>;
+
+type TagProps = {
+  label?: string;
+  icon?: TagIcon;
+  iconClassName?: string;
+  labelClassName?: string;
+  priority?: TagPriority;
+  className?: string;
+};
+
+type PriorityTagConfig = {
+  label: string;
+  Icon: LucideIcon;
+  containerClass: string;
+  contentClass: string;
+};
+
+const priorityTagConfig: Record<TagPriority, PriorityTagConfig> = {
+  high: {
+    label: "High Priority",
+    Icon: FlagIcon,
+    containerClass: "bg-bg-high-priority",
+    contentClass: "text-high-priority",
+  },
+  medium: {
+    label: "Medium Priority",
+    Icon: FlagIcon,
+    containerClass: "bg-bg-orange",
+    contentClass: "text-text-orange",
+  },
+};
+
+export function Tag({
+  label,
+  icon: Icon,
+  iconClassName = "",
+  labelClassName = "",
+  priority,
+  className = "",
+}: TagProps) {
+  if (priority) {
+    const config = priorityTagConfig[priority];
+    const {
+      label: priorityLabel,
+      Icon: PriorityIcon,
+      containerClass,
+      contentClass,
+    } = config;
+
+    return (
+      <div
+        className={cn(
+          "inline-flex items-center gap-1 rounded px-2 py-1",
+          containerClass,
+          className,
+        )}
+      >
+        <PriorityIcon className={cn("size-4", contentClass)} strokeWidth={2} />
+        <span className={cn("text-xs", contentClass)}>{priorityLabel}</span>
+      </div>
+    );
+  }
+
+  return (
+    <div
+      className={cn(
+        "inline-flex items-center gap-2 rounded border px-2 py-1",
+        className,
+      )}
+    >
+      {Icon ? (
+        <Icon
+          className={cn("size-3 shrink-0", iconClassName)}
+          strokeWidth={1.5}
+        />
+      ) : null}
+      {label ? (
+        <span className={cn("text-xs", labelClassName)}>{label}</span>
+      ) : null}
+    </div>
+  );
+}
diff --git a/clients/web/src/components/ui/UserAvatar.tsx b/clients/web/src/components/ui/UserAvatar.tsx
new file mode 100644
index 000000000..5a59f5cfa
--- /dev/null
+++ b/clients/web/src/components/ui/UserAvatar.tsx
@@ -0,0 +1,28 @@
+import type { User } from "@shared";
+
+type UserAvatarProps = {
+  user: User;
+};
+
+export function UserAvatar({ user }: UserAvatarProps) {
+  const initials = [user.first_name?.[0], user.last_name?.[0]]
+    .filter(Boolean)
+    .join("")
+    .toUpperCase();
+
+  if (user.profile_picture) {
+    return (
+      <img
+        src={user.profile_picture}
+        alt={initials}
+        className="size-7 shrink-0 rounded-full object-cover"
+      />
+    );
+  }
+
+  return (
+    <div className="flex size-7 shrink-0 items-center justify-center rounded-full bg-bg-selected text-xs font-medium text-text-default">
+      {initials || "?"}
+    </div>
+  );
+}
diff --git a/clients/web/src/components/ui/accordion.tsx b/clients/web/src/components/ui/accordion.tsx
new file mode 100644
index 000000000..014eae66f
--- /dev/null
+++ b/clients/web/src/components/ui/accordion.tsx
@@ -0,0 +1,81 @@
+import { Accordion as AccordionPrimitive } from "@base-ui/react/accordion";
+import { ChevronDownIcon, ChevronUpIcon } from "lucide-react";
+
+import { cn } from "@/lib/utils";
+
+function Accordion({ className, ...props }: AccordionPrimitive.Root.Props) {
+  return (
+    <AccordionPrimitive.Root
+      data-slot="accordion"
+      className={cn("flex w-full flex-col", className)}
+      {...props}
+    />
+  );
+}
+
+function AccordionItem({ className, ...props }: AccordionPrimitive.Item.Props) {
+  return (
+    <AccordionPrimitive.Item
+      data-slot="accordion-item"
+      className={className}
+      {...props}
+    />
+  );
+}
+
+function AccordionTrigger({
+  className,
+  children,
+  ...props
+}: AccordionPrimitive.Trigger.Props) {
+  return (
+    <AccordionPrimitive.Header
+      data-slot="accordion-header"
+      className="mb-4 flex w-full min-w-0 border-b border-stroke-subtle"
+    >
+      <AccordionPrimitive.Trigger
+        data-slot="accordion-trigger"
+        className={cn(
+          "group/accordion-trigger relative flex flex-1 items-start justify-between rounded-lg border border-transparent py-4 text-left text-md font-medium transition-all outline-none focus-visible:border-ring focus-visible:ring-3 focus-visible:ring-ring/50 focus-visible:after:border-ring aria-disabled:pointer-events-none aria-disabled:opacity-50 **:data-[slot=accordion-trigger-icon]:ml-auto **:data-[slot=accordion-trigger-icon]:size-4 **:data-[slot=accordion-trigger-icon]:text-muted-foreground",
+          className,
+        )}
+        {...props}
+      >
+        {children}
+        <ChevronDownIcon
+          data-slot="accordion-trigger-icon"
+          className="pointer-events-none shrink-0 group-aria-expanded/accordion-trigger:hidden"
+        />
+        <ChevronUpIcon
+          data-slot="accordion-trigger-icon"
+          className="pointer-events-none hidden shrink-0 group-aria-expanded/accordion-trigger:inline"
+        />
+      </AccordionPrimitive.Trigger>
+    </AccordionPrimitive.Header>
+  );
+}
+
+function AccordionContent({
+  className,
+  children,
+  ...props
+}: AccordionPrimitive.Panel.Props) {
+  return (
+    <AccordionPrimitive.Panel
+      data-slot="accordion-content"
+      className="overflow-hidden text-sm data-open:animate-accordion-down data-closed:animate-accordion-up"
+      {...props}
+    >
+      <div
+        className={cn(
+          "h-(--accordion-panel-height) pt-0 pb-2.5 data-ending-style:h-0 data-starting-style:h-0 [&_a]:underline [&_a]:underline-offset-3 [&_a]:hover:text-foreground [&_p:not(:last-child)]:mb-4",
+          className,
+        )}
+      >
+        {children}
+      </div>
+    </AccordionPrimitive.Panel>
+  );
+}
+
+export { Accordion, AccordionItem, AccordionTrigger, AccordionContent };
diff --git a/clients/web/src/components/ui/context-menu.tsx b/clients/web/src/components/ui/context-menu.tsx
new file mode 100644
index 000000000..24a3ce21b
--- /dev/null
+++ b/clients/web/src/components/ui/context-menu.tsx
@@ -0,0 +1,82 @@
+"use client";
+
+import * as React from "react";
+import { ContextMenu as ContextMenuPrimitive } from "radix-ui";
+
+import { cn } from "@/lib/utils";
+
+function ContextMenu({
+  ...props
+}: React.ComponentProps<typeof ContextMenuPrimitive.Root>) {
+  return <ContextMenuPrimitive.Root data-slot="context-menu" {...props} />;
+}
+
+function ContextMenuTrigger({
+  ...props
+}: React.ComponentProps<typeof ContextMenuPrimitive.Trigger>) {
+  return (
+    <ContextMenuPrimitive.Trigger data-slot="context-menu-trigger" {...props} />
+  );
+}
+
+function ContextMenuContent({
+  className,
+  ...props
+}: React.ComponentProps<typeof ContextMenuPrimitive.Content>) {
+  return (
+    <ContextMenuPrimitive.Portal>
+      <ContextMenuPrimitive.Content
+        data-slot="context-menu-content"
+        className={cn(
+          "z-50 min-w-32 overflow-hidden rounded-lg bg-white p-1 text-text-default shadow-lg border border-stroke-subtle duration-100 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95",
+          className,
+        )}
+        {...props}
+      />
+    </ContextMenuPrimitive.Portal>
+  );
+}
+
+function ContextMenuItem({
+  className,
+  inset,
+  variant = "default",
+  ...props
+}: React.ComponentProps<typeof ContextMenuPrimitive.Item> & {
+  inset?: boolean;
+  variant?: "default" | "destructive";
+}) {
+  return (
+    <ContextMenuPrimitive.Item
+      data-slot="context-menu-item"
+      data-inset={inset}
+      data-variant={variant}
+      className={cn(
+        "relative flex !cursor-pointer items-center gap-1.5 rounded-md px-1.5 py-1 text-sm text-text-default outline-hidden select-none focus:bg-bg-selected data-inset:pl-7 data-[variant=destructive]:text-danger data-[variant=destructive]:focus:bg-danger/10 data-disabled:pointer-events-none data-disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+        className,
+      )}
+      {...props}
+    />
+  );
+}
+
+function ContextMenuSeparator({
+  className,
+  ...props
+}: React.ComponentProps<typeof ContextMenuPrimitive.Separator>) {
+  return (
+    <ContextMenuPrimitive.Separator
+      data-slot="context-menu-separator"
+      className={cn("-mx-1 my-1 h-px bg-stroke-subtle", className)}
+      {...props}
+    />
+  );
+}
+
+export {
+  ContextMenu,
+  ContextMenuTrigger,
+  ContextMenuContent,
+  ContextMenuItem,
+  ContextMenuSeparator,
+};
diff --git a/clients/web/src/components/ui/dialog.tsx b/clients/web/src/components/ui/dialog.tsx
new file mode 100644
index 000000000..bff9c888b
--- /dev/null
+++ b/clients/web/src/components/ui/dialog.tsx
@@ -0,0 +1,163 @@
+"use client";
+
+import * as React from "react";
+import { XIcon } from "lucide-react";
+import { Dialog as DialogPrimitive } from "radix-ui";
+
+import { cn } from "@/lib/utils";
+import { Button } from "@/components/ui/Button";
+
+function Dialog({
+  ...props
+}: React.ComponentProps<typeof DialogPrimitive.Root>) {
+  return <DialogPrimitive.Root data-slot="dialog" {...props} />;
+}
+
+function DialogTrigger({
+  ...props
+}: React.ComponentProps<typeof DialogPrimitive.Trigger>) {
+  return <DialogPrimitive.Trigger data-slot="dialog-trigger" {...props} />;
+}
+
+function DialogPortal({
+  ...props
+}: React.ComponentProps<typeof DialogPrimitive.Portal>) {
+  return <DialogPrimitive.Portal data-slot="dialog-portal" {...props} />;
+}
+
+function DialogClose({
+  ...props
+}: React.ComponentProps<typeof DialogPrimitive.Close>) {
+  return <DialogPrimitive.Close data-slot="dialog-close" {...props} />;
+}
+
+function DialogOverlay({
+  className,
+  ...props
+}: React.ComponentProps<typeof DialogPrimitive.Overlay>) {
+  return (
+    <DialogPrimitive.Overlay
+      data-slot="dialog-overlay"
+      className={cn(
+        "fixed inset-0 isolate z-50 bg-black/10 duration-100 supports-backdrop-filter:backdrop-blur-xs data-open:animate-in data-open:fade-in-0 data-closed:animate-out data-closed:fade-out-0",
+        className,
+      )}
+      {...props}
+    />
+  );
+}
+
+function DialogContent({
+  className,
+  children,
+  showCloseButton = true,
+  ...props
+}: React.ComponentProps<typeof DialogPrimitive.Content> & {
+  showCloseButton?: boolean;
+}) {
+  return (
+    <DialogPortal>
+      <DialogOverlay />
+      <DialogPrimitive.Content
+        data-slot="dialog-content"
+        className={cn(
+          "fixed top-1/2 left-1/2 z-50 grid w-full max-w-[calc(100%-2rem)] -translate-x-1/2 -translate-y-1/2 gap-4 rounded-xl bg-popover p-4 text-sm text-popover-foreground ring-1 ring-foreground/10 duration-100 outline-none sm:max-w-sm data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95",
+          className,
+        )}
+        {...props}
+      >
+        {children}
+        {showCloseButton && (
+          <DialogPrimitive.Close data-slot="dialog-close" asChild>
+            <Button variant="secondary" className="absolute top-2 right-2">
+              <XIcon />
+              <span className="sr-only">Close</span>
+            </Button>
+          </DialogPrimitive.Close>
+        )}
+      </DialogPrimitive.Content>
+    </DialogPortal>
+  );
+}
+
+function DialogHeader({ className, ...props }: React.ComponentProps<"div">) {
+  return (
+    <div
+      data-slot="dialog-header"
+      className={cn("flex flex-col gap-2", className)}
+      {...props}
+    />
+  );
+}
+
+function DialogFooter({
+  className,
+  showCloseButton = false,
+  children,
+  ...props
+}: React.ComponentProps<"div"> & {
+  showCloseButton?: boolean;
+}) {
+  return (
+    <div
+      data-slot="dialog-footer"
+      className={cn(
+        "-mx-4 -mb-4 flex flex-col-reverse gap-2 rounded-b-xl border-t bg-muted/50 p-4 sm:flex-row sm:justify-end",
+        className,
+      )}
+      {...props}
+    >
+      {children}
+      {showCloseButton && (
+        <DialogPrimitive.Close asChild>
+          <Button variant="secondary">Close</Button>
+        </DialogPrimitive.Close>
+      )}
+    </div>
+  );
+}
+
+function DialogTitle({
+  className,
+  ...props
+}: React.ComponentProps<typeof DialogPrimitive.Title>) {
+  return (
+    <DialogPrimitive.Title
+      data-slot="dialog-title"
+      className={cn(
+        "cn-font-heading text-base leading-none font-medium",
+        className,
+      )}
+      {...props}
+    />
+  );
+}
+
+function DialogDescription({
+  className,
+  ...props
+}: React.ComponentProps<typeof DialogPrimitive.Description>) {
+  return (
+    <DialogPrimitive.Description
+      data-slot="dialog-description"
+      className={cn(
+        "text-sm text-muted-foreground *:[a]:underline *:[a]:underline-offset-3 *:[a]:hover:text-foreground",
+        className,
+      )}
+      {...props}
+    />
+  );
+}
+
+export {
+  Dialog,
+  DialogClose,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogOverlay,
+  DialogPortal,
+  DialogTitle,
+  DialogTrigger,
+};
diff --git a/clients/web/src/components/ui/dropdown-menu.tsx b/clients/web/src/components/ui/dropdown-menu.tsx
new file mode 100644
index 000000000..8d906d511
--- /dev/null
+++ b/clients/web/src/components/ui/dropdown-menu.tsx
@@ -0,0 +1,273 @@
+"use client";
+
+import * as React from "react";
+import { CheckIcon, ChevronRightIcon } from "lucide-react";
+import { DropdownMenu as DropdownMenuPrimitive } from "radix-ui";
+
+import { cn } from "@/lib/utils";
+
+function DropdownMenu({
+  ...props
+}: React.ComponentProps<typeof DropdownMenuPrimitive.Root>) {
+  return <DropdownMenuPrimitive.Root data-slot="dropdown-menu" {...props} />;
+}
+
+function DropdownMenuPortal({
+  ...props
+}: React.ComponentProps<typeof DropdownMenuPrimitive.Portal>) {
+  return (
+    <DropdownMenuPrimitive.Portal data-slot="dropdown-menu-portal" {...props} />
+  );
+}
+
+function DropdownMenuTrigger({
+  ...props
+}: React.ComponentProps<typeof DropdownMenuPrimitive.Trigger>) {
+  return (
+    <DropdownMenuPrimitive.Trigger
+      data-slot="dropdown-menu-trigger"
+      {...props}
+    />
+  );
+}
+
+function DropdownMenuContent({
+  className,
+  align = "start",
+  sideOffset = 4,
+  ...props
+}: React.ComponentProps<typeof DropdownMenuPrimitive.Content>) {
+  return (
+    <DropdownMenuPrimitive.Portal>
+      <DropdownMenuPrimitive.Content
+        data-slot="dropdown-menu-content"
+        sideOffset={sideOffset}
+        align={align}
+        className={cn(
+          "z-50 max-h-(--radix-dropdown-menu-content-available-height) w-(--radix-dropdown-menu-trigger-width) min-w-32 origin-(--radix-dropdown-menu-content-transform-origin) overflow-x-hidden overflow-y-auto rounded-lg bg-white p-1 text-text-default shadow-lg border border-stroke-subtle duration-100 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 data-[state=closed]:overflow-hidden data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95",
+          className,
+        )}
+        {...props}
+      />
+    </DropdownMenuPrimitive.Portal>
+  );
+}
+
+function DropdownMenuGroup({
+  ...props
+}: React.ComponentProps<typeof DropdownMenuPrimitive.Group>) {
+  return (
+    <DropdownMenuPrimitive.Group data-slot="dropdown-menu-group" {...props} />
+  );
+}
+
+function DropdownMenuItem({
+  className,
+  inset,
+  variant = "default",
+  ...props
+}: React.ComponentProps<typeof DropdownMenuPrimitive.Item> & {
+  inset?: boolean;
+  variant?: "default" | "destructive";
+}) {
+  return (
+    <DropdownMenuPrimitive.Item
+      data-slot="dropdown-menu-item"
+      data-inset={inset}
+      data-variant={variant}
+      className={cn(
+        "group/dropdown-menu-item relative flex !cursor-pointer items-center gap-1.5 rounded-md px-1.5 py-1 text-sm text-text-default outline-hidden select-none focus:bg-bg-selected data-inset:pl-7 data-[variant=destructive]:text-danger data-[variant=destructive]:focus:bg-danger/10 data-disabled:pointer-events-none data-disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+        className,
+      )}
+      {...props}
+    />
+  );
+}
+
+function DropdownMenuCheckboxItem({
+  className,
+  children,
+  checked,
+  inset,
+  ...props
+}: React.ComponentProps<typeof DropdownMenuPrimitive.CheckboxItem> & {
+  inset?: boolean;
+}) {
+  return (
+    <DropdownMenuPrimitive.CheckboxItem
+      data-slot="dropdown-menu-checkbox-item"
+      data-inset={inset}
+      className={cn(
+        "relative flex cursor-pointer items-center gap-1.5 rounded-md py-1 pr-8 pl-1.5 text-sm text-text-default outline-hidden select-none focus:bg-bg-selected data-inset:pl-7 data-disabled:pointer-events-none data-disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+        className,
+      )}
+      checked={checked}
+      {...props}
+    >
+      <span
+        className="pointer-events-none absolute right-2 flex items-center justify-center"
+        data-slot="dropdown-menu-checkbox-item-indicator"
+      >
+        <DropdownMenuPrimitive.ItemIndicator>
+          <CheckIcon />
+        </DropdownMenuPrimitive.ItemIndicator>
+      </span>
+      {children}
+    </DropdownMenuPrimitive.CheckboxItem>
+  );
+}
+
+function DropdownMenuRadioGroup({
+  ...props
+}: React.ComponentProps<typeof DropdownMenuPrimitive.RadioGroup>) {
+  return (
+    <DropdownMenuPrimitive.RadioGroup
+      data-slot="dropdown-menu-radio-group"
+      {...props}
+    />
+  );
+}
+
+function DropdownMenuRadioItem({
+  className,
+  children,
+  inset,
+  ...props
+}: React.ComponentProps<typeof DropdownMenuPrimitive.RadioItem> & {
+  inset?: boolean;
+}) {
+  return (
+    <DropdownMenuPrimitive.RadioItem
+      data-slot="dropdown-menu-radio-item"
+      data-inset={inset}
+      className={cn(
+        "relative flex cursor-pointer items-center gap-1.5 rounded-md py-1 pr-8 pl-1.5 text-sm text-text-default outline-hidden select-none focus:bg-bg-selected data-inset:pl-7 data-disabled:pointer-events-none data-disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+        className,
+      )}
+      {...props}
+    >
+      <span
+        className="pointer-events-none absolute right-2 flex items-center justify-center"
+        data-slot="dropdown-menu-radio-item-indicator"
+      >
+        <DropdownMenuPrimitive.ItemIndicator>
+          <CheckIcon />
+        </DropdownMenuPrimitive.ItemIndicator>
+      </span>
+      {children}
+    </DropdownMenuPrimitive.RadioItem>
+  );
+}
+
+function DropdownMenuLabel({
+  className,
+  inset,
+  ...props
+}: React.ComponentProps<typeof DropdownMenuPrimitive.Label> & {
+  inset?: boolean;
+}) {
+  return (
+    <DropdownMenuPrimitive.Label
+      data-slot="dropdown-menu-label"
+      data-inset={inset}
+      className={cn(
+        "px-1.5 py-1 text-xs font-medium text-text-subtle data-inset:pl-7",
+        className,
+      )}
+      {...props}
+    />
+  );
+}
+
+function DropdownMenuSeparator({
+  className,
+  ...props
+}: React.ComponentProps<typeof DropdownMenuPrimitive.Separator>) {
+  return (
+    <DropdownMenuPrimitive.Separator
+      data-slot="dropdown-menu-separator"
+      className={cn("-mx-1 my-1 h-px bg-stroke-subtle", className)}
+      {...props}
+    />
+  );
+}
+
+function DropdownMenuShortcut({
+  className,
+  ...props
+}: React.ComponentProps<"span">) {
+  return (
+    <span
+      data-slot="dropdown-menu-shortcut"
+      className={cn(
+        "ml-auto text-xs tracking-widest text-text-subtle",
+        className,
+      )}
+      {...props}
+    />
+  );
+}
+
+function DropdownMenuSub({
+  ...props
+}: React.ComponentProps<typeof DropdownMenuPrimitive.Sub>) {
+  return <DropdownMenuPrimitive.Sub data-slot="dropdown-menu-sub" {...props} />;
+}
+
+function DropdownMenuSubTrigger({
+  className,
+  inset,
+  children,
+  ...props
+}: React.ComponentProps<typeof DropdownMenuPrimitive.SubTrigger> & {
+  inset?: boolean;
+}) {
+  return (
+    <DropdownMenuPrimitive.SubTrigger
+      data-slot="dropdown-menu-sub-trigger"
+      data-inset={inset}
+      className={cn(
+        "flex cursor-pointer items-center gap-1.5 rounded-md px-1.5 py-1 text-sm text-text-default outline-hidden select-none focus:bg-bg-selected data-inset:pl-7 data-open:bg-bg-selected [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+        className,
+      )}
+      {...props}
+    >
+      {children}
+      <ChevronRightIcon className="cn-rtl-flip ml-auto" />
+    </DropdownMenuPrimitive.SubTrigger>
+  );
+}
+
+function DropdownMenuSubContent({
+  className,
+  ...props
+}: React.ComponentProps<typeof DropdownMenuPrimitive.SubContent>) {
+  return (
+    <DropdownMenuPrimitive.SubContent
+      data-slot="dropdown-menu-sub-content"
+      className={cn(
+        "z-50 min-w-[96px] origin-(--radix-dropdown-menu-content-transform-origin) overflow-hidden rounded-lg bg-white p-1 text-text-default shadow-lg border border-stroke-subtle duration-100 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95",
+        className,
+      )}
+      {...props}
+    />
+  );
+}
+
+export {
+  DropdownMenu,
+  DropdownMenuPortal,
+  DropdownMenuTrigger,
+  DropdownMenuContent,
+  DropdownMenuGroup,
+  DropdownMenuLabel,
+  DropdownMenuItem,
+  DropdownMenuCheckboxItem,
+  DropdownMenuRadioGroup,
+  DropdownMenuRadioItem,
+  DropdownMenuSeparator,
+  DropdownMenuShortcut,
+  DropdownMenuSub,
+  DropdownMenuSubTrigger,
+  DropdownMenuSubContent,
+};
diff --git a/clients/web/src/components/ui/skeleton.tsx b/clients/web/src/components/ui/skeleton.tsx
new file mode 100644
index 000000000..26bc059db
--- /dev/null
+++ b/clients/web/src/components/ui/skeleton.tsx
@@ -0,0 +1,13 @@
+import { cn } from "@/lib/utils";
+
+function Skeleton({ className, ...props }: React.ComponentProps<"div">) {
+  return (
+    <div
+      data-slot="skeleton"
+      className={cn("animate-pulse rounded-md bg-muted", className)}
+      {...props}
+    />
+  );
+}
+
+export { Skeleton };
diff --git a/clients/web/src/components/ui/tooltip.tsx b/clients/web/src/components/ui/tooltip.tsx
new file mode 100644
index 000000000..c588ccb2b
--- /dev/null
+++ b/clients/web/src/components/ui/tooltip.tsx
@@ -0,0 +1,57 @@
+"use client";
+
+import * as React from "react";
+import { Tooltip as TooltipPrimitive } from "radix-ui";
+
+import { cn } from "@/lib/utils";
+
+function TooltipProvider({
+  delayDuration = 0,
+  ...props
+}: React.ComponentProps<typeof TooltipPrimitive.Provider>) {
+  return (
+    <TooltipPrimitive.Provider
+      data-slot="tooltip-provider"
+      delayDuration={delayDuration}
+      {...props}
+    />
+  );
+}
+
+function Tooltip({
+  ...props
+}: React.ComponentProps<typeof TooltipPrimitive.Root>) {
+  return <TooltipPrimitive.Root data-slot="tooltip" {...props} />;
+}
+
+function TooltipTrigger({
+  ...props
+}: React.ComponentProps<typeof TooltipPrimitive.Trigger>) {
+  return <TooltipPrimitive.Trigger data-slot="tooltip-trigger" {...props} />;
+}
+
+function TooltipContent({
+  className,
+  sideOffset = 0,
+  children,
+  ...props
+}: React.ComponentProps<typeof TooltipPrimitive.Content>) {
+  return (
+    <TooltipPrimitive.Portal>
+      <TooltipPrimitive.Content
+        data-slot="tooltip-content"
+        sideOffset={sideOffset}
+        className={cn(
+          "z-50 inline-flex w-fit max-w-xs items-center gap-1.5 rounded-md bg-white px-3 py-1.5 text-xs text-text-default drop-shadow-md data-[state=delayed-open]:animate-tooltip-in data-[state=instant-open]:animate-tooltip-in data-[state=closed]:animate-tooltip-out",
+          className,
+        )}
+        {...props}
+      >
+        {children}
+        <TooltipPrimitive.Arrow className="z-50 size-2.5 translate-y-[calc(-50%_-_2px)] rotate-45 rounded-[2px] bg-white fill-white" />
+      </TooltipPrimitive.Content>
+    </TooltipPrimitive.Portal>
+  );
+}
+
+export { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger };
diff --git a/clients/web/src/context/startup.tsx b/clients/web/src/context/startup.tsx
new file mode 100644
index 000000000..b0fcebed6
--- /dev/null
+++ b/clients/web/src/context/startup.tsx
@@ -0,0 +1,58 @@
+import { createContext, useContext, useMemo } from "react";
+import { useAuth } from "@clerk/clerk-react";
+import { useQuery } from "@tanstack/react-query";
+import { setConfig } from "@shared";
+
+export enum StartupStatus {
+  Loading,
+  Unauthenticated,
+  NoUserInfo,
+  Ready,
+}
+
+const StartupContext = createContext<StartupStatus>(StartupStatus.Loading);
+
+export function useStartup() {
+  return useContext(StartupContext);
+}
+
+export function StartupProvider({ children }: { children: React.ReactNode }) {
+  const { getToken, isLoaded, isSignedIn, userId } = useAuth();
+
+  const { data, status } = useQuery({
+    queryKey: ["startup-user", userId],
+    queryFn: async () => {
+      const token = await getToken();
+      const res = await fetch(`${process.env.API_BASE_URL}/users/${userId}`, {
+        headers: { Authorization: `Bearer ${token}` },
+      });
+      if (!res.ok) throw new Error(`${res.status}`);
+      return res.json();
+    },
+    enabled: !!isLoaded && !!isSignedIn && !!userId,
+    retry: 5,
+    retryDelay: (attempt) => 1000 * 2 ** attempt,
+  });
+
+  if (data) {
+    setConfig({
+      API_BASE_URL: process.env.API_BASE_URL ?? "",
+      getToken,
+      hotelId: data.hotel_id,
+    });
+  }
+
+  const startupStatus = useMemo<StartupStatus>(() => {
+    if (!isLoaded) return StartupStatus.Loading;
+    if (!isSignedIn) return StartupStatus.Unauthenticated;
+    if (status === "pending") return StartupStatus.Loading;
+    if (status === "error") return StartupStatus.NoUserInfo;
+    return StartupStatus.Ready;
+  }, [isLoaded, isSignedIn, status]);
+
+  return (
+    <StartupContext.Provider value={startupStatus}>
+      {children}
+    </StartupContext.Provider>
+  );
+}
diff --git a/clients/web/src/hooks/use-click-outside.ts b/clients/web/src/hooks/use-click-outside.ts
new file mode 100644
index 000000000..179e305ee
--- /dev/null
+++ b/clients/web/src/hooks/use-click-outside.ts
@@ -0,0 +1,17 @@
+import { useEffect } from "react";
+import type { RefObject } from "react";
+
+export function useClickOutside<T extends HTMLElement>(
+  ref: RefObject<T | null>,
+  handler: () => void,
+) {
+  useEffect(() => {
+    function onMouseDown(e: MouseEvent) {
+      if (ref.current && !ref.current.contains(e.target as Node)) {
+        handler();
+      }
+    }
+    document.addEventListener("mousedown", onMouseDown);
+    return () => document.removeEventListener("mousedown", onMouseDown);
+  }, [ref, handler]);
+}
diff --git a/clients/web/src/hooks/use-debounce.ts b/clients/web/src/hooks/use-debounce.ts
new file mode 100644
index 000000000..7bb0e18e7
--- /dev/null
+++ b/clients/web/src/hooks/use-debounce.ts
@@ -0,0 +1,12 @@
+import { useEffect, useState } from "react";
+
+export function useDebounce<T>(value: T, delay: number): T {
+  const [debounced, setDebounced] = useState(value);
+
+  useEffect(() => {
+    const timer = setTimeout(() => setDebounced(value), delay);
+    return () => clearTimeout(timer);
+  }, [value, delay]);
+
+  return debounced;
+}
diff --git a/clients/web/src/hooks/use-dropdown.ts b/clients/web/src/hooks/use-dropdown.ts
new file mode 100644
index 000000000..dd0ff8d9a
--- /dev/null
+++ b/clients/web/src/hooks/use-dropdown.ts
@@ -0,0 +1,81 @@
+import { useEffect, useRef, useState } from "react";
+
+type UseDropdownOptions<T> = {
+  selected: Array<T>;
+  onChangeSelectedItems?: (items: Array<T>) => void;
+};
+
+type UseDropdownReturn<T> = {
+  open: boolean;
+  search: string;
+  pending: Array<T>;
+  triggerProps: { onClick: () => void };
+  searchProps: {
+    ref: React.RefObject<{ focus: () => void } | null>;
+    value: string;
+    onChange: (value: string) => void;
+  };
+  toggle: (item: T) => void;
+  cancelProps: { onClick: () => void };
+  selectProps: { onClick: () => void };
+};
+
+export function useDropdown<T>({
+  selected,
+  onChangeSelectedItems,
+}: UseDropdownOptions<T>): UseDropdownReturn<T> {
+  const [open, setOpen] = useState(false);
+  const [search, setSearch] = useState("");
+  const [pending, setPending] = useState<Array<T> | null>(null);
+  const searchRef = useRef<HTMLInputElement | null>(null);
+  const activePending = pending ?? selected;
+
+  useEffect(() => {
+    if (open) {
+      searchRef.current?.focus();
+    }
+  }, [open]);
+
+  const toggle = (item: T) => {
+    setPending((prev) => {
+      const current = prev ?? selected;
+      return current.includes(item)
+        ? current.filter((i) => i !== item)
+        : [...current, item];
+    });
+  };
+
+  const handleOpen = () => {
+    setPending(selected);
+    setSearch("");
+    setOpen(true);
+  };
+
+  const close = () => {
+    setPending(null);
+    setSearch("");
+    setOpen(false);
+  };
+
+  const handleCancel = () => close();
+
+  const handleSelect = () => {
+    onChangeSelectedItems?.(activePending);
+    close();
+  };
+
+  return {
+    open,
+    search,
+    pending: activePending,
+    triggerProps: { onClick: open ? close : handleOpen },
+    searchProps: {
+      ref: searchRef,
+      value: search,
+      onChange: setSearch,
+    },
+    toggle,
+    cancelProps: { onClick: handleCancel },
+    selectProps: { onClick: handleSelect },
+  };
+}
diff --git a/clients/web/src/hooks/use-is-admin.ts b/clients/web/src/hooks/use-is-admin.ts
new file mode 100644
index 000000000..5b43be02e
--- /dev/null
+++ b/clients/web/src/hooks/use-is-admin.ts
@@ -0,0 +1,11 @@
+import { useUser } from "@clerk/clerk-react";
+import { useGetUser } from "@shared";
+
+export function useIsAdmin() {
+  const { user: clerkUser } = useUser();
+  const { data: currentUser, isLoading } = useGetUser(clerkUser?.id);
+  return {
+    isAdmin: currentUser?.role === "admin",
+    isLoading,
+  };
+}
diff --git a/clients/web/src/hooks/use-profile-picture.ts b/clients/web/src/hooks/use-profile-picture.ts
new file mode 100644
index 000000000..62781e2ee
--- /dev/null
+++ b/clients/web/src/hooks/use-profile-picture.ts
@@ -0,0 +1,122 @@
+import { useAPIClient } from "@shared/api/client";
+import {
+  deleteProfilePicture as deleteProfilePictureApi,
+  getExtFromMime,
+  getProfilePicture,
+  getUploadUrl,
+  saveProfilePictureKey,
+  uploadFileToS3,
+} from "@shared";
+import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import { useCallback, useMemo, useState } from "react";
+import { StartupStatus, useStartup } from "@/context/startup";
+
+export function useProfilePicture(userId: string): {
+  profilePicUrl: string | null;
+  status: string;
+  isLoading: boolean;
+  isInitialLoading: boolean;
+  handleUpload: (file: File) => Promise<void>;
+  handleRemove: () => Promise<void>;
+} {
+  const startupStatus = useStartup();
+  const api = useAPIClient();
+  const queryClient = useQueryClient();
+  const queryKey = useMemo(
+    () => ["profile-picture", userId] as const,
+    [userId],
+  );
+
+  const [status, setStatus] = useState("");
+  const [isMutating, setIsMutating] = useState(false);
+
+  const { data: profilePicUrl = null, isLoading: isInitialLoading } = useQuery({
+    queryKey,
+    queryFn: async () => {
+      const data = await getProfilePicture(api, userId);
+      return data?.presigned_url ?? null;
+    },
+    enabled: startupStatus === StartupStatus.Ready && !!userId,
+  });
+
+  const uploadMutation = useMutation({
+    mutationFn: async (file: File) => {
+      if (startupStatus !== StartupStatus.Ready) {
+        return;
+      }
+      setStatus("Getting upload URL...");
+      const ext = getExtFromMime(file.type);
+      const { presigned_url, key } = await getUploadUrl(api, userId, ext);
+
+      setStatus("Uploading to S3...");
+      await uploadFileToS3(presigned_url, file);
+
+      setStatus("Saving to profile...");
+      await saveProfilePictureKey(api, userId, key);
+
+      setStatus("Fetching display URL...");
+      const refreshed = await getProfilePicture(api, userId);
+      return refreshed?.presigned_url ?? null;
+    },
+    onSuccess: (newUrl) => {
+      queryClient.setQueryData(queryKey, newUrl);
+      setStatus("Upload complete!");
+    },
+  });
+
+  const removeMutation = useMutation({
+    mutationFn: async () => {
+      if (startupStatus !== StartupStatus.Ready) {
+        return;
+      }
+      setStatus("Removing profile picture...");
+      await deleteProfilePictureApi(api, userId);
+    },
+    onSuccess: () => {
+      queryClient.setQueryData(queryKey, null);
+      setStatus("Profile picture removed!");
+    },
+  });
+
+  const handleUpload = useCallback(
+    async (file: File) => {
+      setIsMutating(true);
+      try {
+        const newUrl = await uploadMutation.mutateAsync(file);
+        if (typeof newUrl === "string" || newUrl === null) {
+          queryClient.setQueryData(queryKey, newUrl);
+          setStatus("Upload complete!");
+        }
+      } catch (err) {
+        setStatus(
+          `Error: ${err instanceof Error ? err.message : "Unknown error"}`,
+        );
+      } finally {
+        setIsMutating(false);
+      }
+    },
+    [queryClient, queryKey, uploadMutation],
+  );
+
+  const handleRemove = useCallback(async () => {
+    setIsMutating(true);
+    try {
+      await removeMutation.mutateAsync();
+    } catch (err) {
+      setStatus(
+        `Error: ${err instanceof Error ? err.message : "Unknown error"}`,
+      );
+    } finally {
+      setIsMutating(false);
+    }
+  }, [removeMutation]);
+
+  return {
+    profilePicUrl,
+    status,
+    isLoading: isMutating,
+    isInitialLoading,
+    handleUpload,
+    handleRemove,
+  };
+}
diff --git a/clients/web/src/hooks/use-room-by-id.ts b/clients/web/src/hooks/use-room-by-id.ts
new file mode 100644
index 000000000..e5507283c
--- /dev/null
+++ b/clients/web/src/hooks/use-room-by-id.ts
@@ -0,0 +1,22 @@
+import { useCallback } from "react";
+import { useQuery } from "@tanstack/react-query";
+import { useCustomInstance } from "@shared";
+import type { RoomWithOptionalGuestBooking } from "@shared";
+
+const useGetRoomByIdHook = () => {
+  const getRoomById = useCustomInstance<RoomWithOptionalGuestBooking>();
+  return useCallback(
+    (id: string, signal?: AbortSignal) =>
+      getRoomById({ url: `/rooms/${id}`, method: "GET", signal }),
+    [getRoomById],
+  );
+};
+
+export function useRoomById(roomId: string | undefined) {
+  const getRoomById = useGetRoomByIdHook();
+  return useQuery({
+    queryKey: ["room", roomId],
+    queryFn: ({ signal }) => getRoomById(roomId!, signal),
+    enabled: !!roomId,
+  });
+}
diff --git a/clients/web/src/hooks/use-room-status.ts b/clients/web/src/hooks/use-room-status.ts
new file mode 100644
index 000000000..2cb2b08f9
--- /dev/null
+++ b/clients/web/src/hooks/use-room-status.ts
@@ -0,0 +1,60 @@
+import { useMemo } from "react";
+import { AccessibilityIcon } from "lucide-react";
+import type { LucideIcon } from "lucide-react";
+import type { RoomWithOptionalGuestBooking } from "@shared";
+
+import { NotebookIcon } from "@/icons/notebook";
+
+export type RoomStatusTag = {
+  key: string;
+  label?: string;
+  icon?: LucideIcon;
+  iconClassName?: string;
+  priority?: "high" | "medium";
+  className?: string;
+};
+
+export type UseRoomStatusResult = Array<Array<RoomStatusTag>>;
+
+export function useRoomStatus(
+  room: RoomWithOptionalGuestBooking,
+): UseRoomStatusResult {
+  return useMemo(() => {
+    const prio = room.priority;
+    const isAccessible = room.is_accessible ?? false;
+    const hasUnassigned = room.has_unassigned_tasks ?? false;
+
+    const tags: Array<RoomStatusTag> = [];
+
+    if (prio === "high" || prio === "medium") {
+      tags.push({
+        key: `priority:${prio}`,
+        priority: prio,
+      });
+    }
+
+    if (isAccessible) {
+      tags.push({
+        key: "accessible",
+        label: "Accessible",
+        icon: AccessibilityIcon,
+        iconClassName: "size-4",
+        className:
+          "border-stroke-subtle gap-1 bg-bg-primary text-text-default text-xs",
+      });
+    }
+
+    if (hasUnassigned) {
+      tags.push({
+        key: "unassigned-tasks",
+        label: "Unassigned Tasks",
+        icon: NotebookIcon as unknown as LucideIcon,
+        iconClassName: "size-4",
+        className:
+          "border-stroke-subtle gap-1 bg-bg-primary text-text-default text-xs",
+      });
+    }
+
+    return tags.length > 0 ? [tags] : [];
+  }, [room]);
+}
diff --git a/clients/web/src/hooks/use-rooms-filters.ts b/clients/web/src/hooks/use-rooms-filters.ts
new file mode 100644
index 000000000..9a0004c1c
--- /dev/null
+++ b/clients/web/src/hooks/use-rooms-filters.ts
@@ -0,0 +1,74 @@
+import { useCallback, useState } from "react";
+import type {
+  RoomAdvancedFilter,
+  RoomAttributeFilter,
+  RoomStatusFilter,
+} from "@shared/api/rooms";
+
+export type RoomFilters = {
+  status: Array<RoomStatusFilter>;
+  attributes: Array<RoomAttributeFilter>;
+  advanced: Array<RoomAdvancedFilter>;
+};
+
+export type RoomsPageFilters = RoomFilters & {
+  floors: Array<number>;
+};
+
+export const EMPTY_ROOM_FILTERS: RoomFilters = {
+  status: [],
+  attributes: [],
+  advanced: [],
+};
+
+function sortFloorsAscending(floors: Array<number>) {
+  return [...floors].sort((a, b) => a - b);
+}
+
+export function useRoomsFilters(initialFilters: RoomsPageFilters) {
+  const [filters, setFilters] = useState<RoomsPageFilters>({
+    ...initialFilters,
+    floors: sortFloorsAscending(initialFilters.floors),
+  });
+
+  const setFloors = useCallback((floors: Array<number>) => {
+    setFilters((prev) => ({
+      ...prev,
+      floors: sortFloorsAscending(floors),
+    }));
+  }, []);
+
+  const applyFilters = useCallback((group: RoomFilters) => {
+    setFilters((prev) => ({ ...prev, ...group }));
+  }, []);
+
+  const removeStatus = useCallback((value: RoomStatusFilter) => {
+    setFilters((prev) => ({
+      ...prev,
+      status: prev.status.filter((s) => s !== value),
+    }));
+  }, []);
+
+  const removeAttribute = useCallback((value: RoomAttributeFilter) => {
+    setFilters((prev) => ({
+      ...prev,
+      attributes: prev.attributes.filter((a) => a !== value),
+    }));
+  }, []);
+
+  const removeAdvanced = useCallback((value: RoomAdvancedFilter) => {
+    setFilters((prev) => ({
+      ...prev,
+      advanced: prev.advanced.filter((a) => a !== value),
+    }));
+  }, []);
+
+  return {
+    filters,
+    setFloors,
+    applyFilters,
+    removeStatus,
+    removeAttribute,
+    removeAdvanced,
+  };
+}
diff --git a/clients/web/src/hooks/use-unassigned-tasks.ts b/clients/web/src/hooks/use-unassigned-tasks.ts
new file mode 100644
index 000000000..f52b1a5ed
--- /dev/null
+++ b/clients/web/src/hooks/use-unassigned-tasks.ts
@@ -0,0 +1,30 @@
+import { useGetRequestsFeed } from "@shared";
+import type { RoomRequestItem } from "@/components/rooms/RoomRequestList";
+
+export function useUnassignedTasks() {
+  const query = useGetRequestsFeed({ unassigned: true, sort: "priority" });
+
+  const tasks: Array<RoomRequestItem> = (query.data?.pages ?? []).flatMap(
+    (page) =>
+      (page.items ?? []).map((item) => ({
+        id: item.id,
+        name: item.name,
+        room_number: item.room_number ?? undefined,
+        request_category: item.request_category ?? undefined,
+        priority: item.priority,
+        status: item.status,
+        description: item.description ?? undefined,
+        notes: item.notes ?? undefined,
+        floor: item.floor ?? undefined,
+        request_type: item.request_type,
+        department_id: item.department_id ?? undefined,
+        department_name: item.department_name ?? undefined,
+        user_id: item.user_id ?? undefined,
+        created_at: item.created_at,
+        request_version: item.request_version,
+        isAssigned: false,
+      })),
+  );
+
+  return { ...query, tasks };
+}
diff --git a/clients/web/src/icons/check-bubble.tsx b/clients/web/src/icons/check-bubble.tsx
new file mode 100644
index 000000000..19d50cd84
--- /dev/null
+++ b/clients/web/src/icons/check-bubble.tsx
@@ -0,0 +1,19 @@
+import type { SVGProps } from "react";
+
+export function CheckBubbleIcon(props: SVGProps<SVGSVGElement>) {
+  return (
+    <svg
+      viewBox="0 0 17 17"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+      {...props}
+    >
+      <path
+        d="M6.10702 8.49686L7.70653 10.097L10.9055 6.89673M1.98829 5.79263C1.87156 5.26661 1.88948 4.71961 2.0404 4.20236C2.19132 3.68512 2.47034 3.21436 2.8516 2.83375C3.23286 2.45314 3.70401 2.17499 4.22137 2.0251C4.73873 1.87521 5.28554 1.85842 5.81111 1.9763C6.10039 1.5237 6.49891 1.15124 6.96992 0.893234C7.44093 0.635233 7.96929 0.5 8.50629 0.5C9.04328 0.5 9.57164 0.635233 10.0427 0.893234C10.5137 1.15124 10.9122 1.5237 11.2015 1.9763C11.7278 1.85791 12.2756 1.87462 12.7938 2.02487C13.3119 2.17513 13.7837 2.45405 14.1652 2.8357C14.5467 3.21734 14.8255 3.68931 14.9757 4.20769C15.1259 4.72608 15.1426 5.27405 15.0243 5.80063C15.4767 6.09002 15.849 6.48869 16.1069 6.95989C16.3648 7.43109 16.5 7.95966 16.5 8.49686C16.5 9.03407 16.3648 9.56264 16.1069 10.0338C15.849 10.505 15.4767 10.9037 15.0243 11.1931C15.1421 11.7189 15.1253 12.2659 14.9755 12.7835C14.8257 13.301 14.5476 13.7724 14.1672 14.1538C13.7867 14.5352 13.3161 14.8143 12.7991 14.9653C12.2821 15.1163 11.7353 15.1342 11.2095 15.0174C10.9206 15.4718 10.5217 15.8458 10.0499 16.105C9.57809 16.3641 9.04854 16.5 8.51029 16.5C7.97203 16.5 7.44247 16.3641 6.97066 16.105C6.49884 15.8458 6.10002 15.4718 5.81111 15.0174C5.28554 15.1353 4.73873 15.1185 4.22137 14.9686C3.70401 14.8187 3.23286 14.5406 2.8516 14.16C2.47034 13.7794 2.19132 13.3086 2.0404 12.7914C1.88948 12.2741 1.87156 11.7271 1.98829 11.2011C1.5324 10.9125 1.15688 10.5132 0.896665 10.0404C0.636453 9.56756 0.5 9.0366 0.5 8.49686C0.5 7.95713 0.636453 7.42617 0.896665 6.95336C1.15688 6.48055 1.5324 6.08126 1.98829 5.79263Z"
+        stroke="currentColor"
+        strokeLinecap="round"
+        strokeLinejoin="round"
+      />
+    </svg>
+  );
+}
diff --git a/clients/web/src/icons/filter-list.tsx b/clients/web/src/icons/filter-list.tsx
new file mode 100644
index 000000000..2ac1bfc6d
--- /dev/null
+++ b/clients/web/src/icons/filter-list.tsx
@@ -0,0 +1,17 @@
+import type { SVGProps } from "react";
+
+export function FilterListIcon(props: SVGProps<SVGSVGElement>) {
+  return (
+    <svg
+      viewBox="0 0 24 24"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+      {...props}
+    >
+      <path
+        d="M10.558 17V16H13.423V17H10.558ZM6.808 12.5V11.5H17.173V12.5H6.808ZM4 8V7H20V8H4Z"
+        fill="currentColor"
+      />
+    </svg>
+  );
+}
diff --git a/clients/web/src/icons/filter.tsx b/clients/web/src/icons/filter.tsx
new file mode 100644
index 000000000..7647a029d
--- /dev/null
+++ b/clients/web/src/icons/filter.tsx
@@ -0,0 +1,19 @@
+import type { SVGProps } from "react";
+
+export function FilterIcon(props: SVGProps<SVGSVGElement>) {
+  return (
+    <svg
+      viewBox="0 0 18 18"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+      {...props}
+    >
+      <path
+        d="M7.11111 2.38889H0.5M9 15.6111H0.5M10.8889 0.5V4.27778M12.7778 13.7222V17.5M17.5 9H9M17.5 15.6111H12.7778M17.5 2.38889H10.8889M5.22222 7.11111V10.8889M5.22222 9H0.5"
+        stroke="currentColor"
+        strokeLinecap="round"
+        strokeLinejoin="round"
+      />
+    </svg>
+  );
+}
diff --git a/clients/web/src/icons/notebook.tsx b/clients/web/src/icons/notebook.tsx
new file mode 100644
index 000000000..cf322d05b
--- /dev/null
+++ b/clients/web/src/icons/notebook.tsx
@@ -0,0 +1,19 @@
+import type { SVGProps } from "react";
+
+export function NotebookIcon(props: SVGProps<SVGSVGElement>) {
+  return (
+    <svg
+      viewBox="0 0 13 16"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+      {...props}
+    >
+      <path
+        d="M3.5 0.5V3.45385M6.5 0.5V3.45385M9.5 0.5V3.45385M3.5 6.40769H8M3.5 9.36154H9.5M3.5 12.3154H7.25M2 1.97692H11C11.8284 1.97692 12.5 2.63816 12.5 3.45385V13.7923C12.5 14.608 11.8284 15.2692 11 15.2692H2C1.17157 15.2692 0.5 14.608 0.5 13.7923V3.45385C0.5 2.63816 1.17157 1.97692 2 1.97692Z"
+        stroke="currentColor"
+        strokeLinecap="round"
+        strokeLinejoin="round"
+      />
+    </svg>
+  );
+}
diff --git a/clients/web/src/icons/search.tsx b/clients/web/src/icons/search.tsx
new file mode 100644
index 000000000..1ecccde13
--- /dev/null
+++ b/clients/web/src/icons/search.tsx
@@ -0,0 +1,17 @@
+import type { SVGProps } from "react";
+
+export function SearchIcon(props: SVGProps<SVGSVGElement>) {
+  return (
+    <svg
+      viewBox="0 0 16.383 16.385"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+      {...props}
+    >
+      <path
+        d="M15.677 16.385L9.415 10.123C8.915 10.549 8.34 10.8787 7.69 11.112C7.04 11.3453 6.38667 11.462 5.73 11.462C4.12867 11.462 2.77333 10.9077 1.664 9.799C0.554667 8.69034 0 7.33534 0 5.734C0 4.13267 0.554 2.777 1.662 1.667C2.77 0.557002 4.12467 0.00133573 5.726 2.39808e-06C7.32733 -0.00133094 8.68333 0.553336 9.794 1.664C10.9047 2.77467 11.46 4.13034 11.46 5.731C11.46 6.42567 11.337 7.098 11.091 7.748C10.845 8.398 10.5217 8.954 10.121 9.416L16.383 15.677L15.677 16.385ZM5.731 10.461C7.05767 10.461 8.17767 10.0043 9.091 9.091C10.0043 8.17767 10.461 7.05734 10.461 5.73C10.461 4.40267 10.0043 3.28267 9.091 2.37C8.17767 1.45734 7.05767 1.00067 5.731 1C4.40433 0.999336 3.284 1.456 2.37 2.37C1.456 3.284 0.999333 4.404 1 5.73C1.00067 7.056 1.45733 8.176 2.37 9.09C3.28267 10.004 4.40267 10.4607 5.73 10.46"
+        fill="currentColor"
+      />
+    </svg>
+  );
+}
diff --git a/clients/web/src/icons/settings.tsx b/clients/web/src/icons/settings.tsx
new file mode 100644
index 000000000..3601ad712
--- /dev/null
+++ b/clients/web/src/icons/settings.tsx
@@ -0,0 +1,17 @@
+import type { SVGProps } from "react";
+
+export function SettingsIcon(props: SVGProps<SVGSVGElement>) {
+  return (
+    <svg
+      viewBox="0 0 17.484 18"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+      {...props}
+    >
+      <path
+        d="M6.877 18L6.515 15.108C6.19567 15.0113 5.85067 14.86 5.48 14.654C5.10867 14.4473 4.793 14.226 4.533 13.99L1.865 15.125L0 11.875L2.306 10.136C2.276 9.956 2.25167 9.77 2.233 9.578C2.213 9.386 2.203 9.19967 2.203 9.019C2.203 8.851 2.213 8.67433 2.233 8.489C2.25167 8.30367 2.276 8.095 2.306 7.863L0 6.126L1.865 2.914L4.513 4.03C4.81167 3.78133 5.135 3.557 5.483 3.357C5.82967 3.157 6.16733 3.00233 6.496 2.893L6.876 0H10.608L10.969 2.912C11.3523 3.04667 11.691 3.201 11.985 3.375C12.279 3.549 12.582 3.767 12.894 4.029L15.619 2.914L17.484 6.125L15.102 7.921C15.1567 8.12767 15.1873 8.31733 15.194 8.49C15.2007 8.66267 15.204 8.83267 15.204 9C15.204 9.15533 15.1973 9.319 15.184 9.491C15.1713 9.66367 15.142 9.87233 15.096 10.117L17.44 11.875L15.575 15.125L12.894 13.971C12.5827 14.233 12.2693 14.4573 11.954 14.644C11.6387 14.8307 11.3103 14.979 10.969 15.089L10.608 18H6.877ZM7.742 17H9.698L10.067 14.292C10.571 14.1587 11.0243 13.9757 11.427 13.743C11.831 13.5103 12.2417 13.1917 12.659 12.787L15.154 13.85L16.148 12.15L13.959 10.506C14.0423 10.2213 14.0977 9.95933 14.125 9.72C14.1517 9.48133 14.165 9.24133 14.165 9C14.165 8.74667 14.1517 8.50667 14.125 8.28C14.0983 8.05333 14.043 7.80433 13.959 7.533L16.186 5.85L15.192 4.15L12.64 5.22C12.3373 4.88733 11.9397 4.57567 11.447 4.285C10.9537 3.995 10.487 3.80267 10.047 3.708L9.742 1H7.748L7.436 3.689C6.932 3.79633 6.46867 3.96967 6.046 4.209C5.624 4.44767 5.204 4.776 4.786 5.194L2.292 4.15L1.298 5.85L3.467 7.47C3.38367 7.694 3.32533 7.93733 3.292 8.2C3.25867 8.46267 3.242 8.736 3.242 9.02C3.242 9.27333 3.25867 9.525 3.292 9.775C3.32533 10.025 3.37733 10.2683 3.448 10.505L1.298 12.15L2.292 13.85L4.767 12.8C5.15967 13.196 5.567 13.5137 5.989 13.753C6.41167 13.9923 6.88767 14.1787 7.417 14.312L7.742 17ZM8.715 11.5C9.41233 11.5 10.0033 11.2577 10.488 10.773C10.9727 10.2883 11.215 9.69733 11.215 9C11.215 8.30267 10.9727 7.71167 10.488 7.227C10.0033 6.74233 9.41233 6.5 8.715 6.5C8.01367 6.5 7.42167 6.74233 6.939 7.227C6.45633 7.71167 6.215 8.30267 6.215 9C6.215 9.69733 6.45633 10.2883 6.939 10.773C7.42167 11.2577 8.01367 11.5 8.715 11.5Z"
+        fill="currentColor"
+      />
+    </svg>
+  );
+}
diff --git a/clients/web/src/icons/tab.tsx b/clients/web/src/icons/tab.tsx
new file mode 100644
index 000000000..4e4651f2f
--- /dev/null
+++ b/clients/web/src/icons/tab.tsx
@@ -0,0 +1,29 @@
+import type { SVGProps } from "react";
+
+export function TabIcon(props: SVGProps<SVGSVGElement>) {
+  return (
+    <svg
+      viewBox="0 0 16 16"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+      {...props}
+    >
+      <path
+        d="M5.5 2.5C5.5 1.11929 6.61929 0 8 0C9.38071 0 10.5 1.11929 10.5 2.5C10.5 3.88071 9.38071 5 8 5C6.61929 5 5.5 3.88071 5.5 2.5Z"
+        fill="currentColor"
+      />
+      <path
+        d="M5.5 13.5C5.5 12.1193 6.61929 11 8 11C9.38071 11 10.5 12.1193 10.5 13.5C10.5 14.8807 9.38071 16 8 16C6.61929 16 5.5 14.8807 5.5 13.5Z"
+        fill="currentColor"
+      />
+      <path
+        d="M0 8C0 6.61929 1.11929 5.5 2.5 5.5C3.88071 5.5 5 6.61929 5 8C5 9.38071 3.88071 10.5 2.5 10.5C1.11929 10.5 0 9.38071 0 8Z"
+        fill="currentColor"
+      />
+      <path
+        d="M11 8C11 6.61929 12.1193 5.5 13.5 5.5C14.8807 5.5 16 6.61929 16 8C16 9.38071 14.8807 10.5 13.5 10.5C12.1193 10.5 11 9.38071 11 8Z"
+        fill="currentColor"
+      />
+    </svg>
+  );
+}
diff --git a/clients/web/src/icons/urgent.tsx b/clients/web/src/icons/urgent.tsx
new file mode 100644
index 000000000..203803fcb
--- /dev/null
+++ b/clients/web/src/icons/urgent.tsx
@@ -0,0 +1,19 @@
+export function UrgentIcon(props: React.SVGProps<SVGSVGElement>) {
+  return (
+    <svg
+      width="16"
+      height="16"
+      viewBox="0 0 16 16"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+      {...props}
+    >
+      <path
+        d="M8 5V8M8 11H8.0075M15.5 8C15.5 12.1421 12.1421 15.5 8 15.5C3.85786 15.5 0.5 12.1421 0.5 8C0.5 3.85786 3.85786 0.5 8 0.5C12.1421 0.5 15.5 3.85786 15.5 8Z"
+        stroke="currentColor"
+        strokeLinecap="round"
+        strokeLinejoin="round"
+      />
+    </svg>
+  );
+}
diff --git a/clients/web/src/lib/utils.ts b/clients/web/src/lib/utils.ts
index ebae5c85c..67a23ead5 100644
--- a/clients/web/src/lib/utils.ts
+++ b/clients/web/src/lib/utils.ts
@@ -1,3 +1,4 @@
+import { useEffect, useState } from "react";
 import { clsx } from "clsx";
 import { twMerge } from "tailwind-merge";
 import type { ClassValue } from "clsx";
@@ -5,3 +6,57 @@ import type { ClassValue } from "clsx";
 export function cn(...inputs: Array<ClassValue>) {
   return twMerge(clsx(inputs));
 }
+
+const AVATAR_COLOR_SETS = [
+  "bg-violet-500 text-white",
+  "bg-sky-400 text-white",
+  "bg-emerald-400 text-white",
+  "bg-amber-500 text-white",
+  "bg-rose-400 text-white",
+  "bg-teal-400 text-white",
+  "bg-orange-400 text-white",
+];
+
+export function getInitials(name: string): string {
+  return name
+    .split(" ")
+    .map((n) => n[0])
+    .join("")
+    .toUpperCase()
+    .slice(0, 2);
+}
+
+export function hashNameToColor(name: string): string {
+  const hash = [...name].reduce((acc, char) => acc + char.charCodeAt(0), 0);
+  return AVATAR_COLOR_SETS[hash % AVATAR_COLOR_SETS.length];
+}
+
+export function formatTimeAgo(isoString: string): string {
+  const diffMs = Date.now() - new Date(isoString).getTime();
+  const diffMins = Math.floor(diffMs / 60_000);
+  if (diffMins < 1) return "just now";
+  if (diffMins < 60) return `${diffMins}m`;
+  const diffHours = Math.floor(diffMins / 60);
+  if (diffHours < 24) return `${diffHours}h`;
+  const diffDays = Math.floor(diffHours / 24);
+  return `${diffDays}d`;
+}
+
+export function formatFullDate(isoString: string): string {
+  return new Date(isoString).toLocaleString("en-US", {
+    month: "short",
+    day: "numeric",
+    year: "numeric",
+    hour: "numeric",
+    minute: "2-digit",
+  });
+}
+
+export function useDebounce<T>(value: T, delay = 300): T {
+  const [debounced, setDebounced] = useState(value);
+  useEffect(() => {
+    const timer = setTimeout(() => setDebounced(value), delay);
+    return () => clearTimeout(timer);
+  }, [value, delay]);
+  return debounced;
+}
diff --git a/clients/web/src/mock-data/home.ts b/clients/web/src/mock-data/home.ts
index b9883d4c9..39b79cbd4 100644
--- a/clients/web/src/mock-data/home.ts
+++ b/clients/web/src/mock-data/home.ts
@@ -1,4 +1,4 @@
-import type { RequestStatus } from "@/components/requests/RequestCard";
+import type { RequestStatus } from "@shared";
 
 export type TaskContent = {
   status: RequestStatus;
diff --git a/clients/web/src/mock-data/rooms.ts b/clients/web/src/mock-data/rooms.ts
deleted file mode 100644
index 794adea3a..000000000
--- a/clients/web/src/mock-data/rooms.ts
+++ /dev/null
@@ -1,222 +0,0 @@
-import type { Room } from "@/components/rooms/RoomsList";
-
-export const rooms: Array<Room> = [
-  {
-    id: "1",
-    room_number: "101",
-    floor: 1,
-    room_type: "Double Suite",
-    tags: ["occupied"],
-  },
-  { id: "2", room_number: "102", floor: 1, room_type: "Queen Suite" },
-  {
-    id: "3",
-    room_number: "103",
-    floor: 1,
-    room_type: "King Suite",
-    tags: ["occupied", "cleaning"],
-  },
-  { id: "4", room_number: "104", floor: 1, room_type: "Queen Suite" },
-  {
-    id: "5",
-    room_number: "105",
-    floor: 1,
-    room_type: "Double Suite",
-    tags: ["occupied"],
-  },
-  { id: "6", room_number: "106", floor: 1, room_type: "Twin Suite" },
-  {
-    id: "7",
-    room_number: "107",
-    floor: 1,
-    room_type: "King Suite",
-    tags: ["cleaning"],
-  },
-  {
-    id: "8",
-    room_number: "108",
-    floor: 1,
-    room_type: "Queen Suite",
-    tags: ["occupied"],
-  },
-  { id: "9", room_number: "109", floor: 1, room_type: "Double Suite" },
-  {
-    id: "10",
-    room_number: "110",
-    floor: 1,
-    room_type: "Queen Suite",
-    tags: ["occupied", "cleaning"],
-  },
-  {
-    id: "11",
-    room_number: "201",
-    floor: 2,
-    room_type: "King Suite",
-    tags: ["occupied"],
-  },
-  { id: "12", room_number: "202", floor: 2, room_type: "Queen Suite" },
-  {
-    id: "13",
-    room_number: "203",
-    floor: 2,
-    room_type: "Double Suite",
-    tags: ["cleaning"],
-  },
-  {
-    id: "14",
-    room_number: "204",
-    floor: 2,
-    room_type: "Twin Suite",
-    tags: ["occupied"],
-  },
-  { id: "15", room_number: "205", floor: 2, room_type: "Queen Suite" },
-  {
-    id: "16",
-    room_number: "206",
-    floor: 2,
-    room_type: "King Suite",
-    tags: ["occupied"],
-  },
-  { id: "17", room_number: "207", floor: 2, room_type: "Queen Suite" },
-  {
-    id: "18",
-    room_number: "208",
-    floor: 2,
-    room_type: "Double Suite",
-    tags: ["occupied", "cleaning"],
-  },
-  { id: "19", room_number: "209", floor: 2, room_type: "Twin Suite" },
-  {
-    id: "20",
-    room_number: "210",
-    floor: 2,
-    room_type: "Queen Suite",
-    tags: ["occupied"],
-  },
-  { id: "21", room_number: "301", floor: 3, room_type: "Queen Suite" },
-  {
-    id: "22",
-    room_number: "302",
-    floor: 3,
-    room_type: "Double Suite",
-    tags: ["occupied"],
-  },
-  { id: "23", room_number: "303", floor: 3, room_type: "King Suite" },
-  {
-    id: "24",
-    room_number: "304",
-    floor: 3,
-    room_type: "Twin Suite",
-    tags: ["cleaning"],
-  },
-  {
-    id: "25",
-    room_number: "305",
-    floor: 3,
-    room_type: "Queen Suite",
-    tags: ["occupied"],
-  },
-  { id: "26", room_number: "306", floor: 3, room_type: "Queen Suite" },
-  {
-    id: "27",
-    room_number: "307",
-    floor: 3,
-    room_type: "Double Suite",
-    tags: ["occupied"],
-  },
-  { id: "28", room_number: "308", floor: 3, room_type: "King Suite" },
-  {
-    id: "29",
-    room_number: "309",
-    floor: 3,
-    room_type: "Twin Suite",
-    tags: ["occupied", "cleaning"],
-  },
-  { id: "30", room_number: "310", floor: 3, room_type: "Queen Suite" },
-  { id: "31", room_number: "401", floor: 4, room_type: "Double Suite" },
-  {
-    id: "32",
-    room_number: "402",
-    floor: 4,
-    room_type: "King Suite",
-    tags: ["occupied"],
-  },
-  {
-    id: "33",
-    room_number: "403",
-    floor: 4,
-    room_type: "Queen Suite",
-    tags: ["cleaning"],
-  },
-  { id: "34", room_number: "404", floor: 4, room_type: "Twin Suite" },
-  {
-    id: "35",
-    room_number: "405",
-    floor: 4,
-    room_type: "Queen Suite",
-    tags: ["occupied"],
-  },
-  { id: "36", room_number: "406", floor: 4, room_type: "Double Suite" },
-  {
-    id: "37",
-    room_number: "407",
-    floor: 4,
-    room_type: "King Suite",
-    tags: ["occupied"],
-  },
-  { id: "38", room_number: "408", floor: 4, room_type: "Queen Suite" },
-  {
-    id: "39",
-    room_number: "409",
-    floor: 4,
-    room_type: "Twin Suite",
-    tags: ["occupied", "cleaning"],
-  },
-  { id: "40", room_number: "410", floor: 4, room_type: "Queen Suite" },
-  { id: "41", room_number: "501", floor: 5, room_type: "King Suite" },
-  {
-    id: "42",
-    room_number: "502",
-    floor: 5,
-    room_type: "Queen Suite",
-    tags: ["occupied"],
-  },
-  { id: "43", room_number: "503", floor: 5, room_type: "Double Suite" },
-  {
-    id: "44",
-    room_number: "504",
-    floor: 5,
-    room_type: "Twin Suite",
-    tags: ["cleaning"],
-  },
-  {
-    id: "45",
-    room_number: "505",
-    floor: 5,
-    room_type: "Queen Suite",
-    tags: ["occupied"],
-  },
-  { id: "46", room_number: "506", floor: 5, room_type: "King Suite" },
-  {
-    id: "47",
-    room_number: "507",
-    floor: 5,
-    room_type: "Queen Suite",
-    tags: ["occupied"],
-  },
-  {
-    id: "48",
-    room_number: "508",
-    floor: 5,
-    room_type: "Double Suite",
-    tags: ["occupied", "cleaning"],
-  },
-  { id: "49", room_number: "509", floor: 5, room_type: "Twin Suite" },
-  {
-    id: "50",
-    room_number: "510",
-    floor: 5,
-    room_type: "Queen Suite",
-    tags: ["occupied"],
-  },
-];
diff --git a/clients/web/src/routeTree.gen.ts b/clients/web/src/routeTree.gen.ts
index ed2656070..63b8cd75b 100644
--- a/clients/web/src/routeTree.gen.ts
+++ b/clients/web/src/routeTree.gen.ts
@@ -11,11 +11,13 @@
 import { Route as rootRouteImport } from './routes/__root'
 import { Route as SignUpRouteImport } from './routes/sign-up'
 import { Route as SignInRouteImport } from './routes/sign-in'
+import { Route as OnboardingRouteImport } from './routes/onboarding'
 import { Route as ProtectedRouteImport } from './routes/_protected'
 import { Route as IndexRouteImport } from './routes/index'
 import { Route as ProtectedTestApiRouteImport } from './routes/_protected/test-api'
 import { Route as ProtectedSettingsRouteImport } from './routes/_protected/settings'
 import { Route as ProtectedRoomsRouteImport } from './routes/_protected/rooms'
+import { Route as ProtectedProfileRouteImport } from './routes/_protected/profile'
 import { Route as ProtectedHomeRouteImport } from './routes/_protected/home'
 import { Route as ProtectedRoomsIndexRouteImport } from './routes/_protected/rooms.index'
 import { Route as ProtectedGuestsIndexRouteImport } from './routes/_protected/guests.index'
@@ -31,6 +33,11 @@ const SignInRoute = SignInRouteImport.update({
   path: '/sign-in',
   getParentRoute: () => rootRouteImport,
 } as any)
+const OnboardingRoute = OnboardingRouteImport.update({
+  id: '/onboarding',
+  path: '/onboarding',
+  getParentRoute: () => rootRouteImport,
+} as any)
 const ProtectedRoute = ProtectedRouteImport.update({
   id: '/_protected',
   getParentRoute: () => rootRouteImport,
@@ -55,6 +62,11 @@ const ProtectedRoomsRoute = ProtectedRoomsRouteImport.update({
   path: '/rooms',
   getParentRoute: () => ProtectedRoute,
 } as any)
+const ProtectedProfileRoute = ProtectedProfileRouteImport.update({
+  id: '/profile',
+  path: '/profile',
+  getParentRoute: () => ProtectedRoute,
+} as any)
 const ProtectedHomeRoute = ProtectedHomeRouteImport.update({
   id: '/home',
   path: '/home',
@@ -78,9 +90,11 @@ const ProtectedGuestsGuestIdRoute = ProtectedGuestsGuestIdRouteImport.update({
 
 export interface FileRoutesByFullPath {
   '/': typeof IndexRoute
+  '/onboarding': typeof OnboardingRoute
   '/sign-in': typeof SignInRoute
   '/sign-up': typeof SignUpRoute
   '/home': typeof ProtectedHomeRoute
+  '/profile': typeof ProtectedProfileRoute
   '/rooms': typeof ProtectedRoomsRouteWithChildren
   '/settings': typeof ProtectedSettingsRoute
   '/test-api': typeof ProtectedTestApiRoute
@@ -90,9 +104,11 @@ export interface FileRoutesByFullPath {
 }
 export interface FileRoutesByTo {
   '/': typeof IndexRoute
+  '/onboarding': typeof OnboardingRoute
   '/sign-in': typeof SignInRoute
   '/sign-up': typeof SignUpRoute
   '/home': typeof ProtectedHomeRoute
+  '/profile': typeof ProtectedProfileRoute
   '/settings': typeof ProtectedSettingsRoute
   '/test-api': typeof ProtectedTestApiRoute
   '/guests/$guestId': typeof ProtectedGuestsGuestIdRoute
@@ -103,9 +119,11 @@ export interface FileRoutesById {
   __root__: typeof rootRouteImport
   '/': typeof IndexRoute
   '/_protected': typeof ProtectedRouteWithChildren
+  '/onboarding': typeof OnboardingRoute
   '/sign-in': typeof SignInRoute
   '/sign-up': typeof SignUpRoute
   '/_protected/home': typeof ProtectedHomeRoute
+  '/_protected/profile': typeof ProtectedProfileRoute
   '/_protected/rooms': typeof ProtectedRoomsRouteWithChildren
   '/_protected/settings': typeof ProtectedSettingsRoute
   '/_protected/test-api': typeof ProtectedTestApiRoute
@@ -117,9 +135,11 @@ export interface FileRouteTypes {
   fileRoutesByFullPath: FileRoutesByFullPath
   fullPaths:
     | '/'
+    | '/onboarding'
     | '/sign-in'
     | '/sign-up'
     | '/home'
+    | '/profile'
     | '/rooms'
     | '/settings'
     | '/test-api'
@@ -129,9 +149,11 @@ export interface FileRouteTypes {
   fileRoutesByTo: FileRoutesByTo
   to:
     | '/'
+    | '/onboarding'
     | '/sign-in'
     | '/sign-up'
     | '/home'
+    | '/profile'
     | '/settings'
     | '/test-api'
     | '/guests/$guestId'
@@ -141,9 +163,11 @@ export interface FileRouteTypes {
     | '__root__'
     | '/'
     | '/_protected'
+    | '/onboarding'
     | '/sign-in'
     | '/sign-up'
     | '/_protected/home'
+    | '/_protected/profile'
     | '/_protected/rooms'
     | '/_protected/settings'
     | '/_protected/test-api'
@@ -155,6 +179,7 @@ export interface FileRouteTypes {
 export interface RootRouteChildren {
   IndexRoute: typeof IndexRoute
   ProtectedRoute: typeof ProtectedRouteWithChildren
+  OnboardingRoute: typeof OnboardingRoute
   SignInRoute: typeof SignInRoute
   SignUpRoute: typeof SignUpRoute
 }
@@ -175,6 +200,13 @@ declare module '@tanstack/react-router' {
       preLoaderRoute: typeof SignInRouteImport
       parentRoute: typeof rootRouteImport
     }
+    '/onboarding': {
+      id: '/onboarding'
+      path: '/onboarding'
+      fullPath: '/onboarding'
+      preLoaderRoute: typeof OnboardingRouteImport
+      parentRoute: typeof rootRouteImport
+    }
     '/_protected': {
       id: '/_protected'
       path: ''
@@ -210,6 +242,13 @@ declare module '@tanstack/react-router' {
       preLoaderRoute: typeof ProtectedRoomsRouteImport
       parentRoute: typeof ProtectedRoute
     }
+    '/_protected/profile': {
+      id: '/_protected/profile'
+      path: '/profile'
+      fullPath: '/profile'
+      preLoaderRoute: typeof ProtectedProfileRouteImport
+      parentRoute: typeof ProtectedRoute
+    }
     '/_protected/home': {
       id: '/_protected/home'
       path: '/home'
@@ -255,6 +294,7 @@ const ProtectedRoomsRouteWithChildren = ProtectedRoomsRoute._addFileChildren(
 
 interface ProtectedRouteChildren {
   ProtectedHomeRoute: typeof ProtectedHomeRoute
+  ProtectedProfileRoute: typeof ProtectedProfileRoute
   ProtectedRoomsRoute: typeof ProtectedRoomsRouteWithChildren
   ProtectedSettingsRoute: typeof ProtectedSettingsRoute
   ProtectedTestApiRoute: typeof ProtectedTestApiRoute
@@ -264,6 +304,7 @@ interface ProtectedRouteChildren {
 
 const ProtectedRouteChildren: ProtectedRouteChildren = {
   ProtectedHomeRoute: ProtectedHomeRoute,
+  ProtectedProfileRoute: ProtectedProfileRoute,
   ProtectedRoomsRoute: ProtectedRoomsRouteWithChildren,
   ProtectedSettingsRoute: ProtectedSettingsRoute,
   ProtectedTestApiRoute: ProtectedTestApiRoute,
@@ -278,6 +319,7 @@ const ProtectedRouteWithChildren = ProtectedRoute._addFileChildren(
 const rootRouteChildren: RootRouteChildren = {
   IndexRoute: IndexRoute,
   ProtectedRoute: ProtectedRouteWithChildren,
+  OnboardingRoute: OnboardingRoute,
   SignInRoute: SignInRoute,
   SignUpRoute: SignUpRoute,
 }
diff --git a/clients/web/src/routes/__root.tsx b/clients/web/src/routes/__root.tsx
index db64dc9a1..502af6834 100644
--- a/clients/web/src/routes/__root.tsx
+++ b/clients/web/src/routes/__root.tsx
@@ -1,12 +1,11 @@
 import { HeadContent, Scripts, createRootRoute } from "@tanstack/react-router";
 import { TanStackRouterDevtoolsPanel } from "@tanstack/react-router-devtools";
 import { TanStackDevtools } from "@tanstack/react-devtools";
-import { ClerkProvider, useAuth } from "@clerk/clerk-react";
+import { ClerkProvider } from "@clerk/clerk-react";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import { ReactQueryDevtools } from "@tanstack/react-query-devtools";
-import { setConfig } from "@shared";
-import { useEffect } from "react";
 import appCss from "../styles.css?url";
+import { StartupProvider } from "@/context/startup";
 
 // Client explicity created outside the component to avoid recreation
 const queryClient = new QueryClient({
@@ -57,16 +56,6 @@ export const Route = createRootRoute({
   shellComponent: RootDocument,
 });
 
-// Component to configure auth provider and the api base url
-function AppConfigurator() {
-  const { getToken } = useAuth();
-  useEffect(() => {
-    setConfig({ API_BASE_URL: process.env.API_BASE_URL ?? "", getToken });
-  }, [getToken]);
-
-  return null;
-}
-
 function RootDocument({ children }: { children: React.ReactNode }) {
   return (
     <html lang="en">
@@ -89,9 +78,8 @@ function RootDocument({ children }: { children: React.ReactNode }) {
             import.meta.env.VITE_CLERK_SIGN_UP_FALLBACK_REDIRECT_URL ?? "/home"
           }
         >
-          <AppConfigurator />
           <QueryClientProvider client={queryClient}>
-            {children}
+            <StartupProvider>{children}</StartupProvider>
             <ReactQueryDevtools initialIsOpen={false} />
           </QueryClientProvider>
         </ClerkProvider>
diff --git a/clients/web/src/routes/_protected.tsx b/clients/web/src/routes/_protected.tsx
index f5544571c..4c30ad60d 100644
--- a/clients/web/src/routes/_protected.tsx
+++ b/clients/web/src/routes/_protected.tsx
@@ -1,9 +1,34 @@
 import { createFileRoute } from "@tanstack/react-router";
 import { RedirectToSignIn, SignedIn, SignedOut } from "@clerk/clerk-react";
+import { Loader2 } from "lucide-react";
 import { SideBarWithContent } from "@/components/SideBarWithContent";
+import NoUserInfo from "@/components/ui/NoUserInfo";
+import { StartupStatus, useStartup } from "@/context/startup";
 
 export const Route = createFileRoute("/_protected")({
-  component: () => (
+  component: ProtectedLayout,
+});
+
+function ProtectedLayout() {
+  const status = useStartup();
+
+  if (status === StartupStatus.Unauthenticated)
+    return (
+      <SignedOut>
+        <RedirectToSignIn />
+      </SignedOut>
+    );
+
+  if (status === StartupStatus.Loading) {
+    return (
+      <div className="flex items-center justify-center min-h-screen">
+        <Loader2 className="animate-spin" />
+      </div>
+    );
+  }
+  if (status === StartupStatus.NoUserInfo) return <NoUserInfo />;
+
+  return (
     <>
       <SignedIn>
         <SideBarWithContent />
@@ -12,5 +37,5 @@ export const Route = createFileRoute("/_protected")({
         <RedirectToSignIn />
       </SignedOut>
     </>
-  ),
-});
+  );
+}
diff --git a/clients/web/src/routes/_protected/guests.$guestId.tsx b/clients/web/src/routes/_protected/guests.$guestId.tsx
index 42dd4ae9c..0f4295ccf 100644
--- a/clients/web/src/routes/_protected/guests.$guestId.tsx
+++ b/clients/web/src/routes/_protected/guests.$guestId.tsx
@@ -1,11 +1,13 @@
+import { ApiError, useGetGuestsStaysId, usePutGuestsId } from "@shared";
 import { Link, createFileRoute } from "@tanstack/react-router";
 import { GuestNotesCard } from "../../components/guests/GuestNotesCard";
 import { GuestPageShell } from "../../components/guests/GuestPageShell";
 import { GuestProfileCard } from "../../components/guests/GuestProfileCard";
+import { GuestProfilePageSkeleton } from "../../components/guests/GuestProfilePageSkeleton";
 import { GuestSpecialNeedsCard } from "../../components/guests/GuestSpecialNeedsCard";
 import { HousekeepingPreferencesCard } from "../../components/guests/HousekeepingPreferencesCard";
 import { PreviousStaysCard } from "../../components/guests/PreviousStaysCard";
-import { guestProfilesById } from "../../components/guests/guest-mocks";
+import { GuestDrawerTab } from "@/components/guests/GuestDetailsDrawer";
 
 export const Route = createFileRoute("/_protected/guests/$guestId")({
   component: GuestProfilePage,
@@ -13,16 +15,46 @@ export const Route = createFileRoute("/_protected/guests/$guestId")({
 
 function GuestProfilePage() {
   const { guestId } = Route.useParams();
-  const guestProfile = guestProfilesById[guestId];
+  const {
+    data: guest,
+    isLoading,
+    isError,
+    error,
+    refetch,
+  } = useGetGuestsStaysId(guestId);
+  const updateGuest = usePutGuestsId();
 
-  if (!guestProfile) {
+  const handleSaveNotes = async (notes: string) => {
+    await updateGuest.mutateAsync({
+      id: guestId,
+      data: { notes },
+    });
+
+    await refetch();
+  };
+
+  const detailErrorMessage =
+    error instanceof ApiError && error.status !== 404
+      ? "Failed to load guest profile."
+      : "Guest not found.";
+
+  if (isLoading) {
+    return (
+      <GuestPageShell title="Guests / Guest Profile">
+        <GuestProfilePageSkeleton />
+      </GuestPageShell>
+    );
+  }
+
+  if (isError || !guest) {
     return (
       <GuestPageShell title="Guests / Guest Profile">
         <section className="border border-black bg-white px-[1vw] py-[2vh]">
-          <p className="text-[1vw] text-black">Guest not found.</p>
+          <p className="text-[1vw] text-black">{detailErrorMessage}</p>
           <Link
             to="/guests"
-            className="mt-[1vh] inline-block text-[1vw] text-[#004fc5] underline"
+            search={{ guestId: undefined, tab: GuestDrawerTab.Profile }}
+            className="mt-[1vh] inline-block text-[1vw] text-primary underline"
           >
             Return to guest list
           </Link>
@@ -31,19 +63,30 @@ function GuestProfilePage() {
     );
   }
 
+  const specialNeeds = {
+    dietaryRestrictions: guest.assistance?.dietary?.join(", ") ?? "",
+    accessibilityNeeds: guest.assistance?.accessibility?.join(", ") ?? "",
+    medicalConditions: guest.assistance?.medical?.join(", ") ?? "",
+  };
+  const housekeeping = {
+    frequency: guest.housekeeping_cadence?.trim() || "-",
+    doNotDisturb:
+      guest.do_not_disturb_start && guest.do_not_disturb_end
+        ? `${guest.do_not_disturb_start} - ${guest.do_not_disturb_end}`
+        : "-",
+  };
+
   return (
     <GuestPageShell title="Guests / Guest Profile">
       <div className="grid gap-[2vh] xl:grid-cols-[minmax(0,45vw)_minmax(0,32vw)]">
         <div className="flex flex-col gap-[2vh]">
-          <GuestProfileCard guest={guestProfile} />
-          <GuestNotesCard initialNotes={guestProfile.notes} />
+          <GuestProfileCard guest={guest} />
+          <GuestNotesCard notes={guest.notes} onSave={handleSaveNotes} />
         </div>
         <div className="flex flex-col gap-[2vh]">
-          <GuestSpecialNeedsCard specialNeeds={guestProfile.specialNeeds} />
-          <PreviousStaysCard stays={guestProfile.previousStays} />
-          <HousekeepingPreferencesCard
-            housekeeping={guestProfile.housekeeping}
-          />
+          <GuestSpecialNeedsCard specialNeeds={specialNeeds} />
+          <HousekeepingPreferencesCard housekeeping={housekeeping} />
+          <PreviousStaysCard stays={guest.past_stays} />
         </div>
       </div>
     </GuestPageShell>
diff --git a/clients/web/src/routes/_protected/guests.index.tsx b/clients/web/src/routes/_protected/guests.index.tsx
index 53a83aa81..f8ec26ca9 100644
--- a/clients/web/src/routes/_protected/guests.index.tsx
+++ b/clients/web/src/routes/_protected/guests.index.tsx
@@ -1,58 +1,188 @@
+import {
+  MakeRequestPriority,
+  useGetGuestBookingsGroupSizes,
+  useGetRoomsFloors,
+  usePostGuestsSearchHook,
+} from "@shared";
+import { useInfiniteQuery } from "@tanstack/react-query";
 import { createFileRoute, useNavigate } from "@tanstack/react-router";
-import { useMemo, useState } from "react";
-import { GuestPageShell } from "../../components/guests/GuestPageShell";
+import { useState } from "react";
+import { GuestListHeader } from "../../components/guests/GuestListHeader";
 import { GuestQuickListTable } from "../../components/guests/GuestQuickListTable";
-import { GuestSearchBar } from "../../components/guests/GuestSearchBar";
-import { guestListItems } from "../../components/guests/guest-mocks";
+import { useDebounce } from "../../hooks/use-debounce";
+import type { Request } from "@shared";
+import {
+  GuestDetailsDrawer,
+  GuestDrawerTab,
+} from "@/components/guests/GuestDetailsDrawer";
+import { CreateRequestDrawer } from "@/components/home/CreateRequestDrawer";
+import { PageShell } from "@/components/ui/PageShell";
+import { GlobalTaskInput } from "@/components/ui/GlobalTaskInput";
 
 export const Route = createFileRoute("/_protected/guests/")({
+  validateSearch: (search: Record<string, unknown>) => ({
+    guestId: typeof search.guestId === "string" ? search.guestId : undefined,
+    tab:
+      search.tab === GuestDrawerTab.Activity
+        ? GuestDrawerTab.Activity
+        : GuestDrawerTab.Profile,
+  }),
   component: GuestsQuickListPage,
 });
 
 function GuestsQuickListPage() {
   const navigate = useNavigate();
+  const { guestId, tab } = Route.useSearch();
   const [searchTerm, setSearchTerm] = useState("");
-  const [groupFilter, setGroupFilter] = useState("all");
-  const [floorFilter, setFloorFilter] = useState("all");
-
-  const filteredGuests = useMemo(() => {
-    const query = searchTerm.trim().toLowerCase();
-
-    return guestListItems.filter((guest) => {
-      const matchesSearch =
-        query.length === 0 ||
-        guest.governmentName.toLowerCase().includes(query) ||
-        guest.preferredName.toLowerCase().includes(query) ||
-        guest.room.toLowerCase().includes(query);
-
-      const matchesGroup =
-        groupFilter === "all" ||
-        (groupFilter === "1-2" && guest.groupSize <= 2) ||
-        (groupFilter === "3-4" &&
-          guest.groupSize >= 3 &&
-          guest.groupSize <= 4) ||
-        (groupFilter === "5+" && guest.groupSize >= 5);
-
-      const matchesFloor =
-        floorFilter === "all" || guest.floor === Number(floorFilter);
-
-      return matchesSearch && matchesGroup && matchesFloor;
+  const [floorFilters, setFloorFilters] = useState<Array<number>>([]);
+  const [groupSizeFilters, setGroupSizeFilters] = useState<Array<number>>([]);
+  const [generatedData, setGeneratedData] = useState<{
+    name?: string;
+    description?: string;
+    priority?: MakeRequestPriority;
+    room_id?: string;
+    guest_id?: string;
+    user_id?: string;
+  } | null>(null);
+
+  const debouncedSearch = useDebounce(searchTerm, 300);
+  const postGuests = usePostGuestsSearchHook();
+  const { data: floorsData } = useGetRoomsFloors();
+  const { data: groupSizesData } = useGetGuestBookingsGroupSizes();
+
+  const availableFloors = floorsData ?? [];
+  const availableGroupSizes = groupSizesData ?? [];
+
+  const { data, fetchNextPage, hasNextPage, isFetching, isLoading, isError } =
+    useInfiniteQuery({
+      queryKey: ["guests", debouncedSearch, floorFilters, groupSizeFilters],
+      queryFn: ({ pageParam }: { pageParam: string | undefined }) =>
+        postGuests({
+          search: debouncedSearch || undefined,
+          floors: floorFilters.length > 0 ? floorFilters : undefined,
+          group_size:
+            groupSizeFilters.length > 0 ? groupSizeFilters : undefined,
+          cursor: pageParam,
+          limit: 20,
+        }),
+      initialPageParam: undefined as string | undefined,
+      getNextPageParam: (lastPage) => lastPage.next_cursor ?? undefined,
+    });
+
+  const allGuests = data?.pages.flatMap((page) => page.data ?? []) ?? [];
+
+  const handleGuestClick = (id: string) => {
+    navigate({
+      to: "/guests",
+      search: { guestId: id, tab: GuestDrawerTab.Profile },
     });
-  }, [floorFilter, groupFilter, searchTerm]);
+  };
+
+  const handleDrawerClose = () => {
+    navigate({
+      to: "/guests",
+      search: { guestId: undefined, tab: GuestDrawerTab.Profile },
+    });
+  };
+
+  const handleTabChange = (newTab: GuestDrawerTab) => {
+    if (!guestId) return;
+    navigate({ to: "/guests", search: { guestId, tab: newTab } });
+  };
+
+  let guestsContent;
+  if (isError) {
+    guestsContent = (
+      <div className="border border-black bg-white px-[1vw] py-[2vh] text-[1vw] text-black">
+        Failed to load guests. Please try again.
+      </div>
+    );
+  } else {
+    guestsContent = (
+      <>
+        <GuestQuickListTable
+          guests={allGuests}
+          isLoading={isLoading}
+          onGuestClick={handleGuestClick}
+        />
+
+        {isLoading && (
+          <div className="px-[1vw] py-[2vh] text-[1vw] text-text-subtle">
+            Loading guests...
+          </div>
+        )}
+
+        {hasNextPage && !isLoading && (
+          <button
+            type="button"
+            onClick={() => fetchNextPage()}
+            disabled={isFetching}
+            className="mt-[1vh] w-full border border-black bg-white py-[1vh] text-[1vw] text-black hover:bg-neutral-50 disabled:opacity-50"
+          >
+            {isFetching ? "Loading..." : "Load more"}
+          </button>
+        )}
+      </>
+    );
+  }
 
   return (
-    <GuestPageShell title="Guests">
-      <GuestSearchBar value={searchTerm} onChange={setSearchTerm} />
-      <GuestQuickListTable
-        guests={filteredGuests}
-        groupFilter={groupFilter}
-        floorFilter={floorFilter}
-        onGroupFilterChange={setGroupFilter}
-        onFloorFilterChange={setFloorFilter}
-        onGuestClick={(guestId) =>
-          navigate({ to: "/guests/$guestId", params: { guestId } })
-        }
+    <PageShell
+      header={{
+        title: "Guests",
+        description: "Description blah blah fries -> bag",
+      }}
+      bodyClassName="pb-24"
+      drawerOpen={generatedData !== null || guestId !== undefined}
+      bottomBar={
+        generatedData === null && guestId === undefined ? (
+          <GlobalTaskInput
+            onRequestGenerated={(r: Request) => {
+              const p = r.priority;
+              setGeneratedData({
+                name: r.name,
+                description: r.description,
+                priority:
+                  p && p in MakeRequestPriority
+                    ? (p as MakeRequestPriority)
+                    : undefined,
+                room_id: r.room_id,
+                guest_id: r.guest_id,
+                user_id: r.user_id,
+              });
+            }}
+          />
+        ) : undefined
+      }
+      drawer={
+        generatedData !== null ? (
+          <CreateRequestDrawer
+            initialData={generatedData}
+            onClose={() => setGeneratedData(null)}
+          />
+        ) : guestId !== undefined ? (
+          <GuestDetailsDrawer
+            guestId={guestId}
+            activeTab={tab}
+            onTabChange={handleTabChange}
+            onClose={handleDrawerClose}
+          />
+        ) : null
+      }
+    >
+      <GuestListHeader
+        searchTerm={searchTerm}
+        onSearchChange={setSearchTerm}
+        availableFloors={availableFloors}
+        availableGroupSizes={availableGroupSizes}
+        selectedFloors={floorFilters}
+        selectedGroupSizes={groupSizeFilters}
+        onApplyFilters={(floors, groupSizes) => {
+          setFloorFilters(floors);
+          setGroupSizeFilters(groupSizes);
+        }}
       />
-    </GuestPageShell>
+      {guestsContent}
+    </PageShell>
   );
 }
diff --git a/clients/web/src/routes/_protected/home.tsx b/clients/web/src/routes/_protected/home.tsx
index c372331d1..94b2f33d2 100644
--- a/clients/web/src/routes/_protected/home.tsx
+++ b/clients/web/src/routes/_protected/home.tsx
@@ -1,32 +1,485 @@
+import { useEffect, useRef, useState } from "react";
 import { createFileRoute } from "@tanstack/react-router";
-import { HomeHeader } from "@/components/home/HomeHeader";
+import { useUser } from "@clerk/clerk-react";
+import { useQuery } from "@tanstack/react-query";
+import {
+  DndContext,
+  DragOverlay,
+  PointerSensor,
+  useSensor,
+  useSensors,
+} from "@dnd-kit/core";
+import { useUpdateRequestDepartment } from "@shared/api/requests";
+import {
+  MakeRequestPriority,
+  useCreateView,
+  useDeleteView,
+  useGetDepartments,
+  useGetRequestById,
+  useGetRequestsFeed,
+  useGetUsersIdHook,
+  useGetViews,
+  useUpdateView,
+} from "@shared";
+import type { DragEndEvent, DragStartEvent } from "@dnd-kit/core";
+import type {
+  Request,
+  RequestFeedItem,
+  RequestFeedSort,
+  User,
+  View,
+} from "@shared";
+import { GlobalTaskInput } from "@/components/ui/GlobalTaskInput";
+import { PageShell } from "@/components/ui/PageShell";
 import { HomeToolbar } from "@/components/home/HomeToolbar";
 import { HomeFilterBar } from "@/components/home/HomeFilterBar";
+import { CreateRequestDrawer } from "@/components/home/CreateRequestDrawer";
 import { KanbanColumn } from "@/components/requests/KanbanColumn";
-import { RequestCardItem } from "@/components/requests/RequestCardItem";
-import { PLACEHOLDER_COLUMNS } from "@/mock-data/home";
+import {
+  RequestCardItem,
+  formatRequestTime,
+} from "@/components/requests/RequestCardItem";
+import { RequestCard } from "@/components/requests/RequestCard";
+import { RequestCardTimestamp } from "@/components/requests/RequestCardTimestamp";
+import { DeleteViewModal } from "@/components/home/DeleteViewModal";
+
+const REQUESTS_WEB_SLUG = "requests_web";
+
+type RequestsWebFilters = {
+  sort?: RequestFeedSort;
+  priorities?: Array<string>;
+  departments?: Array<string>;
+  floors?: Array<number>;
+  userId?: string;
+  userName?: string;
+};
 
 export const Route = createFileRoute("/_protected/home")({
   component: HomePage,
 });
 
-function HomePage() {
+function KanbanColumnData({
+  title,
+  department,
+  onCardClick,
+  onCreateRequest,
+  sort,
+  userId,
+  priorities,
+  floors,
+  search,
+}: {
+  title: string;
+  department: string;
+  onCardClick: (requestId: string) => void;
+  onCreateRequest: (departmentId: string) => void;
+  sort: RequestFeedSort | undefined;
+  userId?: string;
+  priorities?: Array<string>;
+  floors?: Array<number>;
+  search?: string;
+}) {
+  const sentinelRef = useRef<HTMLDivElement>(null);
+  const { data, fetchNextPage, hasNextPage, isFetchingNextPage, isPending } =
+    useGetRequestsFeed({
+      departments: [department],
+      sort,
+      userId,
+      priorities,
+      floors,
+      search,
+    });
+
+  const hasNextPageRef = useRef(hasNextPage);
+  const isFetchingRef = useRef(isFetchingNextPage);
+  hasNextPageRef.current = hasNextPage;
+  isFetchingRef.current = isFetchingNextPage;
+
+  useEffect(() => {
+    const el = sentinelRef.current;
+    if (!el) return;
+    const observer = new IntersectionObserver(
+      ([entry]) => {
+        if (
+          entry.isIntersecting &&
+          hasNextPageRef.current &&
+          !isFetchingRef.current
+        ) {
+          fetchNextPage();
+        }
+      },
+      { threshold: 0.1 },
+    );
+    observer.observe(el);
+    return () => observer.disconnect();
+  }, [fetchNextPage]);
+
+  const requests = (data?.pages ?? []).flatMap((page) => page.items ?? []);
+
+  if (!isPending && requests.length === 0) return null;
+
+  return (
+    <KanbanColumn
+      title={title}
+      droppableId={department}
+      onCreateRequest={() => onCreateRequest(department)}
+    >
+      {requests.map((request: RequestFeedItem) => (
+        <RequestCardItem
+          key={request.id}
+          request={request}
+          onClick={() => onCardClick(request.id)}
+        />
+      ))}
+      <div ref={sentinelRef} className="h-1 shrink-0" />
+    </KanbanColumn>
+  );
+}
+
+function DragOverlayCard({ request }: { request: RequestFeedItem }) {
   return (
-    <main className="flex flex-col h-screen w-[calc(100vw-16rem)] overflow-hidden">
-      <HomeHeader />
-      <HomeToolbar className="mt-2" />
-      <HomeFilterBar />
-      <div className="relative flex-1 overflow-hidden">
-        <div className="flex items-stretch gap-6 h-full overflow-x-auto overflow-y-hidden p-6 pb-0">
-          {PLACEHOLDER_COLUMNS.map((col) => (
-            <KanbanColumn key={col.title} title={col.title}>
-              {col.tasks.map((task, i) => (
-                <RequestCardItem key={i} {...task} />
-              ))}
-            </KanbanColumn>
+    <RequestCard
+      status={request.status}
+      className="w-[22rem] shadow-xl rotate-1 opacity-95"
+    >
+      <RequestCardTimestamp
+        status={request.status}
+        time={formatRequestTime(request.created_at)}
+      />
+      <div className="mt-3">
+        <span className="text-base font-medium leading-snug text-text-default line-clamp-2">
+          {request.name}
+        </span>
+      </div>
+    </RequestCard>
+  );
+}
+
+const DEFAULT_FILTERS: RequestsWebFilters = {
+  sort: "priority",
+  priorities: [],
+  departments: [],
+  floors: [],
+};
+
+function toViewFilters(
+  filters: RequestsWebFilters,
+  user: User | undefined,
+): RequestsWebFilters {
+  return {
+    ...filters,
+    userId: user?.id,
+    userName: user
+      ? `${user.first_name ?? ""} ${user.last_name ?? ""}`.trim()
+      : undefined,
+  };
+}
+
+function HomePage() {
+  const [filters, setFilters] = useState<RequestsWebFilters>(DEFAULT_FILTERS);
+  const [selectedUser, setSelectedUser] = useState<User | undefined>(undefined);
+  const [activeViewId, setActiveViewId] = useState<string | undefined>(
+    undefined,
+  );
+  const [filtersOpen, setFiltersOpen] = useState(false);
+  const [activeDragItem, setActiveDragItem] = useState<RequestFeedItem | null>(
+    null,
+  );
+  const [searchOpen, setSearchOpen] = useState(false);
+  const [searchValue, setSearchValue] = useState("");
+  const [debouncedSearch, setDebouncedSearch] = useState("");
+
+  useEffect(() => {
+    const timeout = setTimeout(() => {
+      setDebouncedSearch(searchValue);
+    }, 300);
+
+    return () => clearTimeout(timeout);
+  }, [searchValue]);
+
+  const { user: clerkUser } = useUser();
+  const getUsersId = useGetUsersIdHook();
+  const { data: backendUser } = useQuery({
+    queryKey: ["user", clerkUser?.id],
+    queryFn: () => getUsersId(clerkUser!.id),
+    enabled: !!clerkUser?.id,
+  });
+
+  const { data: departments } = useGetDepartments(backendUser?.hotel_id);
+  const { data: views = [] } = useGetViews(REQUESTS_WEB_SLUG);
+  const { mutate: createView } = useCreateView(REQUESTS_WEB_SLUG);
+  const { mutate: updateView } = useUpdateView(REQUESTS_WEB_SLUG);
+  const { mutate: deleteView, isPending: isDeletingView } =
+    useDeleteView(REQUESTS_WEB_SLUG);
+  const [viewToDelete, setViewToDelete] = useState<View | null>(null);
+  const { mutate: updateRequestDepartment } = useUpdateRequestDepartment();
+
+  const [drawerData, setDrawerData] = useState<{
+    name?: string;
+    description?: string;
+    priority?: MakeRequestPriority;
+    room_id?: string;
+    guest_id?: string;
+    user_id?: string;
+    department_id?: string;
+  } | null>(null);
+  const [selectedRequestId, setSelectedRequestId] = useState<string | null>(
+    null,
+  );
+
+  const { data: selectedRequest } = useGetRequestById(selectedRequestId);
+
+  const sensors = useSensors(
+    useSensor(PointerSensor, {
+      activationConstraint: { distance: 8 },
+    }),
+  );
+
+  function handleDragStart(event: DragStartEvent) {
+    setActiveDragItem(event.active.data.current?.request ?? null);
+  }
+
+  function handleDragEnd(event: DragEndEvent) {
+    setActiveDragItem(null);
+    const { active, over } = event;
+    if (!over) return;
+
+    const request = active.data.current?.request as RequestFeedItem | undefined;
+    const targetDeptId = over.id as string;
+
+    if (!request || request.department_id === targetDeptId) return;
+
+    const targetDept = (departments ?? []).find((d) => d.id === targetDeptId);
+    if (!targetDept) return;
+
+    updateRequestDepartment({
+      requestId: request.id,
+      departmentId: targetDeptId,
+      sourceDepartmentId: request.department_id ?? "",
+      updatedItem: {
+        ...request,
+        department_id: targetDeptId,
+        department_name: targetDept.name,
+      },
+    });
+  }
+
+  function handleApplyView(view: View) {
+    const viewFilters = view.filters as RequestsWebFilters;
+    setFilters(viewFilters);
+    if (viewFilters.userId) {
+      const [firstName = "", ...rest] = (viewFilters.userName ?? "").split(" ");
+      setSelectedUser({
+        id: viewFilters.userId,
+        first_name: firstName,
+        last_name: rest.join(" "),
+      } as User);
+    } else {
+      setSelectedUser(undefined);
+    }
+    setActiveViewId(view.id);
+  }
+
+  function handleFilterChange(
+    update: Partial<RequestsWebFilters>,
+    user?: User | null,
+  ) {
+    const newFilters = { ...filters, ...update };
+    const newUser = user !== undefined ? (user ?? undefined) : selectedUser;
+    setFilters(newFilters);
+    if (user !== undefined) setSelectedUser(newUser);
+    if (activeViewId)
+      updateView({
+        id: activeViewId,
+        filters: toViewFilters(newFilters, newUser),
+      });
+  }
+
+  function handleSaveView(name: string) {
+    createView({
+      slug: REQUESTS_WEB_SLUG,
+      display_name: name,
+      filters: toViewFilters(filters, selectedUser),
+    });
+  }
+
+  function handleClearAll() {
+    setFilters(DEFAULT_FILTERS);
+    setSelectedUser(undefined);
+    setActiveViewId(undefined);
+  }
+
+  function handleCreateRequest() {
+    setSelectedRequestId(null);
+    setDrawerData({});
+  }
+
+  function handleCreateRequestForDepartment(departmentId: string) {
+    setSelectedRequestId(null);
+    setDrawerData({ department_id: departmentId });
+  }
+
+  function handleRequestGenerated(request: Request) {
+    const p = request.priority;
+    setSelectedRequestId(null);
+    setDrawerData({
+      name: request.name,
+      description: request.description,
+      priority:
+        p && p in MakeRequestPriority ? (p as MakeRequestPriority) : undefined,
+      room_id: request.room_id,
+      guest_id: request.guest_id,
+      user_id: request.user_id,
+      department_id: request.department ?? undefined,
+    });
+  }
+
+  function handleCardClick(requestId: string) {
+    setDrawerData(null);
+    setSelectedRequestId(requestId);
+  }
+
+  const drawer =
+    drawerData !== null ? (
+      <CreateRequestDrawer
+        key="create"
+        initialData={drawerData}
+        onClose={() => setDrawerData(null)}
+      />
+    ) : selectedRequestId !== null ? (
+      selectedRequest ? (
+        <CreateRequestDrawer
+          key={selectedRequestId}
+          existingRequest={selectedRequest}
+          onClose={() => setSelectedRequestId(null)}
+        />
+      ) : (
+        <div className="flex h-full w-full flex-col gap-4 p-10 pt-14">
+          {Array.from({ length: 6 }).map((_, i) => (
+            <div
+              key={i}
+              className="h-7 animate-pulse rounded-md bg-bg-disabled"
+            />
           ))}
         </div>
+      )
+    ) : null;
+
+  const drawerOpen = drawerData !== null || selectedRequestId !== null;
+  const filtersActive =
+    !!selectedUser ||
+    (filters.priorities?.length ?? 0) > 0 ||
+    (filters.departments?.length ?? 0) > 0 ||
+    (filters.floors?.length ?? 0) > 0 ||
+    filters.sort !== "priority";
+
+  return (
+    <PageShell
+      header={{
+        title: "Home",
+        description: "Overview of all tasks currently at play",
+      }}
+      headerBorder={false}
+      subHeader={
+        <>
+          <HomeToolbar
+            onCreateRequest={handleCreateRequest}
+            views={views}
+            activeViewId={activeViewId}
+            filtersOpen={filtersOpen}
+            filtersActive={filtersActive}
+            onToggleFilters={() => setFiltersOpen((o) => !o)}
+            onSelectView={(view) =>
+              view ? handleApplyView(view) : handleClearAll()
+            }
+            onDeleteView={(view) => setViewToDelete(view)}
+            searchOpen={searchOpen}
+            searchValue={searchValue}
+            onSearchOpenChange={setSearchOpen}
+            onSearchChange={setSearchValue}
+          />
+          <div
+            className={`grid transition-all duration-200 ease-out ${filtersOpen ? "grid-rows-[1fr]" : "grid-rows-[0fr]"}`}
+          >
+            <div className="overflow-hidden">
+              <HomeFilterBar
+                sort={filters.sort}
+                onSortChange={(s) => handleFilterChange({ sort: s })}
+                selectedUser={selectedUser}
+                onUserChange={(u) => handleFilterChange({}, u ?? null)}
+                selectedPriorities={filters.priorities ?? []}
+                onPrioritiesChange={(p) =>
+                  handleFilterChange({ priorities: p })
+                }
+                selectedDepartments={filters.departments ?? []}
+                onDepartmentsChange={(d) =>
+                  handleFilterChange({ departments: d })
+                }
+                selectedFloors={filters.floors ?? []}
+                onFloorsChange={(f) => handleFilterChange({ floors: f })}
+                hotelId={backendUser?.hotel_id}
+                currentUserId={backendUser?.id}
+                onClearAll={handleClearAll}
+                onSaveView={handleSaveView}
+              />
+            </div>
+          </div>
+        </>
+      }
+      drawerOpen={drawerOpen}
+      drawer={drawer}
+      contentClassName="!px-0 h-full overflow-hidden relative"
+      bottomBar={
+        !drawerOpen ? (
+          <GlobalTaskInput onRequestGenerated={handleRequestGenerated} />
+        ) : undefined
+      }
+    >
+      <div className="relative flex-1 min-h-0">
+        <DndContext
+          sensors={sensors}
+          onDragStart={handleDragStart}
+          onDragEnd={handleDragEnd}
+        >
+          <div className="absolute inset-0 flex items-stretch gap-6 overflow-x-auto overflow-y-hidden p-6 pb-0">
+            {((filters.departments?.length ?? 0) > 0
+              ? (departments ?? []).filter((d) =>
+                  filters.departments!.includes(d.name),
+                )
+              : (departments ?? [])
+            ).map((dep) => (
+              <KanbanColumnData
+                key={dep.id}
+                title={dep.name}
+                department={dep.id}
+                sort={filters.sort}
+                userId={selectedUser?.id}
+                onCardClick={handleCardClick}
+                onCreateRequest={handleCreateRequestForDepartment}
+                priorities={filters.priorities ?? []}
+                floors={filters.floors ?? []}
+                search={debouncedSearch}
+              />
+            ))}
+          </div>
+          <DragOverlay dropAnimation={null}>
+            {activeDragItem && <DragOverlayCard request={activeDragItem} />}
+          </DragOverlay>
+        </DndContext>
       </div>
-    </main>
+      <DeleteViewModal
+        view={viewToDelete}
+        isPending={isDeletingView}
+        onConfirm={() =>
+          deleteView(viewToDelete!.id, {
+            onSuccess: () => {
+              if (activeViewId === viewToDelete!.id) handleClearAll();
+              setViewToDelete(null);
+            },
+          })
+        }
+        onCancel={() => setViewToDelete(null)}
+      />
+    </PageShell>
   );
 }
diff --git a/clients/web/src/routes/_protected/profile.tsx b/clients/web/src/routes/_protected/profile.tsx
new file mode 100644
index 000000000..8e3091de3
--- /dev/null
+++ b/clients/web/src/routes/_protected/profile.tsx
@@ -0,0 +1,92 @@
+import { createFileRoute } from "@tanstack/react-router";
+import { useUser } from "@clerk/clerk-react";
+import { useGetUsersIdHook } from "@shared";
+import { useQuery } from "@tanstack/react-query";
+import { Skeleton } from "@/components/ui/skeleton";
+import {
+  ProfileHero,
+  ProfileHeroSkeleton,
+} from "@/components/profile/ProfileHero";
+import {
+  ProfileInfoCard,
+  ProfileInfoCardSkeleton,
+} from "@/components/profile/ProfileInfoCard";
+import { NotesFromManagerCard } from "@/components/profile/NotesFromManagerCard";
+import { useProfilePicture } from "@/hooks/use-profile-picture";
+
+export const Route = createFileRoute("/_protected/profile")({
+  component: ProfilePage,
+});
+
+function ProfilePage() {
+  const { user: clerkUser } = useUser();
+  const getUsersId = useGetUsersIdHook();
+  const {
+    profilePicUrl,
+    isLoading: isProfilePictureLoading,
+    handleUpload,
+  } = useProfilePicture(clerkUser?.id ?? "");
+
+  const { data: user, isLoading } = useQuery({
+    queryKey: ["user", clerkUser?.id],
+    queryFn: () => getUsersId(clerkUser!.id),
+    enabled: !!clerkUser?.id,
+  });
+
+  const firstName = user?.first_name ?? "";
+  const lastName = user?.last_name ?? "";
+  const displayName = [firstName, lastName].filter(Boolean).join(" ") || "User";
+  const avatarUrl =
+    profilePicUrl ?? user?.profile_picture ?? clerkUser?.imageUrl;
+
+  return (
+    <main className="flex h-screen flex-col overflow-hidden">
+      <header className="flex-row gap-1.5 border-b border-stroke-subtle px-10 py-5">
+        <h1 className="text-2xl font-semibold text-text-default">Profile</h1>
+        <p className="text-sm font-medium text-text-subtle">
+          Overview of profile
+        </p>
+      </header>
+
+      <div className="flex flex-1 flex-col overflow-y-auto px-6 py-6">
+        {isLoading ? (
+          <>
+            <ProfileHeroSkeleton />
+            <div className="flex items-stretch gap-4">
+              <div className="flex-1">
+                <ProfileInfoCardSkeleton />
+              </div>
+              <div className="flex-1">
+                <Skeleton className="h-56 rounded-lg" />
+              </div>
+            </div>
+          </>
+        ) : (
+          <>
+            <ProfileHero
+              firstName={firstName}
+              lastName={lastName}
+              avatarUrl={avatarUrl}
+              onPickFile={handleUpload}
+              isUploading={isProfilePictureLoading}
+            />
+            <div className="flex items-stretch gap-4">
+              <div className="flex-1">
+                <ProfileInfoCard
+                  userId={clerkUser!.id}
+                  governmentName={displayName}
+                  email={user?.primary_email ?? "—"}
+                  phoneNumber={user?.phone_number ?? "—"}
+                  department={user?.department ?? "—"}
+                />
+              </div>
+              <div className="flex-1">
+                <NotesFromManagerCard />
+              </div>
+            </div>
+          </>
+        )}
+      </div>
+    </main>
+  );
+}
diff --git a/clients/web/src/routes/_protected/rooms.index.tsx b/clients/web/src/routes/_protected/rooms.index.tsx
index 9ea6f0893..d76acefd9 100644
--- a/clients/web/src/routes/_protected/rooms.index.tsx
+++ b/clients/web/src/routes/_protected/rooms.index.tsx
@@ -1,75 +1,125 @@
-import { useMemo, useState } from "react";
 import { createFileRoute } from "@tanstack/react-router";
-import { RoomsHeader } from "@/components/rooms/RoomsHeader";
-import { RoomsOverview } from "@/components/rooms/RoomsOverview";
+import { useState } from "react";
+import { useGetRooms } from "@shared/api/rooms";
+import type {
+  Request,
+  RequestPriority,
+  RoomWithOptionalGuestBooking,
+} from "@shared";
+import type { RoomSortOption } from "@/components/rooms/OrderByDropdown";
+import { GlobalTaskInput } from "@/components/ui/GlobalTaskInput";
+import { PageShell } from "@/components/ui/PageShell";
+import { RoomsToolbar } from "@/components/rooms/RoomsToolbar";
+import { useRoomsFilters } from "@/hooks/use-rooms-filters";
 import { RoomsList } from "@/components/rooms/RoomsList";
 import { RoomDetailsDrawer } from "@/components/rooms/RoomDetailsDrawer";
-import { rooms } from "@/mock-data/rooms";
+import { CreateRequestDrawer } from "@/components/home/CreateRequestDrawer";
+import { RoomsOverview } from "@/components/rooms/RoomsOverview";
 
 export const Route = createFileRoute("/_protected/rooms/")({
   component: RoomsPage,
 });
 
-export type RoomFilters = {
-  floor: Array<number>;
-};
-
-const initialRoomFilters: RoomFilters = {
-  floor: [],
-};
-
 function RoomsPage() {
-  const [roomFilters, setRoomFilters] =
-    useState<RoomFilters>(initialRoomFilters);
-
-  const [selectedRoomId, setSelectedRoomId] = useState<string | null>(null);
-
-  const filteredRooms = useMemo(() => {
-    let result = rooms;
-
-    if (roomFilters.floor.length > 0) {
-      result = result.filter((r) => roomFilters.floor.includes(r.floor));
-    }
+  const [searchTerm, setSearchTerm] = useState("");
+  const {
+    filters,
+    setFloors,
+    applyFilters,
+    removeStatus,
+    removeAttribute,
+    removeAdvanced,
+  } = useRoomsFilters({
+    floors: [],
+    status: [],
+    attributes: [],
+    advanced: [],
+  });
+  const [selectedRoom, setSelectedRoom] =
+    useState<RoomWithOptionalGuestBooking | null>(null);
+  const [sortOption, setSortOption] = useState<RoomSortOption>("ascending");
+  const [generatedData, setGeneratedData] = useState<{
+    name?: string;
+    description?: string;
+    priority?: RequestPriority;
+    room_id?: string;
+    guest_id?: string;
+    user_id?: string;
+  } | null>(null);
 
-    return result;
-  }, [roomFilters]);
+  const { data: roomsData } = useGetRooms({
+    floors: filters.floors.length > 0 ? filters.floors : undefined,
+    status: filters.status.length > 0 ? filters.status : undefined,
+    attributes: filters.attributes.length > 0 ? filters.attributes : undefined,
+    advanced: filters.advanced.length > 0 ? filters.advanced : undefined,
+    sort: sortOption,
+  });
 
-  const selectedRoom =
-    selectedRoomId == null
-      ? null
-      : (rooms.find((r) => r.id === selectedRoomId) ?? null);
-
-  const toggleRoom = (roomId: string) => {
-    setSelectedRoomId((prev) => (prev === roomId ? null : roomId));
-  };
-
-  const updateRoomFilter = <TKey extends keyof RoomFilters>(
-    key: TKey,
-    value: RoomFilters[TKey],
-  ) => {
-    setRoomFilters((prev) => ({ ...prev, [key]: value }));
-  };
-
-  const handleCloseDrawer = () => {
-    setSelectedRoomId(null);
-  };
-
-  return (
-    <main className="flex flex-col h-screen overflow-hidden">
-      <RoomsHeader
-        roomFilters={roomFilters}
-        onRoomFilterChange={updateRoomFilter}
+  const drawerContent =
+    generatedData !== null ? (
+      <CreateRequestDrawer
+        initialData={generatedData}
+        onClose={() => setGeneratedData(null)}
+      />
+    ) : (
+      <RoomDetailsDrawer
+        room={selectedRoom}
+        onClose={() => setSelectedRoom(null)}
       />
+    );
 
-      <section className="flex flex-1 min-h-0">
-        <RoomsList
-          rooms={filteredRooms}
-          onRoomSelect={toggleRoom}
-          selectedRoomId={selectedRoomId}
+  return (
+    <PageShell
+      header={{
+        title: "Rooms",
+        description:
+          "Find any room and access essential details like availability, occupancy, and status at a glance.",
+      }}
+      drawerOpen={generatedData !== null || selectedRoom !== null}
+      drawer={drawerContent}
+      bodyClassName="overflow-hidden"
+      contentClassName={"h-full"}
+    >
+      <div className="flex min-h-0 flex-1 flex-row gap-4">
+        <div className="flex min-h-0 min-w-0 flex-1 flex-col">
+          <RoomsToolbar
+            searchTerm={searchTerm}
+            onChangeSearchTerm={setSearchTerm}
+            filters={filters}
+            onChangeFloors={setFloors}
+            onApplyFilters={applyFilters}
+            onRemoveStatus={removeStatus}
+            onRemoveAttribute={removeAttribute}
+            onRemoveAdvanced={removeAdvanced}
+            sortOption={sortOption}
+            setSortOption={setSortOption}
+          />
+          <RoomsList
+            rooms={roomsData?.items ?? []}
+            onRoomSelect={(room) => {
+              setGeneratedData(null);
+              setSelectedRoom(room);
+            }}
+            selectedRoomNumber={selectedRoom?.room_number ?? null}
+          />
+        </div>
+        <RoomsOverview rooms={roomsData?.items ?? []} />
+      </div>
+      {generatedData === null && selectedRoom === null && (
+        <GlobalTaskInput
+          onRequestGenerated={(r: Request) => {
+            setSelectedRoom(null);
+            setGeneratedData({
+              name: r.name,
+              description: r.description,
+              priority: r.priority,
+              room_id: r.room_id,
+              guest_id: r.guest_id,
+              user_id: r.user_id,
+            });
+          }}
         />
-        <RoomsOverview rooms={filteredRooms} />
-      </section>
-      <RoomDetailsDrawer room={selectedRoom} onClose={handleCloseDrawer} />
-    </main>
+      )}
+    </PageShell>
   );
 }
diff --git a/clients/web/src/routes/_protected/test-api.tsx b/clients/web/src/routes/_protected/test-api.tsx
index baaa71b69..5dea52a6a 100644
--- a/clients/web/src/routes/_protected/test-api.tsx
+++ b/clients/web/src/routes/_protected/test-api.tsx
@@ -1,6 +1,6 @@
 import { createFileRoute } from "@tanstack/react-router";
 import { useState } from "react";
-import { useGetHelloName } from "@shared/api/generated/endpoints/hello/hello.ts";
+import { useGetHelloName } from "@shared";
 import type { ApiError } from "@shared";
 
 export const Route = createFileRoute("/_protected/test-api")({
@@ -15,8 +15,8 @@ function TestApi() {
     submittedName,
   );
 
-  const handleSubmitName = (name: string) => {
-    setSubmittedName(name);
+  const handleSubmitName = (value: string) => {
+    setSubmittedName(value);
   };
 
   const handleSubmit = (e: React.FormEvent) => {
diff --git a/clients/web/src/routes/onboarding.tsx b/clients/web/src/routes/onboarding.tsx
new file mode 100644
index 000000000..7b7acee11
--- /dev/null
+++ b/clients/web/src/routes/onboarding.tsx
@@ -0,0 +1,6 @@
+import { createFileRoute } from "@tanstack/react-router";
+import { OnboardingPage } from "../components/onboarding/OnboardingPage";
+
+export const Route = createFileRoute("/onboarding")({
+  component: OnboardingPage,
+});
diff --git a/clients/web/src/styles.css b/clients/web/src/styles.css
index 6ecb7300f..03eefb324 100644
--- a/clients/web/src/styles.css
+++ b/clients/web/src/styles.css
@@ -3,9 +3,11 @@
 @theme {
   --color-primary: #15502c;
   --color-stroke-subtle: #d8d8d8;
+  --color-stroke-default: #aeaeae;
   --color-stroke-disabled: #e9e9e9;
   --font-playfair: "Playfair Display", ui-serif, serif;
   --color-primary-hover: #0a2916;
+  --color-primary-container: #edf5f1;
   --color-success-accent: #e8fff0;
   --color-success-container: #bdffdd;
   --color-success-stroke: #00a575;
@@ -33,6 +35,7 @@
   --color-danger-strong: #f93333;
   --color-danger-hover: #c90505;
   --color-danger-hover-on: #ffffff;
+  --color-high-priority: #a21313;
   --color-info-accent: #e9f2ff;
   --color-info-container: #dfecff;
   --color-info-stroke: #aac7ff;
@@ -46,14 +49,67 @@
   --color-shadow: #e7e7e7;
   --color-shadow-strong: #dcdcdc;
   --color-bg-container: #f8f8f8;
+  --color-bg-disabled: #bababa;
+  --color-bg-primary: #ffffff;
+  --color-bg-orange: #fff3ed;
+  --color-bg-secondary: #5d5d5d;
+  --color-bg-high-priority: #ffeded;
   --color-text-default: #000;
+  --color-text-orange: #ff8c3f;
   --color-text-subtle: #747474;
   --color-text-secondary: #5d5d5d;
   --color-bg-selected: #edf5f1;
+  --color-neutral-10: #fafafa;
+  --color-neutral-20: #f8f8f8;
+  --color-neutral-400: #808080;
+  --color-neutral-750: #464646;
+  --color-muted: #f0f0f0;
   --color-request-pending-secondary: #fcdcd1;
   --color-request-pending: #f25118;
+  --color-request-assigned-secondary: #dce8ff;
+  --color-request-assigned: #1a56db;
   --color-request-completed-secondary: #cde4ce;
   --color-request-completed: #047a0d;
+  --color-text-heading: #0f172b;
+  --color-text-muted: #62748e;
+  --color-bg-input: #f1f5f9;
+  --color-bg-avatar: #cbd5e1;
+  --color-priority-high: #a21313;
+  --color-priority-high-secondary: #ffeded;
+  --color-priority-medium: #ff8c3f;
+  --color-priority-medium-secondary: #fff3ed;
+  --color-priority-low: #2f61ce;
+  --color-priority-low-secondary: #e1f0ff;
+}
+
+@keyframes tooltip-in {
+  from {
+    opacity: 0;
+    transform: scale(0.95);
+  }
+  to {
+    opacity: 1;
+    transform: scale(1);
+  }
+}
+
+@keyframes tooltip-out {
+  from {
+    opacity: 1;
+    transform: scale(1);
+  }
+  to {
+    opacity: 0;
+    transform: scale(0.95);
+  }
+}
+
+@utility animate-tooltip-in {
+  animation: tooltip-in 200ms ease-out forwards;
+}
+
+@utility animate-tooltip-out {
+  animation: tooltip-out 150ms ease-in forwards;
 }
 
 button {
diff --git a/clients/web/src/tests/generated-types.test.ts b/clients/web/src/tests/generated-types.test.ts
index 11a9a2470..bde339ee8 100644
--- a/clients/web/src/tests/generated-types.test.ts
+++ b/clients/web/src/tests/generated-types.test.ts
@@ -38,7 +38,7 @@ describe("Generated Types Integration", () => {
         status: "pending",
         priority: "high",
         created_at: "2024-01-01T00:00:00Z",
-        updated_at: "2024-01-01T00:00:00Z",
+        request_version: "2024-01-01T00:00:00Z",
       };
 
       expect(request.id).toBe("456");
diff --git a/clients/web/src/tests/guests-ui.test.tsx b/clients/web/src/tests/guests-ui.test.tsx
new file mode 100644
index 000000000..9a0ba74d3
--- /dev/null
+++ b/clients/web/src/tests/guests-ui.test.tsx
@@ -0,0 +1,94 @@
+import { render, screen } from "@testing-library/react";
+import { describe, expect, it } from "vitest";
+import { GuestProfilePageSkeleton } from "../components/guests/GuestProfilePageSkeleton";
+import { GuestProfileCard } from "../components/guests/GuestProfileCard";
+import { GuestQuickListTable } from "../components/guests/GuestQuickListTable";
+import { formatDate } from "../utils/dates";
+import type { GuestWithBooking } from "@shared";
+
+describe("guest UI helpers", () => {
+  describe("formatDate", () => {
+    it("formats ISO dates without shifting the calendar day", () => {
+      expect(formatDate("2024-01-02")).toBe("01/02/2024");
+      expect(formatDate("2024-01-02T00:00:00Z")).toBe("01/02/2024");
+    });
+  });
+
+  describe("GuestQuickListTable", () => {
+    it("does not show the empty state while the first page is loading", () => {
+      render(
+        <GuestQuickListTable guests={[]} isLoading onGuestClick={() => {}} />,
+      );
+
+      expect(screen.queryByText("No guests match your current filters.")).toBe(
+        null,
+      );
+    });
+
+    it("renders a guest row with active booking", () => {
+      const guest: GuestWithBooking = {
+        id: "guest-1",
+        first_name: "Ada",
+        last_name: "Lovelace",
+        preferred_name: "Ada",
+        active_bookings: [{ floor: 4, room_number: 401 }],
+        request_count: 0,
+        has_urgent: false,
+      };
+
+      render(<GuestQuickListTable guests={[guest]} onGuestClick={() => {}} />);
+
+      expect(screen.getByText("Floor 4, Suite 401")).not.toBe(null);
+    });
+  });
+
+  describe("GuestProfileCard", () => {
+    it("renders current backend guest fields", () => {
+      render(
+        <GuestProfileCard
+          guest={{
+            id: "guest-1",
+            first_name: "Jane",
+            last_name: "Doe",
+            phone: "+1 555 111 2222",
+            email: "jane@example.com",
+            preferences: undefined,
+            notes: "VIP",
+            pronouns: "she/her",
+            do_not_disturb_start: undefined,
+            do_not_disturb_end: undefined,
+            housekeeping_cadence: undefined,
+            assistance: undefined,
+            current_stays: [
+              {
+                arrival_date: "2026-04-10",
+                departure_date: "2026-04-15",
+                room_number: 301,
+                group_size: 2,
+                status: "active",
+              },
+            ],
+            past_stays: [],
+          }}
+        />,
+      );
+
+      expect(screen.getByText("Jane Doe")).not.toBe(null);
+      expect(screen.getByText("+1 555 111 2222")).not.toBe(null);
+      expect(screen.getByText("jane@example.com")).not.toBe(null);
+      expect(screen.getByText("she/her")).not.toBe(null);
+      expect(screen.getByText("301")).not.toBe(null);
+      expect(screen.getByText("2")).not.toBe(null);
+    });
+  });
+
+  describe("GuestProfilePageSkeleton", () => {
+    it("renders multiple skeleton placeholders for the profile page", () => {
+      const { container } = render(<GuestProfilePageSkeleton />);
+
+      expect(container.querySelectorAll('[data-slot="skeleton"]').length).toBe(
+        11,
+      );
+    });
+  });
+});
diff --git a/clients/web/src/utils/dates.ts b/clients/web/src/utils/dates.ts
new file mode 100644
index 000000000..dc1c5fbfc
--- /dev/null
+++ b/clients/web/src/utils/dates.ts
@@ -0,0 +1,10 @@
+export function formatDate(iso: string): string {
+  const datePart = iso.includes("T") ? iso.split("T")[0] : iso;
+  const [year, month, day] = datePart.split("-");
+
+  if (!year || !month || !day) {
+    return iso;
+  }
+
+  return `${month}/${day}/${year}`;
+}
diff --git a/clients/web/tsconfig.json b/clients/web/tsconfig.json
index 2022b26ab..5c468769e 100644
--- a/clients/web/tsconfig.json
+++ b/clients/web/tsconfig.json
@@ -27,11 +27,11 @@
     "noUnusedParameters": true,
     "noFallthroughCasesInSwitch": true,
     "noUncheckedSideEffectImports": true,
-    "baseUrl": ".",
     "paths": {
       "@/*": ["./src/*"],
       "@shared": ["../shared/src"],
-      "@shared/*": ["../shared/src/*"]
+      "@shared/*": ["../shared/src/*"],
+      "*": ["./*"]
     }
   }
 }