Merge pull request #50 from Sea-Haven-Industries/feature/fix-phase-2

Fix Phase 2 audit findings: reliability, UX, and monitoring

README.md

@@ -6,7 +6,7 @@ Internal proposal management platform for Sea Haven Industries. Dispatchers subm
 
 Monorepo with five primary services:
 
-- **.NET 8 API** -- Clean Architecture REST API hosted on Lambda behind API Gateway
+- **.NET 8 API** -- Clean Architecture REST API hosted on Lambda behind API Gateway (JWT-authorized) with Function URL for internal access
 - **React 19 Web** -- MUI v7 admin/dispatcher workspace served via CloudFront + S3
 - **React Native Mobile** -- iOS-first field app for dispatchers (offline-capable)
 - **Python Lambdas** -- PDF extraction, PDF generation, library ingestion, AI suggestions, AOSS index provisioning
@@ -46,13 +46,13 @@ All resources are in **us-east-1** (account 328440206208).
 | CDK Stack | Key Resources |
 |---|---|
 | `proposal-system-foundation` | RDS PostgreSQL 15 (t4g.small), S3 buckets, SQS queue + DLQ, Cognito user pool, Secrets Manager |
-| `proposal-system-compute` | API Gateway HTTP API, .NET 8 API Lambda, Python Lambdas (pdf-extract, pdf-generate, library-ingest, suggestions, oss-index-creator), OpenSearch Serverless collection, Bedrock KB |
+| `proposal-system-compute` | API Gateway HTTP API (JWT authorizer), .NET 8 API Lambda + Function URL, Python Lambdas (pdf-extract, pdf-generate, library-ingest, suggestions, oss-index-creator), OpenSearch Serverless collection, Bedrock KB |
 | `proposal-system-frontend` | CloudFront distribution (S3 OAC) |
 
 | Resource Type | Names |
 |---|---|
 | S3 Buckets | `proposal-system-uploads`, `proposal-system-generated`, `proposal-system-library`, `seahaven-ios-certificates` |
-| SQS | `proposal-system-jobs` + `proposal-system-jobs-dlq` (message body filtering by jobType) |
+| SQS | `proposal-system-jobs` (720s visibility, reportBatchItemFailures) + `proposal-system-jobs-dlq` (message body filtering by jobType) |
 | Secrets | `proposal-system/db-credentials`, `proposal-system/internal-api-key` |
 
 ## Local Development
@@ -149,12 +149,29 @@ Build and upload to TestFlight is handled by the `cd-mobile-ios.yaml` reusable w
 | `ASC_ISSUER_ID` | App Store Connect issuer |
 | `ASC_KEY_CONTENT` | App Store Connect API key (base64) |
 
+## Authentication & Authorization
+
+Two-layer auth architecture with defense-in-depth:
+
+| Path | Authorizer | Authentication |
+|---|---|---|
+| External clients → API Gateway `/{proxy+}` | Cognito JWT authorizer (web + mobile client IDs) | .NET JWT middleware (ValidateAudience=true) |
+| `/api/health` | None (public) | None |
+| `/api/auth/callback`, `/api/auth/dev-login` | None (unauthenticated) | None (pre-auth endpoints) |
+| Internal Lambdas → Function URL | None (NONE auth type) | Internal API key (`X-Internal-Api-Key` header, value from Secrets Manager) |
+
+**Role-based access:** Cognito groups (`dispatchers`, `admins`, `sysadmins`) map to API roles via `cognito:groups` claim. Dispatchers can only see their own proposals (ownership enforced in service layer). VendorProposals and GeneratedPdfs endpoints restricted to admins/sysadmins.
+
+**Internal API key:** Python Lambdas call the .NET API via a Lambda Function URL (bypasses API Gateway JWT check). The `InternalApiKeyMiddleware` validates the key and assigns the `admins` role to the synthetic identity.
+
 ## Data Flow
 
 1. Dispatcher submits proposal request (web or mobile)
-2. API creates proposal record, publishes SQS message
+2. API creates proposal record (with advisory-locked number generation), publishes SQS message
 3. If vendor PDF attached: `pdf-extract` Lambda parses and structures data
 4. Suggestions Lambda queries Bedrock KB for similar proposals, generates line items via Claude
 5. Admin reviews/edits line items in pricing workspace
 6. On approval: `pdf-generate` Lambda creates branded PDF
 7. On send: `library-ingest` Lambda adds approved proposal to KB for future matching
+
+Failed SQS messages are reported via `batchItemFailures` and retried up to 3 times before moving to the DLQ.

RETROSPECTIVE-2026-05-19.md

@@ -0,0 +1,228 @@
+# Proposal System — Retrospective (2026-05-19, updated 2026-05-20, session 5 added 2026-05-20)
+
+## Executive Summary
+
+Across four sessions (2026-05-18, 2026-05-19, and two on 2026-05-20), the project progressed from a broken mobile CI pipeline to a functional mobile app on device AND a fully tested web frontend with working dev-mode authentication, proposal lifecycle, and admin workflows.
+
+**Sessions 1-3 (Mobile):** The mobile app went from a broken CI pipeline to a functional app running on a physical device with working email/password authentication. Three distinct launch crashes were resolved, Cognito SRP login was validated end-to-end, and multiple UI issues were fixed. The app boots, authenticates, and renders on iOS 26 hardware. However, it cannot communicate with the backend API from a device, Google OAuth crashes the app, and the branch has not been merged to main.
+
+**Session 4 (Web):** Full local web testing exposed six bugs in the API and frontend: enum serialization failures, identity/role confusion in dev-login, incorrect proposal ownership filtering, Autocomplete binding issues, audit log format errors on Postgres jsonb columns, and missing API idempotency. All were fixed in four logical commits. The web app's core workflow — submit as dispatcher, review/edit/approve/send as admin — is now functional end-to-end in dev mode.
+
+**Session 5 (Automated QA):** Ran 4 parallel test agents covering ~145 test cases across every API endpoint and every frontend page. Found 18 bugs (2 critical, 4 high, 7 medium, 5 low). All 16 actionable bugs fixed in 4 commits. Critical: admin dashboard LINQ crash (EF Core can't translate TimeSpan.TotalHours to SQL) and revision endpoint 500 (unique constraint on ProposalNumber). High: dispatcher dashboard data exposure (missing mine filter), no frontend role guards on admin routes, submittedByName null on mutation responses, invalid role silently defaulting to Admin. Also extracted duplicated STATUS_COLORS and format utilities into shared modules, wired the admin dashboard filter dropdowns, and added debounce to customer search.
+
+**Systemic findings:** The web session revealed two architectural gaps: (1) audit logging was fragile — a format error in a non-critical audit write could roll back an otherwise successful save, and (2) state machine transitions lacked idempotency, meaning retries or UI double-clicks could produce 500 errors instead of graceful no-ops. Both are patterns that would have surfaced in production under real load. Session 5 added a third: the frontend had no authorization enforcement — `ProtectedRoute` checked authentication but not role, so any logged-in user could navigate to admin pages by URL.
+
+## Standards Compliance Status
+
+| Rule | Status | Detail |
+|------|--------|--------|
+| Naming conventions | PASS | kebab-case throughout, branch name follows pattern |
+| CI/CD pipeline exists | PASS | `deploy-mobile.yaml` and `deploy.yaml` both trigger on push to main |
+| OIDC deploy role | PASS | `githubdeploy-proposal-system` |
+| README accurate | **PARTIAL** | Root README updated (0.85, deploy status). `mobile/README.md` incomplete (no auth/device docs). Web dev mode not documented. |
+| Confluence updated | **FAIL** | No Atlassian MCP. Architecture Map missing mobile pipeline, Cognito auth flow, and web dev-mode setup |
+| Memory updated | **UPDATED** | Project memory updated with session 4 web fixes. New feedback memories created for API patterns. |
+| Git workflow | PASS | All sessions used feature branch `mobile/fix-react-version-and-ui` |
+| Commit messages | PASS | Imperative mood, explains "why", logically grouped changes |
+| CDK callback URL fix | PASS | Fixed in CDK + live Cognito via AWS CLI |
+| Pre-push lint/typecheck | NOT VERIFIED | Did not run typecheck before pushing — should have per CLAUDE.md hook |
+| Dev secrets excluded | PASS | `appsettings.Development.json` (dev signing key) kept untracked, not committed |
+| API idempotency | **FIXED** | Approve, MarkSent, Revise transitions now idempotent. Audit failures isolated from saves. |
+
+## Required Memory Updates
+
+### Completed this session
+
+1. **`project_proposal_system.md`** — Updated with session 4 web fixes: dev-mode setup, enum serialization, audit log format, idempotent transitions, scoped My Proposals filtering.
+
+2. **`feedback_mobile_deploy_lessons.md`** — All three session-3 lessons added (React pinning, import type, dev API URL). Done in session 3.
+
+3. **`feedback_react_version_pinning.md`** — Created in session 3. Done.
+
+4. **`feedback_api_idempotency.md`** — NEW: State machine transitions must be idempotent. Audit writes must not roll back successful saves.
+
+5. **`feedback_jsonb_audit_format.md`** — NEW: Postgres jsonb columns require valid JSON, not plain strings. Audit details must be wrapped.
+
+### Still outstanding
+
+6. **`reference_mobile_testflight.md`** — The ⚠️ note about "username/password flow needs to be added" is now resolved but not yet updated in the file.
+
+## Required Documentation Updates
+
+| Doc | Status | Action |
+|-----|--------|--------|
+| Root `README.md` | Updated (session 2) | Needs update: add web dev-mode setup instructions (DevMode, dev-login, local Postgres) |
+| `mobile/README.md` | Exists but incomplete | Add: email/password auth via Cognito SRP, `patch-package` for netinfo iOS 26 fix, React version pinning requirement, local device testing setup |
+| `api/` dev setup | **MISSING** | No documentation for local API development: `appsettings.Development.json` template (without secrets), Docker Compose for Postgres, dev-login endpoint usage |
+| Confluence "AWS Architecture Map" | **OUTSTANDING** | Still blocked — no Atlassian MCP. Needs: mobile CI/CD pipeline, Cognito auth flow, web dev-mode architecture |
+| CDK `foundation-stack.ts` | Updated (session 2) | Callback URLs fixed, CfnOutputs added for client IDs |
+
+## Reusable Skills / Automations
+
+| Candidate | Type | ROI | Description |
+|-----------|------|-----|-------------|
+| React version coherence check | CI step | **CRITICAL** | `node -e` script that reads `node_modules/react-native/Libraries/Renderer/implementations/ReactNativeRenderer-dev.js`, extracts the hardcoded version string, and compares against `node_modules/react/package.json`. Fails if mismatch. Would have caught the exact crash from session 3. |
+| API idempotency test suite | Integration test | **HIGH** | For each state-machine endpoint (approve, markSent, revise), call twice with same input and assert both return 200 with matching response. Would have caught all three idempotency bugs from session 4. Pattern: assert `f(f(x)) == f(x)` for all mutation endpoints. |
+| Audit isolation pattern | Code pattern | **HIGH** | Wrap all non-critical audit writes in try/catch so they never roll back the primary operation. Consider a `SafeAuditService` decorator or middleware. Session 4's bulk update 500 error was caused by audit failure after a successful save. |
+| iOS device smoke test script | Script / Runbook | HIGH | Checklist for post-build device testing: connect device, Metro `--host <LAN_IP>`, build with automatic signing, verify login, test auth flow. |
+| `patch-package` audit CI step | CI check | MEDIUM | Verify patches in `mobile/patches/` still apply cleanly and patched packages haven't been updated. |
+| Dev-mode login test harness | Script | MEDIUM | Script that exercises all three dev-login roles (SysAdmin, Admin, Dispatcher) and verifies each returns a distinct user identity with correct role. Would have caught the role/identity confusion bugs immediately. |
+| Cognito ID token user extraction | Utility | LOW | `parseUserFromIdToken()` in `auth.ts` — reusable for any Cognito-backed app. |
+
+## Key Lessons Learned
+
+### React Native Runtime (Sessions 1-3)
+
+1. **React version MUST be pinned exactly, not with semver range.** RN 0.85.3's bundled `ReactNativeRenderer-dev.js` has a hard check: `if ("19.2.3" !== isomorphicReactPackageVersion)`. The peer dependency says `^19.2.3`, npm resolves to 19.2.6, and the app crashes with an opaque "Cannot read property 'default' of undefined" in `getPaperRenderer`. Pin `"react": "19.2.3"` in package.json.
+
+2. **`import type` is not reliably erased for modules with native initialization.** `import type { CognitoUserSession } from 'amazon-cognito-identity-js'` was NOT stripped by Babel in RN's build pipeline. The module eagerly initialized native crypto at import time, causing a crash. Fix: remove the import entirely and use `any`, or use dynamic `await import()`.
+
+3. **`localhost` in dev config is the phone, not the Mac.** `API_URL: 'http://localhost:5000/api'` in dev mode is unreachable from a physical device. Need either LAN IP or a fallback strategy.
+
+### iOS 26 Specific (Sessions 1-3)
+
+4. **CoreTelephony APIs removed without replacement.** `@react-native-community/netinfo` v12.0.1 still calls deprecated APIs. Required `patch-package` with `respondsToSelector:` guards.
+
+5. **iPhone Mirroring is the fastest way to test on device.** Built into macOS 26, gives full touch control. Developer Mode on the phone is under Settings > Privacy & Security.
+
+### .NET API / Web Frontend (Session 4)
+
+6. **Postgres jsonb columns reject plain strings.** The `details` column on `AuditLogs` is typed `jsonb`. Writing a bare string like `"Added: Widget repair"` produces Postgres error 22P02. Wrap in a JSON object: `JsonSerializer.Serialize(new { message = details })`. This is easy to miss because SQLite and SQL Server `nvarchar` accept anything.
+
+7. **System.Text.Json requires explicit `JsonStringEnumConverter` for enum round-tripping.** Without it, sending `"ServiceCategory": "Plumbing"` from the frontend produces a validation error because the default deserializer expects an integer. Must add `options.JsonSerializerOptions.Converters.Add(new JsonStringEnumConverter())` in `AddJsonOptions`.
+
+8. **State machine transitions must be idempotent.** Approve, MarkSent, and Revise all threw `InvalidOperationException` on repeat calls (e.g., from network retries or UI double-clicks). Fix: if already in the target state, return current entity instead of throwing. This is especially critical for mobile clients with unreliable connectivity.
+
+9. **Audit writes must never roll back successful business operations.** `BulkUpdateAsync` saved line items successfully, then `_audit.LogAsync` threw (due to the jsonb format bug), and the entire request returned 500. The user saw "unexpected error" even though their data was saved. Fix: wrap non-critical audit calls in try/catch.
+
+10. **Dev-login must produce deterministic, distinct identities per role.** Using `Guid.NewGuid()` for CognitoSub meant the same email produced different identities across logins. Using a single hardcoded email for all roles meant switching roles didn't actually switch users. Fix: deterministic sub (`dev-{email}`), distinct email/name per role, and update role on existing user if changed.
+
+11. **"My Proposals" means ownership, not role-based filtering.** Initial implementation filtered by role (show all for admins, filter for dispatchers). The correct behavior: "My Proposals" always shows only proposals the current user submitted, regardless of role. Admins see all proposals in the separate Admin Queue.
+
+### Process (All Sessions)
+
+12. **Feature branch for iterative debugging works.** Session 2 pushed 10+ commits to main. Sessions 3-4 used `mobile/fix-react-version-and-ui` — all fixes stay off main until ready.
+
+13. **User testing catches what type systems and linters can't.** Session 4's six bugs all passed TypeScript compilation and would pass unit tests. They were logic errors in business rules, serialization config, and identity management that only surfaced through manual workflow testing. Interactive testing with role-switching is essential before any deploy.
+
+## Highest ROI Improvements
+
+Ranked by impact-to-effort:
+
+1. **Add API idempotency integration tests** (1 hr) — For each state-machine endpoint, call twice with same input and assert both return 200. Pattern: `assert f(f(x)) == f(x)`. Would have caught 3 of session 4's bugs automatically. Generalizable to any future endpoint.
+
+2. **Add React version coherence CI check** (30 min) — A 10-line node script that extracts the expected version from the bundled renderer and compares to installed React. Prevents the most time-consuming crash from session 3.
+
+3. **Isolate audit writes from business operations** (30 min) — Create a `SafeAuditService` wrapper or add try/catch to all audit calls in services. The pattern already exists in `LineItemService` but should be systematic, not ad-hoc. A single audit format bug caused a 500 on an otherwise successful operation.
+
+4. **Add `.gitignore` to API project** (5 min) — `appsettings.Development.json` contains dev signing keys and must not be committed. Currently relying on manual exclusion. Add it to `.gitignore` with a template file (`.example`) that documents the required keys without values.
+
+5. **Document web dev-mode setup** (15 min) — No docs exist for running the API locally: Docker Compose for Postgres, `appsettings.Development.json` template, dev-login endpoint, role switching. This will block any new developer.
+
+6. **Merge `mobile/fix-react-version-and-ui` and deploy** (5 min) — Branch has 8 commits of critical fixes (sessions 3-4). Current TestFlight build crashes. Must merge before next submission.
+
+7. **Fix dev API_URL for physical devices** (10 min) — `localhost:5000` is unreachable from iPhone. Blocks all API-dependent mobile features during device testing.
+
+8. **Pin all RN ecosystem versions exactly** (5 min) — Already done for React; extend to all `@react-native/*` packages.
+
+## Outstanding Risks or Follow-Ups
+
+| Priority | Item | Risk | Branch/Location |
+|----------|------|------|-----------------|
+| **BLOCKING** | Feature branch not merged — TestFlight build still crashes | Any TestFlight tester or Apple reviewer will see a crash | `mobile/fix-react-version-and-ui` |
+| **BLOCKING** | Google OAuth crashes the app on tap | Apple reviewer may try both login methods | `auth.ts` → `react-native-app-auth` → Cognito Hosted UI |
+| **HIGH** | `appsettings.Development.json` not in `.gitignore` | Dev signing key could be accidentally committed | `api/src/ProposalSystem.Api/` |
+| **HIGH** | Dev API_URL is `localhost:5000` — all API calls fail on device | Proposals can't be created, viewed, or searched on device | `config.ts` |
+| **HIGH** | Placeholder app icons (solid blue squares) | Unprofessional for TestFlight / App Store | `ios/ProposalSystem/Images.xcassets` |
+| **HIGH** | No web dev-mode setup documentation | New developer can't run the system locally | Root README / api/ docs |
+| ~~HIGH~~ | ~~Audit isolation is ad-hoc, not systematic~~ | ~~Fixed session 4; session 5 verified via testing~~ | ~~LineItemService, ProposalService~~ |
+| **MEDIUM** | Confluence Architecture Map still missing mobile pipeline | Documentation debt per CLAUDE.md | Page 1540098 |
+| **MEDIUM** | `react-native-paper` has known issues with RN 0.85 | May surface as bugs in production | GitHub issues #4889, #4905 |
+| **MEDIUM** | netinfo patch needs monitoring for upstream fix | Patches can silently break on version bumps | `patches/@react-native-community+netinfo+12.0.1.patch` |
+| **MEDIUM** | `DeleteAsync` in `LineItemService` doesn't update `TotalBidAmount` | Deleting a line item leaves the proposal total stale | `LineItemService.cs:113` |
+| **LOW** | `no-floating-promises` ESLint rule still not added | Class of crash from session 2 can recur | `mobile/.eslintrc` |
+| **LOW** | Cognito test user password in memory file | Acceptable for internal test account | `reference_mobile_testflight.md` |
+| **LOW** | 4 Dependabot vulnerabilities open | Adam deferred these | GitHub Security tab |
+
+## Session 5 Changelog — Automated QA & Bug Fixes (2026-05-20)
+
+All fixes on `mobile/fix-react-version-and-ui` (4 commits, not yet on main):
+
+### `d00c552` Fix admin dashboard LINQ crash, revise unique constraint, and mutation response data
+- **`AdminController.cs`** — Rewrote avgTurnaround query to fetch approved times to memory before computing TotalHours (EF Core/Npgsql cannot translate TimeSpan.TotalHours)
+- **`ProposalService.cs` ReviseAsync** — Append `-R{n}` suffix to revision ProposalNumber to avoid unique index violation
+- **`ProposalService.cs` Update/Approve/MarkSent** — Added `.Include(p => p.SubmittedBy)` so mutation responses return submittedByName
+
+### `8666010` Validate dev-login input: reject empty email and invalid role
+- **`AuthController.cs`** — Return 400 for empty/whitespace email and invalid role strings; default role changed from Admin to Dispatcher (least privilege)
+
+### `4d72b63` Add frontend role guards, fix dashboard data exposure, and harden UX
+- **`ProtectedRoute.tsx`** — New `RoleGuard` component for role-based route protection
+- **`App.tsx`** — Wrapped admin routes with `RoleGuard`; `/admin/*` requires Admin/SysAdmin, `/admin/users` requires SysAdmin
+- **`Dashboard.tsx`** — Added `mine: true` to dashboard query so dispatchers only see their own proposals
+- **`AdminWorkspace.tsx`** — Auto-save dirty changes before approving (was silently discarding edits)
+- **`ProposalFormPage.tsx`** — Added onError toast handler; added 300ms debounce on customer autocomplete search
+- **`admin.ts`** — Stopped swallowing errors in getPdf; fixed AuditEntry.details type to `string | null`
+- **`LoginPage.tsx`** — Fixed pre-existing TS error with noUncheckedIndexedAccess
+
+### `5e89e42` Extract shared constants and format utils, wire admin dashboard filters
+- **`constants/index.ts`** — Added shared `STATUS_COLORS` and `PRIORITY_COLORS` (removed from 5 files)
+- **`lib/format.ts`** — New shared `formatCurrency`, `formatDate`, `formatDateTime` (removed from 4 files)
+- **`AdminDashboard.tsx`** — Wired Category and Priority filter dropdowns to `usePaginatedList` extraParams
+- **`ProposalDetailPage.tsx`** — Added 'Revised' to STATUS_ORDER so stepper renders correctly
+
+### QA Coverage Summary
+
+| Test Area | Tests | Pass | Fail | Agent |
+|-----------|-------|------|------|-------|
+| Auth & RBAC | 35 | 31 | 4 | Auth agent |
+| Proposal CRUD & State Machine | 38 | 35 | 3 | Proposal agent |
+| Line Items, Customers & Misc | 42 | 39 | 3 | Misc agent |
+| Web Frontend Code Review + API | ~30 | ~25 | ~5 | Frontend agent |
+| **Total** | **~145** | **~130** | **~15** | — |
+
+## Session 3 Changelog — Mobile Device Testing (2026-05-20)
+
+Fixes on `mobile/fix-react-version-and-ui` (not yet on main):
+
+- **Pin React 19.2.3** — fixes renderer version mismatch crash
+- **Remove `import type` from cognito-auth.ts** — fixes eager module init crash
+- **Auth fallback to ID token** — `loginWithCredentials` parses user from JWT when backend API unreachable
+- **Safe area fixes** — Settings gets top+bottom edges; Dashboard/AdminDashboard use bottom-only (nav header handles top)
+- **Pull-to-refresh separation** — filter chip taps no longer trigger refresh animation on proposal queue
+- **Welcome name** — shows first name or email prefix instead of full email
+- **Service category chips** — wrapping `Chip` components replace truncated `SegmentedButtons`
+- **ErrorBoundary** — added to App root for crash visibility
+
+Already on main (sessions 2-3):
+
+- **Email/password login screen** — TextInput form + Cognito SRP via `amazon-cognito-identity-js`
+- **Cognito config populated** — real values from AWS CLI
+- **CDK callback URL fix** — `com.seahavenind.proposals://auth/callback`
+- **netinfo iOS 26 patch** — `patch-package` with `respondsToSelector:` guards
+- **Auto-deploy enabled** — `deploy-mobile.yaml` triggers on `mobile/**` push to main
+- **Root README updated** — RN 0.85, deploy status corrected
+- **`mobile/README.md` created** — local dev, signing, CI/CD docs
+
+## Session 4 Changelog — Web Local Testing (2026-05-20)
+
+All fixes on `mobile/fix-react-version-and-ui` (4 commits, not yet on main):
+
+### `f44caba` Fix JSON enum serialization and audit log jsonb format
+- **`Program.cs`** — Added `JsonStringEnumConverter` to `AddJsonOptions` so frontend string enums deserialize correctly
+- **`AuditService.cs`** — Wrapped plain-string audit details in `JsonSerializer.Serialize(new { message = details })` for Postgres jsonb column
+- **`global.json`** — Relaxed SDK version from 8.0.400 to 8.0.100 to match installed .NET SDK
+
+### `f37c2aa` Fix dev-login role switching, distinct users, and user resolution races
+- **`AuthController.cs`** — Dev-login now updates role on existing user; CognitoSub is deterministic (`dev-{email}`)
+- **`CurrentUserService.cs`** — Added `DbUpdateException` catch on concurrent user creation with retry lookup
+- **`LoginPage.tsx`** — Distinct dev user per role (SysAdmin=Adam, Admin=Sarah, Dispatcher=Mike)
+
+### `9b97b7b` Fix proposal workflow: scoped My Proposals, idempotent state transitions
+- **`ProposalService.cs`** — New proposals created as `InReview` (not `Draft`); My Proposals filters by `Mine` parameter (not role); `ApproveAsync`, `MarkSentAsync`, `ReviseAsync` all idempotent
+- **`LineItemService.cs`** — Audit writes wrapped in try/catch so failures don't roll back successful saves
+- **`ProposalDtos.cs`** — Added `bool Mine` filter parameter
+- **`proposals.ts` / `ProposalListPage.tsx`** — Frontend passes `mine: true` for My Proposals page
+
+### `2645d97` Fix customer name not binding from Autocomplete free text input
+- **`ProposalFormPage.tsx`** — `onInputChange` with `reason === 'input'` now calls `handleChange('customerName', value)` alongside search

api/global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.400",
+    "version": "8.0.100",
     "rollForward": "latestFeature"
   }
 }

api/src/ProposalSystem.Api/Controllers/AdminController.cs

@@ -29,11 +29,14 @@ public class AdminController : ControllerBase
         var approvedThisWeek = await _db.Proposals
             .CountAsync(p => p.ApprovedAt >= weekStart, ct);
 
-        var avgTurnaround = await _db.Proposals
+        var approvedTimes = await _db.Proposals
             .Where(p => p.ApprovedAt.HasValue)
-            .Select(p => (p.ApprovedAt!.Value - p.SubmittedAt).TotalHours)
-            .DefaultIfEmpty(0)
-            .AverageAsync(ct);
+            .Select(p => new { p.ApprovedAt, p.SubmittedAt })
+            .ToListAsync(ct);
+
+        var avgTurnaround = approvedTimes.Count > 0
+            ? approvedTimes.Average(p => (p.ApprovedAt!.Value - p.SubmittedAt).TotalHours)
+            : 0;
 
         var totalProposals = await _db.Proposals.CountAsync(ct);
 

api/src/ProposalSystem.Api/Controllers/AuthController.cs

@@ -5,6 +5,8 @@ using System.Text;
 using System.Text.Json;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.IdentityModel.Protocols;
+using Microsoft.IdentityModel.Protocols.OpenIdConnect;
 using Microsoft.IdentityModel.Tokens;
 using ProposalSystem.Domain.Entities;
 using ProposalSystem.Infrastructure.Data;
@@ -40,7 +42,35 @@ public class AuthController : ControllerBase
             return BadRequest(new { message = "Failed to exchange authorization code" });
 
         var handler = new JwtSecurityTokenHandler();
-        var idToken = handler.ReadJwtToken(tokenResponse.IdToken);
+
+        var authority = _config["Auth:Authority"];
+        JwtSecurityToken idToken;
+        if (!string.IsNullOrEmpty(authority))
+        {
+            var configManager = new ConfigurationManager<OpenIdConnectConfiguration>(
+                $"{authority}/.well-known/openid-configuration",
+                new OpenIdConnectConfigurationRetriever(),
+                new HttpDocumentRetriever());
+            var oidcConfig = await configManager.GetConfigurationAsync(ct);
+
+            var validationParams = new TokenValidationParameters
+            {
+                ValidateIssuerSigningKey = true,
+                IssuerSigningKeys = oidcConfig.SigningKeys,
+                ValidateIssuer = true,
+                ValidIssuer = authority,
+                ValidateAudience = true,
+                ValidAudience = clientId,
+                ValidateLifetime = true,
+            };
+
+            handler.ValidateToken(tokenResponse.IdToken, validationParams, out var validatedToken);
+            idToken = (JwtSecurityToken)validatedToken;
+        }
+        else
+        {
+            idToken = handler.ReadJwtToken(tokenResponse.IdToken);
+        }
 
         var sub = idToken.Claims.FirstOrDefault(c => c.Type == "sub")?.Value
             ?? throw new InvalidOperationException("No sub claim in ID token");
@@ -71,12 +101,17 @@ public class AuthController : ControllerBase
             _db.Users.Add(user);
             await _db.SaveChangesAsync(ct);
         }
-        else if (user.Email != email || user.DisplayName != name)
+        else
         {
-            user.Email = email;
-            user.DisplayName = name;
-            user.UpdatedAt = DateTime.UtcNow;
-            await _db.SaveChangesAsync(ct);
+            var changed = false;
+            if (user.Email != email) { user.Email = email; changed = true; }
+            if (user.DisplayName != name) { user.DisplayName = name; changed = true; }
+            if (user.Role != role) { user.Role = role; changed = true; }
+            if (changed)
+            {
+                user.UpdatedAt = DateTime.UtcNow;
+                await _db.SaveChangesAsync(ct);
+            }
         }
 
         return Ok(new AuthResponse(
@@ -99,7 +134,13 @@ public class AuthController : ControllerBase
         if (string.IsNullOrEmpty(signingKey))
             return StatusCode(500, new { message = "Dev signing key not configured" });
 
-        var role = Enum.TryParse<UserRole>(request.Role, true, out var parsed) ? parsed : UserRole.Admin;
+        if (string.IsNullOrWhiteSpace(request.Email))
+            return BadRequest(new { message = "Email is required" });
+
+        if (!string.IsNullOrEmpty(request.Role) && !Enum.TryParse<UserRole>(request.Role, true, out _))
+            return BadRequest(new { message = $"Invalid role: '{request.Role}'. Valid roles are: Dispatcher, Admin, SysAdmin" });
+
+        var role = Enum.TryParse<UserRole>(request.Role, true, out var parsed) ? parsed : UserRole.Dispatcher;
 
         var user = await _db.Users.FirstOrDefaultAsync(u => u.Email == request.Email, ct);
         if (user == null)
@@ -107,7 +148,7 @@ public class AuthController : ControllerBase
             user = new User
             {
                 Id = Guid.NewGuid(),
-                CognitoSub = $"dev-{Guid.NewGuid():N}",
+                CognitoSub = $"dev-{request.Email}",
                 Email = request.Email,
                 DisplayName = request.DisplayName ?? request.Email.Split('@')[0],
                 Role = role,
@@ -118,6 +159,12 @@ public class AuthController : ControllerBase
             _db.Users.Add(user);
             await _db.SaveChangesAsync(ct);
         }
+        else if (user.Role != role)
+        {
+            user.Role = role;
+            user.UpdatedAt = DateTime.UtcNow;
+            await _db.SaveChangesAsync(ct);
+        }
 
         var claims = new List<Claim>
         {

api/src/ProposalSystem.Api/Controllers/GeneratedPdfsController.cs

@@ -9,7 +9,7 @@ namespace ProposalSystem.Api.Controllers;
 
 [ApiController]
 [Route("api/generated-pdfs")]
-[Authorize]
+[Authorize(Roles = "admins,sysadmins")]
 public class GeneratedPdfsController : ControllerBase
 {
     private readonly ProposalDbContext _db;

api/src/ProposalSystem.Api/Controllers/VendorProposalsController.cs

@@ -8,7 +8,7 @@ namespace ProposalSystem.Api.Controllers;
 
 [ApiController]
 [Route("api/vendor-proposals")]
-[Authorize]
+[Authorize(Roles = "admins,sysadmins")]
 public class VendorProposalsController : ControllerBase
 {
     private readonly ProposalDbContext _db;
@@ -38,14 +38,13 @@ public class VendorProposalsController : ControllerBase
 
         await _db.SaveChangesAsync(ct);
 
-        if (vendor.TotalVendorCost > 0)
+        var proposal = await _db.Proposals.FindAsync(new object[] { vendor.ProposalId }, ct);
+        if (proposal != null)
         {
-            var proposal = await _db.Proposals.FindAsync(new object[] { vendor.ProposalId }, ct);
-            if (proposal != null)
-            {
-                proposal.VendorTotalCost = vendor.TotalVendorCost;
-                await _db.SaveChangesAsync(ct);
-            }
+            proposal.VendorTotalCost = await _db.VendorProposals
+                .Where(v => v.ProposalId == vendor.ProposalId)
+                .SumAsync(v => v.TotalVendorCost, ct);
+            await _db.SaveChangesAsync(ct);
         }
 
         return NoContent();

api/src/ProposalSystem.Api/Program.cs

@@ -63,11 +63,14 @@ if (!string.IsNullOrEmpty(cognitoAuthority))
         .AddJwtBearer(options =>
         {
             options.Authority = cognitoAuthority;
+            var webClientId = builder.Configuration["COGNITO_WEB_CLIENT_ID"] ?? "";
+            var mobileClientId = builder.Configuration["COGNITO_MOBILE_CLIENT_ID"] ?? "";
             options.TokenValidationParameters = new TokenValidationParameters
             {
                 ValidateIssuerSigningKey = true,
                 ValidateIssuer = true,
-                ValidateAudience = false,
+                ValidateAudience = true,
+                ValidAudiences = new[] { webClientId, mobileClientId }.Where(s => !string.IsNullOrEmpty(s)).ToList(),
                 ValidateLifetime = true,
                 RoleClaimType = "cognito:groups",
             };
@@ -137,6 +140,9 @@ builder.Services.AddValidatorsFromAssemblyContaining<CreateProposalValidator>();
 builder.Services.AddControllers(options =>
 {
     options.Filters.Add<ValidationFilter>();
+}).AddJsonOptions(options =>
+{
+    options.JsonSerializerOptions.Converters.Add(new System.Text.Json.Serialization.JsonStringEnumConverter());
 });
 
 // Middleware

api/src/ProposalSystem.Api/Services/CurrentUserService.cs

@@ -80,16 +80,22 @@ public class CurrentUserService : ICurrentUserService
         };
 
         _db.Users.Add(_cachedUser);
-        await _db.SaveChangesAsync();
+        try
+        {
+            await _db.SaveChangesAsync();
+        }
+        catch (DbUpdateException)
+        {
+            _db.Entry(_cachedUser).State = EntityState.Detached;
+            _cachedUser = await _db.Users.FirstOrDefaultAsync(u => u.Email == email)
+                ?? throw new UnauthorizedAccessException("Could not resolve current user");
+        }
     }
 
     private User GetOrThrow()
     {
-        if (_cachedUser != null) return _cachedUser;
-
-        ResolveAsync().GetAwaiter().GetResult();
-
         return _cachedUser
-            ?? throw new UnauthorizedAccessException("Could not resolve current user");
+            ?? throw new InvalidOperationException(
+                "CurrentUserService.ResolveAsync() was not called. Ensure the authentication middleware runs before accessing user properties.");
     }
 }

api/src/ProposalSystem.Application/DTOs/ProposalDtos.cs

@@ -67,6 +67,7 @@ public record ProposalFilterRequest(
     DateTime? FromDate,
     DateTime? ToDate,
     string? Search,
+    bool Mine = false,
     int Page = 1,
     int PageSize = 25
 );

api/src/ProposalSystem.Application/Validators/BulkUpdateLineItemsValidator.cs

@@ -0,0 +1,38 @@
+using FluentValidation;
+using ProposalSystem.Application.DTOs;
+
+namespace ProposalSystem.Application.Validators;
+
+public class BulkUpdateLineItemsValidator : AbstractValidator<BulkUpdateLineItemsRequest>
+{
+    public BulkUpdateLineItemsValidator()
+    {
+        RuleFor(x => x.LineItems).NotNull();
+
+        RuleForEach(x => x.LineItems).ChildRules(entry =>
+        {
+            entry.RuleFor(x => x.Description)
+                .NotEmpty().WithMessage("Description is required")
+                .MaximumLength(1000);
+
+            entry.RuleFor(x => x.Quantity)
+                .GreaterThan(0).WithMessage("Quantity must be positive");
+
+            entry.RuleFor(x => x.Unit)
+                .NotEmpty().WithMessage("Unit is required")
+                .MaximumLength(50);
+
+            entry.RuleFor(x => x.TotalPrice)
+                .GreaterThanOrEqualTo(0).WithMessage("Total price cannot be negative");
+
+            entry.RuleFor(x => x.UnitPrice)
+                .GreaterThanOrEqualTo(0)
+                .When(x => x.UnitPrice.HasValue)
+                .WithMessage("Unit price cannot be negative");
+
+            entry.RuleFor(x => x.PricingMode).IsInEnum();
+            entry.RuleFor(x => x.Source).IsInEnum();
+            entry.RuleFor(x => x.SortOrder).GreaterThanOrEqualTo(0);
+        });
+    }
+}

api/src/ProposalSystem.Infrastructure/Services/AuditService.cs

@@ -1,3 +1,4 @@
+using System.Text.Json;
 using ProposalSystem.Application.Interfaces;
 using ProposalSystem.Domain.Entities;
 using ProposalSystem.Infrastructure.Data;
@@ -17,13 +18,17 @@ public class AuditService : IAuditService
 
     public async Task LogAsync(AuditAction action, Guid? proposalId, string? details = null, CancellationToken ct = default)
     {
+        var jsonDetails = details != null
+            ? JsonSerializer.Serialize(new { message = details })
+            : null;
+
         var entry = new AuditLog
         {
             Id = Guid.NewGuid(),
             ProposalId = proposalId,
             UserId = _currentUser.UserId,
             Action = action,
-            Details = details,
+            Details = jsonDetails,
             Timestamp = DateTime.UtcNow,
             IpAddress = _currentUser.IpAddress,
         };

api/src/ProposalSystem.Infrastructure/Services/LineItemService.cs

@@ -54,7 +54,11 @@ public class LineItemService : ILineItemService
         _db.LineItems.Add(lineItem);
         await _db.SaveChangesAsync(ct);
 
-        await _audit.LogAsync(AuditAction.EditLineItem, proposalId, $"Added: {request.Description}", ct);
+        try
+        {
+            await _audit.LogAsync(AuditAction.EditLineItem, proposalId, $"Added: {request.Description}", ct);
+        }
+        catch { /* audit failure should not roll back a successful save */ }
 
         return MapToResponse(lineItem);
     }
@@ -97,7 +101,11 @@ public class LineItemService : ILineItemService
 
         await _db.SaveChangesAsync(ct);
 
-        await _audit.LogAsync(AuditAction.EditLineItem, proposalId, $"Bulk update: {newItems.Count} items", ct);
+        try
+        {
+            await _audit.LogAsync(AuditAction.EditLineItem, proposalId, $"Bulk update: {newItems.Count} items", ct);
+        }
+        catch { /* audit failure should not roll back a successful save */ }
 
         return newItems.OrderBy(li => li.SortOrder).Select(MapToResponse).ToList();
     }

api/src/ProposalSystem.Infrastructure/Services/ProposalNumberGenerator.cs

@@ -18,8 +18,13 @@ public class ProposalNumberGenerator : IProposalNumberGenerator
         var year = DateTime.UtcNow.Year;
         var prefix = $"SHI-{year}-";
 
+        // Advisory lock prevents concurrent number generation within the same transaction
+        await _db.Database.ExecuteSqlRawAsync(
+            "SELECT pg_advisory_xact_lock(hashtext('proposal_number_gen'))", ct);
+
         var lastNumber = await _db.Proposals
             .Where(p => p.ProposalNumber.StartsWith(prefix))
+            .Where(p => !p.ProposalNumber.Contains("-R"))
             .OrderByDescending(p => p.ProposalNumber)
             .Select(p => p.ProposalNumber)
             .FirstOrDefaultAsync(ct);

api/src/ProposalSystem.Infrastructure/Services/ProposalService.cs

@@ -30,6 +30,8 @@ public class ProposalService : IProposalService
 
     public async Task<ProposalResponse> CreateAsync(CreateProposalRequest request, CancellationToken ct = default)
     {
+        await using var transaction = await _db.Database.BeginTransactionAsync(ct);
+
         var proposalNumber = await _numberGenerator.GenerateAsync(ct);
         var now = DateTime.UtcNow;
 
@@ -43,7 +45,7 @@ public class ProposalService : IProposalService
             ScopeOfWork = request.ScopeOfWork,
             ServiceCategory = request.ServiceCategory,
             Priority = request.Priority,
-            Status = ProposalStatus.Draft,
+            Status = ProposalStatus.InReview,
             Notes = request.Notes ?? string.Empty,
             SubmittedById = _currentUser.UserId,
             SubmittedAt = now,
@@ -53,6 +55,7 @@ public class ProposalService : IProposalService
 
         _db.Proposals.Add(proposal);
         await _db.SaveChangesAsync(ct);
+        await transaction.CommitAsync(ct);
 
         await _audit.LogAsync(AuditAction.Submit, proposal.Id, null, ct);
 
@@ -69,7 +72,10 @@ public class ProposalService : IProposalService
             .Include(p => p.ApprovedBy)
             .FirstOrDefaultAsync(p => p.Id == id, ct);
 
-        return proposal == null ? null : MapToResponse(proposal);
+        if (proposal == null) return null;
+        if (_currentUser.Role == UserRole.Dispatcher && proposal.SubmittedById != _currentUser.UserId)
+            return null;
+        return MapToResponse(proposal);
     }
 
     public async Task<PagedResponse<ProposalListResponse>> GetAllAsync(ProposalFilterRequest filter, CancellationToken ct = default)
@@ -79,7 +85,7 @@ public class ProposalService : IProposalService
             .Include(p => p.AssignedAdmin)
             .AsQueryable();
 
-        if (_currentUser.Role == UserRole.Dispatcher)
+        if (_currentUser.Role == UserRole.Dispatcher || filter.Mine)
         {
             query = query.Where(p => p.SubmittedById == _currentUser.UserId);
         }
@@ -135,7 +141,11 @@ public class ProposalService : IProposalService
 
     public async Task<ProposalResponse> UpdateAsync(Guid id, UpdateProposalRequest request, CancellationToken ct = default)
     {
-        var proposal = await _db.Proposals.FindAsync(new object[] { id }, ct)
+        var proposal = await _db.Proposals
+            .Include(p => p.SubmittedBy)
+            .Include(p => p.AssignedAdmin)
+            .Include(p => p.ApprovedBy)
+            .FirstOrDefaultAsync(p => p.Id == id, ct)
             ?? throw new KeyNotFoundException($"Proposal {id} not found");
 
         if (request.RefinedScope != null)
@@ -163,9 +173,14 @@ public class ProposalService : IProposalService
     {
         var proposal = await _db.Proposals
             .Include(p => p.LineItems)
+            .Include(p => p.SubmittedBy)
+            .Include(p => p.ApprovedBy)
             .FirstOrDefaultAsync(p => p.Id == id, ct)
             ?? throw new KeyNotFoundException($"Proposal {id} not found");
 
+        if (proposal.Status == ProposalStatus.Approved)
+            return MapToResponse(proposal);
+
         if (proposal.Status != ProposalStatus.InReview)
             throw new InvalidOperationException("Only proposals in review can be approved");
 
@@ -186,9 +201,15 @@ public class ProposalService : IProposalService
 
     public async Task<ProposalResponse> MarkSentAsync(Guid id, CancellationToken ct = default)
     {
-        var proposal = await _db.Proposals.FindAsync(new object[] { id }, ct)
+        var proposal = await _db.Proposals
+            .Include(p => p.SubmittedBy)
+            .Include(p => p.ApprovedBy)
+            .FirstOrDefaultAsync(p => p.Id == id, ct)
             ?? throw new KeyNotFoundException($"Proposal {id} not found");
 
+        if (proposal.Status == ProposalStatus.Sent)
+            return MapToResponse(proposal);
+
         if (proposal.Status != ProposalStatus.Approved)
             throw new InvalidOperationException("Only approved proposals can be marked as sent");
 
@@ -211,13 +232,21 @@ public class ProposalService : IProposalService
             .FirstOrDefaultAsync(p => p.Id == id, ct)
             ?? throw new KeyNotFoundException($"Proposal {id} not found");
 
+        if (proposal.Status == ProposalStatus.Revised)
+        {
+            var existingRevision = await _db.Proposals
+                .FirstOrDefaultAsync(p => p.ParentProposalId == proposal.Id, ct);
+            if (existingRevision != null)
+                return MapToResponse(existingRevision);
+        }
+
         if (proposal.Status != ProposalStatus.Sent)
             throw new InvalidOperationException("Only sent proposals can be revised");
 
         var revision = new Proposal
         {
             Id = Guid.NewGuid(),
-            ProposalNumber = proposal.ProposalNumber,
+            ProposalNumber = $"{proposal.ProposalNumber}-R{proposal.CurrentRevision + 1}",
             WorkOrderNumber = proposal.WorkOrderNumber,
             CustomerName = proposal.CustomerName,
             CustomerAddress = proposal.CustomerAddress,

docker-compose.yml

@@ -1,10 +1,10 @@
 services:
   postgres:
-    image: postgres:16-alpine
+    image: postgres:15-alpine
     ports:
       - "5432:5432"
     environment:
-      POSTGRES_DB: proposalsystem
+      POSTGRES_DB: proposals
       POSTGRES_USER: postgres
       POSTGRES_PASSWORD: localdev
     volumes:

infra/bin/app.ts

@@ -28,6 +28,9 @@ const compute = new ComputeStack(app, 'proposal-system-compute', {
   libraryBucket: foundation.libraryBucket,
   jobsQueue: foundation.jobsQueue,
   userPool: foundation.userPool,
+  alarmTopic: foundation.alarmTopic,
+  webClientId: foundation.webClientId,
+  mobileClientId: foundation.mobileClientId,
 });
 
 new FrontendStack(app, 'proposal-system-frontend', {

infra/lib/compute-stack.ts

@@ -2,16 +2,20 @@ import * as cdk from 'aws-cdk-lib';
 import * as ec2 from 'aws-cdk-lib/aws-ec2';
 import * as lambda from 'aws-cdk-lib/aws-lambda';
 import * as apigatewayv2 from 'aws-cdk-lib/aws-apigatewayv2';
+import * as apigatewayv2Authorizers from 'aws-cdk-lib/aws-apigatewayv2-authorizers';
 import * as apigatewayv2Integrations from 'aws-cdk-lib/aws-apigatewayv2-integrations';
 import * as iam from 'aws-cdk-lib/aws-iam';
 import * as s3 from 'aws-cdk-lib/aws-s3';
 import * as sqs from 'aws-cdk-lib/aws-sqs';
+import * as sns from 'aws-cdk-lib/aws-sns';
 import * as cognito from 'aws-cdk-lib/aws-cognito';
 import * as secretsmanager from 'aws-cdk-lib/aws-secretsmanager';
 import * as lambdaEventSources from 'aws-cdk-lib/aws-lambda-event-sources';
 import * as bedrock from 'aws-cdk-lib/aws-bedrock';
 import * as opensearchserverless from 'aws-cdk-lib/aws-opensearchserverless';
 import * as logs from 'aws-cdk-lib/aws-logs';
+import * as cloudwatch from 'aws-cdk-lib/aws-cloudwatch';
+import * as cloudwatchActions from 'aws-cdk-lib/aws-cloudwatch-actions';
 import * as cr from 'aws-cdk-lib/custom-resources';
 import { Construct } from 'constructs';
 
@@ -24,6 +28,9 @@ export interface ComputeStackProps extends cdk.StackProps {
   libraryBucket: s3.IBucket;
   jobsQueue: sqs.IQueue;
   userPool: cognito.IUserPool;
+  alarmTopic: sns.ITopic;
+  webClientId: string;
+  mobileClientId: string;
 }
 
 export class ComputeStack extends cdk.Stack {
@@ -209,6 +216,11 @@ export class ComputeStack extends cdk.Stack {
         LIBRARY_BUCKET: props.libraryBucket.bucketName,
         JOBS_QUEUE_URL: props.jobsQueue.queueUrl,
         INTERNAL_API_KEY_SECRET_ARN: internalApiKeySecret.secretArn,
+        Auth__Authority: `https://cognito-idp.${this.region}.amazonaws.com/${props.userPool.userPoolId}`,
+        Auth__ClientId: props.webClientId,
+        Auth__CognitoDomain: `proposal-system-seahaven.auth.${this.region}.amazoncognito.com`,
+        COGNITO_WEB_CLIENT_ID: props.webClientId,
+        COGNITO_MOBILE_CLIENT_ID: props.mobileClientId,
       },
       tracing: lambda.Tracing.ACTIVE,
       logRetention: logs.RetentionDays.TWO_MONTHS,
@@ -226,6 +238,11 @@ export class ComputeStack extends cdk.Stack {
       resources: [props.userPool.userPoolArn],
     }));
 
+    // Function URL for internal Lambda-to-API calls (bypasses API Gateway JWT authorizer)
+    const apiFunctionUrl = apiFunction.addFunctionUrl({
+      authType: lambda.FunctionUrlAuthType.NONE,
+    });
+
     // API Gateway HTTP API
     const httpApi = new apigatewayv2.HttpApi(this, 'HttpApi', {
       apiName: 'proposal-system-gateway',
@@ -251,10 +268,29 @@ export class ComputeStack extends cdk.Stack {
       apiFunction
     );
 
+    const jwtAuthorizer = new apigatewayv2Authorizers.HttpJwtAuthorizer(
+      'CognitoAuthorizer',
+      `https://cognito-idp.${this.region}.amazonaws.com/${props.userPool.userPoolId}`,
+      { jwtAudience: [props.webClientId, props.mobileClientId] },
+    );
+
+    httpApi.addRoutes({
+      path: '/api/health',
+      methods: [apigatewayv2.HttpMethod.GET],
+      integration: apiIntegration,
+    });
+
+    httpApi.addRoutes({
+      path: '/api/auth/{proxy+}',
+      methods: [apigatewayv2.HttpMethod.POST],
+      integration: apiIntegration,
+    });
+
     httpApi.addRoutes({
       path: '/{proxy+}',
       methods: [apigatewayv2.HttpMethod.ANY],
       integration: apiIntegration,
+      authorizer: jwtAuthorizer,
     });
 
     // Python Lambda: Suggestions Engine
@@ -272,7 +308,7 @@ export class ComputeStack extends cdk.Stack {
       environment: {
         KNOWLEDGE_BASE_ID: knowledgeBase.attrKnowledgeBaseId,
         MODEL_ID: 'us.anthropic.claude-sonnet-4-5-20250929-v1:0',
-        API_BASE_URL: httpApi.apiEndpoint,
+        API_BASE_URL: apiFunctionUrl.url,
         INTERNAL_API_KEY_SECRET_ARN: internalApiKeySecret.secretArn,
       },
       logRetention: logs.RetentionDays.TWO_MONTHS,
@@ -303,7 +339,7 @@ export class ComputeStack extends cdk.Stack {
       environment: {
         UPLOADS_BUCKET: props.uploadsBucket.bucketName,
         MODEL_ID: 'us.anthropic.claude-sonnet-4-5-20250929-v1:0',
-        API_BASE_URL: httpApi.apiEndpoint,
+        API_BASE_URL: apiFunctionUrl.url,
         INTERNAL_API_KEY_SECRET_ARN: internalApiKeySecret.secretArn,
       },
       logRetention: logs.RetentionDays.TWO_MONTHS,
@@ -330,7 +366,7 @@ export class ComputeStack extends cdk.Stack {
       securityGroups: [props.lambdaSecurityGroup],
       environment: {
         GENERATED_BUCKET: props.generatedBucket.bucketName,
-        API_BASE_URL: httpApi.apiEndpoint,
+        API_BASE_URL: apiFunctionUrl.url,
         INTERNAL_API_KEY_SECRET_ARN: internalApiKeySecret.secretArn,
       },
       logRetention: logs.RetentionDays.TWO_MONTHS,
@@ -355,7 +391,7 @@ export class ComputeStack extends cdk.Stack {
         LIBRARY_BUCKET: props.libraryBucket.bucketName,
         KNOWLEDGE_BASE_ID: knowledgeBase.attrKnowledgeBaseId,
         DATA_SOURCE_ID: dataSource.attrDataSourceId,
-        API_BASE_URL: httpApi.apiEndpoint,
+        API_BASE_URL: apiFunctionUrl.url,
         INTERNAL_API_KEY_SECRET_ARN: internalApiKeySecret.secretArn,
       },
       logRetention: logs.RetentionDays.TWO_MONTHS,
@@ -371,6 +407,7 @@ export class ComputeStack extends cdk.Stack {
     // SQS Event Sources with message filtering
     suggestionsFunction.addEventSource(new lambdaEventSources.SqsEventSource(props.jobsQueue, {
       batchSize: 1,
+      reportBatchItemFailures: true,
       filters: [
         lambda.FilterCriteria.filter({
           body: { jobType: lambda.FilterRule.isEqual('suggestions') },
@@ -380,6 +417,7 @@ export class ComputeStack extends cdk.Stack {
 
     pdfExtractFunction.addEventSource(new lambdaEventSources.SqsEventSource(props.jobsQueue, {
       batchSize: 1,
+      reportBatchItemFailures: true,
       filters: [
         lambda.FilterCriteria.filter({
           body: { jobType: lambda.FilterRule.isEqual('pdf-extract') },
@@ -389,6 +427,7 @@ export class ComputeStack extends cdk.Stack {
 
     pdfGenerateFunction.addEventSource(new lambdaEventSources.SqsEventSource(props.jobsQueue, {
       batchSize: 1,
+      reportBatchItemFailures: true,
       filters: [
         lambda.FilterCriteria.filter({
           body: { jobType: lambda.FilterRule.isEqual('pdf-generate') },
@@ -398,6 +437,7 @@ export class ComputeStack extends cdk.Stack {
 
     libraryIngestFunction.addEventSource(new lambdaEventSources.SqsEventSource(props.jobsQueue, {
       batchSize: 1,
+      reportBatchItemFailures: true,
       filters: [
         lambda.FilterCriteria.filter({
           body: { jobType: lambda.FilterRule.isEqual('library-ingest') },
@@ -405,6 +445,45 @@ export class ComputeStack extends cdk.Stack {
       ],
     }));
 
+    // CloudWatch Alarms
+    const alarmAction = new cloudwatchActions.SnsAction(props.alarmTopic);
+
+    const lambdaFunctions = [
+      { fn: apiFunction, name: 'api' },
+      { fn: suggestionsFunction, name: 'suggestions' },
+      { fn: pdfExtractFunction, name: 'pdf-extract' },
+      { fn: pdfGenerateFunction, name: 'pdf-generate' },
+      { fn: libraryIngestFunction, name: 'library-ingest' },
+    ];
+
+    for (const { fn, name } of lambdaFunctions) {
+      const alarm = new cloudwatch.Alarm(this, `LambdaErrors-${name}`, {
+        alarmName: `proposal-system-${name}-errors`,
+        alarmDescription: `Lambda errors for ${name}`,
+        metric: fn.metricErrors({ period: cdk.Duration.minutes(5) }),
+        threshold: 1,
+        evaluationPeriods: 1,
+        treatMissingData: cloudwatch.TreatMissingData.NOT_BREACHING,
+      });
+      alarm.addAlarmAction(alarmAction);
+    }
+
+    const api5xxAlarm = new cloudwatch.Alarm(this, 'Api5xxAlarm', {
+      alarmName: 'proposal-system-api-5xx',
+      alarmDescription: 'API Gateway 5xx errors',
+      metric: new cloudwatch.Metric({
+        namespace: 'AWS/ApiGateway',
+        metricName: '5xx',
+        dimensionsMap: { ApiId: httpApi.httpApiId },
+        statistic: 'Sum',
+        period: cdk.Duration.minutes(5),
+      }),
+      threshold: 5,
+      evaluationPeriods: 1,
+      treatMissingData: cloudwatch.TreatMissingData.NOT_BREACHING,
+    });
+    api5xxAlarm.addAlarmAction(alarmAction);
+
     // Outputs
     new cdk.CfnOutput(this, 'ApiEndpoint', { value: httpApi.apiEndpoint });
     new cdk.CfnOutput(this, 'ApiFunctionArn', { value: apiFunction.functionArn });

infra/lib/foundation-stack.ts

@@ -6,6 +6,10 @@ import * as sqs from 'aws-cdk-lib/aws-sqs';
 import * as cognito from 'aws-cdk-lib/aws-cognito';
 import * as logs from 'aws-cdk-lib/aws-logs';
 import * as secretsmanager from 'aws-cdk-lib/aws-secretsmanager';
+import * as sns from 'aws-cdk-lib/aws-sns';
+import * as snsSubscriptions from 'aws-cdk-lib/aws-sns-subscriptions';
+import * as cloudwatch from 'aws-cdk-lib/aws-cloudwatch';
+import * as cloudwatchActions from 'aws-cdk-lib/aws-cloudwatch-actions';
 import { Construct } from 'constructs';
 
 export class FoundationStack extends cdk.Stack {
@@ -17,6 +21,9 @@ export class FoundationStack extends cdk.Stack {
   public readonly libraryBucket: s3.IBucket;
   public readonly jobsQueue: sqs.IQueue;
   public readonly userPool: cognito.IUserPool;
+  public readonly alarmTopic: sns.ITopic;
+  public readonly webClientId: string;
+  public readonly mobileClientId: string;
 
   constructor(scope: Construct, id: string, props?: cdk.StackProps) {
     super(scope, id, props);
@@ -156,7 +163,7 @@ export class FoundationStack extends cdk.Stack {
 
     this.jobsQueue = new sqs.Queue(this, 'JobsQueue', {
       queueName: 'proposal-system-jobs',
-      visibilityTimeout: cdk.Duration.seconds(180),
+      visibilityTimeout: cdk.Duration.seconds(720),
       deadLetterQueue: {
         queue: dlq,
         maxReceiveCount: 3,
@@ -234,6 +241,8 @@ export class FoundationStack extends cdk.Stack {
       },
     });
 
+    this.webClientId = webClient.userPoolClientId;
+
     // Mobile App Client (PKCE)
     const mobileClient = userPool.addClient('MobileClient', {
       userPoolClientName: 'proposal-system-mobile',
@@ -253,6 +262,67 @@ export class FoundationStack extends cdk.Stack {
       },
     });
 
+    this.webClientId = webClient.userPoolClientId;
+    this.mobileClientId = mobileClient.userPoolClientId;
+
+    // SNS Alarm Topic
+    const alarmTopic = new sns.Topic(this, 'AlarmTopic', {
+      topicName: 'proposal-system-alarms',
+      displayName: 'Proposal System Alarms',
+    });
+    alarmTopic.addSubscription(
+      new snsSubscriptions.EmailSubscription('adam@seahavenind.com'),
+    );
+    this.alarmTopic = alarmTopic;
+
+    const alarmAction = new cloudwatchActions.SnsAction(alarmTopic);
+
+    // DLQ Alarm: any message landing in DLQ indicates a processing failure
+    const dlqAlarm = new cloudwatch.Alarm(this, 'DlqDepthAlarm', {
+      alarmName: 'proposal-system-dlq-depth',
+      alarmDescription: 'Messages in DLQ — SQS processing failures',
+      metric: dlq.metricApproximateNumberOfMessagesVisible({
+        period: cdk.Duration.minutes(1),
+      }),
+      threshold: 0,
+      comparisonOperator: cloudwatch.ComparisonOperator.GREATER_THAN_THRESHOLD,
+      evaluationPeriods: 1,
+      treatMissingData: cloudwatch.TreatMissingData.NOT_BREACHING,
+    });
+    dlqAlarm.addAlarmAction(alarmAction);
+
+    // RDS Alarms
+    const rdsAlarms = [
+      new cloudwatch.Alarm(this, 'RdsCpuAlarm', {
+        alarmName: 'proposal-system-rds-cpu',
+        alarmDescription: 'RDS CPU utilization above 80%',
+        metric: dbInstance.metricCPUUtilization({ period: cdk.Duration.minutes(5) }),
+        threshold: 80,
+        evaluationPeriods: 3,
+        treatMissingData: cloudwatch.TreatMissingData.BREACHING,
+      }),
+      new cloudwatch.Alarm(this, 'RdsConnectionsAlarm', {
+        alarmName: 'proposal-system-rds-connections',
+        alarmDescription: 'RDS database connections above 80',
+        metric: dbInstance.metricDatabaseConnections({ period: cdk.Duration.minutes(5) }),
+        threshold: 80,
+        evaluationPeriods: 2,
+        treatMissingData: cloudwatch.TreatMissingData.NOT_BREACHING,
+      }),
+      new cloudwatch.Alarm(this, 'RdsFreeStorageAlarm', {
+        alarmName: 'proposal-system-rds-free-storage',
+        alarmDescription: 'RDS free storage below 2 GB',
+        metric: dbInstance.metricFreeStorageSpace({ period: cdk.Duration.minutes(5) }),
+        threshold: 2_000_000_000,
+        comparisonOperator: cloudwatch.ComparisonOperator.LESS_THAN_THRESHOLD,
+        evaluationPeriods: 1,
+        treatMissingData: cloudwatch.TreatMissingData.BREACHING,
+      }),
+    ];
+    for (const alarm of rdsAlarms) {
+      alarm.addAlarmAction(alarmAction);
+    }
+
     // CloudWatch Log Groups
     const logGroupNames = [
       'proposal-system-api',
@@ -280,5 +350,6 @@ export class FoundationStack extends cdk.Stack {
     new cdk.CfnOutput(this, 'DbSecretArn', { value: this.dbSecret.secretArn });
     new cdk.CfnOutput(this, 'WebClientId', { value: webClient.userPoolClientId });
     new cdk.CfnOutput(this, 'MobileClientId', { value: mobileClient.userPoolClientId });
+    new cdk.CfnOutput(this, 'AlarmTopicArn', { value: alarmTopic.topicArn });
   }
 }

lambdas/library-ingest/app.py

@@ -8,6 +8,7 @@ then triggers a KB sync.
 import json
 import logging
 import os
+import time
 from datetime import datetime
 
 import boto3
@@ -41,12 +42,17 @@ def _get_api_key() -> str:
 
 
 def handler(event, context):
+    batch_item_failures = []
     for record in event.get("Records", []):
-        body = json.loads(record["body"])
-        payload = body.get("payload", body)
-        proposal_id = payload["proposalId"]
-        process_ingestion(proposal_id)
-    return {"statusCode": 200}
+        try:
+            body = json.loads(record["body"])
+            payload = body.get("payload", body)
+            proposal_id = payload["proposalId"]
+            process_ingestion(proposal_id)
+        except Exception as e:
+            logger.error("Failed to process record %s: %s", record.get("messageId"), e)
+            batch_item_failures.append({"itemIdentifier": record["messageId"]})
+    return {"batchItemFailures": batch_item_failures}
 
 
 def process_ingestion(proposal_id: str):
@@ -67,10 +73,10 @@ def process_ingestion(proposal_id: str):
 
 def fetch_proposal(proposal_id: str) -> dict | None:
     try:
-        resp = httpx.get(
+        resp = _retry_request(
+            "GET",
             f"{API_BASE_URL}/api/proposals/{proposal_id}",
             headers=_api_headers(),
-            timeout=10,
         )
         if resp.status_code == 200:
             return resp.json()
@@ -81,10 +87,10 @@ def fetch_proposal(proposal_id: str) -> dict | None:
 
 def fetch_line_items(proposal_id: str) -> list[dict]:
     try:
-        resp = httpx.get(
+        resp = _retry_request(
+            "GET",
             f"{API_BASE_URL}/api/proposals/{proposal_id}/line-items",
             headers=_api_headers(),
-            timeout=10,
         )
         if resp.status_code == 200:
             return resp.json()
@@ -198,3 +204,22 @@ def _api_headers() -> dict:
     if api_key:
         headers["X-Internal-Api-Key"] = api_key
     return headers
+
+
+def _retry_request(
+    method: str, url: str, *, max_retries: int = 3, **kwargs
+) -> httpx.Response:
+    kwargs.setdefault("timeout", 10)
+    for attempt in range(max_retries):
+        try:
+            resp = httpx.request(method, url, **kwargs)
+            if resp.status_code < 500:
+                return resp
+        except (httpx.ConnectError, httpx.ReadTimeout, httpx.WriteTimeout) as exc:
+            if attempt == max_retries - 1:
+                raise
+            logger.warning(
+                "Retryable error (attempt %d/%d): %s", attempt + 1, max_retries, exc
+            )
+        time.sleep(min(2**attempt, 4))
+    return resp  # type: ignore[possibly-undefined]

lambdas/pdf-extract/app.py

@@ -9,6 +9,7 @@ import json
 import logging
 import os
 import tempfile
+import time
 
 import boto3
 import httpx
@@ -41,19 +42,24 @@ def _get_api_key() -> str:
 
 
 def handler(event, context):
+    batch_item_failures = []
     for record in event.get("Records", []):
-        body = json.loads(record["body"])
-        payload = body.get("payload", body)
-        proposal_id = payload["proposalId"]
-        s3_key = payload.get("s3Key", "")
-        vendor_proposal_id = payload.get("vendorProposalId", "")
+        try:
+            body = json.loads(record["body"])
+            payload = body.get("payload", body)
+            proposal_id = payload["proposalId"]
+            s3_key = payload.get("s3Key", "")
+            vendor_proposal_id = payload.get("vendorProposalId", "")
 
-        if not s3_key:
-            logger.warning("No s3Key in payload for proposal %s", proposal_id)
-            continue
+            if not s3_key:
+                logger.warning("No s3Key in payload for proposal %s", proposal_id)
+                continue
 
-        process_pdf(proposal_id, s3_key, vendor_proposal_id)
-    return {"statusCode": 200}
+            process_pdf(proposal_id, s3_key, vendor_proposal_id)
+        except Exception as e:
+            logger.error("Failed to process record %s: %s", record.get("messageId"), e)
+            batch_item_failures.append({"itemIdentifier": record["messageId"]})
+    return {"batchItemFailures": batch_item_failures}
 
 
 def process_pdf(proposal_id: str, s3_key: str, vendor_proposal_id: str):
@@ -299,7 +305,8 @@ def save_extraction(vendor_proposal_id: str, extracted: dict):
     }
 
     try:
-        resp = httpx.put(
+        resp = _retry_request(
+            "PUT",
             f"{API_BASE_URL}/api/vendor-proposals/{vendor_proposal_id}",
             json={
                 "vendorName": extracted["vendorName"],
@@ -308,7 +315,6 @@ def save_extraction(vendor_proposal_id: str, extracted: dict):
                 "processingStatus": "Complete",
             },
             headers=_api_headers(),
-            timeout=10,
         )
         if resp.status_code not in (200, 204):
             logger.error(
@@ -322,11 +328,11 @@ def update_processing_status(vendor_proposal_id: str, status: str):
     if not vendor_proposal_id:
         return
     try:
-        httpx.put(
+        _retry_request(
+            "PUT",
             f"{API_BASE_URL}/api/vendor-proposals/{vendor_proposal_id}/status",
             json={"processingStatus": status},
             headers=_api_headers(),
-            timeout=10,
         )
     except Exception as e:
         logger.error("Error updating status: %s", e)
@@ -338,3 +344,22 @@ def _api_headers() -> dict:
     if api_key:
         headers["X-Internal-Api-Key"] = api_key
     return headers
+
+
+def _retry_request(
+    method: str, url: str, *, max_retries: int = 3, **kwargs
+) -> httpx.Response:
+    kwargs.setdefault("timeout", 10)
+    for attempt in range(max_retries):
+        try:
+            resp = httpx.request(method, url, **kwargs)
+            if resp.status_code < 500:
+                return resp
+        except (httpx.ConnectError, httpx.ReadTimeout, httpx.WriteTimeout) as exc:
+            if attempt == max_retries - 1:
+                raise
+            logger.warning(
+                "Retryable error (attempt %d/%d): %s", attempt + 1, max_retries, exc
+            )
+        time.sleep(min(2**attempt, 4))
+    return resp  # type: ignore[possibly-undefined]

lambdas/pdf-generate/app.py

@@ -7,6 +7,7 @@ Triggered via SQS when an admin requests PDF generation.
 import json
 import logging
 import os
+import time
 from datetime import datetime
 from io import BytesIO
 
@@ -65,12 +66,17 @@ def _get_api_key() -> str:
 
 
 def handler(event, context):
+    batch_item_failures = []
     for record in event.get("Records", []):
-        body = json.loads(record["body"])
-        payload = body.get("payload", body)
-        proposal_id = payload["proposalId"]
-        generate_pdf(proposal_id)
-    return {"statusCode": 200}
+        try:
+            body = json.loads(record["body"])
+            payload = body.get("payload", body)
+            proposal_id = payload["proposalId"]
+            generate_pdf(proposal_id)
+        except Exception as e:
+            logger.error("Failed to process record %s: %s", record.get("messageId"), e)
+            batch_item_failures.append({"itemIdentifier": record["messageId"]})
+    return {"batchItemFailures": batch_item_failures}
 
 
 def generate_pdf(proposal_id: str):
@@ -96,10 +102,10 @@ def generate_pdf(proposal_id: str):
 
 def fetch_proposal(proposal_id: str) -> dict | None:
     try:
-        resp = httpx.get(
+        resp = _retry_request(
+            "GET",
             f"{API_BASE_URL}/api/proposals/{proposal_id}",
             headers=_api_headers(),
-            timeout=10,
         )
         if resp.status_code == 200:
             return resp.json()
@@ -110,10 +116,10 @@ def fetch_proposal(proposal_id: str) -> dict | None:
 
 def fetch_line_items(proposal_id: str) -> list[dict]:
     try:
-        resp = httpx.get(
+        resp = _retry_request(
+            "GET",
             f"{API_BASE_URL}/api/proposals/{proposal_id}/line-items",
             headers=_api_headers(),
-            timeout=10,
         )
         if resp.status_code == 200:
             return resp.json()
@@ -524,11 +530,11 @@ def upload_pdf(s3_key: str, pdf_bytes: bytes):
 
 def register_pdf(proposal_id: str, s3_key: str):
     try:
-        resp = httpx.post(
+        resp = _retry_request(
+            "POST",
             f"{API_BASE_URL}/api/generated-pdfs",
             json={"proposalId": proposal_id, "s3Key": s3_key},
             headers=_api_headers(),
-            timeout=10,
         )
         if resp.status_code not in (200, 201):
             logger.error("Failed to register PDF: %s %s", resp.status_code, resp.text)
@@ -542,3 +548,22 @@ def _api_headers() -> dict:
     if api_key:
         headers["X-Internal-Api-Key"] = api_key
     return headers
+
+
+def _retry_request(
+    method: str, url: str, *, max_retries: int = 3, **kwargs
+) -> httpx.Response:
+    kwargs.setdefault("timeout", 10)
+    for attempt in range(max_retries):
+        try:
+            resp = httpx.request(method, url, **kwargs)
+            if resp.status_code < 500:
+                return resp
+        except (httpx.ConnectError, httpx.ReadTimeout, httpx.WriteTimeout) as exc:
+            if attempt == max_retries - 1:
+                raise
+            logger.warning(
+                "Retryable error (attempt %d/%d): %s", attempt + 1, max_retries, exc
+            )
+        time.sleep(min(2**attempt, 4))
+    return resp  # type: ignore[possibly-undefined]

lambdas/suggestions/app.py

@@ -7,6 +7,7 @@ to generate line item suggestions for new proposals.
 import json
 import logging
 import os
+import time
 
 import boto3
 import httpx
@@ -38,13 +39,18 @@ def _get_api_key() -> str:
 
 
 def handler(event, context):
+    batch_item_failures = []
     for record in event.get("Records", []):
-        body = json.loads(record["body"])
-        payload = body.get("payload", body)
-        proposal_id = payload["proposalId"]
-        trigger = payload.get("trigger", "generate")
-        process_suggestion(proposal_id, trigger)
-    return {"statusCode": 200}
+        try:
+            body = json.loads(record["body"])
+            payload = body.get("payload", body)
+            proposal_id = payload["proposalId"]
+            trigger = payload.get("trigger", "generate")
+            process_suggestion(proposal_id, trigger)
+        except Exception as e:
+            logger.error("Failed to process record %s: %s", record.get("messageId"), e)
+            batch_item_failures.append({"itemIdentifier": record["messageId"]})
+    return {"batchItemFailures": batch_item_failures}
 
 
 def process_suggestion(proposal_id: str, trigger: str):
@@ -72,10 +78,10 @@ def process_suggestion(proposal_id: str, trigger: str):
 
 def fetch_line_items(proposal_id: str) -> list[dict]:
     try:
-        resp = httpx.get(
+        resp = _retry_request(
+            "GET",
             f"{API_BASE_URL}/api/proposals/{proposal_id}/line-items",
             headers=_api_headers(),
-            timeout=10,
         )
         if resp.status_code == 200:
             return resp.json()
@@ -86,10 +92,10 @@ def fetch_line_items(proposal_id: str) -> list[dict]:
 
 def fetch_proposal(proposal_id: str) -> dict | None:
     try:
-        resp = httpx.get(
+        resp = _retry_request(
+            "GET",
             f"{API_BASE_URL}/api/proposals/{proposal_id}",
             headers=_api_headers(),
-            timeout=10,
         )
         if resp.status_code == 200:
             return resp.json()
@@ -263,7 +269,8 @@ def post_line_items(proposal_id: str, items: list[dict], existing_items: list[di
         )
 
     try:
-        resp = httpx.put(
+        resp = _retry_request(
+            "PUT",
             f"{API_BASE_URL}/api/proposals/{proposal_id}/line-items",
             json={"lineItems": line_items_payload},
             headers=_api_headers(),
@@ -288,14 +295,14 @@ def store_similar_references(proposal_id: str, similar_proposals: list[dict]):
             continue
 
         try:
-            httpx.post(
+            _retry_request(
+                "POST",
                 f"{API_BASE_URL}/api/proposals/{proposal_id}/similar-references",
                 json={
                     "referencedLibraryItemId": library_item_id,
                     "similarityScore": sp["score"],
                 },
                 headers=_api_headers(),
-                timeout=10,
             )
         except Exception as e:
             logger.error("Error storing similar reference: %s", e)
@@ -303,11 +310,11 @@ def store_similar_references(proposal_id: str, similar_proposals: list[dict]):
 
 def update_status_to_in_review(proposal_id: str):
     try:
-        httpx.put(
+        _retry_request(
+            "PUT",
             f"{API_BASE_URL}/api/proposals/{proposal_id}",
             json={"status": "InReview"},
             headers=_api_headers(),
-            timeout=10,
         )
     except Exception as e:
         logger.error("Error updating status: %s", e)
@@ -319,3 +326,22 @@ def _api_headers() -> dict:
     if api_key:
         headers["X-Internal-Api-Key"] = api_key
     return headers
+
+
+def _retry_request(
+    method: str, url: str, *, max_retries: int = 3, **kwargs
+) -> httpx.Response:
+    kwargs.setdefault("timeout", 10)
+    for attempt in range(max_retries):
+        try:
+            resp = httpx.request(method, url, **kwargs)
+            if resp.status_code < 500:
+                return resp
+        except (httpx.ConnectError, httpx.ReadTimeout, httpx.WriteTimeout) as exc:
+            if attempt == max_retries - 1:
+                raise
+            logger.warning(
+                "Retryable error (attempt %d/%d): %s", attempt + 1, max_retries, exc
+            )
+        time.sleep(min(2**attempt, 4))
+    return resp  # type: ignore[possibly-undefined]

mobile/ios/ProposalSystem/AppDelegate.swift

@@ -2,6 +2,7 @@ import UIKit
 import React
 import React_RCTAppDelegate
 import ReactAppDependencyProvider
+import RCTLinking
 
 @main
 class AppDelegate: UIResponder, UIApplicationDelegate {
@@ -31,6 +32,14 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
     return true
   }
+
+  func application(
+    _ app: UIApplication,
+    open url: URL,
+    options: [UIApplication.OpenURLOptionsKey: Any] = [:]
+  ) -> Bool {
+    return RCTLinkingManager.application(app, open: url, options: options)
+  }
 }
 
 class ReactNativeDelegate: RCTDefaultReactNativeFactoryDelegate {

mobile/ios/ProposalSystem/Info.plist

@@ -8,6 +8,8 @@
 	<string>Sea Haven Proposals</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIconName</key>
+	<string>AppIcon</string>
 	<key>CFBundleIdentifier</key>
 	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
@@ -20,6 +22,17 @@
 	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
+	<key>CFBundleURLTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleURLName</key>
+			<string>com.seahavenind.proposals</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>com.seahavenind.proposals</string>
+			</array>
+		</dict>
+	</array>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>LSRequiresIPhoneOS</key>
@@ -31,35 +44,14 @@
 		<key>NSAllowsLocalNetworking</key>
 		<true/>
 	</dict>
-	<key>CFBundleURLTypes</key>
-	<array>
-		<dict>
-			<key>CFBundleURLSchemes</key>
-			<array>
-				<string>com.seahavenind.proposals</string>
-			</array>
-			<key>CFBundleURLName</key>
-			<string>com.seahavenind.proposals</string>
-		</dict>
-	</array>
 	<key>NSCameraUsageDescription</key>
 	<string>Sea Haven Proposals needs camera access to capture vendor proposal documents.</string>
-	<key>NSPhotoLibraryUsageDescription</key>
-	<string>Sea Haven Proposals needs photo library access to attach vendor proposal images.</string>
 	<key>NSFaceIDUsageDescription</key>
 	<string>Sea Haven Proposals uses Face ID to secure your login session.</string>
-	<key>UILaunchStoryboardName</key>
-	<string>LaunchScreen</string>
-	<key>UIRequiredDeviceCapabilities</key>
-	<array>
-		<string>arm64</string>
-	</array>
-	<key>UISupportedInterfaceOrientations</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
+	<key>NSPhotoLibraryUsageDescription</key>
+	<string>Sea Haven Proposals needs photo library access to attach vendor proposal images.</string>
+	<key>RCTNewArchEnabled</key>
+	<true/>
 	<key>UIAppFonts</key>
 	<array>
 		<string>MaterialCommunityIcons.ttf</string>
@@ -82,9 +74,19 @@
 		<string>FontAwesome6_Brands.ttf</string>
 		<string>MaterialIcons.ttf</string>
 	</array>
+	<key>UILaunchStoryboardName</key>
+	<string>LaunchScreen</string>
+	<key>UIRequiredDeviceCapabilities</key>
+	<array>
+		<string>arm64</string>
+	</array>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
-	<key>CFBundleIconName</key>
-	<string>AppIcon</string>
 </dict>
 </plist>

mobile/package-lock.json

@@ -7,6 +7,7 @@
     "": {
       "name": "proposal-system-mobile",
       "version": "0.1.0",
+      "hasInstallScript": true,
       "dependencies": {
         "@proposal-system/api-contracts": "file:../shared/api-contracts",
         "@react-native-async-storage/async-storage": "^2.1.0",
@@ -18,7 +19,7 @@
         "@tanstack/react-query": "^5.100.10",
         "amazon-cognito-identity-js": "^6.3.0",
         "axios": "^1.16.0",
-        "react": "^19.0.0",
+        "react": "19.2.3",
         "react-native": "^0.85.3",
         "react-native-app-auth": "^8.0.0",
         "react-native-document-picker": "^9.3.0",
@@ -5835,9 +5836,9 @@
       }
     },
     "node_modules/react": {
-      "version": "19.2.6",
-      "resolved": "https://registry.npmjs.org/react/-/react-19.2.6.tgz",
-      "integrity": "sha512-sfWGGfavi0xr8Pg0sVsyHMAOziVYKgPLNrS7ig+ivMNb3wbCBw3KxtflsGBAwD3gYQlE/AEZsTLgToRrSCjb0Q==",
+      "version": "19.2.3",
+      "resolved": "https://registry.npmjs.org/react/-/react-19.2.3.tgz",
+      "integrity": "sha512-Ku/hhYbVjOQnXDZFv2+RibmLFGwFdeeKHFcOTlrt7xplBnya5OGn/hIRDsqDiSUcfORsDC7MPxwork8jBwsIWA==",
       "license": "MIT",
       "engines": {
         "node": ">=0.10.0"

mobile/package.json

@@ -20,7 +20,7 @@
     "@tanstack/react-query": "^5.100.10",
     "amazon-cognito-identity-js": "^6.3.0",
     "axios": "^1.16.0",
-    "react": "^19.0.0",
+    "react": "19.2.3",
     "react-native": "^0.85.3",
     "react-native-app-auth": "^8.0.0",
     "react-native-document-picker": "^9.3.0",

mobile/src/App.tsx

@@ -1,19 +1,40 @@
-import React, { useEffect } from 'react';
+import React, { useEffect, Component, ErrorInfo, ReactNode } from 'react';
 import { Provider as ReduxProvider, useDispatch } from 'react-redux';
 import { PaperProvider } from 'react-native-paper';
 import { QueryClientProvider } from '@tanstack/react-query';
 import { SafeAreaProvider } from 'react-native-safe-area-context';
 import NetInfo from '@react-native-community/netinfo';
-import { Alert } from 'react-native';
+import { Alert, Text, View } from 'react-native';
 
 import { store } from './store';
 import { theme } from './theme';
 import { queryClient } from './lib/queryClient';
 import { RootNavigator } from './navigation/RootNavigator';
 import { tokenStorage, userStorage } from './lib/storage';
-import { setUser, setLoading } from './store/slices/authSlice';
+import { setUser, setLoading, logout as logoutAction } from './store/slices/authSlice';
 import { processOfflineQueue } from './hooks/useOfflineDraft';
 import { proposalsApi, CreateProposalRequest } from './lib/api/proposals';
+import { onSessionExpired } from './lib/api/client';
+
+class ErrorBoundary extends Component<{ children: ReactNode }, { error: Error | null }> {
+  state = { error: null as Error | null };
+  static getDerivedStateFromError(error: Error) { return { error }; }
+  componentDidCatch(error: Error, info: ErrorInfo) {
+    console.error('ErrorBoundary caught:', error, info.componentStack);
+  }
+  render() {
+    if (this.state.error) {
+      return (
+        <View style={{ flex: 1, justifyContent: 'center', padding: 32, backgroundColor: '#fff' }}>
+          <Text style={{ fontSize: 18, fontWeight: 'bold', color: 'red', marginBottom: 8 }}>App Error</Text>
+          <Text style={{ fontSize: 14, color: '#333' }}>{this.state.error.message}</Text>
+          <Text style={{ fontSize: 12, color: '#666', marginTop: 8 }}>{this.state.error.stack?.slice(0, 500)}</Text>
+        </View>
+      );
+    }
+    return this.props.children;
+  }
+}
 
 function AuthBootstrap({ children }: { children: React.ReactNode }) {
   const dispatch = useDispatch();
@@ -36,6 +57,12 @@ function AuthBootstrap({ children }: { children: React.ReactNode }) {
     })();
   }, [dispatch]);
 
+  useEffect(() => {
+    return onSessionExpired(() => {
+      dispatch(logoutAction());
+    });
+  }, [dispatch]);
+
   useEffect(() => {
     const unsubscribe = NetInfo.addEventListener((state) => {
       if (state.isConnected) {
@@ -61,16 +88,18 @@ function AuthBootstrap({ children }: { children: React.ReactNode }) {
 
 export default function App() {
   return (
-    <ReduxProvider store={store}>
-      <QueryClientProvider client={queryClient}>
-        <PaperProvider theme={theme}>
-          <SafeAreaProvider>
-            <AuthBootstrap>
-              <RootNavigator />
-            </AuthBootstrap>
-          </SafeAreaProvider>
-        </PaperProvider>
-      </QueryClientProvider>
-    </ReduxProvider>
+    <ErrorBoundary>
+      <ReduxProvider store={store}>
+        <QueryClientProvider client={queryClient}>
+          <PaperProvider theme={theme}>
+            <SafeAreaProvider>
+              <AuthBootstrap>
+                <RootNavigator />
+              </AuthBootstrap>
+            </SafeAreaProvider>
+          </PaperProvider>
+        </QueryClientProvider>
+      </ReduxProvider>
+    </ErrorBoundary>
   );
 }

mobile/src/hooks/usePaginatedList.ts

@@ -21,6 +21,7 @@ export function usePaginatedList<T>(
   const [pageSize, setPageSize] = useState(DEFAULT_PAGE_SIZE);
   const [totalCount, setTotalCount] = useState(0);
   const [loading, setLoading] = useState(true);
+  const [refreshing, setRefreshing] = useState(false);
   const [err, setErr] = useState('');
   const debounceRef = useRef<ReturnType<typeof setTimeout> | null>(null);
 
@@ -37,8 +38,7 @@ export function usePaginatedList<T>(
     };
   }, [search]);
 
-  const reload = useCallback(() => {
-    setLoading(true);
+  const fetchData = useCallback(() => {
     setErr('');
     fetchFn({ search: debouncedSearch, page, pageSize, ...extraParams })
       .then(({ items, totalCount: total }) => {
@@ -46,13 +46,22 @@ export function usePaginatedList<T>(
         setTotalCount(total);
       })
       .catch((e: Error) => setErr(e.message || 'Failed to load'))
-      .finally(() => setLoading(false));
+      .finally(() => {
+        setLoading(false);
+        setRefreshing(false);
+      });
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [fetchFn, debouncedSearch, page, pageSize, extraKey]);
 
   useEffect(() => {
-    reload();
-  }, [reload]);
+    setLoading(true);
+    fetchData();
+  }, [fetchData]);
+
+  const reload = useCallback(() => {
+    setRefreshing(true);
+    fetchData();
+  }, [fetchData]);
 
   return useMemo(
     () => ({
@@ -65,9 +74,10 @@ export function usePaginatedList<T>(
       setPageSize,
       totalCount,
       loading,
+      refreshing,
       err,
       reload,
     }),
-    [rows, search, page, pageSize, totalCount, loading, err, reload],
+    [rows, search, page, pageSize, totalCount, loading, refreshing, err, reload],
   );
 }

mobile/src/lib/api/auth.ts

@@ -1,6 +1,6 @@
 import { authorize, refresh, revoke } from 'react-native-app-auth';
 import Config from '../../config';
-import apiClient from './client';
+import apiClient, { registerTokenRefresh } from './client';
 import { authenticateWithCredentials } from './cognito-auth';
 import {
   tokenStorage,
@@ -9,6 +9,25 @@ import {
   StoredUser,
 } from '../storage';
 
+function parseUserFromIdToken(idToken: string): StoredUser {
+  const base64Url = idToken.split('.')[1];
+  const base64 = base64Url.replace(/-/g, '+').replace(/_/g, '/');
+  const padded = base64.padEnd(base64.length + ((4 - (base64.length % 4)) % 4), '=');
+  const payload = JSON.parse(atob(padded));
+  const groups: string[] = payload['cognito:groups'] || [];
+  const role = groups.includes('sysadmins')
+    ? 'SysAdmin'
+    : groups.includes('admins')
+      ? 'Admin'
+      : 'Dispatcher';
+  return {
+    id: payload.sub,
+    email: payload.email,
+    displayName: payload.name || payload.email,
+    role: role as StoredUser['role'],
+  };
+}
+
 const cognitoConfig = {
   clientId: Config.COGNITO_CLIENT_ID,
   redirectUrl: Config.COGNITO_REDIRECT_URI,
@@ -53,7 +72,12 @@ export const authApi = {
     };
     await tokenStorage.save(tokens);
 
-    const profile = await authApi.getMe();
+    let profile: StoredUser;
+    try {
+      profile = await authApi.getMe();
+    } catch {
+      profile = parseUserFromIdToken(cognitoTokens.idToken);
+    }
     await userStorage.save(profile);
     return profile;
   },
@@ -96,3 +120,5 @@ export const authApi = {
     return res.data;
   },
 };
+
+registerTokenRefresh(() => authApi.refreshTokens());

mobile/src/lib/api/client.ts

@@ -2,6 +2,41 @@ import axios from 'axios';
 import Config from '../../config';
 import { tokenStorage } from '../storage';
 
+type RefreshFn = () => Promise<void>;
+let _refreshTokens: RefreshFn | null = null;
+
+export function registerTokenRefresh(fn: RefreshFn) {
+  _refreshTokens = fn;
+}
+
+type SessionExpiredListener = () => void;
+
+const sessionExpiredListeners: SessionExpiredListener[] = [];
+
+export function onSessionExpired(listener: SessionExpiredListener): () => void {
+  sessionExpiredListeners.push(listener);
+  return () => {
+    const idx = sessionExpiredListeners.indexOf(listener);
+    if (idx >= 0) sessionExpiredListeners.splice(idx, 1);
+  };
+}
+
+function emitSessionExpired() {
+  sessionExpiredListeners.forEach((fn) => fn());
+}
+
+let isRefreshing = false;
+let refreshSubscribers: Array<(token: string) => void> = [];
+
+function subscribeToRefresh(cb: (token: string) => void) {
+  refreshSubscribers.push(cb);
+}
+
+function onRefreshComplete(token: string) {
+  refreshSubscribers.forEach((cb) => cb(token));
+  refreshSubscribers = [];
+}
+
 const apiClient = axios.create({
   baseURL: Config.API_URL,
   headers: {
@@ -23,15 +58,40 @@ apiClient.interceptors.request.use(
 
 apiClient.interceptors.response.use(
   (response) => response,
-  (error) => {
+  async (error) => {
     if (error.response) {
-      const { status, data } = error.response;
+      const { status, data, config: originalRequest } = error.response;
 
-      if (status === 401) {
-        tokenStorage.clear();
-        return Promise.reject(
-          new Error('Session expired. Please log in again.'),
-        );
+      if (status === 401 && !originalRequest._retry) {
+        originalRequest._retry = true;
+
+        if (isRefreshing) {
+          return new Promise((resolve) => {
+            subscribeToRefresh((token) => {
+              originalRequest.headers.Authorization = `Bearer ${token}`;
+              resolve(apiClient(originalRequest));
+            });
+          });
+        }
+
+        isRefreshing = true;
+        try {
+          if (!_refreshTokens) throw new Error('No refresh handler');
+          await _refreshTokens();
+          const tokens = await tokenStorage.get();
+          const newToken = tokens?.accessToken ?? '';
+          onRefreshComplete(newToken);
+          originalRequest.headers.Authorization = `Bearer ${newToken}`;
+          return apiClient(originalRequest);
+        } catch {
+          await tokenStorage.clear();
+          emitSessionExpired();
+          return Promise.reject(
+            new Error('Session expired. Please log in again.'),
+          );
+        } finally {
+          isRefreshing = false;
+        }
       }
 
       if (status === 403) {

mobile/src/lib/api/cognito-auth.ts

@@ -1,4 +1,3 @@
-import type { CognitoUserSession } from 'amazon-cognito-identity-js';
 import Config from '../../config';
 
 export interface CognitoTokens {
@@ -8,7 +7,8 @@ export interface CognitoTokens {
   expiresAt: string;
 }
 
-function extractTokens(session: CognitoUserSession): CognitoTokens {
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+function extractTokens(session: any): CognitoTokens {
   const accessToken = session.getAccessToken();
   return {
     accessToken: accessToken.getJwtToken(),
@@ -22,7 +22,6 @@ export async function authenticateWithCredentials(
   email: string,
   password: string,
 ): Promise<CognitoTokens> {
-  // Lazy-load to keep amazon-cognito-identity-js out of the startup module graph
   const {
     CognitoUserPool,
     CognitoUser,

mobile/src/screens/SettingsScreen.tsx

@@ -8,7 +8,7 @@ export function SettingsScreen() {
   const { user, logout } = useAuth();
 
   return (
-    <SafeAreaView style={styles.container} edges={['bottom']}>
+    <SafeAreaView style={styles.container} edges={['top', 'bottom']}>
       <View style={styles.content}>
         <Card style={styles.card} mode="elevated">
           <Card.Content>

mobile/src/screens/admin/ProposalQueueScreen.tsx

@@ -30,6 +30,7 @@ export function ProposalQueueScreen() {
     search,
     setSearch,
     loading,
+    refreshing,
     reload,
   } = usePaginatedList<ProposalListItem>(
     (params) =>
@@ -90,7 +91,7 @@ export function ProposalQueueScreen() {
           <ProposalCard proposal={item} onPress={() => handlePress(item)} />
         )}
         refreshControl={
-          <RefreshControl refreshing={loading} onRefresh={reload} />
+          <RefreshControl refreshing={refreshing} onRefresh={reload} />
         }
         contentContainerStyle={rows.length === 0 ? styles.empty : styles.list}
         ListEmptyComponent={

mobile/src/screens/dispatcher/DashboardScreen.tsx

@@ -52,7 +52,7 @@ export function DashboardScreen() {
         }
       >
         <Text variant="headlineSmall" style={styles.welcome}>
-          Welcome, {user?.displayName?.split(' ')[0] || 'there'}
+          Welcome, {user?.displayName?.includes('@') ? user.displayName.split('@')[0] : user?.displayName?.split(' ')[0] || 'there'}
         </Text>
 
         {stats && (

mobile/src/screens/dispatcher/NewProposalScreen.tsx

@@ -11,6 +11,7 @@ import {
   TextInput,
   Button,
   Text,
+  Chip,
   SegmentedButtons,
   Snackbar,
 } from 'react-native-paper';
@@ -146,16 +147,19 @@ export function NewProposalScreen() {
         <Text variant="labelLarge" style={styles.label}>
           Service Category
         </Text>
-        <SegmentedButtons
-          value={draft.serviceCategory}
-          onValueChange={(v) => updateDraft({ serviceCategory: v })}
-          buttons={SERVICE_CATEGORIES.map((c) => ({
-            value: c,
-            label: c,
-          }))}
-          style={styles.segmented}
-          density="small"
-        />
+        <View style={styles.chipRow}>
+          {SERVICE_CATEGORIES.map((c) => (
+            <Chip
+              key={c}
+              selected={draft.serviceCategory === c}
+              showSelectedOverlay
+              onPress={() => updateDraft({ serviceCategory: c })}
+              style={styles.chip}
+            >
+              {c}
+            </Chip>
+          ))}
+        </View>
 
         <Text variant="labelLarge" style={styles.label}>
           Priority
@@ -247,6 +251,15 @@ const styles = StyleSheet.create({
   segmented: {
     marginBottom: 16,
   },
+  chipRow: {
+    flexDirection: 'row',
+    flexWrap: 'wrap',
+    gap: 8,
+    marginBottom: 16,
+  },
+  chip: {
+    marginBottom: 0,
+  },
   hint: {
     color: '#9E9E9E',
     marginBottom: 12,

web/src/App.tsx

@@ -3,7 +3,7 @@ import { useSelector } from 'react-redux';
 import { Box, Toolbar, Typography } from '@mui/material';
 import { selectSidebarOpen } from './app/slices/uiSlice';
 import type { RootState } from './app/store';
-import ProtectedRoute from './components/ProtectedRoute';
+import ProtectedRoute, { RoleGuard } from './components/ProtectedRoute';
 import Topbar from './components/Topbar';
 import Sidebar from './components/Sidebar';
 import LoginPage from './pages/auth/LoginPage';
@@ -50,10 +50,10 @@ export default function App() {
                   <Route path="/proposals/:id" element={<ProposalDetailPage />} />
 
                   {/* Admin Routes */}
-                  <Route path="/admin" element={<AdminDashboard />} />
-                  <Route path="/admin/proposals" element={<AdminDashboard />} />
-                  <Route path="/admin/proposals/:id" element={<AdminWorkspace />} />
-                  <Route path="/admin/users" element={<Typography variant="h5" sx={{ p: 2 }}>User Management — Coming Soon</Typography>} />
+                  <Route path="/admin" element={<RoleGuard roles={['Admin', 'SysAdmin']}><AdminDashboard /></RoleGuard>} />
+                  <Route path="/admin/proposals" element={<RoleGuard roles={['Admin', 'SysAdmin']}><AdminDashboard /></RoleGuard>} />
+                  <Route path="/admin/proposals/:id" element={<RoleGuard roles={['Admin', 'SysAdmin']}><AdminWorkspace /></RoleGuard>} />
+                  <Route path="/admin/users" element={<RoleGuard roles={['SysAdmin']}><Typography variant="h5" sx={{ p: 2 }}>User Management — Coming Soon</Typography></RoleGuard>} />
 
                   <Route path="*" element={<Navigate to="/" replace />} />
                 </Routes>

web/src/components/ProtectedRoute.tsx

@@ -10,3 +10,13 @@ export default function ProtectedRoute({ children }: { children: React.ReactNode
 
   return <>{children}</>;
 }
+
+export function RoleGuard({ roles, children }: { roles: string[]; children: React.ReactNode }) {
+  const { user } = useAuth();
+
+  if (!user || !roles.includes(user.role)) {
+    return <Navigate to="/" replace />;
+  }
+
+  return <>{children}</>;
+}

web/src/constants/index.ts

@@ -19,3 +19,17 @@ export const STORAGE_KEY_SIDEBAR = 'sidebarOpen';
 export const PROPOSAL_STATUSES = ['Draft', 'InReview', 'Approved', 'Sent', 'Revised'] as const;
 export const SERVICE_CATEGORIES = ['HVAC', 'Plumbing', 'Electrical', 'General', 'Renovation'] as const;
 export const PRIORITIES = ['Standard', 'Urgent', 'Emergency'] as const;
+
+export const STATUS_COLORS: Record<string, 'default' | 'info' | 'warning' | 'success' | 'error'> = {
+  Draft: 'default',
+  InReview: 'info',
+  Approved: 'success',
+  Sent: 'success',
+  Revised: 'warning',
+};
+
+export const PRIORITY_COLORS: Record<string, 'default' | 'warning' | 'error'> = {
+  Standard: 'default',
+  Urgent: 'warning',
+  Emergency: 'error',
+};

web/src/hooks/usePaginatedList.ts

@@ -32,6 +32,14 @@ export function usePaginatedList<T>(fetchFn: FetchFn<T>, extraParams: Record<str
     };
   }, [search]);
 
+  const prevExtraKey = useRef(extraKey);
+  useEffect(() => {
+    if (prevExtraKey.current !== extraKey) {
+      prevExtraKey.current = extraKey;
+      setPage(1);
+    }
+  }, [extraKey]);
+
   const reload = useCallback(() => {
     setLoading(true);
     setErr('');

web/src/lib/api/admin.ts

@@ -19,7 +19,7 @@ export interface AuditEntry {
   userId: string;
   userName: string;
   action: string;
-  details: Record<string, unknown>;
+  details: string | null;
   timestamp: string;
   ipAddress: string | null;
 }
@@ -66,11 +66,8 @@ export const adminApi = {
   },
 
   getPdf: async (id: string): Promise<{ downloadUrl: string; expiresAt: string } | null> => {
-    try {
-      const res = await apiClient.get(`/proposals/${id}/pdf`);
-      return res.data;
-    } catch {
-      return null;
-    }
+    const res = await apiClient.get(`/proposals/${id}/pdf`);
+    if (res.status === 202) return null;
+    return res.data;
   },
 };

web/src/lib/api/proposals.ts

@@ -67,6 +67,7 @@ export interface ProposalFilters {
   priority?: string;
   fromDate?: string;
   toDate?: string;
+  mine?: boolean;
 }
 
 export const proposalsApi = {
@@ -83,6 +84,7 @@ export const proposalsApi = {
     if (filters.status) params.append('status', filters.status);
     if (filters.serviceCategory) params.append('serviceCategory', filters.serviceCategory);
     if (filters.priority) params.append('priority', filters.priority);
+    if (filters.mine) params.append('mine', 'true');
 
     const res = await apiClient.get(`/proposals?${params.toString()}`);
     return res.data;

web/src/lib/format.ts

@@ -0,0 +1,18 @@
+export function formatCurrency(amount: number): string {
+  return new Intl.NumberFormat('en-US', { style: 'currency', currency: 'USD' }).format(amount);
+}
+
+export function formatDate(iso: string): string {
+  return new Date(iso).toLocaleDateString('en-US', { month: 'short', day: 'numeric', year: 'numeric' });
+}
+
+export function formatDateTime(iso: string | null): string {
+  if (!iso) return '-';
+  return new Date(iso).toLocaleString('en-US', {
+    month: 'short',
+    day: 'numeric',
+    year: 'numeric',
+    hour: 'numeric',
+    minute: '2-digit',
+  });
+}

web/src/pages/admin/dashboard/AdminDashboard.tsx

@@ -1,3 +1,4 @@
+import { useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 import { useQuery } from '@tanstack/react-query';
 import {
@@ -28,29 +29,8 @@ import { usePaginatedList } from '../../../hooks/usePaginatedList';
 import { proposalsApi, type ProposalListItem } from '../../../lib/api/proposals';
 import { adminApi, type DashboardStats } from '../../../lib/api/admin';
 import { QUERY_KEYS } from '../../../constants/queryKeys';
-import { SERVICE_CATEGORIES, PRIORITIES } from '../../../constants';
-
-const STATUS_COLORS: Record<string, 'default' | 'info' | 'warning' | 'success'> = {
-  Draft: 'default',
-  InReview: 'info',
-  Approved: 'success',
-  Sent: 'success',
-  Revised: 'warning',
-};
-
-const PRIORITY_COLORS: Record<string, 'default' | 'warning' | 'error'> = {
-  Standard: 'default',
-  Urgent: 'warning',
-  Emergency: 'error',
-};
-
-function formatCurrency(amount: number): string {
-  return new Intl.NumberFormat('en-US', { style: 'currency', currency: 'USD' }).format(amount);
-}
-
-function formatDate(iso: string): string {
-  return new Date(iso).toLocaleDateString('en-US', { month: 'short', day: 'numeric', year: 'numeric' });
-}
+import { SERVICE_CATEGORIES, PRIORITIES, STATUS_COLORS, PRIORITY_COLORS } from '../../../constants';
+import { formatCurrency, formatDate } from '../../../lib/format';
 
 function StatCard({ icon, label, value, color }: { icon: React.ReactNode; label: string; value: string; color: string }) {
   return (
@@ -76,6 +56,9 @@ export default function AdminDashboard() {
     queryFn: adminApi.getDashboard,
   });
 
+  const [categoryFilter, setCategoryFilter] = useState('');
+  const [priorityFilter, setPriorityFilter] = useState('');
+
   const {
     rows,
     search,
@@ -87,7 +70,10 @@ export default function AdminDashboard() {
     totalCount,
     loading,
     err,
-  } = usePaginatedList<ProposalListItem>(proposalsApi.getAll);
+  } = usePaginatedList<ProposalListItem>(proposalsApi.getAll, {
+    ...(categoryFilter && { serviceCategory: categoryFilter }),
+    ...(priorityFilter && { priority: priorityFilter }),
+  });
 
   return (
     <Box>
@@ -167,9 +153,9 @@ export default function AdminDashboard() {
               size="small"
               select
               label="Category"
-              value=""
+              value={categoryFilter}
               sx={{ width: 160 }}
-              onChange={() => {}}
+              onChange={(e) => setCategoryFilter(e.target.value)}
             >
               <MenuItem value="">All</MenuItem>
               {SERVICE_CATEGORIES.map((c) => (
@@ -180,9 +166,9 @@ export default function AdminDashboard() {
               size="small"
               select
               label="Priority"
-              value=""
+              value={priorityFilter}
               sx={{ width: 140 }}
-              onChange={() => {}}
+              onChange={(e) => setPriorityFilter(e.target.value)}
             >
               <MenuItem value="">All</MenuItem>
               {PRIORITIES.map((p) => (

web/src/pages/admin/workspace/AdminWorkspace.tsx

@@ -1,5 +1,5 @@
-import { useState, useEffect } from 'react';
-import { useParams, useNavigate } from 'react-router-dom';
+import { useState, useEffect, useCallback } from 'react';
+import { useParams, useNavigate, useBlocker } from 'react-router-dom';
 import { useQuery, useMutation } from '@tanstack/react-query';
 import {
   Box,
@@ -34,14 +34,7 @@ import { QUERY_KEYS } from '../../../constants/queryKeys';
 import LineItemEditor, { type EditableLineItem } from '../../../components/admin/LineItemEditor';
 import VendorDataPanel from '../../../components/admin/VendorDataPanel';
 import SimilarProposalsPanel from '../../../components/admin/SimilarProposalsPanel';
-
-const STATUS_COLORS: Record<string, 'default' | 'info' | 'warning' | 'success'> = {
-  Draft: 'default',
-  InReview: 'info',
-  Approved: 'success',
-  Sent: 'success',
-  Revised: 'warning',
-};
+import { STATUS_COLORS } from '../../../constants';
 
 export default function AdminWorkspace() {
   const { id } = useParams<{ id: string }>();
@@ -88,6 +81,23 @@ export default function AdminWorkspace() {
     }
   }, [proposal]);
 
+  useEffect(() => {
+    if (!dirty) return;
+    const handler = (e: BeforeUnloadEvent) => {
+      e.preventDefault();
+    };
+    window.addEventListener('beforeunload', handler);
+    return () => window.removeEventListener('beforeunload', handler);
+  }, [dirty]);
+
+  const blocker = useBlocker(
+    useCallback(
+      ({ currentLocation, nextLocation }: { currentLocation: { pathname: string }; nextLocation: { pathname: string } }) =>
+        dirty && currentLocation.pathname !== nextLocation.pathname,
+      [dirty],
+    ),
+  );
+
   const saveMutation = useMutation({
     mutationFn: async () => {
       await adminApi.updateProposal(id!, { refinedScope });
@@ -115,10 +125,17 @@ export default function AdminWorkspace() {
   });
 
   const approveMutation = useMutation({
-    mutationFn: () => adminApi.approveProposal(id!),
+    mutationFn: async () => {
+      if (dirty) {
+        await saveMutation.mutateAsync();
+      }
+      await adminApi.approveProposal(id!);
+    },
     onSuccess: () => {
       queryClient.invalidateQueries({ queryKey: [QUERY_KEYS.proposals, id] });
+      queryClient.invalidateQueries({ queryKey: [QUERY_KEYS.proposalLineItems, id] });
       setApproveDialogOpen(false);
+      setDirty(false);
       toast.success('Proposal approved');
     },
   });
@@ -387,6 +404,20 @@ export default function AdminWorkspace() {
         </CardContent>
       </Card>
 
+      {/* Unsaved Changes Navigation Guard */}
+      <Dialog open={blocker.state === 'blocked'} onClose={() => blocker.reset?.()}>
+        <DialogTitle>Unsaved Changes</DialogTitle>
+        <DialogContent>
+          <Typography>You have unsaved changes. Are you sure you want to leave?</Typography>
+        </DialogContent>
+        <DialogActions>
+          <Button onClick={() => blocker.reset?.()}>Stay</Button>
+          <Button variant="contained" color="error" onClick={() => blocker.proceed?.()}>
+            Discard & Leave
+          </Button>
+        </DialogActions>
+      </Dialog>
+
       {/* Approve Confirmation Dialog */}
       <Dialog open={approveDialogOpen} onClose={() => setApproveDialogOpen(false)}>
         <DialogTitle>Approve Proposal</DialogTitle>

web/src/pages/auth/LoginPage.tsx

@@ -1,7 +1,7 @@
 import { useEffect, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 import { useDispatch } from 'react-redux';
-import { Box, Button, Card, CardContent, Typography, Divider, Stack } from '@mui/material';
+import { Alert, Box, Button, Card, CardContent, Typography, Divider, Stack } from '@mui/material';
 import GoogleIcon from '@mui/icons-material/Google';
 import AdminPanelSettingsIcon from '@mui/icons-material/AdminPanelSettings';
 import EngineeringIcon from '@mui/icons-material/Engineering';
@@ -28,7 +28,7 @@ function buildLoginUrl(): string {
 export default function LoginPage() {
   const navigate = useNavigate();
   const dispatch = useDispatch();
-  const { isAuthenticated } = useAuth();
+  const { isAuthenticated, error } = useAuth();
   const [loading, setLoading] = useState(false);
 
   const isDevMode = !CLIENT_ID;
@@ -39,10 +39,17 @@ export default function LoginPage() {
     }
   }, [isAuthenticated, navigate]);
 
+  const devUsers: Record<string, { email: string; name: string }> = {
+    SysAdmin: { email: 'adam@seahavenind.com', name: 'Adam Moussa' },
+    Admin: { email: 'sarah@seahavenind.com', name: 'Sarah Chen' },
+    Dispatcher: { email: 'mike@seahavenind.com', name: 'Mike Torres' },
+  };
+
   const handleDevLogin = async (role: string) => {
     setLoading(true);
     try {
-      const user = await authApi.devLogin('adam@seahavenind.com', 'Adam Moussa', role);
+      const dev = devUsers[role] ?? devUsers['SysAdmin']!;
+      const user = await authApi.devLogin(dev.email, dev.name, role);
       dispatch(setUser(user));
       navigate('/', { replace: true });
     } catch (err) {
@@ -96,6 +103,11 @@ export default function LoginPage() {
             </Typography>
           </Box>
           <CardContent sx={{ p: '30px', textAlign: 'center' }}>
+            {error && (
+              <Alert severity="error" sx={{ mb: 2, textAlign: 'left' }}>
+                {error}
+              </Alert>
+            )}
             {isDevMode ? (
               <>
                 <Typography variant="body2" color="text.secondary" sx={{ mb: 3 }}>

web/src/pages/dashboard/Dashboard.tsx

@@ -23,22 +23,8 @@ import CheckCircleIcon from '@mui/icons-material/CheckCircle';
 import SendIcon from '@mui/icons-material/Send';
 import { proposalsApi, type ProposalListItem, type ProposalStats } from '../../lib/api/proposals';
 import { QUERY_KEYS } from '../../constants/queryKeys';
-
-const STATUS_COLORS: Record<string, 'default' | 'info' | 'warning' | 'success' | 'error'> = {
-  Draft: 'default',
-  InReview: 'info',
-  Approved: 'success',
-  Sent: 'success',
-  Revised: 'warning',
-};
-
-function formatCurrency(amount: number): string {
-  return new Intl.NumberFormat('en-US', { style: 'currency', currency: 'USD' }).format(amount);
-}
-
-function formatDate(iso: string): string {
-  return new Date(iso).toLocaleDateString('en-US', { month: 'short', day: 'numeric', year: 'numeric' });
-}
+import { STATUS_COLORS } from '../../constants';
+import { formatCurrency, formatDate } from '../../lib/format';
 
 function KpiCard({ icon, label, value }: { icon: React.ReactNode; label: string; value: string }) {
   return (
@@ -61,7 +47,7 @@ export default function Dashboard() {
 
   const { data: recentData, isLoading: recentLoading } = useQuery<{ items: ProposalListItem[]; totalCount: number }>({
     queryKey: [QUERY_KEYS.proposals, 'dashboard-recent'],
-    queryFn: () => proposalsApi.getAll({ page: 1, pageSize: 5 }),
+    queryFn: () => proposalsApi.getAll({ page: 1, pageSize: 5, mine: true }),
   });
 
   const { data: stats, isLoading: statsLoading } = useQuery<ProposalStats>({

web/src/pages/proposals/detail/ProposalDetailPage.tsx

@@ -16,30 +16,10 @@ import {
 } from '@mui/material';
 import ArrowBackIcon from '@mui/icons-material/ArrowBack';
 import { proposalsApi, type ProposalDetail } from '../../../lib/api/proposals';
+import { STATUS_COLORS } from '../../../constants';
+import { formatCurrency, formatDateTime } from '../../../lib/format';
 
-const STATUS_ORDER = ['Draft', 'InReview', 'Approved', 'Sent'];
-const STATUS_COLORS: Record<string, 'default' | 'info' | 'warning' | 'success' | 'error'> = {
-  Draft: 'default',
-  InReview: 'info',
-  Approved: 'success',
-  Sent: 'success',
-  Revised: 'warning',
-};
-
-function formatCurrency(amount: number): string {
-  return new Intl.NumberFormat('en-US', { style: 'currency', currency: 'USD' }).format(amount);
-}
-
-function formatDateTime(iso: string | null): string {
-  if (!iso) return '-';
-  return new Date(iso).toLocaleString('en-US', {
-    month: 'short',
-    day: 'numeric',
-    year: 'numeric',
-    hour: 'numeric',
-    minute: '2-digit',
-  });
-}
+const STATUS_ORDER = ['Draft', 'InReview', 'Approved', 'Sent', 'Revised'];
 
 function InfoRow({ label, value }: { label: string; value: React.ReactNode }) {
   return (

web/src/pages/proposals/form/ProposalFormPage.tsx

@@ -1,4 +1,4 @@
-import { useState, useCallback } from 'react';
+import { useState, useCallback, useRef } from 'react';
 import { useNavigate } from 'react-router-dom';
 import { useMutation } from '@tanstack/react-query';
 import {
@@ -37,6 +37,7 @@ export default function ProposalFormPage() {
   const [customerLoading, setCustomerLoading] = useState(false);
   const [addresses, setAddresses] = useState<string[]>([]);
   const [vendorFile, setVendorFile] = useState<File | null>(null);
+  const searchDebounceRef = useRef<ReturnType<typeof setTimeout> | null>(null);
 
   const handleChange = (field: keyof CreateProposalRequest, value: string) => {
     setForm((prev) => ({ ...prev, [field]: value }));
@@ -90,6 +91,9 @@ export default function ProposalFormPage() {
       toast.success(`Proposal ${proposal.proposalNumber} submitted`);
       navigate(`/proposals/${proposal.id}`);
     },
+    onError: (error: Error) => {
+      toast.error(error.message || 'Failed to submit proposal');
+    },
   });
 
   const handleSubmit = (e: React.FormEvent) => {
@@ -130,7 +134,13 @@ export default function ProposalFormPage() {
                   options={customers}
                   getOptionLabel={(opt) => (typeof opt === 'string' ? opt : opt.name)}
                   loading={customerLoading}
-                  onInputChange={(_, value) => searchCustomers(value)}
+                  onInputChange={(_, value, reason) => {
+                    if (reason === 'input') {
+                      handleChange('customerName', value);
+                    }
+                    if (searchDebounceRef.current) clearTimeout(searchDebounceRef.current);
+                    searchDebounceRef.current = setTimeout(() => searchCustomers(value), 300);
+                  }}
                   onChange={handleCustomerSelect}
                   renderInput={(params) => (
                     <TextField

web/src/pages/proposals/list/ProposalListPage.tsx

@@ -21,25 +21,12 @@ import SearchIcon from '@mui/icons-material/Search';
 import AddCircleIcon from '@mui/icons-material/AddCircle';
 import { usePaginatedList } from '../../../hooks/usePaginatedList';
 import { proposalsApi, type ProposalListItem } from '../../../lib/api/proposals';
-
-const STATUS_COLORS: Record<string, 'default' | 'info' | 'warning' | 'success' | 'error'> = {
-  Draft: 'default',
-  InReview: 'info',
-  Approved: 'success',
-  Sent: 'success',
-  Revised: 'warning',
-};
-
-function formatCurrency(amount: number): string {
-  return new Intl.NumberFormat('en-US', { style: 'currency', currency: 'USD' }).format(amount);
-}
-
-function formatDate(iso: string): string {
-  return new Date(iso).toLocaleDateString('en-US', { month: 'short', day: 'numeric', year: 'numeric' });
-}
+import { STATUS_COLORS } from '../../../constants';
+import { formatCurrency, formatDate } from '../../../lib/format';
 
 export default function ProposalListPage() {
   const navigate = useNavigate();
+  const mineParams = { mine: true };
   const {
     rows,
     search,
@@ -51,7 +38,7 @@ export default function ProposalListPage() {
     totalCount,
     loading,
     err,
-  } = usePaginatedList<ProposalListItem>(proposalsApi.getAll);
+  } = usePaginatedList<ProposalListItem>(proposalsApi.getAll, mineParams);
 
   return (
     <Box>