Release v2.3.0 — Atlas scoping, BU detail view, drift checker fix

See CHANGELOG.md for full details.

.gitignore

@@ -71,3 +71,4 @@ docs/data-exports/
 
 # Python cache
 __pycache__/
+docs/Team_Device Loader.xlsx

.gitlab-ci.yml

@@ -1,44 +1,21 @@
 # =============================================================================
 # GitLab CI/CD Pipeline — STEAM Security Dashboard
 # =============================================================================
-#
-# Pipeline stages:
-#   1. install   — install dependencies for backend and frontend
-#   2. lint      — run linters / static checks
-#   3. test      — run backend (Jest) and frontend (react-scripts) tests
-#   4. build     — produce the production frontend bundle
-#   5. deploy    — deploy to staging (local) or production (SSH to 71.85.90.6)
-#   6. verify    — post-deploy health checks
-#
-# Environments:
-#   staging    — dashboard-dev:3100 (auto-deploy on main/master)
-#   production — 71.85.90.6:3001 (manual trigger, requires staging verification)
-#
-# Executor: shell (runs on dashboard-dev using system Node.js)
+# Executor: Docker (LXC 108 — 71.85.90.8)
+# Build/test jobs run in node:18 containers.
+# Release: v2.1.0
+# Deploy jobs run in alpine with SSH/rsync, targeting staging (71.85.90.9)
+# and production (71.85.90.6) via SSH.
 # =============================================================================
 
-# ---------------------------------------------------------------------------
-# Variables
-# ---------------------------------------------------------------------------
 variables:
   PROD_HOST: "71.85.90.6"
   PROD_USER: "root"
   PROD_DIR: "/home/cve-dashboard"
+  STAGING_HOST: "71.85.90.9"
+  STAGING_USER: "root"
   STAGING_DIR: "/home/cve-dashboard-staging"
 
-# ---------------------------------------------------------------------------
-# Global cache — persists node_modules between pipeline runs
-# ---------------------------------------------------------------------------
-cache:
-  key: ${CI_COMMIT_REF_SLUG}
-  paths:
-    - node_modules/
-    - frontend/node_modules/
-  policy: pull
-
-# ---------------------------------------------------------------------------
-# Stages
-# ---------------------------------------------------------------------------
 stages:
   - install
   - lint
@@ -48,44 +25,45 @@ stages:
   - verify
 
 # =============================================================================
-# STAGE 1: Install dependencies
+# STAGE 1: Install
 # =============================================================================
 
 install-backend:
   stage: install
+  image: node:18
   script:
-    - npm ci --prefer-offline
+    - npm ci
   cache:
-    key: ${CI_COMMIT_REF_SLUG}
+    key: backend-${CI_COMMIT_REF_SLUG}
     paths:
       - node_modules/
-    policy: pull-push
+    policy: push
 
 install-frontend:
   stage: install
+  image: node:18
   script:
-    - cd frontend && npm ci --prefer-offline
+    - cd frontend && npm ci
   cache:
-    key: ${CI_COMMIT_REF_SLUG}
+    key: frontend-${CI_COMMIT_REF_SLUG}
     paths:
       - frontend/node_modules/
-    policy: pull-push
+    policy: push
 
 # =============================================================================
-# STAGE 2: Lint / static analysis
+# STAGE 2: Lint
 # =============================================================================
 
-lint-frontend:
-  stage: lint
-  script:
-    - cd frontend && npm ci --prefer-offline && npx eslint src/ --ignore-pattern '**/__tests__/**' --ignore-pattern '**/*.test.js' --max-warnings 10
-  needs:
-    - install-frontend
-
 lint-backend:
   stage: lint
+  image: node:18
+  cache:
+    key: backend-${CI_COMMIT_REF_SLUG}
+    paths:
+      - node_modules/
+    policy: pull
   script:
-    - npm ci --prefer-offline
+    - test -d node_modules || npm ci
     - node -c backend/server.js
     - node -c backend/routes/*.js
     - node -c backend/helpers/*.js
@@ -93,14 +71,35 @@ lint-backend:
   needs:
     - install-backend
 
+lint-frontend:
+  stage: lint
+  image: node:18
+  cache:
+    key: frontend-${CI_COMMIT_REF_SLUG}
+    paths:
+      - frontend/node_modules/
+    policy: pull
+  script:
+    - cd frontend && (test -d node_modules || npm ci) && npx eslint src/ --ignore-pattern '**/__tests__/**' --ignore-pattern '**/*.test.js' --max-warnings 25
+  needs:
+    - install-frontend
+
 # =============================================================================
-# STAGE 3: Tests
+# STAGE 3: Test
 # =============================================================================
 
 test-backend:
   stage: test
+  image: node:18
+  variables:
+    DATABASE_URL: $DATABASE_URL
+  cache:
+    key: backend-${CI_COMMIT_REF_SLUG}
+    paths:
+      - node_modules/
+    policy: pull
   script:
-    - npm ci --prefer-offline
+    - test -d node_modules || npm ci
     - ./node_modules/.bin/jest --ci --forceExit backend/__tests__/
   timeout: 5 minutes
   needs:
@@ -108,9 +107,18 @@ test-backend:
 
 test-frontend:
   stage: test
+  image: node:18
+  cache:
+    - key: frontend-${CI_COMMIT_REF_SLUG}
+      paths:
+        - frontend/node_modules/
+      policy: pull
+    - key: backend-${CI_COMMIT_REF_SLUG}
+      paths:
+        - node_modules/
+      policy: pull
   script:
-    - npm ci --prefer-offline
-    - cd frontend && npm ci --prefer-offline && CI=true npx react-scripts test --watchAll=false --ci
+    - cd frontend && (test -d node_modules || npm ci) && cd .. && (test -d node_modules || npm ci) && cd frontend && CI=true npx react-scripts test --watchAll=false --ci
   timeout: 5 minutes
   needs:
     - install-frontend
@@ -121,8 +129,14 @@ test-frontend:
 
 build-frontend:
   stage: build
+  image: node:18
+  cache:
+    key: frontend-${CI_COMMIT_REF_SLUG}
+    paths:
+      - frontend/node_modules/
+    policy: pull
   script:
-    - cd frontend && npm ci --prefer-offline && CI=false REACT_APP_API_BASE=/api REACT_APP_API_HOST="" npm run build
+    - cd frontend && (test -d node_modules || npm ci) && CI=false REACT_APP_API_BASE=/api REACT_APP_API_HOST="" npm run build
   artifacts:
     paths:
       - frontend/build/
@@ -132,26 +146,30 @@ build-frontend:
     - lint-frontend
 
 # =============================================================================
-# STAGE 5: Deploy
+# STAGE 5: Deploy (SSH from container)
 # =============================================================================
 
-# ---------------------------------------------------------------------------
-# Staging — auto-deploys on main/master to dashboard-dev:3100
-# ---------------------------------------------------------------------------
+.deploy-base: &deploy-base
+  image: alpine:latest
+  before_script:
+    - apk add --no-cache openssh-client rsync
+    - mkdir -p ~/.ssh
+    - echo "$SSH_PRIVATE_KEY" | base64 -d > ~/.ssh/id_ed25519
+    - chmod 600 ~/.ssh/id_ed25519
+    - echo -e "Host *\n  StrictHostKeyChecking no\n  UserKnownHostsFile /dev/null" > ~/.ssh/config
+
 deploy-staging:
+  <<: *deploy-base
   stage: deploy
   rules:
     - if: $CI_COMMIT_BRANCH == "main" || $CI_COMMIT_BRANCH == "master"
       when: on_success
   environment:
     name: staging
-    url: http://localhost:3100
+    url: http://71.85.90.9:3100
   script:
-    - echo "Deploying to staging (dashboard-dev:3100)..."
-    # Ensure staging directory exists
-    - mkdir -p ${STAGING_DIR}
-    # Sync code (exclude .git, node_modules, uploads, logs)
-    - rsync -a --delete
+    - echo "Deploying to staging (${STAGING_HOST})..."
+    - rsync -az --delete
         --exclude='.git'
         --exclude='node_modules'
         --exclude='frontend/node_modules'
@@ -160,26 +178,16 @@ deploy-staging:
         --exclude='*.log'
         --exclude='*.db'
         --exclude='.env'
-        ${CI_PROJECT_DIR}/ ${STAGING_DIR}/
-    # Copy built frontend
-    - cp -r ${CI_PROJECT_DIR}/frontend/build ${STAGING_DIR}/frontend/build
-    # Install deps in staging
-    - cd ${STAGING_DIR} && npm ci --prefer-offline
-    - cd ${STAGING_DIR}/frontend && npm ci --prefer-offline
-    # Ensure staging .env exists
-    - |
-      if [ ! -f "${STAGING_DIR}/backend/.env" ]; then
-        cp ${CI_PROJECT_DIR}/backend/.env ${STAGING_DIR}/backend/.env
-        sed -i 's/^PORT=.*/PORT=3100/' ${STAGING_DIR}/backend/.env
-        grep -q "^PORT=" ${STAGING_DIR}/backend/.env || echo "PORT=3100" >> ${STAGING_DIR}/backend/.env
-      fi
-    # Run migrations
-    - cd ${STAGING_DIR}/backend && node migrations/run-all.js
-    # Restart staging service
-    - sudo systemctl restart cve-backend-staging || sudo systemctl start cve-backend-staging || true
+        ./ ${STAGING_USER}@${STAGING_HOST}:${STAGING_DIR}/
+    - rsync -az frontend/build/ ${STAGING_USER}@${STAGING_HOST}:${STAGING_DIR}/frontend/build/
+    - ssh ${STAGING_USER}@${STAGING_HOST} "cd ${STAGING_DIR} && npm ci --prefer-offline"
+    - ssh ${STAGING_USER}@${STAGING_HOST} "cd ${STAGING_DIR}/frontend && npm ci --prefer-offline"
+    - ssh ${STAGING_USER}@${STAGING_HOST} "cd ${STAGING_DIR}/backend && node migrations/run-all.js"
+    - ssh ${STAGING_USER}@${STAGING_HOST} "systemctl restart cve-backend-staging || systemctl start cve-backend-staging || true"
     - echo "Staging deploy complete."
   after_script:
     - |
+      apk add --no-cache curl > /dev/null 2>&1
       ISSUES=$(git log --format=%B -1 | grep -oP '#\d+' | tr -d '#' | sort -u)
       for ISSUE in $ISSUES; do
         curl --silent --request POST \
@@ -192,10 +200,8 @@ deploy-staging:
     - build-frontend
     - test-backend
 
-# ---------------------------------------------------------------------------
-# Production — manual trigger, SSH to 71.85.90.6
-# ---------------------------------------------------------------------------
 deploy-production:
+  <<: *deploy-base
   stage: deploy
   rules:
     - if: $CI_COMMIT_BRANCH == "main" || $CI_COMMIT_BRANCH == "master"
@@ -205,10 +211,8 @@ deploy-production:
     url: http://71.85.90.6:3001
   script:
     - echo "Deploying to production (${PROD_HOST})..."
-    # Record current commit on prod for rollback
     - ssh ${PROD_USER}@${PROD_HOST} "cd ${PROD_DIR} && git rev-parse HEAD 2>/dev/null || echo none" > /tmp/prod-prev-commit
     - echo "Previous production commit:$(cat /tmp/prod-prev-commit)"
-    # Sync code to production (exclude local-only files)
     - rsync -az --delete
         --exclude='.git'
         --exclude='node_modules'
@@ -219,20 +223,17 @@ deploy-production:
         --exclude='*.db'
         --exclude='.env'
         --exclude='.compliance-staging'
-        ${CI_PROJECT_DIR}/ ${PROD_USER}@${PROD_HOST}:${PROD_DIR}/
-    # Copy built frontend
-    - rsync -az ${CI_PROJECT_DIR}/frontend/build/ ${PROD_USER}@${PROD_HOST}:${PROD_DIR}/frontend/build/
-    # Install deps on production
+        ./ ${PROD_USER}@${PROD_HOST}:${PROD_DIR}/
+    - rsync -az frontend/build/ ${PROD_USER}@${PROD_HOST}:${PROD_DIR}/frontend/build/
     - ssh ${PROD_USER}@${PROD_HOST} "cd ${PROD_DIR} && npm ci --prefer-offline"
     - ssh ${PROD_USER}@${PROD_HOST} "cd ${PROD_DIR}/frontend && npm ci --prefer-offline"
-    # Run migrations
     - ssh ${PROD_USER}@${PROD_HOST} "cd ${PROD_DIR}/backend && node migrations/run-all.js"
-    # Restart services — install systemd unit if not present
-    - ssh ${PROD_USER}@${PROD_HOST} "test -f /etc/systemd/system/cve-backend.service" || scp ${CI_PROJECT_DIR}/deploy/cve-backend-production.service ${PROD_USER}@${PROD_HOST}:/etc/systemd/system/cve-backend.service
+    - ssh ${PROD_USER}@${PROD_HOST} "test -f /etc/systemd/system/cve-backend.service || true"
     - ssh ${PROD_USER}@${PROD_HOST} "systemctl daemon-reload && systemctl enable cve-backend && systemctl restart cve-backend"
     - echo "Production deploy complete."
   after_script:
     - |
+      apk add --no-cache curl > /dev/null 2>&1
       ISSUES=$(git log --format=%B -1 | grep -oP '#\d+' | tr -d '#' | sort -u)
       for ISSUE in $ISSUES; do
         curl --silent --request POST \
@@ -246,23 +247,22 @@ deploy-production:
     - test-backend
 
 # =============================================================================
-# STAGE 6: Post-deploy verification
+# STAGE 6: Verify
 # =============================================================================
 
-# ---------------------------------------------------------------------------
-# Staging health check
-# ---------------------------------------------------------------------------
 verify-staging:
   stage: verify
+  image: alpine:latest
   rules:
     - if: $CI_COMMIT_BRANCH == "main" || $CI_COMMIT_BRANCH == "master"
       when: on_success
   script:
+    - apk add --no-cache curl
     - echo "Verifying staging..."
     - sleep 3
     - |
       for i in 1 2 3 4 5; do
-        STATUS=$(curl -s -o /dev/null -w "%{http_code}" http://localhost:3100/api/health 2>/dev/null || echo "000")
+        STATUS=$(curl -s -o /dev/null -w "%{http_code}" http://${STAGING_HOST}:3100/api/health 2>/dev/null || echo "000")
         if [ "$STATUS" = "200" ]; then
           echo "Staging health check passed (attempt $i)"
           break
@@ -274,19 +274,28 @@ verify-staging:
         echo "FAILED: Staging health check failed after 5 attempts"
         exit 1
       fi
+    - |
+      COMP_STATUS=$(curl -s -o /dev/null -w "%{http_code}" "http://${STAGING_HOST}:3100/api/compliance/items?page=1&limit=1" || echo "000")
+      [ "$COMP_STATUS" != "200" ] && echo "WARN: Compliance items returned $COMP_STATUS" || true
+    - |
+      VCL_STATUS=$(curl -s -o /dev/null -w "%{http_code}" "http://${STAGING_HOST}:3100/api/compliance/vcl/stats" || echo "000")
+      [ "$VCL_STATUS" != "200" ] && echo "WARN: VCL stats returned $VCL_STATUS" || true
     - echo "Staging verification passed."
   needs:
     - deploy-staging
 
-# ---------------------------------------------------------------------------
-# Production health check — rolls back on failure
-# ---------------------------------------------------------------------------
 verify-production:
   stage: verify
+  image: alpine:latest
   rules:
     - if: $CI_COMMIT_BRANCH == "main" || $CI_COMMIT_BRANCH == "master"
       when: on_success
   script:
+    - apk add --no-cache curl openssh-client
+    - mkdir -p ~/.ssh
+    - echo "$SSH_PRIVATE_KEY" | base64 -d > ~/.ssh/id_ed25519
+    - chmod 600 ~/.ssh/id_ed25519
+    - echo -e "Host *\n  StrictHostKeyChecking no\n  UserKnownHostsFile /dev/null" > ~/.ssh/config
     - echo "Verifying production..."
     - sleep 3
     - |
@@ -304,7 +313,6 @@ verify-production:
         PREV_COMMIT=$(cat /tmp/prod-prev-commit 2>/dev/null || echo "")
         if [ -n "$PREV_COMMIT" ] && [ "$PREV_COMMIT" != "none" ]; then
           echo "Rolling back to $PREV_COMMIT..."
-          # Re-sync the previous version
           ssh ${PROD_USER}@${PROD_HOST} "cd ${PROD_DIR} && git checkout ${PREV_COMMIT} --force 2>/dev/null" || true
           ssh ${PROD_USER}@${PROD_HOST} "cd ${PROD_DIR} && npm ci --prefer-offline"
           ssh ${PROD_USER}@${PROD_HOST} "systemctl restart cve-backend"
@@ -314,6 +322,12 @@ verify-production:
         fi
         exit 1
       fi
+    - |
+      COMP_STATUS=$(curl -s -o /dev/null -w "%{http_code}" "http://${PROD_HOST}:3001/api/compliance/items?page=1&limit=1" || echo "000")
+      [ "$COMP_STATUS" != "200" ] && echo "WARN: Compliance items returned $COMP_STATUS" || true
+    - |
+      VCL_STATUS=$(curl -s -o /dev/null -w "%{http_code}" "http://${PROD_HOST}:3001/api/compliance/vcl/stats" || echo "000")
+      [ "$VCL_STATUS" != "200" ] && echo "WARN: VCL stats returned $VCL_STATUS" || true
     - echo "Production verification passed."
   needs:
     - deploy-production

.kiro/hooks/migration-registration-check.kiro.hook

@@ -0,0 +1,14 @@
+{
+  "enabled": true,
+  "name": "Migration Registration Check",
+  "description": "After any write to backend/migrations/, verify the file is registered in POSTGRES_MIGRATIONS array in run-all.js. Blocks until confirmed.",
+  "version": "2",
+  "when": {
+    "type": "postToolUse",
+    "toolTypes": ["write"]
+  },
+  "then": {
+    "type": "askAgent",
+    "prompt": "STOP. If the tool just wrote or created a file matching backend/migrations/*.js (but NOT run-all.js itself), you MUST immediately:\n1. Read backend/migrations/run-all.js\n2. Check if the migration filename exists in the POSTGRES_MIGRATIONS array\n3. If NOT present, add it to the end of the array RIGHT NOW before doing anything else\n4. Do NOT proceed with other work until this is done\n\nThis is a hard requirement — migrations not in run-all.js will not run in CI/CD and will break production deploys. If the written file is not a migration file, ignore this message."
+  }
+}

.kiro/steering/tech.md

@@ -80,9 +80,74 @@ Python dependencies: `pandas>=2.0.0`, `openpyxl>=3.0.0` (install via apt or venv
 - Both `.env` files are gitignored; see `.env.example` files for templates.
 - React env vars are baked in at **build time** — you must rebuild (`npm run build`) after changing them.
 
+## Code Style & Lint Rules
+
+### Unused Variables
+
+The frontend ESLint config enforces `no-unused-vars` as a warning. The CI pipeline fails if warnings exceed 25. To avoid lint failures:
+
+- **Prefix intentionally-unused variables with `_`** — this suppresses the warning. The `varsIgnorePattern: "^_"` and `argsIgnorePattern: "^_"` rules are configured in `frontend/package.json`.
+- Common patterns:
+  - `const [_unused, setFoo] = useState(...)` — destructured value you don't need
+  - `const _legacyRef = useRef(...)` — kept for future use
+  - `function handler(_event) { ... }` — required parameter signature but unused
+- **Do not leave variables unprefixed if unused.** Either use them, remove them, or prefix with `_`.
+- This applies to all frontend code written by the agent.
+
+### Backend
+
+No ESLint is configured for backend — the pipeline uses `node -c` syntax checking only. Keep code clean but there is no automated unused-var enforcement on the backend side.
+
 ## Ports
 
 | Environment | URL | Notes |
 |---|---|---|
-| Production / Dev server | http://IP:3001 | Express serves API + static frontend build |
+| Production | http://71.85.90.6:3001 | Express serves API + static frontend build |
+| Staging | http://71.85.90.9:3100 | Auto-deploy on master push |
 | Local dev (frontend only) | http://localhost:3000 | React dev server with hot-reload, proxies API to :3001 |
+
+## Secure Context Constraints
+
+All environments serve over **plain HTTP** (not HTTPS). This means browser APIs that require a [secure context](https://developer.mozilla.org/en-US/docs/Web/Security/Secure_Contexts) are **not available** in production or staging:
+
+- `navigator.clipboard` (Clipboard API) — use `document.execCommand('copy')` with a hidden textarea instead
+- `navigator.share` (Web Share API)
+- `crypto.subtle` (Web Crypto API)
+- `navigator.credentials` (Credential Management API)
+- Service Workers and Push Notifications
+
+When writing frontend code that needs clipboard, sharing, or crypto functionality, always use the non-secure fallback pattern. Do not use `navigator.clipboard.writeText()` or similar secure-context APIs.
+
+## CI/CD Pipeline
+
+### Infrastructure
+
+| Role | Host | Notes |
+|---|---|---|
+| GitLab instance | steam-gitlab.charterlab.com | Self-hosted GitLab |
+| CI Runner (LXC 108) | 71.85.90.8 | Docker executor, Runner #6, project-locked |
+| Staging target | 71.85.90.9 | Auto-deploy on master, port 3100 |
+| Production target | 71.85.90.6 | Manual deploy trigger, port 3001 |
+
+### Executor: Docker
+
+The pipeline uses **Docker executor** on Runner #6. Jobs run in isolated containers:
+
+- **Install / Lint / Test / Build stages**: `node:18` image
+- **Deploy stages**: `alpine:latest` image (installs `openssh-client` and `rsync` at runtime)
+
+Deploy jobs SSH from inside the Alpine container to the target hosts using a base64-encoded `$SSH_PRIVATE_KEY` stored as a GitLab CI/CD variable.
+
+### CI/CD Variables (project-level)
+
+These are set in GitLab → Settings → CI/CD → Variables:
+
+| Variable | Purpose |
+|---|---|
+| `DATABASE_URL` | PostgreSQL connection string for backend integration tests |
+| `SSH_PRIVATE_KEY` | Base64-encoded private key for deploy SSH access |
+| `GITLAB_PAT` | Project access token for issue comments and release creation |
+
+### Pipeline file
+
+The pipeline is defined in `.gitlab-ci.yml` at the project root. Stages: install → lint → test → build → deploy → verify.

CHANGELOG.md

@@ -6,27 +6,124 @@ Format follows [Keep a Changelog](https://keepachangelog.com/en/1.1.0/) and this
 
 ---
 
-## [2.0.0] — 2026-05-19
+## [2.3.0] — 2026-06-16
+
+### Added
+
+- **BU reassignment detail view** — click the "BU reassignment" count in the anomaly banner to see which specific findings moved and from/to which team
+- **Atlas sync scoped to active teams** — Atlas sync now respects BU scope and defaults to managed BUs, preventing cache pollution from unrelated teams
+- **Atlas known host distinction** — badge only renders for hosts Atlas actively tracks, suppressing noise from BUs not covered by Atlas (e.g., ACCESS-OPS)
+- **Per-user Ivanti identity** — FP workflow views filtered by individual Ivanti first/last name for personalized queue
+- **Searchable dropdowns for Granite Loader** — team, operation type, and status columns now use filterable select inputs
+- **IPv6 fallback display** — findings without IPv4 show Qualys IPv6 (amber Q badge) or primary IPv6 (indigo v6 badge)
+- **Remediate workflow type** — new workflow option in Ivanti Queue with remediation notes appended to Jira tickets
+- **DECOM workflow type** — added to RedirectModal workflow options
+- **View in CARD button** — added to tooltip and action modal for direct CARD web UI navigation
+- **CARD asset-search by Host ID** — faster lookup path for enrichment operations
+- **Per-metric compliance views** — replaced cross-metric aggregates with per-metric summary cards
+- **Non-metric category filters** on compliance page
+- **Ivanti Findings Data Guide** — Knowledge Base article explaining common data patterns (missing CVEs, BU reassignment, Atlas badges, etc.)
+- **Markdown table rendering** in Knowledge Base viewer (remark-gfm support)
+- **In-app notifications** table and infrastructure
+
+### Fixed
+
+- **Drift checker re-classifying same findings every sync** — archived findings were never removed from ivanti_findings, causing ~500 false re-classifications per sync. Now properly cleaned up after archive detection
+- **Atlas Coverage tab not responding to scope changes** — metrics and status endpoints now filter by active teams and re-fetch on scope switch
+- **Knowledge Base content/download failing for relative file paths** — sendFile now resolves paths correctly
+- **remark-gfm compatibility** — upgraded to v4 for react-markdown v10 (was causing blank KB viewer)
+- **SearchableSelect** — only opens on focus, closes properly on blur/select
+- **Clipboard copy on HTTP** — use execCommand fallback for non-secure contexts
+- **Empty description in single-item Jira modal** on ReportingPage
+- **CARD enrich for items without IP** — uses host_id lookup as fallback
+- **update_token error handling** — shows CARD link for assets that can't be actioned via API
+- **Decom workflow migration** — includes Remediate in state check constraint
+
+### Changed
+
+- Atlas sync defaults to `IVANTI_MANAGED_BUS` when no scope is specified instead of syncing all BUs
+- BU change history API accepts `since` and `limit` query params for scoped queries
+- Anomaly banner uses 60-minute lookback window to capture drift checker records
+- Archive activity chart should now show near-zero on normal syncs (only genuinely new disappearances)
+
+---
+
+## [2.2.0] — 2026-06-04
+
+### Features
+
+- **Group by Host toggle** on the Ivanti findings table — collapses duplicate assets (same hostname + IP) with multiple finding IDs into expandable host rows. Hosts with only one finding remain as flat rows. Toggle between grouped and flat views from the toolbar.
+- **CARD ownership tooltip on IP hover** — hover over any IP address in the findings table to see CARD asset ownership data (confirmed/unconfirmed/candidate teams) in an interactive tooltip. Results cached per session for instant re-display.
+- **CARD direct action modal** — click "Actions" in the CARD tooltip to open a full confirm/decline/redirect modal that works directly against the CARD API without needing a queue item.
+- **Inline view panel** in the Archer Template Manager with per-section copy buttons
+- **Queue item redirect in place** — pending queue items can now be redirected without duplicating
+
+### Bug Fixes
+
+- Improve CARD decline error diagnostics and prevent accidental modal dismiss
+- CARD teams fetch retries silently up to 3x on failure with increasing delay
+- Redirect dropdowns show owner-data teams as fallback when the full teams API fails
+- CARD tooltip uses quick mode (CTEC suffix only, 15s timeout) to avoid multi-minute waits
+- Timeouts (504) are not cached — re-hover will retry the lookup
+
+---
+
+## [2.1.0] — 2026-06-06
+
+### Features
+
+- **Archer Template Library** — new template management system for Archer Risk Acceptance forms. Store static content (Environment Overview, Segmentation, Mitigating Controls) organized by Vendor > Platform > Model. Full CRUD with clone, search/filter, and per-section copy-to-clipboard. Accessible from the nav drawer (Template Mgr) and integrated into the Ivanti Queue for Archer workflow items.
+- **Estimated resolution date per metric** — the compliance asset sidebar now shows each noncompliant metric's estimated resolution date at the top of its section, in `YYYY-MM-DD` format, with placeholders for metrics that have no date set or an invalid date (closes #20)
+- **CARD Action Modal** with full owner context
+- **Granite Loader Sheet generator** with CARD enrichment, plus a Loader Sheet button on the Reporting page queue panel
+- **Vendor-specific issue type dropdown** for Jira ticket creation, with all vendor project keys
+- **LIVE and LAST REPORT badges** on the VCL compliance page
+- **Collapsible sections** on the Ivanti Queue page and side panel
+
+### Bug Fixes
+
+- Fix remediation plan and resolution date missing from the compliance table; format `resolution_date` as `YYYY-MM-DD`
+- Improve CARD action error messages and default loader columns
+- Fix CARD production timeout by forcing IPv4 (`dns.setDefaultResultOrder('ipv4first')`)
+- Add IP address validation to CARD confirm/decline/redirect actions
+- Auto-resolve bare IP to CARD asset ID with suffix lookup
+- Increase CARD API timeout from 15s to 30s
+- Rewrite CARD enrich-batch to use the team assets endpoint for full data
+
+---
+
+## [2.0.0] — 2026-05-26
 
 ### Breaking Changes
 
 - **PostgreSQL migration** — database engine switched from SQLite to PostgreSQL. Requires running `deploy-postgres.sh`, data migration, and `DATABASE_URL` env var. SQLite is no longer supported.
 - **Multi-BU tenancy** — data is now scoped per business unit with per-user team assignments. Replaces the previous binary scope toggle.
+- **Raw Jira status display** — removed Open/In Progress/Closed status mapping; shows the actual Jira status field everywhere.
 
 ### Features
 
-- **In-app notification system** — replaces Webex bot integration with native notifications
-- **Screenshot uploads** in feedback modal, Webex bot DM on issue close
+- **Jira integration overhaul**
+  - Flexible Jira ticket creation — CVE/Vendor fields optional, source context tracking
+  - Multi-item Jira ticket creation from Ivanti Queue (consolidation modal)
+  - Issue type dropdown and Save to Dashboard from Jira lookup
+  - Success toast after consolidated ticket creation
+  - Improved Jira lookup error messages
 - **CCP Metrics page** — multi-vertical VCL upload and cross-org compliance reporting
+  - Metric-first hierarchy restructure with Jira cross-project sync
+  - Per-metric forecast burndown chart
+  - Aggregated burndown forecast on overview page
+  - Sub-team drill-down with intermediate view and per-team breakdowns
+  - Non-Compliant stat clickable with metric breakdown buttons
+  - Compliant/total counts on metric summary cards
+  - Per-metric remediation plans
+  - VCL metric calculations guide
+- **Exports page** — Jira Tickets, CCP Metrics, and Remediation Status export cards
 - **VCL compliance reporting** — exec report page, device metadata fields, bulk upload
-- **Aggregated burndown forecast** on CCP Metrics overview page
-- **Sub-team drill-down** — metric sub-team intermediate view with per-team breakdowns
-- **Metric breakdown panel** — Non-Compliant stat clickable, reveals metric breakdown buttons, compact grid with top 8 and show-all toggle
-- **Remediation plan and resolution date history tracking**
 - **Data management panel** — delete vertical, rollback upload, and reset all
-- **VCL vertical metadata** — inline-editable team fields on compliance routes
-- **Re-queue findings** from rejected FP submissions
+- **In-app notification system** — replaces Webex bot integration with native notifications
+- **Remediation plan and resolution date history tracking**
 - **FP submissions cleanup** — auto-clear approved, dismiss rejected, collapsible section
+- **Re-queue findings** from rejected FP submissions
 - **DECOM workflow type** — auto-note/hide on decom, show CVEs on CARD queue items
 - **Interactive configuration wizard** for deployment setup
 - **Unified setup script** (`configure.js`) merging deploy + config wizard
@@ -34,12 +131,23 @@ Format follows [Keep a Changelog](https://keepachangelog.com/en/1.1.0/) and this
 - **Multi-select BU picker** replacing binary scope toggle
 - **Configurable IVANTI_MANAGED_BUS** env var for multi-tenant drift classification
 - **Pipeline-to-issue traceability** via `after_script` comments in CI/CD
-- **CI/CD pipeline** with feedback modal, Atlas `qualys_id` fallback, and health endpoint
+- **CI/CD pipeline** with health endpoint and automated deploy stages
 - **Docker Compose** and `deploy-postgres.sh` for production cutover
 - **Systemd service scripts** for start/stop management
+- **VCL vertical metadata** — inline-editable team fields on compliance routes
 
 ### Bug Fixes
 
+- Fix Clear Completed button failing on queue items with Jira ticket links (FK violation)
+- Fix status badge background making text invisible
+- Fix calendar SLA dates not highlighting after Postgres migration
+- Fix document View link using localhost instead of relative URL
+- Validate library doc file types before sending to Ivanti API
+- Improve FP workflow error messages — include Ivanti API response body
+- Fix forecast chart bar order and snapshot month derivation
+- Fix forecast deduplication for multi-vertical metrics
+- Fix CCP Metrics page crash for non-Admin users
+- Fix CCP Metrics crash when donut chart has zero non-compliant devices
 - Fix duplicate failing metrics on same asset across compliance endpoints
 - Fix duplicate chart entries on compliance page when multiple verticals share a report_date
 - Fix requeue inserting Postgres array literal instead of JSON into `cves_json`
@@ -51,21 +159,21 @@ Format follows [Keep a Changelog](https://keepachangelog.com/en/1.1.0/) and this
 - Fix requeue: fallback to `finding_ids_json` when queue items are deleted or absent
 - Sync FP submission `lifecycle_status` from Ivanti `currentState` on fetch
 - Fix History tab crash: coerce Ivanti note fields to strings before rendering
-- Fix archive bar chart: `fmtDate` now handles ISO datetime strings from PostgreSQL date columns
-- Fix Ivanti panel bugs: Invalid Date, wrong workflow count, crash on archive click, BU scope filtering
+- Fix archive bar chart: `fmtDate` now handles ISO datetime strings from PostgreSQL
+- Fix Ivanti panel bugs: Invalid Date, wrong workflow count, crash on archive click
 - Fix BU drift checker: derive `EXPECTED_BUS` from `IVANTI_BU_FILTER` env var
 - Fix null `bu_teams` in postgres migration, add retry logic to deploy script
 - Fix missing `created_by` column in `archer_tickets` table
 - Fix FP workflow counts donut scoped by BU
 - Fix `dotenv` loading in `db.js` so `DATABASE_URL` is available on import
-- Fix property test CI failure: mock db module before importing route
 
 ### Maintenance
 
 - Track `package-lock.json` files for deterministic CI installs
-- Remove unused icon imports and unused imports to satisfy ESLint thresholds
+- Remove unused imports to satisfy ESLint thresholds
 - CI pipeline fixes: dependency installation, lint thresholds, test isolation
 - Auto-run migrations in pipeline
+- Strengthen migration registration hook
 - Documentation updates for PostgreSQL migration, systemd scripts, and reference manual
 
 ---

README.md

@@ -1,6 +1,44 @@
-# STEAM Security Dashboard v1.0.0
+# STEAM Security Dashboard v2.2.0
 
-A self-hosted vulnerability management dashboard for the NTS-AEO-STEAM and NTS-AEO-ACCESS-ENG business units. Centralises CVE tracking, Ivanti host finding triage, AEO compliance posture, FP/Archer/CARD exception workflows, and internal documentation in a single interface.
+A self-hosted vulnerability management dashboard for the NTS-AEO-STEAM, NTS-AEO-ACCESS-ENG, NTS-AEO-ACCESS-OPS, and NTS-AEO-INTELDEV business units. Centralises CVE tracking, Ivanti host finding triage, AEO compliance posture monitoring, CCP Metrics cross-org compliance reporting, FP/Archer/CARD/GRANITE/DECOM exception workflows, CARD asset ownership management, Granite Loader Sheet generation, Jira ticket management, and internal documentation in a single interface.
+
+---
+
+## Table of Contents
+
+- [Quick Start](#quick-start)
+- [Features](#features)
+  - [Home — CVE Management](#home--cve-management)
+  - [Reporting — Ivanti Host Findings](#reporting--ivanti-host-findings)
+  - [Ivanti Queue — Workflow Staging](#ivanti-queue--workflow-staging)
+  - [FP Workflow Submission](#fp-workflow-submission)
+  - [Archer Tickets](#archer-tickets)
+  - [Archer Template Library](#archer-template-library)
+  - [AEO Compliance](#aeo-compliance)
+  - [CCP Metrics — Multi-Vertical Compliance](#ccp-metrics--multi-vertical-compliance)
+  - [CARD Asset Ownership](#card-asset-ownership)
+  - [Granite Loader Sheet](#granite-loader-sheet)
+  - [Atlas Action Plans](#atlas-action-plans)
+  - [Jira Integration](#jira-integration)
+  - [Finding Archive Tracking](#finding-archive-tracking)
+  - [Findings Trend](#findings-trend)
+  - [Knowledge Base](#knowledge-base)
+  - [Exports](#exports)
+  - [In-App Notifications](#in-app-notifications)
+  - [Feedback — GitLab Integration](#feedback--gitlab-integration)
+  - [Access Control](#access-control)
+- [Project Structure](#project-structure)
+- [Tech Stack](#tech-stack)
+- [Configuration](#configuration)
+- [Database Schema](#database-schema)
+- [Migrations](#migrations)
+- [API Reference](#api-reference)
+- [CI/CD Pipeline](#cicd-pipeline)
+- [Documentation](#documentation)
+- [Troubleshooting](#troubleshooting)
+- [License](#license)
+
+---
 
 ## Quick Start
 
@@ -34,7 +72,7 @@ cp backend/.env.example backend/.env
 #   openssl rand -base64 32
 ```
 
-See `backend/.env.example` for all available options including `DATABASE_URL`, Ivanti API, Jira, and Atlas integration keys.
+See `backend/.env.example` for all available options including `DATABASE_URL`, Ivanti API, Jira, Atlas, CARD, and GitLab integration keys.
 
 ### Start PostgreSQL
 
@@ -47,6 +85,14 @@ chmod +x scripts/deploy-postgres.sh
 
 For fresh installs without an existing SQLite database, the script creates the schema and skips migration.
 
+### Run Migrations
+
+```bash
+cd backend && node migrations/run-all.js
+```
+
+Migrations are idempotent and safe to re-run.
+
 ### Build and Run
 
 ```bash
@@ -57,80 +103,801 @@ cd frontend && npm run build && cd ..
 ./start-servers.sh
 ```
 
-Dashboard: http://localhost:3000 · API: http://localhost:3001
+Dashboard: http://localhost:3001
 
-The helper scripts use `systemctl` under the hood — the systemd units in `systemd/` must be installed first. See the full manual for setup instructions.
+The helper scripts use `systemctl` under the hood — the systemd units in `systemd/` must be installed first. See the full reference manual for setup instructions.
+
+### Interactive Configuration Wizard
+
+For first-time deployments, the wizard walks through all required settings:
+
+```bash
+node configure.js
+```
+
+---
 
 ## Features
 
-| Feature | Description |
-|---------|-------------|
-| **CVE Management** | Track CVEs across multiple vendors with document storage and NVD auto-fill |
-| **Reporting** | Ivanti host finding triage with donut charts, inline editing, advanced filtering, CSV/XLSX export |
-| **Ivanti Queue** | Personal staging list for batch FP, Archer, CARD, and Granite workflows |
-| **FP Workflow** | Submit false positive workflows directly to Ivanti API with attachments |
-| **Compliance** | Weekly AEO xlsx upload with diff preview, drift detection, per-team metric health cards |
-| **Archive Tracking** | Automatic detection of disappeared/returned findings with BU reassignment classification |
-| **Findings Trend** | Historical open vs closed chart with archive activity sparkline and shift reason tooltips |
-| **Jira Integration** | Create, sync, and track Jira Data Center tickets linked to CVE/vendor pairs |
-| **Archer Tickets** | Track risk acceptance exceptions (EXC numbers) linked to findings |
-| **CARD API** | Granite/CARD asset lookup integration for network device workflows |
-| **Knowledge Base** | Internal document library with inline PDF/Markdown viewing |
-| **Access Control** | Four user groups (Admin, Standard_User, Leadership, Read_Only) with full audit trail |
+### Home — CVE Management
+
+Searchable CVE list with per-vendor tracking and document storage. NVD API integration auto-populates severity, description, and publication date from the National Vulnerability Database.
+
+**Capabilities:**
+- Create, edit, and delete CVE entries with vendor association
+- Upload advisory documents (PDF, email, screenshot, patch notes) per CVE/vendor pair
+- NVD auto-lookup on CVE ID entry (rate-limited, API key optional for higher throughput)
+- Filter by vendor, severity, status, and free-text search
+- Required document tracking per vendor with mandatory/optional flags
+- Calendar widget with SLA date highlighting
+
+### Reporting — Ivanti Host Findings
+
+Ivanti/RiskSense host finding triage with donut charts, advanced filtering, inline editing, CSV/XLSX export, and multi-BU scope.
+
+**Capabilities:**
+- Sync open host findings from Ivanti API (24-hour cadence, configurable via `IVANTI_BU_FILTER`)
+- Group by Host toggle — collapses duplicate assets (same hostname + IP) with multiple findings into expandable rows
+- CARD ownership tooltip on IP hover — displays confirmed/unconfirmed/candidate teams from CARD API
+- CARD direct action modal — confirm, decline, or redirect ownership without a queue item
+- Advanced column filtering, severity sorting, and free-text search
+- Inline note editing with override hostname/DNS fields
+- Per-user Ivanti identity for filtered FP workflow views
+- Multi-select BU picker for scoping visible findings
+- CSV and XLSX export with current filter state
+- Add findings to the todo queue for batch workflow processing
+
+### Ivanti Queue — Workflow Staging
+
+Personal staging list for batch-processing FP, Archer, CARD, GRANITE, DECOM, and Remediate workflows.
+
+**Capabilities:**
+- Add individual findings or bulk-select from the Reporting page
+- Six workflow types: FP (False Positive), Archer (Risk Acceptance), CARD (Ownership), GRANITE (Loader Sheet), DECOM (Decommission), Remediate
+- Collapsible sections per workflow type
+- Multi-item Jira ticket creation (consolidation modal)
+- Ticket link display on completed items
+- Clear Completed with FK-safe deletion
+- Redirect pending items between workflow types without duplication
+- DECOM items auto-note and auto-hide the finding on completion
+
+### FP Workflow Submission
+
+Submit False Positive workflows directly to the Ivanti API with attachments and lifecycle tracking.
+
+**Capabilities:**
+- Batch-select queue items for FP submission
+- Attach supporting documents (10MB limit per file)
+- Configurable expiration date, scope override, and reason
+- Lifecycle tracking: submitted, approved, rejected, rework, resubmitted
+- Edit and re-submit rejected workflows
+- Re-queue findings from rejected submissions
+- Auto-clear approved submissions, dismiss rejected
+- Per-user workflow history with attachment results
+- Collapsible submissions panel
+
+### Archer Tickets
+
+Track Archer risk acceptance exceptions (EXC numbers) linked to CVE/vendor pairs.
+
+**Capabilities:**
+- Create Archer ticket records with EXC number, URL, and status
+- Status workflow: Draft, Open, Under Review, Accepted
+- Link tickets to specific CVE/vendor combinations
+- Full CRUD with audit logging
+
+### Archer Template Library
+
+Template management system for Archer Risk Acceptance forms. Stores static content (Environment Overview, Segmentation, Mitigating Controls) organised by Vendor, Platform, and Model.
+
+**Capabilities:**
+- Full CRUD with clone, search/filter, and per-section copy-to-clipboard
+- Inline view panel with per-section copy buttons
+- Template selector integrated into the Ivanti Queue for Archer workflow items
+- Organised hierarchy: Vendor > Platform > Model
+- Accessible from nav drawer (Template Mgr) and Ivanti Queue Archer items
+
+### AEO Compliance
+
+Weekly AEO compliance xlsx upload with diff preview, drift detection, per-team metric health cards, and device-level violation tracking.
+
+**Capabilities:**
+- Upload weekly compliance spreadsheets (xlsx) with automated parsing
+- Diff preview showing new, resolved, and recurring non-compliant items
+- Per-team metric health cards with pass/fail indicators
+- Device-level violation detail panel with notes per hostname/metric pair
+- Bulk notes import from CSV
+- Compliance history tracking across uploads
+- Per-metric estimated resolution date display
+- Notes with group_id for batch operations
+
+### CCP Metrics — Multi-Vertical Compliance
+
+Cross-organisational VCL (Vulnerability Compliance Level) upload and reporting for multiple verticals. The CCP Metrics page provides executive-level visibility into compliance posture across teams.
+
+**Capabilities:**
+- Multi-vertical VCL xlsx upload with Summary and Detail sheet parsing
+- Metric-first hierarchy with per-metric remediation plans
+- Per-metric forecast burndown chart
+- Aggregated burndown forecast on overview page
+- Sub-team drill-down with intermediate view and per-team breakdowns
+- Non-Compliant stat clickable with metric breakdown buttons
+- Compliant/total counts on metric summary cards
+- LIVE and LAST REPORT badges showing data freshness
+- Data management panel — delete vertical, rollback upload, reset all
+- Exec report page with exportable summaries
+- Inline-editable team fields on vertical metadata
+- Device metadata fields for asset context
+
+### CARD Asset Ownership
+
+CARD API integration for asset ownership management — confirm, decline, and redirect ownership for network assets.
+
+**Capabilities:**
+- Owner lookup by IP address or Ivanti Host ID (asset-search)
+- Confirm, decline, and redirect ownership actions via API
+- Suffix-guessing fallback when no host_id available (CTEC, NATL, CHTR, COML, RESI, WIFI, VOIP)
+- IP address validation before mutation operations
+- Update_token handling for safe concurrent operations
+- Cached tooltip results per session
+- Team assets endpoint for batch enrichment
+- Quick mode (CTEC suffix only, 15s timeout) for tooltip performance
+
+### Granite Loader Sheet
+
+Generate Granite Loader Sheets with CARD enrichment, searchable picklists, per-row editing, and XLSX export.
+
+**Capabilities:**
+- Generate loader sheets from queue items or the Reporting page
+- CARD enrichment — pull NCIM, Qualys, Netops Granite data per asset
+- Searchable picklists for teams, statuses, operation types
+- Per-row inline editing before export
+- Column groups with configurable visibility
+- XLSX export with formatting
+
+### Atlas Action Plans
+
+Atlas InfoSec action plan tracking with per-host vulnerability mapping and local cache for badge rendering.
+
+**Capabilities:**
+- View action plans linked to Ivanti host findings via host_id
+- Create remediation, risk acceptance, and compensating control plans
+- AtlasBadge component on findings rows indicating plan existence
+- Slide-out detail panel with plan metadata
+- Local cache (`atlas_action_plans_cache` table) for instant badge rendering
+- Manual cache refresh triggers re-fetch from Atlas API
+- Qualys vulnerability mapping per host
+
+### Jira Integration
+
+Create, sync, and track Jira Data Center tickets linked to CVE/vendor pairs and Ivanti queue items.
+
+**Capabilities:**
+- Create tickets from CVE records or Ivanti queue items
+- Multi-item Jira ticket creation from the consolidation modal
+- Flexible ticket creation — CVE/Vendor fields optional, source context tracking
+- Vendor-specific issue type dropdown with per-vendor project keys
+- JQL-based ticket lookup and sync
+- Raw Jira status display (no status mapping)
+- Save to Dashboard from Jira lookup results
+- Dedicated Jira page for managing tickets
+- Rate limiting with configurable window and burst limits
+- Blocked dangerous endpoints (bulk delete, user management)
+
+### Finding Archive Tracking
+
+Automatic detection of disappeared and returned findings with BU reassignment classification and anomaly logging.
+
+**Capabilities:**
+- Detect findings that disappear between syncs — classify as ARCHIVED, RETURNED, CLOSED, or CLOSED_GONE
+- BU reassignment tracking with history log
+- Sync anomaly detection with significance thresholds
+- Anomaly banner component on the Reporting page
+- Archive summary bar with state distribution
+- Transition history with severity-at-transition recording
+- Return classification (original finding restored vs. new duplicate)
+- Configurable `IVANTI_MANAGED_BUS` for drift classification scope
+
+### Findings Trend
+
+Historical open vs closed findings chart with per-BU trend lines, archive activity sparkline, and shift reason tooltips.
+
+**Capabilities:**
+- Ivanti counts history chart (open/closed over time)
+- Per-BU trend lines via `ivanti_counts_history_by_bu`
+- Archive activity sparkline overlay
+- Shift reason tooltips from anomaly log
+
+### Knowledge Base
+
+Internal document library for policies, guides, and reference material.
+
+**Capabilities:**
+- Upload documents (PDF, Markdown, Word, Excel)
+- Inline PDF and Markdown viewing
+- Category-based organisation with search
+- Slug-based URL routing
+
+### Exports
+
+Dedicated Exports page with pre-built export cards for common data pulls.
+
+**Capabilities:**
+- Jira Tickets export
+- CCP Metrics export
+- Remediation Status export
+- CSV and XLSX format options
+
+### In-App Notifications
+
+Native notification system replacing the previous Webex bot integration.
+
+**Capabilities:**
+- Per-user notification bell with unread count
+- Notification types for sync events, workflow completions, and system alerts
+- Mark as read / dismiss actions
+- Persistent storage in `notifications` table
+
+### Feedback — GitLab Integration
+
+In-app bug reports and feature requests submitted directly to the GitLab project as issues.
+
+**Capabilities:**
+- Feedback modal accessible from the nav drawer
+- Bug report and feature request templates
+- Submitted as GitLab issues via PAT authentication
+- GitLab webhook receiver for issue lifecycle events (label changes, closes)
+- Webhook secret validation for security
+
+### Access Control
+
+Four user groups with role-based permissions and full audit trail.
+
+| Group | Permissions |
+|-------|------------|
+| Admin | Full CRUD, user management, audit log access, system configuration, data management |
+| Standard_User | Create/update operations, FP workflow submission, queue management |
+| Leadership | Read access to all data plus compliance and export views |
+| Read_Only | Read-only access to all data |
+
+**Additional capabilities:**
+- Per-user BU team assignments (multi-BU tenancy)
+- Per-user Ivanti identity (first/last name) for workflow filtering
+- Cookie-based sessions with 24-hour expiry (httpOnly)
+- Login rate limiting (20 attempts per 15-minute window)
+- Full audit trail for all state-changing operations
+- User profile panel with password change
+
+---
 
 ## Project Structure
 
 ```
 cve-dashboard/
 ├── backend/
-│   ├── server.js              # Express API server
+│   ├── server.js              # Express API — middleware, CVE/document routes inline
 │   ├── db.js                  # PostgreSQL connection pool (pg)
 │   ├── db-schema.sql          # Complete DDL for fresh Postgres setup
-│   ├── setup-postgres.js      # Schema initializer (runs db-schema.sql)
-│   ├── routes/                # API route handlers
-│   ├── helpers/               # API clients (Ivanti, Jira, Atlas, CARD)
-│   ├── middleware/            # Auth middleware
-│   ├── migrations/            # Schema migrations (legacy SQLite deployments)
-│   └── scripts/               # Compliance parser, data import utilities
+│   ├── setup.js               # One-time DB init + default admin creation
+│   ├── routes/
+│   │   ├── auth.js            # Login, logout, session validation
+│   │   ├── users.js           # User CRUD, role/group management
+│   │   ├── auditLog.js        # Audit log queries
+│   │   ├── nvdLookup.js       # NVD API proxy
+│   │   ├── knowledgeBase.js   # Document library CRUD
+│   │   ├── archerTickets.js   # Archer EXC ticket tracking
+│   │   ├── archerTemplates.js # Archer template library CRUD + clone
+│   │   ├── ivantiWorkflows.js # Ivanti FP workflow batch queries
+│   │   ├── ivantiFindings.js  # Ivanti findings sync, query, inline edit
+│   │   ├── ivantiTodoQueue.js # Per-user queue staging
+│   │   ├── ivantiArchive.js   # Finding archive tracking + anomaly log
+│   │   ├── ivantiFpWorkflow.js# FP workflow submission to Ivanti API
+│   │   ├── compliance.js      # AEO compliance upload + items + notes
+│   │   ├── vclMultiVertical.js# VCL/CCP multi-vertical compliance
+│   │   ├── atlas.js           # Atlas action plan proxy + cache
+│   │   ├── jiraTickets.js     # Jira CRUD + REST API integration
+│   │   ├── cardApi.js         # CARD ownership proxy + asset-search
+│   │   ├── notifications.js   # In-app notification system
+│   │   ├── feedback.js        # GitLab issue creation for bug/feature
+│   │   └── webhooks.js        # GitLab webhook receiver
+│   ├── helpers/
+│   │   ├── auditLog.js        # logAudit() — fire-and-forget DB insert
+│   │   ├── cardApi.js         # CARD API — OAuth token, owner lookup, asset-search
+│   │   ├── ivantiApi.js       # Ivanti/RiskSense HTTP helpers
+│   │   ├── atlasApi.js        # Atlas action plan API
+│   │   ├── jiraApi.js         # Jira ticket creation + rate limiter
+│   │   ├── driftChecker.js    # BU drift detection between syncs
+│   │   ├── vclHelpers.js      # VCL metric calculation helpers
+│   │   └── teams.js           # Team validation helpers
+│   ├── middleware/
+│   │   └── auth.js            # requireAuth(), requireGroup(...groups)
+│   ├── migrations/            # Sequential migration scripts (idempotent)
+│   │   └── run-all.js         # Run all migrations in order
+│   └── scripts/               # Python utilities (compliance parsing)
+│
 ├── frontend/
-│   ├── src/
-│   │   ├── App.js             # Main app with routing
-│   │   ├── components/        # React components
-│   │   └── contexts/          # Auth context
-│   └── public/
+│   └── src/
+│       ├── App.js             # Main app — routing, CVE list, filters, modals
+│       ├── App.css            # Global styles and CSS variables
+│       ├── contexts/
+│       │   └── AuthContext.js # Auth state provider (login, logout, role helpers)
+│       ├── utils/
+│       │   ├── graniteLoaderConfig.js   # Granite column definitions and groups
+│       │   ├── graniteLoaderExport.js   # XLSX generation logic
+│       │   └── graniteLoaderPicklists.js # Searchable dropdown options
+│       └── components/
+│           ├── LoginForm.js
+│           ├── NavDrawer.js
+│           ├── UserMenu.js
+│           ├── UserProfilePanel.js
+│           ├── CalendarWidget.js
+│           ├── UserManagement.js
+│           ├── AuditLog.js
+│           ├── NvdSyncModal.js
+│           ├── KnowledgeBaseModal.js
+│           ├── KnowledgeBaseViewer.js
+│           ├── CardOwnerTooltip.js
+│           ├── CardDetailModal.js
+│           ├── CardActionModal.js
+│           ├── RedirectModal.js
+│           ├── LoaderModal.js
+│           ├── SearchableSelect.js
+│           ├── AtlasBadge.js
+│           ├── AtlasIcon.js
+│           ├── AtlasSlideOutPanel.js
+│           ├── AdminScopeToggle.js
+│           ├── ConfirmModal.js
+│           ├── ConsolidationModal.js
+│           ├── CveTooltip.js
+│           ├── DeleteConfirmModal.js
+│           ├── FeedbackModal.js
+│           ├── NotificationBell.js
+│           ├── RemediationModal.js
+│           ├── TemplateFormModal.js
+│           ├── TemplateSelector.js
+│           └── pages/
+│               ├── AdminPage.js
+│               ├── ReportingPage.js
+│               ├── IvantiTodoQueuePage.js
+│               ├── CompliancePage.js
+│               ├── ComplianceUploadModal.js
+│               ├── ComplianceDetailPanel.js
+│               ├── ComplianceChartsPanel.js
+│               ├── CCPMetricsPage.js
+│               ├── VCLReportPage.js
+│               ├── MetricInfoPanel.js
+│               ├── BulkUploadModal.js
+│               ├── MultiVerticalUploadModal.js
+│               ├── IvantiCountsChart.js
+│               ├── AnomalyBanner.js
+│               ├── ArchiveSummaryBar.js
+│               ├── ArcherPage.js
+│               ├── ArcherTemplatePage.js
+│               ├── JiraPage.js
+│               ├── KnowledgeBasePage.js
+│               └── ExportsPage.js
+│
 ├── docs/
 │   ├── api/                   # API specs (Ivanti, Atlas, Jira)
-│   ├── design/                # Design system, workflow diagrams
-│   ├── guides/                # User guides, full reference manual
+│   ├── architecture/          # Architecture proposals (AD/SAML, split)
+│   ├── design/                # Design system, workflow colour codes
+│   ├── guides/                # User guides, full reference manual, VCL calculations
+│   ├── operations/            # Operational logs and connectivity tests
 │   ├── security/              # Security audits and remediation plans
 │   ├── testing/               # Test plans and scripts
 │   └── troubleshooting/       # Investigation scripts and reports
-├── docker-compose.yml         # PostgreSQL 16 container definition
+│
 ├── scripts/
-│   └── deploy-postgres.sh     # One-time deployment: container, schema, migration
-├── systemd/                   # systemd service files
-├── start-servers.sh
-└── stop-servers.sh
+│   ├── deploy-postgres.sh     # One-time: container, schema, migration
+│   └── reset-and-migrate.sh   # Dev utility: reset DB and re-run migrations
+├── deploy/
+│   ├── cve-backend-production.service
+│   ├── cve-backend-staging.service
+│   └── setup-staging.sh
+├── systemd/
+│   ├── cve-backend.service
+│   └── cve-frontend.service
+├── configure.js               # Interactive configuration wizard
+├── docker-compose.yml         # PostgreSQL 16 container definition
+├── start-servers.sh           # Start backend (serves API + frontend build)
+├── stop-servers.sh            # Stop backend
+└── CHANGELOG.md
 ```
 
+---
+
 ## Tech Stack
 
 | Layer | Technology |
 |-------|------------|
 | Backend | Node.js 18+, Express 5 |
 | Database | PostgreSQL 16 (Docker, port 5433) |
-| Frontend | React 19, Recharts, Lucide React |
-| Auth | bcryptjs, cookie-based sessions, express-rate-limit |
-| Compliance | Python 3, pandas, openpyxl |
+| Auth | bcryptjs, cookie-based sessions (httpOnly, 24h expiry), express-rate-limit |
+| File uploads | Multer 2 (10MB limit) |
+| Frontend | React 19 (Create React App / react-scripts 5) |
+| Frontend serving | Express serves `frontend/build/` as static files on port 3001 |
+| UI Icons | lucide-react |
+| Charts | recharts |
+| Spreadsheet parsing | xlsx (frontend), pandas + openpyxl (backend Python scripts) |
+| Markdown rendering | react-markdown + rehype-sanitize |
+| Diagrams | mermaid |
+| Testing | Jest 30 (backend property tests), React Testing Library (frontend) |
+
+---
+
+## Configuration
+
+All configuration lives in `backend/.env`. Copy `backend/.env.example` as a starting point.
+
+| Variable | Purpose | Default |
+|---|---|---|
+| `PORT` | Backend server port | `3001` |
+| `API_HOST` | Backend bind address | `localhost` |
+| `CORS_ORIGINS` | Comma-separated allowed origins | `http://localhost:3000` |
+| `SESSION_SECRET` | **Required.** Session signing key. Generate with `openssl rand -base64 32` | — |
+| `DATABASE_URL` | PostgreSQL connection string | — |
+| `NVD_API_KEY` | NVD API key (increases rate limit from 5 to 50 req/30s) | — |
+| `IVANTI_API_KEY` | Ivanti/RiskSense API key | — |
+| `IVANTI_CLIENT_ID` | Ivanti client ID | `1550` |
+| `IVANTI_FIRST_NAME` | Fallback Ivanti identity (first name) | — |
+| `IVANTI_LAST_NAME` | Fallback Ivanti identity (last name) | — |
+| `IVANTI_BU_FILTER` | Comma-separated BU values to sync | `NTS-AEO-ACCESS-ENG,NTS-AEO-STEAM` |
+| `IVANTI_MANAGED_BUS` | BUs considered "managed" for drift classification | `NTS-AEO-ACCESS-ENG,NTS-AEO-STEAM` |
+| `IVANTI_SKIP_TLS` | Skip TLS verification for SSL inspection proxies | `false` |
+| `ATLAS_API_URL` | Atlas InfoSec API base URL | — |
+| `ATLAS_API_USER` | Atlas Basic Auth username | — |
+| `ATLAS_API_PASS` | Atlas Basic Auth password | — |
+| `ATLAS_SKIP_TLS` | Skip Atlas TLS verification | `false` |
+| `JIRA_BASE_URL` | Jira Data Center REST API base URL | — |
+| `JIRA_AUTH_METHOD` | Auth method: `basic` or `pat` | `basic` |
+| `JIRA_API_USER` | Jira Basic Auth username | — |
+| `JIRA_API_TOKEN` | Jira Basic Auth token | — |
+| `JIRA_PAT` | Jira Personal Access Token (when `JIRA_AUTH_METHOD=pat`) | — |
+| `JIRA_PROJECT_KEY` | Default Jira project key | — |
+| `JIRA_ISSUE_TYPE` | Default issue type | `Task` |
+| `JIRA_SKIP_TLS` | Skip Jira TLS verification | `false` |
+| `CARD_API_URL` | CARD API base URL | — |
+| `CARD_API_USER` | CARD OAuth username | — |
+| `CARD_API_PASS` | CARD OAuth password | — |
+| `CARD_SKIP_TLS` | Skip CARD TLS verification | `false` |
+| `GITLAB_URL` | GitLab instance URL for feedback integration | `http://steam-gitlab.charterlab.com` |
+| `GITLAB_PROJECT_ID` | GitLab project numeric ID | — |
+| `GITLAB_PAT` | GitLab project access token (api scope) | — |
+| `GITLAB_WEBHOOK_SECRET` | Shared secret for webhook validation | — |
+
+> `SESSION_SECRET` and `DATABASE_URL` are required for the backend to start. All integration keys are optional — features degrade gracefully when their keys are absent.
+
+---
+
+## Database Schema
+
+PostgreSQL 16 with the following tables:
+
+| Table | Purpose |
+|-------|---------|
+| `cves` | CVE records with vendor association, severity, status |
+| `documents` | Uploaded advisory documents linked to CVE/vendor pairs |
+| `required_documents` | Per-vendor required document types |
+| `users` | User accounts with role, group, BU teams, Ivanti identity |
+| `sessions` | Active session tokens with expiry |
+| `audit_logs` | Immutable audit trail for all state-changing operations |
+| `jira_tickets` | Locally tracked Jira tickets linked to CVE/vendor |
+| `archer_tickets` | Archer risk acceptance exceptions (EXC numbers) |
+| `knowledge_base` | Internal document library entries |
+| `ivanti_findings` | Individual Ivanti host findings (synced from API) |
+| `ivanti_sync_state` | Sync metadata — last run time, status, error |
+| `ivanti_counts_cache` | Cached open/closed counts and FP workflow counts |
+| `ivanti_counts_history` | Historical open/closed counts over time |
+| `ivanti_counts_history_by_bu` | Per-BU historical counts |
+| `ivanti_fp_submissions` | FP workflow submissions with lifecycle tracking |
+| `ivanti_fp_submission_history` | Edit history for FP submissions |
+| `ivanti_todo_queue` | Per-user workflow staging queue |
+| `ivanti_finding_archives` | Archived/returned/closed finding records |
+| `ivanti_archive_transitions` | State transition history for archived findings |
+| `ivanti_sync_anomaly_log` | Sync anomaly detection log |
+| `ivanti_finding_bu_history` | BU reassignment history per finding |
+| `atlas_action_plans_cache` | Cached Atlas action plan data for badge rendering |
+| `compliance_uploads` | Compliance xlsx upload metadata |
+| `compliance_items` | Individual non-compliant items per upload |
+| `compliance_notes` | Per-hostname/metric notes |
+
+The complete DDL is in `backend/db-schema.sql`. For fresh installs, `scripts/deploy-postgres.sh` applies it automatically.
+
+---
+
+## Migrations
+
+Run all migrations (idempotent):
+
+```bash
+cd backend && node migrations/run-all.js
+```
+
+Migration files in execution order:
+
+| Migration | Purpose |
+|-----------|---------|
+| `add_user_groups.js` | User group column and check constraint |
+| `add_user_ivanti_identity.js` | Per-user Ivanti first/last name |
+| `add_user_bu_teams.js` | Per-user BU team assignments |
+| `add_knowledge_base_table.js` | Knowledge base document library |
+| `add_ivanti_sync_table.js` | Ivanti sync state (single-row) |
+| `add_ivanti_findings_tables.js` | Individual findings + counts cache |
+| `add_ivanti_findings_ipv6_columns.js` | IPv6 fallback columns |
+| `add_ivanti_counts_history_table.js` | Historical counts + per-BU |
+| `add_ivanti_todo_queue_table.js` | Per-user workflow staging queue |
+| `add_todo_queue_hostname.js` | Hostname column on queue items |
+| `add_todo_queue_ip_address.js` | IP address column on queue items |
+| `add_granite_workflow_type.js` | GRANITE workflow type |
+| `add_card_workflow_type.js` | CARD workflow type |
+| `add_decom_workflow_type.js` | DECOM workflow type |
+| `add_remediate_workflow_type.js` | Remediate workflow type |
+| `add_compliance_tables.js` | Compliance uploads, items, notes |
+| `add_compliance_notes_group_id.js` | Group ID for batch notes |
+| `add_compliance_history_metric_id.js` | Metric ID in compliance history |
+| `add_compliance_item_history.js` | Compliance item history tracking |
+| `add_fp_submissions_table.js` | FP workflow submissions |
+| `add_fp_submission_editing.js` | Submission edit history |
+| `add_fp_submissions_dismissed.js` | Dismissed/lifecycle status |
+| `add_fp_submissions_requeued_at.js` | Requeue timestamp |
+| `add_archer_tickets_table.js` | Archer EXC tickets |
+| `add_archer_tickets_timestamps.js` | Timestamp columns |
+| `add_archer_templates_table.js` | Archer template library |
+| `add_atlas_action_plans_cache.js` | Atlas plan cache |
+| `add_atlas_known_column.js` | Atlas known flag |
+| `add_finding_archive_tables.js` | Archive tracking tables |
+| `add_closed_gone_state.js` | CLOSED_GONE archive state |
+| `add_return_classification.js` | Return classification field |
+| `add_sync_anomaly_tables.js` | Anomaly detection log |
+| `add_flexible_jira_ticket_creation.js` | Optional CVE/vendor on Jira tickets |
+| `add_multi_item_jira_ticket.js` | Multi-item ticket references |
+| `add_jira_sync_columns.js` | Jira sync metadata (SQLite) |
+| `add_jira_sync_columns_pg.js` | Jira sync metadata (PostgreSQL) |
+| `drop_jira_status_check_constraint.js` | Remove status enum for raw display |
+| `add_notifications_table.js` | In-app notification system |
+| `add_created_by_columns.js` | created_by on archer_tickets |
+| `add_queue_remediation_notes_table.js` | Remediation notes on queue items |
+| `add_vcl_multi_vertical.js` | VCL multi-vertical tables |
+| `add_vcl_reporting_columns.js` | VCL reporting metadata |
+| `add_vcl_vertical_metadata.js` | VCL vertical team fields |
+| `backfill_anomaly_log.js` | Backfill anomaly classification data |
+| `backfill_return_classification.js` | Backfill return classification |
+| `reclassify_bu_roundtrips.js` | Reclassify BU roundtrip transitions |
+
+---
+
+## API Reference
+
+All routes are prefixed with `/api`. All endpoints except login, logout, health check, and webhooks require a valid session cookie.
+
+### Public
+
+| Method | Path | Description |
+|--------|------|-------------|
+| GET | `/api/health` | Health check (used by CI/CD verification) |
+| POST | `/api/auth/login` | Authenticate and create session |
+| POST | `/api/auth/logout` | Destroy session |
+| POST | `/api/webhooks/gitlab` | GitLab webhook receiver (validated by secret) |
+
+### CVE Management
+
+| Method | Path | Description | Group |
+|--------|------|-------------|-------|
+| GET | `/api/cves` | List CVEs with filtering | Any |
+| POST | `/api/cves` | Create CVE | Standard_User+ |
+| PUT | `/api/cves/:id` | Update CVE | Standard_User+ |
+| DELETE | `/api/cves/:id` | Delete CVE | Admin |
+| POST | `/api/cves/:cveId/:vendor/documents` | Upload document | Standard_User+ |
+| GET | `/api/cves/:cveId/:vendor/documents` | List documents | Any |
+| DELETE | `/api/documents/:id` | Delete document | Admin |
+
+### Users and Auth
+
+| Method | Path | Description | Group |
+|--------|------|-------------|-------|
+| GET | `/api/auth/me` | Current session user | Any |
+| GET | `/api/users` | List all users | Admin |
+| POST | `/api/users` | Create user | Admin |
+| PUT | `/api/users/:id` | Update user (role, group, teams) | Admin |
+| DELETE | `/api/users/:id` | Delete user | Admin |
+| PUT | `/api/users/:id/password` | Change password | Owner or Admin |
+
+### Ivanti Findings
+
+| Method | Path | Description | Group |
+|--------|------|-------------|-------|
+| GET | `/api/ivanti/findings` | Query synced findings | Any |
+| POST | `/api/ivanti/findings/sync` | Trigger manual sync | Standard_User+ |
+| PUT | `/api/ivanti/findings/:id/note` | Update finding note | Standard_User+ |
+| PUT | `/api/ivanti/findings/:id/override` | Override hostname/DNS | Standard_User+ |
+
+### Ivanti Queue
+
+| Method | Path | Description | Group |
+|--------|------|-------------|-------|
+| GET | `/api/ivanti/todo-queue` | Get user's queue | Any |
+| POST | `/api/ivanti/todo-queue` | Add item(s) to queue | Standard_User+ |
+| PUT | `/api/ivanti/todo-queue/:id` | Update queue item | Standard_User+ |
+| DELETE | `/api/ivanti/todo-queue/:id` | Remove queue item | Standard_User+ |
+| DELETE | `/api/ivanti/todo-queue/completed` | Clear completed items | Standard_User+ |
+
+### Ivanti FP Workflow
+
+| Method | Path | Description | Group |
+|--------|------|-------------|-------|
+| POST | `/api/ivanti/fp-workflow` | Submit FP workflow to Ivanti | Standard_User+ |
+| GET | `/api/ivanti/fp-workflow/submissions` | List user's submissions | Any |
+| PUT | `/api/ivanti/fp-workflow/submissions/:id` | Edit/resubmit | Standard_User+ |
+
+### Ivanti Archive
+
+| Method | Path | Description | Group |
+|--------|------|-------------|-------|
+| GET | `/api/ivanti/archive` | Query archived findings | Any |
+| GET | `/api/ivanti/archive/anomalies` | Sync anomaly log | Any |
+| GET | `/api/ivanti/archive/transitions/:id` | Transition history | Any |
+
+### Compliance (AEO)
+
+| Method | Path | Description | Group |
+|--------|------|-------------|-------|
+| POST | `/api/compliance/upload` | Upload xlsx | Standard_User+ |
+| GET | `/api/compliance/items` | Query non-compliant items | Any |
+| GET | `/api/compliance/trends` | Compliance trend data | Any |
+| POST | `/api/compliance/notes` | Add note to hostname/metric | Standard_User+ |
+
+### VCL Multi-Vertical (CCP Metrics)
+
+| Method | Path | Description | Group |
+|--------|------|-------------|-------|
+| POST | `/api/compliance/vcl-multi/upload` | Upload VCL xlsx | Standard_User+ |
+| GET | `/api/compliance/vcl-multi/verticals` | List verticals | Any |
+| GET | `/api/compliance/vcl-multi/metrics` | Query metrics | Any |
+| GET | `/api/compliance/vcl-multi/forecast` | Burndown forecast | Any |
+| DELETE | `/api/compliance/vcl-multi/verticals/:id` | Delete vertical | Admin |
+
+### Atlas
+
+| Method | Path | Description | Group |
+|--------|------|-------------|-------|
+| GET | `/api/atlas/hosts/:hostId/plans` | Get plans for host | Any |
+| PUT | `/api/atlas/hosts/:hostId/plans` | Create plan | Standard_User+ |
+| PATCH | `/api/atlas/hosts/:hostId/plans` | Update plan | Standard_User+ |
+| POST | `/api/atlas/hosts/:hostId/refresh` | Refresh cache | Standard_User+ |
+
+### Jira
+
+| Method | Path | Description | Group |
+|--------|------|-------------|-------|
+| GET | `/api/jira-tickets` | List local tickets | Any |
+| POST | `/api/jira-tickets` | Create ticket (local + Jira API) | Standard_User+ |
+| GET | `/api/jira-tickets/lookup` | JQL search against Jira | Standard_User+ |
+| POST | `/api/jira-tickets/save` | Save from Jira lookup | Standard_User+ |
+
+### CARD
+
+| Method | Path | Description | Group |
+|--------|------|-------------|-------|
+| GET | `/api/card/owner/:assetId` | Lookup owner | Any |
+| GET | `/api/card/asset-search/:hostId` | Search by Ivanti host ID | Any |
+| POST | `/api/card/owner/:assetId/confirm` | Confirm ownership | Standard_User+ |
+| POST | `/api/card/owner/:assetId/decline` | Decline ownership | Standard_User+ |
+| POST | `/api/card/owner/:assetId/redirect` | Redirect ownership | Standard_User+ |
+| GET | `/api/card/teams` | List all CARD teams | Any |
+
+### Other
+
+| Method | Path | Description | Group |
+|--------|------|-------------|-------|
+| GET | `/api/audit-logs` | Query audit trail | Admin |
+| GET | `/api/nvd/:cveId` | NVD metadata lookup | Any |
+| GET/POST | `/api/knowledge-base` | Document library CRUD | Any / Standard_User+ |
+| GET/POST | `/api/archer-tickets` | Archer ticket CRUD | Any / Standard_User+ |
+| GET/POST | `/api/archer-templates` | Template library CRUD | Any / Standard_User+ |
+| GET | `/api/notifications` | User notifications | Any |
+| POST | `/api/feedback` | Submit bug/feature to GitLab | Any |
+
+---
+
+## CI/CD Pipeline
+
+Defined in `.gitlab-ci.yml`. Stages: install, lint, test, build, deploy, verify.
+
+| Stage | What it does |
+|-------|-------------|
+| install | `npm ci` for root + frontend |
+| lint | ESLint on frontend (warning threshold: 25) |
+| test | Jest backend property tests + frontend unit tests |
+| build | `npm run build` in frontend/ |
+| deploy-staging | rsync to 71.85.90.9, run migrations, restart service (auto on master) |
+| deploy-production | rsync to 71.85.90.6, run migrations, restart service (manual trigger) |
+| verify | Hit `/api/health` endpoint, post issue comments for `Closes #N` references |
+
+**Runner:** Docker executor on LXC 108 (71.85.90.8), Runner #6, `node:18` image for build stages, `alpine:latest` for deploy.
+
+**Required CI/CD variables:** `DATABASE_URL`, `SSH_PRIVATE_KEY` (base64), `GITLAB_PAT`.
+
+---
 
 ## Documentation
 
 - **[Full Reference Manual](docs/guides/full-reference-manual.md)** — comprehensive feature documentation, API reference, database schema, security model, and configuration details
+- **[VCL Metric Calculations](docs/guides/vcl-metric-calculations.md)** — formula reference for CCP Metrics compliance calculations
 - **[Postgres Migration Plan](docs/guides/postgres-migration-plan.md)** — architecture decisions, schema design, and cutover procedure for the SQLite to PostgreSQL migration
 - **[Migration Guide](backend/migrations/README.md)** — schema migration scripts for upgrading existing deployments
-- **[Design System](docs/design/design-system.md)** — UI component patterns and color system
+- **[Design System](docs/design/design-system.md)** — UI component patterns and colour system
 - **[Ivanti API Reference](docs/api/ivanti-api-reference.md)** — Ivanti/RiskSense API integration details
 - **[Jira API Use Cases](docs/api/jira-api-use-cases.md)** — Jira Data Center API compliance summary
+- **[AD/SAML Integration Architecture](docs/architecture/ad-saml-integration.md)** — planned Active Directory / SAML SSO integration
+- **[Security Audit Tracker](docs/security/security-audit-tracker.md)** — living security audit document
+
+---
+
+## Troubleshooting
+
+### Backend fails to start with "FATAL: SESSION_SECRET"
+
+**Symptom:** Server exits immediately with `FATAL: SESSION_SECRET environment variable must be set`.
+
+**Cause:** The `SESSION_SECRET` env var is not configured in `backend/.env`.
+
+**Fix:** Generate a secret and add it to `backend/.env`:
+```bash
+echo "SESSION_SECRET=$(openssl rand -base64 32)" >> backend/.env
+```
+
+### Database connection refused
+
+**Symptom:** Backend logs `Error: connect ECONNREFUSED` on startup.
+
+**Cause:** PostgreSQL container is not running or `DATABASE_URL` is misconfigured.
+
+**Fix:**
+```bash
+docker compose up -d    # Start the Postgres container
+# Verify DATABASE_URL in backend/.env matches: postgresql://steam:<password>@localhost:5433/cve_dashboard
+```
+
+### CARD API timeouts in production
+
+**Symptom:** CARD tooltip shows timeout errors or takes minutes to respond.
+
+**Cause:** IPv6 AAAA records for `card.charter.com` are unreachable from this network. Node.js defaults to trying IPv6 first.
+
+**Fix:** The backend sets `dns.setDefaultResultOrder('ipv4first')` globally. If you still see issues, verify the setting is at the top of `server.js` before any network imports.
+
+### Compliance upload fails with "No items parsed"
+
+**Symptom:** Upload completes but reports 0 new, 0 resolved, 0 recurring items.
+
+**Cause:** The xlsx file structure does not match the expected format (sheet names, column headers).
+
+**Fix:** Ensure the compliance xlsx has the expected sheet layout. Check `backend/scripts/parse_compliance_xlsx.py` for the expected column mappings.
+
+### Missing migrations after deploy
+
+**Symptom:** API returns 500 errors referencing missing columns or tables.
+
+**Cause:** Migrations were not run after pulling new code.
+
+**Fix:**
+```bash
+cd backend && node migrations/run-all.js
+```
+
+### Frontend changes not visible after deploy
+
+**Symptom:** UI still shows old version after code changes.
+
+**Cause:** The frontend must be rebuilt after any source changes — Express serves the static build.
+
+**Fix:**
+```bash
+cd frontend && npm run build
+# Restart backend or refresh the browser
+```
+
+---
 
 ## License
 

backend/__tests__/compliance-per-metric-metadata.test.js

@@ -0,0 +1,380 @@
+/**
+ * Unit Tests: PATCH /api/compliance/items/:hostname/metadata — Per-Metric Scoping
+ *
+ * Feature: remediation-plan-history (per-metric extension)
+ *
+ * Tests cover:
+ * - Task 8.1: metric_id/metric_ids validation, precedence, non-empty/max 100 chars, active item check
+ * - Task 8.2: Per-metric SELECT, INSERT history per metric, UPDATE only matching rows
+ * - Task 8.3: Hostname-level behavior preserved with NULL metric_id in history
+ *
+ * Validates: Requirements 8, 11, 15
+ */
+
+const http = require('http');
+const express = require('express');
+
+// Mock auth middleware
+jest.mock('../middleware/auth', () => ({
+    requireAuth: () => (req, res, next) => {
+        req.user = { id: 1, username: 'testuser', group: 'Admin' };
+        next();
+    },
+    requireGroup: () => (req, res, next) => next(),
+}));
+
+// Mock audit log as a no-op
+jest.mock('../helpers/auditLog', () => jest.fn());
+
+// Mock ivantiApi
+jest.mock('../helpers/ivantiApi', () => ({
+    ivantiFormPost: jest.fn(),
+    ivantiPost: jest.fn(),
+}));
+
+// Mock driftChecker
+jest.mock('../helpers/driftChecker', () => ({
+    loadConfig: jest.fn(() => ({})),
+    compareSchemaToDrift: jest.fn(() => null),
+    reconcileConfig: jest.fn(() => ({ changes: [] })),
+}));
+
+// Mock the db pool
+const mockPool = {
+    query: jest.fn(() => Promise.resolve({ rows: [], rowCount: 0 })),
+    connect: jest.fn(),
+};
+jest.mock('../db', () => mockPool);
+
+const { createComplianceRouter } = require('../routes/compliance');
+
+// --- HTTP helper ---
+
+function request(server, method, path, body) {
+    return new Promise((resolve, reject) => {
+        const addr = server.address();
+        const options = {
+            hostname: '127.0.0.1',
+            port: addr.port,
+            path,
+            method,
+            headers: { 'Content-Type': 'application/json' },
+        };
+
+        const req = http.request(options, (res) => {
+            const chunks = [];
+            res.on('data', (chunk) => chunks.push(chunk));
+            res.on('end', () => {
+                const rawBody = Buffer.concat(chunks).toString();
+                let json;
+                try { json = JSON.parse(rawBody); } catch (e) { json = null; }
+                resolve({ statusCode: res.statusCode, body: json });
+            });
+        });
+
+        req.on('error', reject);
+        if (body) req.write(JSON.stringify(body));
+        req.end();
+    });
+}
+
+// --- Setup ---
+
+let app, server;
+
+beforeAll((done) => {
+    app = express();
+    app.use(express.json());
+    const mockUpload = { single: () => (req, res, next) => next() };
+    app.use('/api/compliance', createComplianceRouter(mockUpload));
+    server = app.listen(0, '127.0.0.1', done);
+});
+
+afterAll((done) => {
+    server.close(done);
+});
+
+beforeEach(() => {
+    jest.clearAllMocks();
+});
+
+// --- Task 8.1: Validation ---
+
+describe('Task 8.1: metric_id/metric_ids validation', () => {
+    it('returns 400 when metric_ids is not an array', async () => {
+        const res = await request(server, 'PATCH', '/api/compliance/items/srv-001/metadata', {
+            resolution_date: '2026-06-15',
+            metric_ids: 'not-an-array',
+        });
+        expect(res.statusCode).toBe(400);
+        expect(res.body.error).toBe('metric_ids must be an array');
+    });
+
+    it('returns 400 when metric_ids is empty array', async () => {
+        const res = await request(server, 'PATCH', '/api/compliance/items/srv-001/metadata', {
+            resolution_date: '2026-06-15',
+            metric_ids: [],
+        });
+        expect(res.statusCode).toBe(400);
+        expect(res.body.error).toBe('metric_ids must contain at least one entry');
+    });
+
+    it('returns 400 when metric_ids contains empty string', async () => {
+        const res = await request(server, 'PATCH', '/api/compliance/items/srv-001/metadata', {
+            resolution_date: '2026-06-15',
+            metric_ids: ['2.1.1', ''],
+        });
+        expect(res.statusCode).toBe(400);
+        expect(res.body.error).toBe('metric_id cannot be empty');
+    });
+
+    it('returns 400 when metric_id exceeds 100 characters', async () => {
+        const longId = 'x'.repeat(101);
+        const res = await request(server, 'PATCH', '/api/compliance/items/srv-001/metadata', {
+            resolution_date: '2026-06-15',
+            metric_ids: [longId],
+        });
+        expect(res.statusCode).toBe(400);
+        expect(res.body.error).toBe('metric_id exceeds 100 characters');
+    });
+
+    it('returns 400 when single metric_id is empty string', async () => {
+        const res = await request(server, 'PATCH', '/api/compliance/items/srv-001/metadata', {
+            resolution_date: '2026-06-15',
+            metric_id: '',
+        });
+        expect(res.statusCode).toBe(400);
+        expect(res.body.error).toBe('metric_id cannot be empty');
+    });
+
+    it('returns 400 when single metric_id exceeds 100 characters', async () => {
+        const longId = 'x'.repeat(101);
+        const res = await request(server, 'PATCH', '/api/compliance/items/srv-001/metadata', {
+            resolution_date: '2026-06-15',
+            metric_id: longId,
+        });
+        expect(res.statusCode).toBe(400);
+        expect(res.body.error).toBe('metric_id exceeds 100 characters');
+    });
+
+    it('returns 400 when metric_id does not correspond to active compliance_item', async () => {
+        const mockClient = {
+            query: jest.fn()
+                .mockResolvedValueOnce({ rows: [], rowCount: 0 }) // BEGIN
+                .mockResolvedValueOnce({ rows: [], rowCount: 0 }) // SELECT active metrics — none found
+                .mockResolvedValueOnce({ rows: [], rowCount: 0 }), // ROLLBACK
+            release: jest.fn(),
+        };
+        mockPool.connect.mockResolvedValueOnce(mockClient);
+
+        const res = await request(server, 'PATCH', '/api/compliance/items/srv-001/metadata', {
+            resolution_date: '2026-06-15',
+            metric_ids: ['nonexistent-metric'],
+        });
+        expect(res.statusCode).toBe(400);
+        expect(res.body.error).toContain('Invalid metric_id: nonexistent-metric');
+    });
+
+    it('uses metric_ids when both metric_id and metric_ids are provided', async () => {
+        // metric_ids wins — should validate metric_ids, not metric_id
+        const mockClient = {
+            query: jest.fn()
+                .mockResolvedValueOnce({ rows: [], rowCount: 0 }) // BEGIN
+                .mockResolvedValueOnce({ rows: [{ metric_id: '3.1.1', resolution_date: null, remediation_plan: null }], rowCount: 1 }) // SELECT active metrics
+                .mockResolvedValueOnce({ rows: [], rowCount: 1 }) // INSERT history
+                .mockResolvedValueOnce({ rows: [], rowCount: 1 }) // UPDATE
+                .mockResolvedValueOnce({ rows: [], rowCount: 0 }), // COMMIT
+            release: jest.fn(),
+        };
+        mockPool.connect.mockResolvedValueOnce(mockClient);
+
+        const res = await request(server, 'PATCH', '/api/compliance/items/srv-001/metadata', {
+            resolution_date: '2026-06-15',
+            metric_id: '2.1.1',       // should be ignored
+            metric_ids: ['3.1.1'],    // should be used
+        });
+        expect(res.statusCode).toBe(200);
+        // Verify the SELECT query used metric_ids value ['3.1.1'], not metric_id '2.1.1'
+        const selectCall = mockClient.query.mock.calls[1];
+        expect(selectCall[1]).toEqual(['srv-001', ['3.1.1']]);
+    });
+});
+
+// --- Task 8.2: Per-metric scoping behavior ---
+
+describe('Task 8.2: Per-metric SELECT, INSERT history, UPDATE matching rows', () => {
+    it('selects current values per targeted metric and inserts history per metric', async () => {
+        const mockClient = {
+            query: jest.fn()
+                .mockResolvedValueOnce({ rows: [], rowCount: 0 }) // BEGIN
+                .mockResolvedValueOnce({ rows: [
+                    { metric_id: '2.1.1', resolution_date: '2026-01-01', remediation_plan: 'Plan A' },
+                    { metric_id: '2.3.2', resolution_date: '2026-02-01', remediation_plan: 'Plan B' },
+                ], rowCount: 2 }) // SELECT active metrics with current values
+                .mockResolvedValueOnce({ rows: [], rowCount: 1 }) // INSERT history for 2.1.1 resolution_date
+                .mockResolvedValueOnce({ rows: [], rowCount: 1 }) // INSERT history for 2.1.1 remediation_plan
+                .mockResolvedValueOnce({ rows: [], rowCount: 1 }) // INSERT history for 2.3.2 resolution_date
+                .mockResolvedValueOnce({ rows: [], rowCount: 1 }) // INSERT history for 2.3.2 remediation_plan
+                .mockResolvedValueOnce({ rows: [], rowCount: 2 }) // UPDATE matching rows
+                .mockResolvedValueOnce({ rows: [], rowCount: 0 }), // COMMIT
+            release: jest.fn(),
+        };
+        mockPool.connect.mockResolvedValueOnce(mockClient);
+
+        const res = await request(server, 'PATCH', '/api/compliance/items/srv-001/metadata', {
+            resolution_date: '2026-06-15',
+            remediation_plan: 'New unified plan',
+            metric_ids: ['2.1.1', '2.3.2'],
+        });
+
+        expect(res.statusCode).toBe(200);
+        expect(res.body.updated).toBe(2);
+
+        // Verify history inserts include metric_id
+        const calls = mockClient.query.mock.calls;
+        // Call [2] = INSERT history for 2.1.1 resolution_date
+        expect(calls[2][0]).toContain('INSERT INTO compliance_item_history');
+        expect(calls[2][1][1]).toBe('2.1.1'); // metric_id
+        expect(calls[2][1][2]).toBe('2026-01-01'); // old_value
+        expect(calls[2][1][3]).toBe('2026-06-15'); // new_value
+
+        // Call [3] = INSERT history for 2.1.1 remediation_plan
+        expect(calls[3][1][1]).toBe('2.1.1');
+        expect(calls[3][1][2]).toBe('Plan A'); // old_value
+        expect(calls[3][1][3]).toBe('New unified plan'); // new_value
+
+        // Call [4] = INSERT history for 2.3.2 resolution_date
+        expect(calls[4][1][1]).toBe('2.3.2');
+        expect(calls[4][1][2]).toBe('2026-02-01'); // old_value
+
+        // Call [5] = INSERT history for 2.3.2 remediation_plan
+        expect(calls[5][1][1]).toBe('2.3.2');
+        expect(calls[5][1][2]).toBe('Plan B'); // old_value
+    });
+
+    it('skips history insert when value is unchanged for a specific metric', async () => {
+        const mockClient = {
+            query: jest.fn()
+                .mockResolvedValueOnce({ rows: [], rowCount: 0 }) // BEGIN
+                .mockResolvedValueOnce({ rows: [
+                    { metric_id: '2.1.1', resolution_date: '2026-06-15', remediation_plan: null },
+                ], rowCount: 1 }) // SELECT — already has the target date
+                .mockResolvedValueOnce({ rows: [], rowCount: 1 }) // UPDATE (no history inserts since value unchanged)
+                .mockResolvedValueOnce({ rows: [], rowCount: 0 }), // COMMIT
+            release: jest.fn(),
+        };
+        mockPool.connect.mockResolvedValueOnce(mockClient);
+
+        const res = await request(server, 'PATCH', '/api/compliance/items/srv-001/metadata', {
+            resolution_date: '2026-06-15',
+            metric_ids: ['2.1.1'],
+        });
+
+        expect(res.statusCode).toBe(200);
+        // No INSERT history calls — only BEGIN, SELECT, UPDATE, COMMIT
+        const calls = mockClient.query.mock.calls;
+        expect(calls.length).toBe(4);
+        expect(calls[2][0]).toContain('UPDATE compliance_items');
+    });
+
+    it('updates only matching rows with metric_id = ANY filter', async () => {
+        const mockClient = {
+            query: jest.fn()
+                .mockResolvedValueOnce({ rows: [], rowCount: 0 }) // BEGIN
+                .mockResolvedValueOnce({ rows: [
+                    { metric_id: '2.1.1', resolution_date: null, remediation_plan: null },
+                ], rowCount: 1 }) // SELECT
+                .mockResolvedValueOnce({ rows: [], rowCount: 1 }) // INSERT history
+                .mockResolvedValueOnce({ rows: [], rowCount: 1 }) // UPDATE
+                .mockResolvedValueOnce({ rows: [], rowCount: 0 }), // COMMIT
+            release: jest.fn(),
+        };
+        mockPool.connect.mockResolvedValueOnce(mockClient);
+
+        const res = await request(server, 'PATCH', '/api/compliance/items/srv-001/metadata', {
+            resolution_date: '2026-06-15',
+            metric_id: '2.1.1',
+        });
+
+        expect(res.statusCode).toBe(200);
+        // Verify UPDATE query includes metric_id = ANY filter
+        const updateCall = mockClient.query.mock.calls[3];
+        expect(updateCall[0]).toContain('metric_id = ANY');
+        expect(updateCall[0]).toContain("status = 'active'");
+        expect(updateCall[1]).toContain('srv-001');
+        expect(updateCall[1]).toEqual(expect.arrayContaining([['2.1.1']]));
+    });
+});
+
+// --- Task 8.3: Hostname-level behavior preserved ---
+
+describe('Task 8.3: Hostname-level behavior with NULL metric_id', () => {
+    it('updates all active rows when no metric_id/metric_ids provided', async () => {
+        const mockClient = {
+            query: jest.fn()
+                .mockResolvedValueOnce({ rows: [], rowCount: 0 }) // BEGIN
+                .mockResolvedValueOnce({ rows: [{ resolution_date: null, remediation_plan: null }], rowCount: 1 }) // SELECT current
+                .mockResolvedValueOnce({ rows: [], rowCount: 1 }) // INSERT history
+                .mockResolvedValueOnce({ rows: [], rowCount: 5 }) // UPDATE all active rows
+                .mockResolvedValueOnce({ rows: [], rowCount: 0 }), // COMMIT
+            release: jest.fn(),
+        };
+        mockPool.connect.mockResolvedValueOnce(mockClient);
+
+        const res = await request(server, 'PATCH', '/api/compliance/items/srv-001/metadata', {
+            resolution_date: '2026-06-15',
+        });
+
+        expect(res.statusCode).toBe(200);
+        expect(res.body.updated).toBe(5);
+
+        // Verify UPDATE does NOT include metric_id filter
+        const updateCall = mockClient.query.mock.calls[3];
+        expect(updateCall[0]).not.toContain('metric_id');
+        expect(updateCall[0]).toContain("status = 'active'");
+    });
+
+    it('inserts history with NULL metric_id when no metric scoping', async () => {
+        const mockClient = {
+            query: jest.fn()
+                .mockResolvedValueOnce({ rows: [], rowCount: 0 }) // BEGIN
+                .mockResolvedValueOnce({ rows: [{ resolution_date: '2026-01-01', remediation_plan: 'Old plan' }], rowCount: 1 }) // SELECT current
+                .mockResolvedValueOnce({ rows: [], rowCount: 1 }) // INSERT history (resolution_date)
+                .mockResolvedValueOnce({ rows: [], rowCount: 1 }) // INSERT history (remediation_plan)
+                .mockResolvedValueOnce({ rows: [], rowCount: 3 }) // UPDATE
+                .mockResolvedValueOnce({ rows: [], rowCount: 0 }), // COMMIT
+            release: jest.fn(),
+        };
+        mockPool.connect.mockResolvedValueOnce(mockClient);
+
+        const res = await request(server, 'PATCH', '/api/compliance/items/srv-001/metadata', {
+            resolution_date: '2026-06-15',
+            remediation_plan: 'New plan',
+        });
+
+        expect(res.statusCode).toBe(200);
+
+        // Verify history INSERT includes NULL for metric_id
+        const historyCall1 = mockClient.query.mock.calls[2];
+        expect(historyCall1[0]).toContain('INSERT INTO compliance_item_history');
+        expect(historyCall1[0]).toContain('NULL');
+    });
+
+    it('returns 404 when hostname has no active items (hostname-level path)', async () => {
+        const mockClient = {
+            query: jest.fn()
+                .mockResolvedValueOnce({ rows: [], rowCount: 0 }) // BEGIN
+                .mockResolvedValueOnce({ rows: [], rowCount: 0 }) // SELECT current — empty
+                .mockResolvedValueOnce({ rows: [], rowCount: 0 }), // ROLLBACK
+            release: jest.fn(),
+        };
+        mockPool.connect.mockResolvedValueOnce(mockClient);
+
+        const res = await request(server, 'PATCH', '/api/compliance/items/srv-001/metadata', {
+            resolution_date: '2026-06-15',
+        });
+
+        expect(res.statusCode).toBe(404);
+        expect(res.body.error).toBe('Device not found');
+    });
+});

backend/__tests__/compliance-remediation-display-fix.exploration.property.test.js

@@ -0,0 +1,216 @@
+/**
+ * Bug Condition Exploration Property Test: Compliance Remediation Display Fix
+ *
+ * Spec: .kiro/specs/compliance-remediation-display-fix/ (bugfix)
+ *
+ * BUG CONDITION:
+ *   isBugCondition(row) = row.resolution_date != null OR row.remediation_plan != null
+ *   Any row with metadata set will lose it through groupByHostname() because the
+ *   function does not propagate resolution_date or remediation_plan into device objects.
+ *
+ * THIS TEST IS EXPECTED TO FAIL ON UNFIXED CODE.
+ * Failure confirms the bug exists — resolution_date and remediation_plan are undefined
+ * in the grouped device objects returned by groupByHostname().
+ *
+ * **Validates: Requirements 1.1, 1.2, 2.2**
+ */
+
+const fc = require('fast-check');
+
+// --- Mocks (must be installed BEFORE requiring the route module) ---
+
+jest.mock('../middleware/auth', () => ({
+    requireAuth: () => (req, res, next) => next(),
+    requireGroup: () => (req, res, next) => next(),
+}));
+
+jest.mock('../helpers/auditLog', () => jest.fn());
+
+jest.mock('../helpers/driftChecker', () => ({
+    loadConfig: jest.fn(() => ({})),
+    compareSchemaToDrift: jest.fn(() => null),
+    reconcileConfig: jest.fn(() => ({ changes: [] })),
+}));
+
+jest.mock('../helpers/vclHelpers', () => ({
+    isValidDateString: jest.fn(() => true),
+    validateRemediationPlan: jest.fn(() => ({ valid: true })),
+    computeVCLStats: jest.fn(() => ({})),
+    categorizeNonCompliant: jest.fn(() => []),
+    rankHeavyHitters: jest.fn(() => []),
+    computeForecastBurndown: jest.fn(() => ({})),
+    matchByHostname: jest.fn(() => []),
+    computeBulkDiff: jest.fn(() => ({})),
+    mapColumnHeaders: jest.fn(() => ({})),
+}));
+
+const mockPool = {
+    query: jest.fn(() => Promise.resolve({ rows: [], rowCount: 0 })),
+    connect: jest.fn(() => Promise.resolve({
+        query: jest.fn(() => Promise.resolve({ rows: [], rowCount: 0 })),
+        release: jest.fn(),
+    })),
+};
+jest.mock('../db', () => mockPool);
+
+const { groupByHostname } = require('../routes/compliance');
+
+// --- Generators ---
+
+/** Generate a date string in YYYY-MM-DD format (avoid toISOString on shrunk invalid dates) */
+const arbDateString = fc.tuple(
+    fc.integer({ min: 2020, max: 2030 }),
+    fc.integer({ min: 1, max: 12 }),
+    fc.integer({ min: 1, max: 28 })
+).map(([y, m, d]) => `${y}-${String(m).padStart(2, '0')}-${String(d).padStart(2, '0')}`);
+
+/** Generate a non-empty remediation plan string */
+const arbRemediationPlan = fc.string({ minLength: 1, maxLength: 200 }).filter(s => s.trim().length > 0);
+
+/** Generate a hostname (alphanumeric with dashes, realistic) */
+const arbHostname = fc.stringMatching(/^[A-Z][A-Z0-9\-]{2,20}$/);
+
+/** Generate a metric_id like "7.1.1" or "3.2" */
+const arbMetricId = fc.tuple(
+    fc.integer({ min: 1, max: 9 }),
+    fc.integer({ min: 1, max: 9 }),
+    fc.integer({ min: 1, max: 9 })
+).map(([a, b, c]) => `${a}.${b}.${c}`);
+
+/**
+ * Generate a compliance row with non-null resolution_date and/or remediation_plan.
+ * This is the bug condition: rows that have metadata which should be propagated.
+ */
+const arbComplianceRowWithMetadata = fc.record({
+    hostname: arbHostname,
+    ip_address: fc.ipV4(),
+    device_type: fc.constantFrom('Switch', 'Router', 'Firewall', 'Server'),
+    team: fc.constantFrom('STEAM', 'ACCESS-ENG'),
+    status: fc.constant('active'),
+    metric_id: arbMetricId,
+    metric_desc: fc.string({ minLength: 3, maxLength: 50 }),
+    category: fc.constantFrom('Configuration', 'Patching', 'Access Control'),
+    seen_count: fc.integer({ min: 1, max: 20 }),
+    first_seen: arbDateString,
+    last_seen: arbDateString,
+    resolved_on: fc.constant(null),
+    resolution_date: arbDateString,
+    remediation_plan: arbRemediationPlan,
+});
+
+// --- Property Test ---
+
+describe('Bug Condition Exploration: resolution_date and remediation_plan in groupByHostname()', () => {
+    it('Property 1: groupByHostname() should propagate resolution_date from rows to device objects', () => {
+        fc.assert(
+            fc.property(arbComplianceRowWithMetadata, (row) => {
+                const rows = [row];
+                const noteHostnames = new Set();
+                const devices = groupByHostname(rows, noteHostnames);
+
+                // There should be exactly one device for the single hostname
+                expect(devices).toHaveLength(1);
+                const device = devices[0];
+
+                // BUG CONDITION: resolution_date should be propagated but is undefined on unfixed code
+                expect(device.resolution_date).toBe(row.resolution_date);
+            }),
+            { numRuns: 100 }
+        );
+    });
+
+    it('Property 2: groupByHostname() should propagate remediation_plan from rows to device objects', () => {
+        fc.assert(
+            fc.property(arbComplianceRowWithMetadata, (row) => {
+                const rows = [row];
+                const noteHostnames = new Set();
+                const devices = groupByHostname(rows, noteHostnames);
+
+                expect(devices).toHaveLength(1);
+                const device = devices[0];
+
+                // BUG CONDITION: remediation_plan should be propagated but is undefined on unfixed code
+                expect(device.remediation_plan).toBe(row.remediation_plan);
+            }),
+            { numRuns: 100 }
+        );
+    });
+
+    it('Property 3: groupByHostname() should pick first non-null resolution_date across multiple rows for same hostname', () => {
+        fc.assert(
+            fc.property(
+                arbHostname,
+                fc.array(arbMetricId, { minLength: 2, maxLength: 5 }),
+                arbDateString,
+                (hostname, metricIds, resolutionDate) => {
+                    // Create multiple rows for the same hostname, first row has resolution_date
+                    const rows = metricIds.map((mid, idx) => ({
+                        hostname,
+                        ip_address: '10.0.0.1',
+                        device_type: 'Switch',
+                        team: 'STEAM',
+                        status: 'active',
+                        metric_id: mid,
+                        metric_desc: `Metric ${mid}`,
+                        category: 'Configuration',
+                        seen_count: 1,
+                        first_seen: '2025-01-01',
+                        last_seen: '2025-06-01',
+                        resolved_on: null,
+                        resolution_date: idx === 0 ? resolutionDate : null,
+                        remediation_plan: null,
+                    }));
+
+                    const noteHostnames = new Set();
+                    const devices = groupByHostname(rows, noteHostnames);
+
+                    expect(devices).toHaveLength(1);
+                    const device = devices[0];
+
+                    // The first non-null resolution_date should be propagated
+                    expect(device.resolution_date).toBe(resolutionDate);
+                }
+            ),
+            { numRuns: 100 }
+        );
+    });
+
+    it('Property 4: groupByHostname() should pick first non-null remediation_plan across multiple rows for same hostname', () => {
+        fc.assert(
+            fc.property(
+                arbHostname,
+                fc.array(arbMetricId, { minLength: 2, maxLength: 5 }),
+                arbRemediationPlan,
+                (hostname, metricIds, plan) => {
+                    // Create multiple rows for the same hostname, first row has remediation_plan
+                    const rows = metricIds.map((mid, idx) => ({
+                        hostname,
+                        ip_address: '10.0.0.1',
+                        device_type: 'Switch',
+                        team: 'STEAM',
+                        status: 'active',
+                        metric_id: mid,
+                        metric_desc: `Metric ${mid}`,
+                        category: 'Configuration',
+                        seen_count: 1,
+                        first_seen: '2025-01-01',
+                        last_seen: '2025-06-01',
+                        resolved_on: null,
+                        resolution_date: null,
+                        remediation_plan: idx === 0 ? plan : null,
+                    }));
+
+                    const noteHostnames = new Set();
+                    const devices = groupByHostname(rows, noteHostnames);
+
+                    expect(devices).toHaveLength(1);
+                    const device = devices[0];
+
+                    // The first non-null remediation_plan should be propagated
+                    expect(device.remediation_plan).toBe(plan);
+                }
+            ),
+            { numRuns: 100 }
+        );
+    });
+});

backend/__tests__/compliance-remediation-display-fix.preservation.property.test.js

@@ -0,0 +1,333 @@
+/**
+ * Preservation Property Tests: Compliance Remediation Display Fix
+ *
+ * Spec: .kiro/specs/compliance-remediation-display-fix/ (bugfix)
+ *
+ * These tests verify that groupByHostname() correctly aggregates existing fields
+ * on UNFIXED code. They should PASS on unfixed code — they capture baseline
+ * behaviour that must be preserved through the fix.
+ *
+ * Properties tested:
+ *   P2.A — Each device.hostname appears exactly once in output
+ *   P2.B — device.failing_metrics contains no duplicate metric_ids
+ *   P2.C — device.seen_count >= every row's seen_count for that hostname
+ *   P2.D — device.first_seen <= every row's first_seen for that hostname
+ *   P2.E — device.last_seen >= every row's last_seen for that hostname
+ *   P2.F — device.has_notes matches noteHostnames membership
+ *
+ * **Validates: Requirements 3.3, 3.5**
+ */
+
+const fc = require('fast-check');
+
+// Mock dependencies required by the compliance module
+jest.mock('../middleware/auth', () => ({
+    requireAuth: () => (req, res, next) => next(),
+    requireGroup: () => (req, res, next) => next(),
+}));
+jest.mock('../helpers/auditLog', () => jest.fn());
+jest.mock('../db', () => ({
+    query: jest.fn(() => Promise.resolve({ rows: [], rowCount: 0 })),
+    connect: jest.fn(() => Promise.resolve({ query: jest.fn(), release: jest.fn() })),
+}));
+
+const { groupByHostname } = require('../routes/compliance');
+
+// --- Generators ---
+
+/**
+ * Generate a valid hostname string (alphanumeric + hyphens, 1-20 chars).
+ */
+const hostnameArb = fc.stringMatching(/^[A-Z][A-Z0-9\-]{0,14}$/);
+
+/**
+ * Generate a metric_id string like "7.1.1", "7.2.3", etc.
+ */
+const metricIdArb = fc.tuple(
+    fc.integer({ min: 1, max: 9 }),
+    fc.integer({ min: 1, max: 9 }),
+    fc.integer({ min: 1, max: 9 })
+).map(([a, b, c]) => `${a}.${b}.${c}`);
+
+/**
+ * Generate a date string in YYYY-MM-DD format for first_seen/last_seen.
+ */
+const dateArb = fc.tuple(
+    fc.integer({ min: 2023, max: 2025 }),
+    fc.integer({ min: 1, max: 12 }),
+    fc.integer({ min: 1, max: 28 })
+).map(([y, m, d]) => `${y}-${String(m).padStart(2, '0')}-${String(d).padStart(2, '0')}`);
+
+/**
+ * Generate a compliance row with resolution_date = null and remediation_plan = null
+ * (non-bug-condition inputs — these are the rows that should work correctly on unfixed code).
+ */
+function complianceRowArb(hostname, metricId) {
+    return fc.record({
+        hostname: fc.constant(hostname),
+        ip_address: fc.constantFrom('10.0.0.1', '10.0.0.2', '192.168.1.1', ''),
+        device_type: fc.constantFrom('Switch', 'Router', 'Firewall', ''),
+        team: fc.constantFrom('STEAM', 'ACCESS-ENG'),
+        status: fc.constantFrom('active', 'resolved'),
+        metric_id: fc.constant(metricId),
+        metric_desc: fc.constantFrom('Password Complexity', 'Firmware Version', 'Logging Enabled'),
+        category: fc.constantFrom('Configuration', 'Patching', 'Monitoring'),
+        seen_count: fc.integer({ min: 1, max: 20 }),
+        first_seen: dateArb,
+        last_seen: dateArb,
+        resolved_on: fc.constant(null),
+        resolution_date: fc.constant(null),
+        remediation_plan: fc.constant(null),
+    });
+}
+
+/**
+ * Generate an array of compliance rows with varying hostnames and metric_ids.
+ * Ensures at least 1 row, with 1-4 hostnames and 1-5 metrics per hostname.
+ */
+const complianceRowsArb = fc.tuple(
+    fc.array(hostnameArb, { minLength: 1, maxLength: 4 }),
+    fc.array(metricIdArb, { minLength: 1, maxLength: 5 })
+).chain(([hostnames, metricIds]) => {
+    // Ensure unique hostnames and metric_ids
+    const uniqueHostnames = [...new Set(hostnames)];
+    const uniqueMetricIds = [...new Set(metricIds)];
+
+    if (uniqueHostnames.length === 0 || uniqueMetricIds.length === 0) {
+        // Fallback: generate at least one row
+        return complianceRowArb('HOST-A', '1.1.1').map(row => [row]);
+    }
+
+    // Generate rows: each hostname gets some subset of metric_ids
+    // Some hostnames may share metric_ids (same metric failing on different devices)
+    const rowArbs = [];
+    for (const hostname of uniqueHostnames) {
+        // Each hostname gets 1 to all metric_ids
+        const metricsForHost = uniqueMetricIds.slice(0, Math.max(1, Math.ceil(Math.random() * uniqueMetricIds.length)));
+        for (const metricId of metricsForHost) {
+            rowArbs.push(complianceRowArb(hostname, metricId));
+        }
+    }
+
+    return fc.tuple(...rowArbs).map(rows => rows);
+});
+
+/**
+ * Better generator: explicitly controls the structure to ensure good coverage.
+ * Generates 1-3 hostnames, each with 1-4 rows (possibly duplicate metric_ids to test dedup).
+ */
+const structuredRowsArb = fc.record({
+    numHostnames: fc.integer({ min: 1, max: 3 }),
+    numMetricsPerHost: fc.integer({ min: 1, max: 4 }),
+    allowDuplicateMetrics: fc.boolean(),
+}).chain(({ numHostnames, numMetricsPerHost, allowDuplicateMetrics }) => {
+    const hostnameArbs = fc.array(hostnameArb, { minLength: numHostnames, maxLength: numHostnames });
+    const metricArbs = fc.array(metricIdArb, { minLength: numMetricsPerHost, maxLength: numMetricsPerHost });
+
+    return fc.tuple(hostnameArbs, metricArbs).chain(([hostnames, metrics]) => {
+        const uniqueHostnames = [...new Set(hostnames)];
+        if (uniqueHostnames.length === 0) return fc.constant([]);
+
+        const rowArbs = [];
+        for (const hostname of uniqueHostnames) {
+            const metricsToUse = allowDuplicateMetrics
+                ? metrics  // May have duplicates
+                : [...new Set(metrics)];
+
+            for (const metricId of metricsToUse) {
+                rowArbs.push(complianceRowArb(hostname, metricId));
+            }
+            // Add an extra duplicate row for the first metric to test dedup
+            if (allowDuplicateMetrics && metricsToUse.length > 0) {
+                rowArbs.push(complianceRowArb(hostname, metricsToUse[0]));
+            }
+        }
+
+        if (rowArbs.length === 0) return fc.constant([]);
+        return fc.tuple(...rowArbs).map(rows => rows);
+    });
+});
+
+
+// =============================================================================
+// Property P2.A — Each device.hostname appears exactly once in output
+// =============================================================================
+//
+// **Validates: Requirements 3.3, 3.5**
+//
+describe('Property P2.A — Each device.hostname appears exactly once in output', () => {
+    it('P2.A — groupByHostname produces one device per unique hostname', () => {
+        fc.assert(
+            fc.property(structuredRowsArb, (rows) => {
+                if (rows.length === 0) return;
+
+                const noteHostnames = new Set();
+                const devices = groupByHostname(rows, noteHostnames);
+
+                // Each hostname in the output should appear exactly once
+                const outputHostnames = devices.map(d => d.hostname);
+                const uniqueOutputHostnames = new Set(outputHostnames);
+                expect(outputHostnames.length).toBe(uniqueOutputHostnames.size);
+
+                // Every hostname from input should appear in output
+                const inputHostnames = new Set(rows.map(r => r.hostname));
+                for (const hostname of inputHostnames) {
+                    expect(uniqueOutputHostnames.has(hostname)).toBe(true);
+                }
+            }),
+            { numRuns: 100 },
+        );
+    });
+});
+
+
+// =============================================================================
+// Property P2.B — device.failing_metrics contains no duplicate metric_ids
+// =============================================================================
+//
+// **Validates: Requirements 3.3, 3.5**
+//
+describe('Property P2.B — device.failing_metrics contains no duplicate metric_ids', () => {
+    it('P2.B — groupByHostname deduplicates metrics by metric_id', () => {
+        fc.assert(
+            fc.property(structuredRowsArb, (rows) => {
+                if (rows.length === 0) return;
+
+                const noteHostnames = new Set();
+                const devices = groupByHostname(rows, noteHostnames);
+
+                for (const device of devices) {
+                    const metricIds = device.failing_metrics.map(m => m.metric_id);
+                    const uniqueMetricIds = new Set(metricIds);
+                    expect(metricIds.length).toBe(uniqueMetricIds.size);
+                }
+            }),
+            { numRuns: 100 },
+        );
+    });
+});
+
+
+// =============================================================================
+// Property P2.C — device.seen_count >= every row's seen_count for that hostname
+// =============================================================================
+//
+// **Validates: Requirements 3.3, 3.5**
+//
+describe('Property P2.C — device.seen_count >= every row seen_count for that hostname', () => {
+    it('P2.C — groupByHostname picks the maximum seen_count across rows', () => {
+        fc.assert(
+            fc.property(structuredRowsArb, (rows) => {
+                if (rows.length === 0) return;
+
+                const noteHostnames = new Set();
+                const devices = groupByHostname(rows, noteHostnames);
+
+                for (const device of devices) {
+                    const rowsForHost = rows.filter(r => r.hostname === device.hostname);
+                    for (const row of rowsForHost) {
+                        expect(device.seen_count).toBeGreaterThanOrEqual(row.seen_count);
+                    }
+                }
+            }),
+            { numRuns: 100 },
+        );
+    });
+});
+
+
+// =============================================================================
+// Property P2.D — device.first_seen <= every row's first_seen for that hostname
+// =============================================================================
+//
+// **Validates: Requirements 3.3, 3.5**
+//
+describe('Property P2.D — device.first_seen <= every row first_seen for that hostname', () => {
+    it('P2.D — groupByHostname picks the earliest first_seen across rows', () => {
+        fc.assert(
+            fc.property(structuredRowsArb, (rows) => {
+                if (rows.length === 0) return;
+
+                const noteHostnames = new Set();
+                const devices = groupByHostname(rows, noteHostnames);
+
+                for (const device of devices) {
+                    const rowsForHost = rows.filter(r => r.hostname === device.hostname);
+                    for (const row of rowsForHost) {
+                        if (row.first_seen && device.first_seen) {
+                            expect(device.first_seen <= row.first_seen).toBe(true);
+                        }
+                    }
+                }
+            }),
+            { numRuns: 100 },
+        );
+    });
+});
+
+
+// =============================================================================
+// Property P2.E — device.last_seen >= every row's last_seen for that hostname
+// =============================================================================
+//
+// **Validates: Requirements 3.3, 3.5**
+//
+describe('Property P2.E — device.last_seen >= every row last_seen for that hostname', () => {
+    it('P2.E — groupByHostname picks the latest last_seen across rows', () => {
+        fc.assert(
+            fc.property(structuredRowsArb, (rows) => {
+                if (rows.length === 0) return;
+
+                const noteHostnames = new Set();
+                const devices = groupByHostname(rows, noteHostnames);
+
+                for (const device of devices) {
+                    const rowsForHost = rows.filter(r => r.hostname === device.hostname);
+                    for (const row of rowsForHost) {
+                        if (row.last_seen && device.last_seen) {
+                            expect(device.last_seen >= row.last_seen).toBe(true);
+                        }
+                    }
+                }
+            }),
+            { numRuns: 100 },
+        );
+    });
+});
+
+
+// =============================================================================
+// Property P2.F — device.has_notes matches noteHostnames membership
+// =============================================================================
+//
+// **Validates: Requirements 3.3, 3.5**
+//
+describe('Property P2.F — device.has_notes matches noteHostnames membership', () => {
+    it('P2.F — groupByHostname sets has_notes based on noteHostnames Set', () => {
+        fc.assert(
+            fc.property(
+                structuredRowsArb,
+                fc.array(hostnameArb, { minLength: 0, maxLength: 3 }),
+                (rows, noteHosts) => {
+                    if (rows.length === 0) return;
+
+                    // Build noteHostnames set — include some from input, some random
+                    const inputHostnames = [...new Set(rows.map(r => r.hostname))];
+                    const noteHostnames = new Set([
+                        ...noteHosts,
+                        // Include some actual hostnames from input to test true case
+                        ...inputHostnames.slice(0, Math.ceil(inputHostnames.length / 2)),
+                    ]);
+
+                    const devices = groupByHostname(rows, noteHostnames);
+
+                    for (const device of devices) {
+                        const expected = noteHostnames.has(device.hostname);
+                        expect(device.has_notes).toBe(expected);
+                    }
+                },
+            ),
+            { numRuns: 100 },
+        );
+    });
+});

backend/__tests__/ivanti-queue-clear-completed-fix.property.test.js

@@ -0,0 +1,576 @@
+/**
+ * Bug Condition Exploration Property Test: Ivanti Queue Clear Completed FK Violation
+ *
+ * Spec: .kiro/specs/ivanti-queue-clear-completed-fix/ (bugfix)
+ *
+ * BUG CONDITION (from design.md):
+ *   isBugCondition(input) returns true when linkedItems.length > 0
+ *   — completed queue items have associated rows in jira_ticket_queue_items
+ *
+ * The current DELETE /completed handler issues a bare:
+ *   DELETE FROM ivanti_todo_queue WHERE user_id = $1 AND status = 'complete'
+ * which fails with a FK violation when child rows exist in jira_ticket_queue_items.
+ *
+ * THIS TEST ENCODES THE EXPECTED (FIXED) BEHAVIOR:
+ *   The handler should delete junction table references first, then delete
+ *   completed queue items, all within a transaction, and return success.
+ *
+ * ON UNFIXED CODE, THIS TEST WILL FAIL:
+ *   The current handler does not use transactions or clean up junction rows.
+ *   When pool.query receives the bare DELETE and junction rows exist, the mock
+ *   simulates the FK violation error that PostgreSQL would throw.
+ *   The handler catches the error and returns 500 instead of the expected 200.
+ *
+ * COUNTEREXAMPLE:
+ *   "DELETE FROM ivanti_todo_queue fails with FK violation when junction rows
+ *    reference completed items"
+ *
+ * **Validates: Requirements 1.1**
+ */
+
+const http = require('http');
+const express = require('express');
+const fc = require('fast-check');
+
+// --- Mocks (must be installed BEFORE requiring the route module) ---
+
+jest.mock('../middleware/auth', () => ({
+    requireAuth: () => (req, _res, next) => {
+        req.user = { id: 42, username: 'testuser', group: 'Admin' };
+        next();
+    },
+    requireGroup: () => (_req, _res, next) => next(),
+}));
+
+jest.mock('../helpers/auditLog', () => jest.fn());
+
+// Programmable pg pool mock
+let queryHandler = () => Promise.resolve({ rows: [], rowCount: 0 });
+
+const mockClient = {
+    query: jest.fn((text, params) => queryHandler(text, params)),
+    release: jest.fn(),
+};
+
+const mockPool = {
+    query: jest.fn((text, params) => queryHandler(text, params)),
+    connect: jest.fn(() => Promise.resolve(mockClient)),
+};
+
+jest.mock('../db', () => mockPool);
+
+const createIvantiTodoQueueRouter = require('../routes/ivantiTodoQueue');
+
+// --- HTTP helper ---
+
+function request(server, method, urlPath) {
+    return new Promise((resolve, reject) => {
+        const addr = server.address();
+        const options = {
+            hostname: '127.0.0.1',
+            port: addr.port,
+            path: urlPath,
+            method,
+            headers: { 'Content-Type': 'application/json' },
+        };
+        const req = http.request(options, (res) => {
+            const chunks = [];
+            res.on('data', (chunk) => chunks.push(chunk));
+            res.on('end', () => {
+                const raw = Buffer.concat(chunks).toString();
+                let body;
+                try { body = JSON.parse(raw); } catch { body = raw; }
+                resolve({ statusCode: res.statusCode, body });
+            });
+        });
+        req.on('error', reject);
+        req.end();
+    });
+}
+
+// --- Generators ---
+
+/**
+ * Generate a non-empty array of completed queue item IDs (simulating items
+ * that belong to the authenticated user and have status = 'complete').
+ */
+const completedItemIdsArb = fc.array(
+    fc.integer({ min: 1, max: 10000 }),
+    { minLength: 1, maxLength: 10 }
+).map(ids => [...new Set(ids)]); // ensure unique IDs
+
+/**
+ * Generate junction table links for a subset of completed items.
+ * At least one item MUST have a junction link (this is the bug condition).
+ */
+const junctionLinksArb = (itemIds) => {
+    // Generate at least 1 junction link, up to 3 per item
+    return fc.array(
+        fc.record({
+            jira_ticket_id: fc.integer({ min: 1, max: 5000 }),
+            queue_item_id: fc.constantFrom(...itemIds),
+        }),
+        { minLength: 1, maxLength: Math.min(itemIds.length * 3, 15) }
+    );
+};
+
+// --- Test Suite ---
+
+describe('Bug Condition Exploration: FK Violation on Clear Completed With Junction Table Links', () => {
+    let app;
+    let server;
+
+    beforeAll((done) => {
+        app = express();
+        app.use(express.json());
+        app.use('/api/ivanti/todo-queue', createIvantiTodoQueueRouter());
+        server = app.listen(0, '127.0.0.1', done);
+    });
+
+    afterAll((done) => {
+        server.close(done);
+    });
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+        mockClient.query.mockReset();
+        mockClient.release.mockReset();
+        mockPool.query.mockReset();
+        mockPool.connect.mockReset();
+        mockPool.connect.mockResolvedValue(mockClient);
+        queryHandler = () => Promise.resolve({ rows: [], rowCount: 0 });
+    });
+
+    /**
+     * Property 1: Bug Condition - FK Violation on Clear Completed With Junction Table Links
+     *
+     * For any set of completed queue items where at least one has junction table links,
+     * the FIXED handler should:
+     *   1. Use a transaction (BEGIN/COMMIT)
+     *   2. Delete junction table references first
+     *   3. Delete the completed queue items
+     *   4. Return 200 with { message, deleted: N }
+     *
+     * On UNFIXED code: The handler uses a bare pool.query DELETE which will receive
+     * a FK violation error from our mock (simulating PostgreSQL behavior), causing
+     * the handler to return 500. This test FAILS, confirming the bug exists.
+     *
+     * **Validates: Requirements 1.1**
+     */
+    it('Property 1: completed items with junction links are deleted successfully (encodes expected fixed behavior)', async () => {
+        await fc.assert(
+            fc.asyncProperty(
+                completedItemIdsArb,
+                fc.context(),
+                async (itemIds, ctx) => {
+                    // Generate junction links for these items
+                    const junctionLinks = itemIds.map(id => ({
+                        jira_ticket_id: id * 10,
+                        queue_item_id: id,
+                    }));
+
+                    ctx.log(`Testing with ${itemIds.length} completed items, ${junctionLinks.length} junction links`);
+                    ctx.log(`Item IDs: ${JSON.stringify(itemIds)}`);
+
+                    // Reset mocks for this iteration
+                    mockClient.query.mockReset();
+                    mockClient.release.mockReset();
+                    mockPool.query.mockReset();
+                    mockPool.connect.mockReset();
+                    mockPool.connect.mockResolvedValue(mockClient);
+
+                    // Configure the query handler to simulate the bug condition:
+                    // - If the code uses pool.query with a bare DELETE on ivanti_todo_queue,
+                    //   simulate the FK violation error (this is what the UNFIXED code does)
+                    // - If the code uses a transaction (BEGIN, SELECT, DELETE junction, DELETE queue, COMMIT),
+                    //   simulate successful execution (this is what the FIXED code should do)
+                    const fkViolationError = new Error(
+                        'update or delete on table "ivanti_todo_queue" violates foreign key constraint ' +
+                        '"jira_ticket_queue_items_queue_item_id_fkey" on table "jira_ticket_queue_items"'
+                    );
+                    fkViolationError.code = '23503'; // PostgreSQL FK violation error code
+
+                    // Handler for pool.query (unfixed code path)
+                    mockPool.query.mockImplementation((text, params) => {
+                        // The unfixed code issues a bare DELETE — simulate FK violation
+                        if (text.includes('DELETE FROM ivanti_todo_queue')) {
+                            return Promise.reject(fkViolationError);
+                        }
+                        return Promise.resolve({ rows: [], rowCount: 0 });
+                    });
+
+                    // Handler for client.query (fixed code path — transaction-based)
+                    mockClient.query.mockImplementation((text, params) => {
+                        if (text === 'BEGIN') {
+                            return Promise.resolve({ rows: [], rowCount: 0 });
+                        }
+                        if (text.includes('SELECT') && text.includes('ivanti_todo_queue') && text.includes('complete')) {
+                            return Promise.resolve({
+                                rows: itemIds.map(id => ({ id })),
+                                rowCount: itemIds.length,
+                            });
+                        }
+                        if (text.includes('DELETE FROM jira_ticket_queue_items')) {
+                            return Promise.resolve({
+                                rows: [],
+                                rowCount: junctionLinks.length,
+                            });
+                        }
+                        if (text.includes('DELETE FROM ivanti_todo_queue')) {
+                            return Promise.resolve({
+                                rows: [],
+                                rowCount: itemIds.length,
+                            });
+                        }
+                        if (text === 'COMMIT') {
+                            return Promise.resolve({ rows: [], rowCount: 0 });
+                        }
+                        if (text === 'ROLLBACK') {
+                            return Promise.resolve({ rows: [], rowCount: 0 });
+                        }
+                        return Promise.resolve({ rows: [], rowCount: 0 });
+                    });
+
+                    // Make the request
+                    const res = await request(server, 'DELETE', '/api/ivanti/todo-queue/completed');
+
+                    // Assert EXPECTED (fixed) behavior:
+                    // The handler should return 200 with the correct deleted count
+                    expect(res.statusCode).toBe(200);
+                    expect(res.body.message).toBe('Completed items cleared.');
+                    expect(res.body.deleted).toBe(itemIds.length);
+                }
+            ),
+            { numRuns: 20, verbose: 2 }
+        );
+    });
+});
+
+
+// --- Preservation Property Tests ---
+
+/**
+ * Property 2: Preservation - Clear Completed Without Junction Table Links
+ *
+ * Spec: .kiro/specs/ivanti-queue-clear-completed-fix/ (bugfix)
+ *
+ * PRESERVATION GOAL:
+ *   Verify that the UNFIXED code already handles non-bug-condition cases correctly.
+ *   These tests establish a baseline that must be preserved after the fix is applied.
+ *
+ * NON-BUG-CONDITION CASES:
+ *   - Completed items WITHOUT junction table links → DELETE succeeds, returns count
+ *   - No completed items exist → returns { deleted: 0 }
+ *   - Pending/in-progress items → never touched by the DELETE
+ *
+ * The current handler uses:
+ *   pool.query("DELETE FROM ivanti_todo_queue WHERE user_id = $1 AND status = 'complete'", [req.user.id])
+ * This works correctly when no FK violations occur (no junction table references).
+ *
+ * EXPECTED OUTCOME: All tests PASS on unfixed code.
+ *
+ * **Validates: Requirements 3.1, 3.2, 3.3**
+ */
+
+describe('Preservation: Clear Completed Without Junction Table Links', () => {
+    let app;
+    let server;
+
+    beforeAll((done) => {
+        app = express();
+        app.use(express.json());
+        app.use('/api/ivanti/todo-queue', createIvantiTodoQueueRouter());
+        server = app.listen(0, '127.0.0.1', done);
+    });
+
+    afterAll((done) => {
+        server.close(done);
+    });
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+        mockClient.query.mockReset();
+        mockClient.release.mockReset();
+        mockPool.query.mockReset();
+        mockPool.connect.mockReset();
+        mockPool.connect.mockResolvedValue(mockClient);
+        queryHandler = () => Promise.resolve({ rows: [], rowCount: 0 });
+    });
+
+    /**
+     * Property 2a: Completed items without junction links are all deleted
+     *
+     * For any random count of completed items (1–20) belonging to the user,
+     * when none have junction table links, the DELETE succeeds and returns
+     * the correct count.
+     *
+     * The fixed code uses a transaction (client.query) so we mock client.query
+     * to simulate successful execution without FK violations.
+     *
+     * **Validates: Requirements 3.1**
+     */
+    it('Property 2a: completed items without junction links are deleted and correct count returned', async () => {
+        await fc.assert(
+            fc.asyncProperty(
+                fc.integer({ min: 1, max: 20 }),
+                fc.context(),
+                async (completedCount, ctx) => {
+                    ctx.log(`Testing with ${completedCount} completed items (no junction links)`);
+
+                    // Reset mocks for this iteration
+                    mockClient.query.mockReset();
+                    mockClient.release.mockReset();
+                    mockPool.connect.mockReset();
+                    mockPool.connect.mockResolvedValue(mockClient);
+
+                    // Generate item IDs
+                    const itemIds = Array.from({ length: completedCount }, (_, i) => i + 1);
+
+                    // Mock client.query for the transaction-based handler
+                    mockClient.query.mockImplementation((text, params) => {
+                        if (text === 'BEGIN') return Promise.resolve({ rows: [], rowCount: 0 });
+                        if (text.includes('SELECT') && text.includes('ivanti_todo_queue') && text.includes('complete')) {
+                            return Promise.resolve({ rows: itemIds.map(id => ({ id })), rowCount: completedCount });
+                        }
+                        if (text.includes('DELETE FROM jira_ticket_queue_items')) {
+                            return Promise.resolve({ rows: [], rowCount: 0 }); // no junction links
+                        }
+                        if (text.includes('DELETE FROM ivanti_todo_queue')) {
+                            return Promise.resolve({ rows: [], rowCount: completedCount });
+                        }
+                        if (text === 'COMMIT') return Promise.resolve({ rows: [], rowCount: 0 });
+                        if (text === 'ROLLBACK') return Promise.resolve({ rows: [], rowCount: 0 });
+                        return Promise.resolve({ rows: [], rowCount: 0 });
+                    });
+
+                    const res = await request(server, 'DELETE', '/api/ivanti/todo-queue/completed');
+
+                    // Assert preservation behavior
+                    expect(res.statusCode).toBe(200);
+                    expect(res.body.message).toBe('Completed items cleared.');
+                    expect(res.body.deleted).toBe(completedCount);
+                }
+            ),
+            { numRuns: 30, verbose: 2 }
+        );
+    });
+
+    /**
+     * Property 2b: When no completed items exist, returns deleted: 0
+     *
+     * When the user has no completed items, the SELECT returns empty rows
+     * and the endpoint returns { message: 'Completed items cleared.', deleted: 0 }.
+     *
+     * **Validates: Requirements 3.2**
+     */
+    it('Property 2b: no completed items returns deleted: 0', async () => {
+        await fc.assert(
+            fc.asyncProperty(
+                fc.constant(null),
+                fc.context(),
+                async (_unused, ctx) => {
+                    ctx.log('Testing with 0 completed items');
+
+                    // Reset mocks for this iteration
+                    mockClient.query.mockReset();
+                    mockClient.release.mockReset();
+                    mockPool.connect.mockReset();
+                    mockPool.connect.mockResolvedValue(mockClient);
+
+                    // Mock client.query: SELECT returns empty rows (no completed items)
+                    mockClient.query.mockImplementation((text, params) => {
+                        if (text === 'BEGIN') return Promise.resolve({ rows: [], rowCount: 0 });
+                        if (text.includes('SELECT') && text.includes('ivanti_todo_queue') && text.includes('complete')) {
+                            return Promise.resolve({ rows: [], rowCount: 0 });
+                        }
+                        if (text === 'COMMIT') return Promise.resolve({ rows: [], rowCount: 0 });
+                        if (text === 'ROLLBACK') return Promise.resolve({ rows: [], rowCount: 0 });
+                        return Promise.resolve({ rows: [], rowCount: 0 });
+                    });
+
+                    const res = await request(server, 'DELETE', '/api/ivanti/todo-queue/completed');
+
+                    expect(res.statusCode).toBe(200);
+                    expect(res.body.message).toBe('Completed items cleared.');
+                    expect(res.body.deleted).toBe(0);
+                }
+            ),
+            { numRuns: 5, verbose: 2 }
+        );
+    });
+
+    /**
+     * Property 2c: Pending/in-progress items are never touched
+     *
+     * The SELECT query only fetches items with status = 'complete' for the user.
+     * We verify the query text and parameters to ensure non-complete items
+     * are never affected.
+     *
+     * **Validates: Requirements 3.3**
+     */
+    it('Property 2c: DELETE only targets complete status for the authenticated user', async () => {
+        await fc.assert(
+            fc.asyncProperty(
+                fc.integer({ min: 0, max: 15 }),
+                fc.context(),
+                async (completedCount, ctx) => {
+                    ctx.log(`Testing query targeting with ${completedCount} completed items`);
+
+                    // Reset mocks for this iteration
+                    mockClient.query.mockReset();
+                    mockClient.release.mockReset();
+                    mockPool.connect.mockReset();
+                    mockPool.connect.mockResolvedValue(mockClient);
+
+                    // Track the queries issued via client
+                    const queriesIssued = [];
+                    const itemIds = Array.from({ length: completedCount }, (_, i) => i + 1);
+
+                    mockClient.query.mockImplementation((text, params) => {
+                        queriesIssued.push({ text, params });
+                        if (text === 'BEGIN') return Promise.resolve({ rows: [], rowCount: 0 });
+                        if (text.includes('SELECT') && text.includes('ivanti_todo_queue') && text.includes('complete')) {
+                            return Promise.resolve({ rows: itemIds.map(id => ({ id })), rowCount: completedCount });
+                        }
+                        if (text.includes('DELETE FROM jira_ticket_queue_items')) {
+                            return Promise.resolve({ rows: [], rowCount: 0 });
+                        }
+                        if (text.includes('DELETE FROM ivanti_todo_queue')) {
+                            return Promise.resolve({ rows: [], rowCount: completedCount });
+                        }
+                        if (text === 'COMMIT') return Promise.resolve({ rows: [], rowCount: 0 });
+                        if (text === 'ROLLBACK') return Promise.resolve({ rows: [], rowCount: 0 });
+                        return Promise.resolve({ rows: [], rowCount: 0 });
+                    });
+
+                    const res = await request(server, 'DELETE', '/api/ivanti/todo-queue/completed');
+
+                    expect(res.statusCode).toBe(200);
+
+                    // Verify the SELECT query targets only complete status for user 42
+                    const selectQueries = queriesIssued.filter(q => q.text.includes('SELECT') && q.text.includes('complete'));
+                    expect(selectQueries.length).toBeGreaterThanOrEqual(1);
+
+                    for (const q of selectQueries) {
+                        expect(q.text).toMatch(/status\s*=\s*'\s*complete\s*'/i);
+                        expect(q.text).toMatch(/user_id\s*=/i);
+                        expect(q.params).toContain(42);
+                    }
+                }
+            ),
+            { numRuns: 20, verbose: 2 }
+        );
+    });
+
+    /**
+     * Property 2d: Other users' items remain untouched
+     *
+     * The SELECT query is parameterized with req.user.id (mocked as 42).
+     * For any random count of completed items, the query only affects user 42's items.
+     * We verify the user_id parameter is always the authenticated user's ID.
+     *
+     * **Validates: Requirements 3.1, 3.3**
+     */
+    it('Property 2d: DELETE is scoped to the authenticated user only', async () => {
+        await fc.assert(
+            fc.asyncProperty(
+                fc.integer({ min: 1, max: 10 }),
+                fc.context(),
+                async (completedCount, ctx) => {
+                    ctx.log(`Testing user isolation with ${completedCount} completed items`);
+
+                    // Reset mocks for this iteration
+                    mockClient.query.mockReset();
+                    mockClient.release.mockReset();
+                    mockPool.connect.mockReset();
+                    mockPool.connect.mockResolvedValue(mockClient);
+
+                    const queriesIssued = [];
+                    const itemIds = Array.from({ length: completedCount }, (_, i) => i + 1);
+
+                    mockClient.query.mockImplementation((text, params) => {
+                        queriesIssued.push({ text, params });
+                        if (text === 'BEGIN') return Promise.resolve({ rows: [], rowCount: 0 });
+                        if (text.includes('SELECT') && text.includes('ivanti_todo_queue') && text.includes('complete')) {
+                            return Promise.resolve({ rows: itemIds.map(id => ({ id })), rowCount: completedCount });
+                        }
+                        if (text.includes('DELETE FROM jira_ticket_queue_items')) {
+                            return Promise.resolve({ rows: [], rowCount: 0 });
+                        }
+                        if (text.includes('DELETE FROM ivanti_todo_queue')) {
+                            return Promise.resolve({ rows: [], rowCount: completedCount });
+                        }
+                        if (text === 'COMMIT') return Promise.resolve({ rows: [], rowCount: 0 });
+                        if (text === 'ROLLBACK') return Promise.resolve({ rows: [], rowCount: 0 });
+                        return Promise.resolve({ rows: [], rowCount: 0 });
+                    });
+
+                    const res = await request(server, 'DELETE', '/api/ivanti/todo-queue/completed');
+
+                    expect(res.statusCode).toBe(200);
+                    expect(res.body.deleted).toBe(completedCount);
+
+                    // Verify the SELECT query is scoped to user 42
+                    const selectQueries = queriesIssued.filter(q => q.text.includes('SELECT') && q.text.includes('user_id'));
+                    for (const q of selectQueries) {
+                        expect(q.params).toContain(42); // req.user.id from mock
+                    }
+                }
+            ),
+            { numRuns: 20, verbose: 2 }
+        );
+    });
+
+    /**
+     * Property 2e: Response shape is always { message: string, deleted: number }
+     *
+     * For any random count of completed items (including 0), the response
+     * always has the correct shape with message as a string and deleted as a number.
+     *
+     * **Validates: Requirements 3.1, 3.2**
+     */
+    it('Property 2e: response shape is { message: string, deleted: number }', async () => {
+        await fc.assert(
+            fc.asyncProperty(
+                fc.integer({ min: 0, max: 50 }),
+                fc.context(),
+                async (completedCount, ctx) => {
+                    ctx.log(`Testing response shape with deleted count: ${completedCount}`);
+
+                    // Reset mocks for this iteration
+                    mockClient.query.mockReset();
+                    mockClient.release.mockReset();
+                    mockPool.connect.mockReset();
+                    mockPool.connect.mockResolvedValue(mockClient);
+
+                    const itemIds = Array.from({ length: completedCount }, (_, i) => i + 1);
+
+                    mockClient.query.mockImplementation((text, params) => {
+                        if (text === 'BEGIN') return Promise.resolve({ rows: [], rowCount: 0 });
+                        if (text.includes('SELECT') && text.includes('ivanti_todo_queue') && text.includes('complete')) {
+                            return Promise.resolve({ rows: itemIds.map(id => ({ id })), rowCount: completedCount });
+                        }
+                        if (text.includes('DELETE FROM jira_ticket_queue_items')) {
+                            return Promise.resolve({ rows: [], rowCount: 0 });
+                        }
+                        if (text.includes('DELETE FROM ivanti_todo_queue')) {
+                            return Promise.resolve({ rows: [], rowCount: completedCount });
+                        }
+                        if (text === 'COMMIT') return Promise.resolve({ rows: [], rowCount: 0 });
+                        if (text === 'ROLLBACK') return Promise.resolve({ rows: [], rowCount: 0 });
+                        return Promise.resolve({ rows: [], rowCount: 0 });
+                    });
+
+                    const res = await request(server, 'DELETE', '/api/ivanti/todo-queue/completed');
+
+                    expect(res.statusCode).toBe(200);
+                    expect(typeof res.body.message).toBe('string');
+                    expect(typeof res.body.deleted).toBe('number');
+                    expect(res.body.message).toBe('Completed items cleared.');
+                    expect(res.body.deleted).toBe(completedCount);
+                }
+            ),
+            { numRuns: 25, verbose: 2 }
+        );
+    });
+});

backend/__tests__/ivanti-queue-clear-completed-fix.test.js

@@ -0,0 +1,371 @@
+/**
+ * Unit tests for DELETE /api/ivanti/todo-queue/completed transaction logic
+ *
+ * Spec: .kiro/specs/ivanti-queue-clear-completed-fix/ (bugfix)
+ *
+ * Validates: Requirements 2.1, 2.2, 3.1, 3.2
+ *
+ * Tests verify:
+ * - Correct query sequence within a transaction (BEGIN → SELECT → DELETE junction → DELETE queue → COMMIT)
+ * - ROLLBACK is called when any query in the transaction fails
+ * - Client is always released in the finally block (even on error)
+ * - Empty completed set triggers early COMMIT and returns { deleted: 0 }
+ * - Response shape is { message: 'Completed items cleared.', deleted: N }
+ */
+const http = require('http');
+const express = require('express');
+
+// --- Mocks ---
+
+jest.mock('../middleware/auth', () => ({
+    requireAuth: () => (req, _res, next) => {
+        req.user = { id: 7, username: 'testuser', group: 'Admin' };
+        next();
+    },
+    requireGroup: () => (_req, _res, next) => next(),
+}));
+
+jest.mock('../helpers/auditLog', () => jest.fn());
+
+const mockClient = {
+    query: jest.fn(),
+    release: jest.fn(),
+};
+
+const mockPool = {
+    query: jest.fn(),
+    connect: jest.fn(() => Promise.resolve(mockClient)),
+};
+
+jest.mock('../db', () => mockPool);
+
+const createIvantiTodoQueueRouter = require('../routes/ivantiTodoQueue');
+
+// --- HTTP helper ---
+
+function request(server, method, urlPath) {
+    return new Promise((resolve, reject) => {
+        const addr = server.address();
+        const options = {
+            hostname: '127.0.0.1',
+            port: addr.port,
+            path: urlPath,
+            method,
+            headers: { 'Content-Type': 'application/json' },
+        };
+        const req = http.request(options, (res) => {
+            const chunks = [];
+            res.on('data', (chunk) => chunks.push(chunk));
+            res.on('end', () => {
+                const raw = Buffer.concat(chunks).toString();
+                let body;
+                try { body = JSON.parse(raw); } catch { body = raw; }
+                resolve({ statusCode: res.statusCode, body });
+            });
+        });
+        req.on('error', reject);
+        req.end();
+    });
+}
+
+// --- Test Suite ---
+
+describe('DELETE /api/ivanti/todo-queue/completed — Transaction Logic', () => {
+    let app;
+    let server;
+
+    beforeAll((done) => {
+        app = express();
+        app.use(express.json());
+        app.use('/api/ivanti/todo-queue', createIvantiTodoQueueRouter());
+        server = app.listen(0, '127.0.0.1', done);
+    });
+
+    afterAll((done) => {
+        server.close(done);
+    });
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+        mockClient.query.mockReset();
+        mockClient.release.mockReset();
+        mockPool.connect.mockReset();
+        mockPool.connect.mockResolvedValue(mockClient);
+    });
+
+    /**
+     * Test 1: Correct query sequence
+     * Validates: Requirements 2.1, 2.2
+     *
+     * Verifies the handler issues queries in the correct order:
+     * BEGIN → SELECT IDs → DELETE junction → DELETE queue → COMMIT
+     */
+    it('executes queries in correct transaction order: BEGIN → SELECT → DELETE junction → DELETE queue → COMMIT', async () => {
+        const completedIds = [10, 20, 30];
+
+        mockClient.query
+            .mockResolvedValueOnce({ rows: [], rowCount: 0 }) // BEGIN
+            .mockResolvedValueOnce({ rows: completedIds.map(id => ({ id })), rowCount: 3 }) // SELECT
+            .mockResolvedValueOnce({ rows: [], rowCount: 2 }) // DELETE junction
+            .mockResolvedValueOnce({ rows: [], rowCount: 3 }) // DELETE queue
+            .mockResolvedValueOnce({ rows: [], rowCount: 0 }); // COMMIT
+
+        const res = await request(server, 'DELETE', '/api/ivanti/todo-queue/completed');
+
+        expect(res.statusCode).toBe(200);
+
+        // Verify query sequence
+        const calls = mockClient.query.mock.calls;
+        expect(calls.length).toBe(5);
+
+        // BEGIN
+        expect(calls[0][0]).toBe('BEGIN');
+
+        // SELECT completed IDs
+        expect(calls[1][0]).toContain('SELECT');
+        expect(calls[1][0]).toContain('ivanti_todo_queue');
+        expect(calls[1][0]).toContain('complete');
+        expect(calls[1][1]).toEqual([7]); // user id
+
+        // DELETE junction table references
+        expect(calls[2][0]).toContain('DELETE FROM jira_ticket_queue_items');
+        expect(calls[2][0]).toContain('ANY');
+        expect(calls[2][1]).toEqual([completedIds]);
+
+        // DELETE queue items
+        expect(calls[3][0]).toContain('DELETE FROM ivanti_todo_queue');
+        expect(calls[3][0]).toContain('ANY');
+        expect(calls[3][1]).toEqual([completedIds]);
+
+        // COMMIT
+        expect(calls[4][0]).toBe('COMMIT');
+    });
+
+    /**
+     * Test 2: ROLLBACK on error
+     * Validates: Requirements 2.1
+     *
+     * Verifies ROLLBACK is called when any query in the transaction fails.
+     */
+    describe('ROLLBACK on error', () => {
+        it('calls ROLLBACK when SELECT query fails', async () => {
+            mockClient.query
+                .mockResolvedValueOnce({ rows: [], rowCount: 0 }) // BEGIN
+                .mockRejectedValueOnce(new Error('SELECT failed')); // SELECT throws
+
+            // After the catch, ROLLBACK is called
+            mockClient.query.mockResolvedValueOnce({ rows: [], rowCount: 0 }); // ROLLBACK
+
+            const res = await request(server, 'DELETE', '/api/ivanti/todo-queue/completed');
+
+            expect(res.statusCode).toBe(500);
+            expect(res.body).toEqual({ error: 'Internal server error.' });
+
+            const calls = mockClient.query.mock.calls;
+            const rollbackCall = calls.find(c => c[0] === 'ROLLBACK');
+            expect(rollbackCall).toBeDefined();
+        });
+
+        it('calls ROLLBACK when DELETE junction query fails', async () => {
+            mockClient.query
+                .mockResolvedValueOnce({ rows: [], rowCount: 0 }) // BEGIN
+                .mockResolvedValueOnce({ rows: [{ id: 1 }, { id: 2 }], rowCount: 2 }) // SELECT
+                .mockRejectedValueOnce(new Error('DELETE junction failed')); // DELETE junction throws
+
+            mockClient.query.mockResolvedValueOnce({ rows: [], rowCount: 0 }); // ROLLBACK
+
+            const res = await request(server, 'DELETE', '/api/ivanti/todo-queue/completed');
+
+            expect(res.statusCode).toBe(500);
+            expect(res.body).toEqual({ error: 'Internal server error.' });
+
+            const calls = mockClient.query.mock.calls;
+            const rollbackCall = calls.find(c => c[0] === 'ROLLBACK');
+            expect(rollbackCall).toBeDefined();
+        });
+
+        it('calls ROLLBACK when DELETE queue query fails', async () => {
+            mockClient.query
+                .mockResolvedValueOnce({ rows: [], rowCount: 0 }) // BEGIN
+                .mockResolvedValueOnce({ rows: [{ id: 5 }], rowCount: 1 }) // SELECT
+                .mockResolvedValueOnce({ rows: [], rowCount: 1 }) // DELETE junction
+                .mockRejectedValueOnce(new Error('DELETE queue failed')); // DELETE queue throws
+
+            mockClient.query.mockResolvedValueOnce({ rows: [], rowCount: 0 }); // ROLLBACK
+
+            const res = await request(server, 'DELETE', '/api/ivanti/todo-queue/completed');
+
+            expect(res.statusCode).toBe(500);
+            expect(res.body).toEqual({ error: 'Internal server error.' });
+
+            const calls = mockClient.query.mock.calls;
+            const rollbackCall = calls.find(c => c[0] === 'ROLLBACK');
+            expect(rollbackCall).toBeDefined();
+        });
+
+        it('calls ROLLBACK when COMMIT fails', async () => {
+            mockClient.query
+                .mockResolvedValueOnce({ rows: [], rowCount: 0 }) // BEGIN
+                .mockResolvedValueOnce({ rows: [{ id: 1 }], rowCount: 1 }) // SELECT
+                .mockResolvedValueOnce({ rows: [], rowCount: 1 }) // DELETE junction
+                .mockResolvedValueOnce({ rows: [], rowCount: 1 }) // DELETE queue
+                .mockRejectedValueOnce(new Error('COMMIT failed')); // COMMIT throws
+
+            mockClient.query.mockResolvedValueOnce({ rows: [], rowCount: 0 }); // ROLLBACK
+
+            const res = await request(server, 'DELETE', '/api/ivanti/todo-queue/completed');
+
+            expect(res.statusCode).toBe(500);
+            expect(res.body).toEqual({ error: 'Internal server error.' });
+
+            const calls = mockClient.query.mock.calls;
+            const rollbackCall = calls.find(c => c[0] === 'ROLLBACK');
+            expect(rollbackCall).toBeDefined();
+        });
+    });
+
+    /**
+     * Test 3: Client always released
+     * Validates: Requirements 2.1
+     *
+     * Verifies client.release() is always called in the finally block,
+     * even when an error occurs.
+     */
+    describe('client always released', () => {
+        it('releases client after successful transaction', async () => {
+            mockClient.query
+                .mockResolvedValueOnce({ rows: [], rowCount: 0 }) // BEGIN
+                .mockResolvedValueOnce({ rows: [{ id: 1 }], rowCount: 1 }) // SELECT
+                .mockResolvedValueOnce({ rows: [], rowCount: 1 }) // DELETE junction
+                .mockResolvedValueOnce({ rows: [], rowCount: 1 }) // DELETE queue
+                .mockResolvedValueOnce({ rows: [], rowCount: 0 }); // COMMIT
+
+            await request(server, 'DELETE', '/api/ivanti/todo-queue/completed');
+
+            expect(mockClient.release).toHaveBeenCalledTimes(1);
+        });
+
+        it('releases client after failed transaction (error in SELECT)', async () => {
+            mockClient.query
+                .mockResolvedValueOnce({ rows: [], rowCount: 0 }) // BEGIN
+                .mockRejectedValueOnce(new Error('DB error')); // SELECT throws
+
+            mockClient.query.mockResolvedValueOnce({ rows: [], rowCount: 0 }); // ROLLBACK
+
+            await request(server, 'DELETE', '/api/ivanti/todo-queue/completed');
+
+            expect(mockClient.release).toHaveBeenCalledTimes(1);
+        });
+
+        it('releases client after failed transaction (error in DELETE)', async () => {
+            mockClient.query
+                .mockResolvedValueOnce({ rows: [], rowCount: 0 }) // BEGIN
+                .mockResolvedValueOnce({ rows: [{ id: 1 }, { id: 2 }], rowCount: 2 }) // SELECT
+                .mockRejectedValueOnce(new Error('FK violation')); // DELETE junction throws
+
+            mockClient.query.mockResolvedValueOnce({ rows: [], rowCount: 0 }); // ROLLBACK
+
+            await request(server, 'DELETE', '/api/ivanti/todo-queue/completed');
+
+            expect(mockClient.release).toHaveBeenCalledTimes(1);
+        });
+
+        it('releases client when empty completed set triggers early return', async () => {
+            mockClient.query
+                .mockResolvedValueOnce({ rows: [], rowCount: 0 }) // BEGIN
+                .mockResolvedValueOnce({ rows: [], rowCount: 0 }) // SELECT (empty)
+                .mockResolvedValueOnce({ rows: [], rowCount: 0 }); // COMMIT
+
+            await request(server, 'DELETE', '/api/ivanti/todo-queue/completed');
+
+            expect(mockClient.release).toHaveBeenCalledTimes(1);
+        });
+    });
+
+    /**
+     * Test 4: Empty completed set
+     * Validates: Requirements 3.1, 3.2
+     *
+     * When SELECT returns no completed items, the handler should:
+     * - Issue COMMIT (not ROLLBACK)
+     * - Return { message: 'Completed items cleared.', deleted: 0 }
+     * - NOT issue any DELETE queries
+     */
+    it('empty completed set triggers early COMMIT and returns { deleted: 0 }', async () => {
+        mockClient.query
+            .mockResolvedValueOnce({ rows: [], rowCount: 0 }) // BEGIN
+            .mockResolvedValueOnce({ rows: [], rowCount: 0 }) // SELECT (empty)
+            .mockResolvedValueOnce({ rows: [], rowCount: 0 }); // COMMIT
+
+        const res = await request(server, 'DELETE', '/api/ivanti/todo-queue/completed');
+
+        expect(res.statusCode).toBe(200);
+        expect(res.body).toEqual({ message: 'Completed items cleared.', deleted: 0 });
+
+        // Verify query sequence: BEGIN → SELECT → COMMIT (no DELETEs)
+        const calls = mockClient.query.mock.calls;
+        expect(calls.length).toBe(3);
+        expect(calls[0][0]).toBe('BEGIN');
+        expect(calls[1][0]).toContain('SELECT');
+        expect(calls[2][0]).toBe('COMMIT');
+
+        // No DELETE queries issued
+        const deleteQueries = calls.filter(c => c[0].includes('DELETE'));
+        expect(deleteQueries.length).toBe(0);
+    });
+
+    /**
+     * Test 5: Response shape preserved
+     * Validates: Requirements 2.2, 3.1
+     *
+     * Verifies the response is always { message: 'Completed items cleared.', deleted: N }
+     */
+    describe('response shape preserved', () => {
+        it('returns correct shape with deleted count matching rowCount', async () => {
+            mockClient.query
+                .mockResolvedValueOnce({ rows: [], rowCount: 0 }) // BEGIN
+                .mockResolvedValueOnce({ rows: [{ id: 1 }, { id: 2 }, { id: 3 }, { id: 4 }, { id: 5 }], rowCount: 5 }) // SELECT
+                .mockResolvedValueOnce({ rows: [], rowCount: 3 }) // DELETE junction
+                .mockResolvedValueOnce({ rows: [], rowCount: 5 }) // DELETE queue
+                .mockResolvedValueOnce({ rows: [], rowCount: 0 }); // COMMIT
+
+            const res = await request(server, 'DELETE', '/api/ivanti/todo-queue/completed');
+
+            expect(res.statusCode).toBe(200);
+            expect(res.body).toEqual({
+                message: 'Completed items cleared.',
+                deleted: 5,
+            });
+        });
+
+        it('returns correct shape with single deleted item', async () => {
+            mockClient.query
+                .mockResolvedValueOnce({ rows: [], rowCount: 0 }) // BEGIN
+                .mockResolvedValueOnce({ rows: [{ id: 99 }], rowCount: 1 }) // SELECT
+                .mockResolvedValueOnce({ rows: [], rowCount: 0 }) // DELETE junction
+                .mockResolvedValueOnce({ rows: [], rowCount: 1 }) // DELETE queue
+                .mockResolvedValueOnce({ rows: [], rowCount: 0 }); // COMMIT
+
+            const res = await request(server, 'DELETE', '/api/ivanti/todo-queue/completed');
+
+            expect(res.statusCode).toBe(200);
+            expect(res.body).toEqual({
+                message: 'Completed items cleared.',
+                deleted: 1,
+            });
+        });
+
+        it('returns error shape on failure', async () => {
+            mockClient.query
+                .mockResolvedValueOnce({ rows: [], rowCount: 0 }) // BEGIN
+                .mockRejectedValueOnce(new Error('Something broke')); // SELECT throws
+
+            mockClient.query.mockResolvedValueOnce({ rows: [], rowCount: 0 }); // ROLLBACK
+
+            const res = await request(server, 'DELETE', '/api/ivanti/todo-queue/completed');
+
+            expect(res.statusCode).toBe(500);
+            expect(res.body).toEqual({ error: 'Internal server error.' });
+        });
+    });
+});

backend/__tests__/ivanti-queue-remediation-notes.property.test.js

@@ -0,0 +1,337 @@
+/**
+ * Property-Based Tests: Ivanti Queue Remediation — Notes System
+ *
+ * Feature: ivanti-queue-remediation
+ *
+ * Tests properties 3–7 from the design document:
+ * - Property 3: Whitespace-only note content is always rejected
+ * - Property 4: Note creation round-trip
+ * - Property 5: Notes returned in descending creation order
+ * - Property 6: Ownership enforcement
+ * - Property 7: Cascade delete removes all associated notes
+ *
+ * These tests validate the pure logic and simulate the API behavior
+ * without requiring a running database.
+ */
+
+const fc = require('fast-check');
+
+// ---------------------------------------------------------------------------
+// Simulate the backend validation and data layer logic
+// ---------------------------------------------------------------------------
+
+/**
+ * Simulates POST /api/ivanti/todo-queue/:id/notes validation logic.
+ * Returns { accepted: boolean, status: number, error?: string }
+ */
+function validateNoteCreation(note_text, queueItemExists, isOwner) {
+    // Ownership check
+    if (!queueItemExists || !isOwner) {
+        return { accepted: false, status: 404, error: 'Queue item not found.' };
+    }
+
+    // Text validation
+    if (!note_text || typeof note_text !== 'string' || note_text.trim().length === 0) {
+        return { accepted: false, status: 400, error: 'Note text is required.' };
+    }
+    if (note_text.length > 5000) {
+        return { accepted: false, status: 400, error: 'Note text must not exceed 5000 characters.' };
+    }
+
+    return { accepted: true, status: 201 };
+}
+
+/**
+ * Simulates a simple in-memory note store for round-trip and ordering tests.
+ */
+class NoteStore {
+    constructor() {
+        this.notes = [];
+        this.nextId = 1;
+        this.queueItems = new Map(); // id -> { user_id }
+    }
+
+    createQueueItem(userId) {
+        const id = this.nextId++;
+        this.queueItems.set(id, { user_id: userId });
+        return id;
+    }
+
+    createNote(queueItemId, userId, username, noteText) {
+        const item = this.queueItems.get(queueItemId);
+        if (!item) return { error: 'Queue item not found.', status: 404 };
+        if (item.user_id !== userId) return { error: 'Queue item not found.', status: 404 };
+        if (!noteText || typeof noteText !== 'string' || noteText.trim().length === 0) {
+            return { error: 'Note text is required.', status: 400 };
+        }
+        if (noteText.length > 5000) {
+            return { error: 'Note text must not exceed 5000 characters.', status: 400 };
+        }
+
+        const note = {
+            id: this.nextId++,
+            queue_item_id: queueItemId,
+            user_id: userId,
+            username,
+            note_text: noteText,
+            created_at: new Date().toISOString(),
+        };
+        this.notes.push(note);
+        return { note, status: 201 };
+    }
+
+    getNotes(queueItemId, userId) {
+        const item = this.queueItems.get(queueItemId);
+        if (!item) return { error: 'Queue item not found.', status: 404 };
+        if (item.user_id !== userId) return { error: 'Queue item not found.', status: 404 };
+
+        const notes = this.notes
+            .filter(n => n.queue_item_id === queueItemId)
+            .sort((a, b) => new Date(b.created_at) - new Date(a.created_at));
+        return { notes, status: 200 };
+    }
+
+    deleteQueueItem(queueItemId) {
+        this.queueItems.delete(queueItemId);
+        // Simulate ON DELETE CASCADE
+        this.notes = this.notes.filter(n => n.queue_item_id !== queueItemId);
+    }
+
+    getNotesForItem(queueItemId) {
+        return this.notes.filter(n => n.queue_item_id === queueItemId);
+    }
+}
+
+// ---------------------------------------------------------------------------
+// Arbitraries
+// ---------------------------------------------------------------------------
+
+// Whitespace-only strings (including empty)
+const arbWhitespaceOnly = fc.oneof(
+    fc.constant(''),
+    fc.array(fc.constantFrom(' ', '\t', '\n', '\r', '\f'), { minLength: 1, maxLength: 50 })
+        .map(arr => arr.join(''))
+);
+
+// Valid note text: 1–5000 chars, at least one non-whitespace
+const arbValidNoteText = fc.string({ minLength: 1, maxLength: 200 }).filter(s => s.trim().length > 0);
+
+// Over-length note text
+const arbOverlengthNoteText = fc.string({ minLength: 5001, maxLength: 5100 });
+
+// User IDs (positive integers)
+const arbUserId = fc.integer({ min: 1, max: 10000 });
+
+// Usernames
+const arbUsername = fc.string({ minLength: 1, maxLength: 50 }).filter(s => s.trim().length > 0);
+
+// Number of notes to create (for ordering test)
+const arbNoteCount = fc.integer({ min: 2, max: 10 });
+
+// ---------------------------------------------------------------------------
+// Property 3: Whitespace-only note content is always rejected
+// **Validates: Requirements 3.5, 4.4, 5.8**
+// ---------------------------------------------------------------------------
+describe('Feature: ivanti-queue-remediation, Property 3: Whitespace-only note content is always rejected', () => {
+    it('rejects any string composed entirely of whitespace characters', () => {
+        fc.assert(
+            fc.property(arbWhitespaceOnly, (noteText) => {
+                const result = validateNoteCreation(noteText, true, true);
+                expect(result.accepted).toBe(false);
+                expect(result.status).toBe(400);
+            }),
+            { numRuns: 100 }
+        );
+    });
+
+    it('rejects undefined and null as note_text', () => {
+        const arbNullish = fc.oneof(fc.constant(undefined), fc.constant(null));
+        fc.assert(
+            fc.property(arbNullish, (noteText) => {
+                const result = validateNoteCreation(noteText, true, true);
+                expect(result.accepted).toBe(false);
+                expect(result.status).toBe(400);
+            }),
+            { numRuns: 10 }
+        );
+    });
+});
+
+// ---------------------------------------------------------------------------
+// Property 4: Note creation round-trip
+// **Validates: Requirements 4.1, 3.3**
+// ---------------------------------------------------------------------------
+describe('Feature: ivanti-queue-remediation, Property 4: Note creation round-trip', () => {
+    it('creates a note and retrieves it with exact same text, correct username, and valid created_at', () => {
+        fc.assert(
+            fc.property(arbValidNoteText, arbUserId, arbUsername, (noteText, userId, username) => {
+                const store = new NoteStore();
+                const itemId = store.createQueueItem(userId);
+
+                const createResult = store.createNote(itemId, userId, username, noteText);
+                expect(createResult.status).toBe(201);
+                expect(createResult.note.note_text).toBe(noteText);
+                expect(createResult.note.username).toBe(username);
+
+                const getResult = store.getNotes(itemId, userId);
+                expect(getResult.status).toBe(200);
+                expect(getResult.notes.length).toBe(1);
+                expect(getResult.notes[0].note_text).toBe(noteText);
+                expect(getResult.notes[0].username).toBe(username);
+                expect(getResult.notes[0].created_at).toBeTruthy();
+                // Verify created_at is a valid ISO timestamp
+                expect(new Date(getResult.notes[0].created_at).toString()).not.toBe('Invalid Date');
+            }),
+            { numRuns: 100 }
+        );
+    });
+});
+
+// ---------------------------------------------------------------------------
+// Property 5: Notes returned in descending creation order
+// **Validates: Requirements 4.2**
+// ---------------------------------------------------------------------------
+describe('Feature: ivanti-queue-remediation, Property 5: Notes returned in descending creation order', () => {
+    it('for N >= 2 notes, GET returns them with created_at in descending order', () => {
+        fc.assert(
+            fc.property(arbNoteCount, arbUserId, arbUsername, (count, userId, username) => {
+                const store = new NoteStore();
+                const itemId = store.createQueueItem(userId);
+
+                // Create N notes
+                for (let i = 0; i < count; i++) {
+                    const result = store.createNote(itemId, userId, username, `Note ${i + 1}`);
+                    expect(result.status).toBe(201);
+                }
+
+                const getResult = store.getNotes(itemId, userId);
+                expect(getResult.status).toBe(200);
+                expect(getResult.notes.length).toBe(count);
+
+                // Verify descending order
+                for (let i = 0; i < getResult.notes.length - 1; i++) {
+                    const current = new Date(getResult.notes[i].created_at);
+                    const next = new Date(getResult.notes[i + 1].created_at);
+                    expect(current.getTime()).toBeGreaterThanOrEqual(next.getTime());
+                }
+            }),
+            { numRuns: 100 }
+        );
+    });
+});
+
+// ---------------------------------------------------------------------------
+// Property 6: Ownership enforcement
+// **Validates: Requirements 4.3**
+// ---------------------------------------------------------------------------
+describe('Feature: ivanti-queue-remediation, Property 6: Ownership enforcement', () => {
+    it('returns 404 when user B attempts to create notes on user A queue item', () => {
+        fc.assert(
+            fc.property(
+                arbUserId,
+                arbUserId.filter(id => id > 1), // ensure we can generate different users
+                arbValidNoteText,
+                arbUsername,
+                (userA, userBOffset, noteText, username) => {
+                    const userB = userA + userBOffset; // guarantee different user
+                    const store = new NoteStore();
+                    const itemId = store.createQueueItem(userA);
+
+                    const result = store.createNote(itemId, userB, username, noteText);
+                    expect(result.status).toBe(404);
+                    expect(result.error).toBe('Queue item not found.');
+                }
+            ),
+            { numRuns: 100 }
+        );
+    });
+
+    it('returns 404 when user B attempts to get notes on user A queue item', () => {
+        fc.assert(
+            fc.property(
+                arbUserId,
+                arbUserId.filter(id => id > 1),
+                arbValidNoteText,
+                arbUsername,
+                (userA, userBOffset, noteText, username) => {
+                    const userB = userA + userBOffset;
+                    const store = new NoteStore();
+                    const itemId = store.createQueueItem(userA);
+
+                    // User A creates a note
+                    store.createNote(itemId, userA, username, noteText);
+
+                    // User B tries to read
+                    const result = store.getNotes(itemId, userB);
+                    expect(result.status).toBe(404);
+                    expect(result.error).toBe('Queue item not found.');
+                }
+            ),
+            { numRuns: 100 }
+        );
+    });
+});
+
+// ---------------------------------------------------------------------------
+// Property 7: Cascade delete removes all associated notes
+// **Validates: Requirements 3.4, 7.3**
+// ---------------------------------------------------------------------------
+describe('Feature: ivanti-queue-remediation, Property 7: Cascade delete removes all associated notes', () => {
+    it('deleting a queue item removes all its associated notes', () => {
+        fc.assert(
+            fc.property(
+                arbNoteCount,
+                arbUserId,
+                arbUsername,
+                (count, userId, username) => {
+                    const store = new NoteStore();
+                    const itemId = store.createQueueItem(userId);
+
+                    // Create N notes
+                    for (let i = 0; i < count; i++) {
+                        store.createNote(itemId, userId, username, `Remediation step ${i + 1}`);
+                    }
+
+                    // Verify notes exist
+                    expect(store.getNotesForItem(itemId).length).toBe(count);
+
+                    // Delete the queue item (simulates CASCADE)
+                    store.deleteQueueItem(itemId);
+
+                    // Verify zero notes remain
+                    expect(store.getNotesForItem(itemId).length).toBe(0);
+                }
+            ),
+            { numRuns: 100 }
+        );
+    });
+
+    it('deleting a queue item does not affect notes for other queue items', () => {
+        fc.assert(
+            fc.property(
+                arbNoteCount,
+                arbUserId,
+                arbUsername,
+                (count, userId, username) => {
+                    const store = new NoteStore();
+                    const itemA = store.createQueueItem(userId);
+                    const itemB = store.createQueueItem(userId);
+
+                    // Create notes for both items
+                    for (let i = 0; i < count; i++) {
+                        store.createNote(itemA, userId, username, `Note A-${i}`);
+                        store.createNote(itemB, userId, username, `Note B-${i}`);
+                    }
+
+                    // Delete item A
+                    store.deleteQueueItem(itemA);
+
+                    // Item B notes are unaffected
+                    expect(store.getNotesForItem(itemB).length).toBe(count);
+                    expect(store.getNotesForItem(itemA).length).toBe(0);
+                }
+            ),
+            { numRuns: 100 }
+        );
+    });
+});

backend/__tests__/ivanti-queue-remediation-vendor-validation.property.test.js

@@ -0,0 +1,141 @@
+/**
+ * Property-Based Tests: Ivanti Queue Remediation — Vendor Validation
+ *
+ * Feature: ivanti-queue-remediation
+ * Property 1: Remediate vendor validation
+ *
+ * For any non-empty string of 1–200 characters (trimmed, with at least one
+ * non-whitespace character), submitting it as the vendor field with workflow_type
+ * "Remediate" to the queue API SHALL be accepted; and for any empty,
+ * whitespace-only, or >200 character vendor string, the request SHALL be
+ * rejected with a 400 status.
+ *
+ * **Validates: Requirements 1.2, 1.3**
+ */
+
+const fc = require('fast-check');
+
+// ---------------------------------------------------------------------------
+// Replicate the pure validation logic from ivantiTodoQueue.js
+// ---------------------------------------------------------------------------
+
+const VALID_WORKFLOW_TYPES = ['FP', 'Archer', 'CARD', 'GRANITE', 'DECOM', 'Remediate'];
+const INVENTORY_TYPES = ['CARD', 'GRANITE', 'DECOM'];
+
+function isValidVendor(vendor) {
+    if (typeof vendor !== 'string') return false;
+    const trimmed = vendor.trim();
+    return trimmed.length > 0 && trimmed.length <= 200;
+}
+
+/**
+ * Simulates the validation logic for the batch/single add endpoints.
+ * Returns { accepted: boolean, status: number } mirroring the route behavior.
+ */
+function validateRemediateRequest(vendor) {
+    const workflow_type = 'Remediate';
+
+    if (!VALID_WORKFLOW_TYPES.includes(workflow_type)) {
+        return { accepted: false, status: 400 };
+    }
+
+    // Remediate is NOT in INVENTORY_TYPES, so vendor is required
+    if (!INVENTORY_TYPES.includes(workflow_type)) {
+        if (!isValidVendor(vendor)) {
+            return { accepted: false, status: 400 };
+        }
+    }
+
+    return { accepted: true, status: 201 };
+}
+
+// ---------------------------------------------------------------------------
+// Arbitraries
+// ---------------------------------------------------------------------------
+
+// Valid vendor: 1–200 chars trimmed, at least one non-whitespace char
+const arbValidVendor = fc.string({ minLength: 1, maxLength: 200 }).filter(s => {
+    const trimmed = s.trim();
+    return trimmed.length > 0 && trimmed.length <= 200;
+});
+
+// Invalid vendor: empty string
+const arbEmptyVendor = fc.constant('');
+
+// Invalid vendor: whitespace-only strings
+const arbWhitespaceOnlyVendor = fc.array(
+    fc.constantFrom(' ', '\t', '\n', '\r'),
+    { minLength: 1, maxLength: 50 }
+).map(arr => arr.join(''));
+
+// Invalid vendor: strings > 200 chars when trimmed
+const arbOverlengthVendor = fc.string({ minLength: 201, maxLength: 400 }).filter(s => {
+    return s.trim().length > 200;
+});
+
+// ---------------------------------------------------------------------------
+// Property 1: Remediate vendor validation
+// ---------------------------------------------------------------------------
+describe('Feature: ivanti-queue-remediation, Property 1: Remediate vendor validation', () => {
+    it('accepts any non-empty vendor string of 1–200 trimmed characters with at least one non-whitespace', () => {
+        fc.assert(
+            fc.property(arbValidVendor, (vendor) => {
+                const result = validateRemediateRequest(vendor);
+                expect(result.accepted).toBe(true);
+                expect(result.status).toBe(201);
+            }),
+            { numRuns: 100 }
+        );
+    });
+
+    it('rejects empty string as vendor for Remediate workflow', () => {
+        fc.assert(
+            fc.property(arbEmptyVendor, (vendor) => {
+                const result = validateRemediateRequest(vendor);
+                expect(result.accepted).toBe(false);
+                expect(result.status).toBe(400);
+            }),
+            { numRuns: 10 }
+        );
+    });
+
+    it('rejects whitespace-only strings as vendor for Remediate workflow', () => {
+        fc.assert(
+            fc.property(arbWhitespaceOnlyVendor, (vendor) => {
+                const result = validateRemediateRequest(vendor);
+                expect(result.accepted).toBe(false);
+                expect(result.status).toBe(400);
+            }),
+            { numRuns: 100 }
+        );
+    });
+
+    it('rejects vendor strings exceeding 200 characters when trimmed', () => {
+        fc.assert(
+            fc.property(arbOverlengthVendor, (vendor) => {
+                const result = validateRemediateRequest(vendor);
+                expect(result.accepted).toBe(false);
+                expect(result.status).toBe(400);
+            }),
+            { numRuns: 100 }
+        );
+    });
+
+    it('rejects non-string vendor values (undefined, null, number)', () => {
+        const arbNonString = fc.oneof(
+            fc.constant(undefined),
+            fc.constant(null),
+            fc.integer(),
+            fc.boolean()
+        );
+
+        fc.assert(
+            fc.property(arbNonString, (vendor) => {
+                const result = validateRemediateRequest(vendor);
+                expect(result.accepted).toBe(false);
+                expect(result.status).toBe(400);
+            }),
+            { numRuns: 100 }
+        );
+    });
+});

backend/__tests__/ivanti-todo-queue-ticket-links.test.js

@@ -0,0 +1,137 @@
+/**
+ * Unit tests for GET /api/ivanti/todo-queue/ticket-links endpoint
+ * Validates: Requirements 6.3, 6.4
+ */
+const http = require('http');
+const express = require('express');
+
+// Mock auth middleware
+jest.mock('../middleware/auth', () => ({
+    requireAuth: () => (req, _res, next) => {
+        req.user = { id: 7, username: 'testuser' };
+        next();
+    },
+    requireGroup: () => (_req, _res, next) => next(),
+}));
+
+// Mock audit log
+jest.mock('../helpers/auditLog', () => jest.fn());
+
+// Mock the db pool
+jest.mock('../db', () => ({
+    query: jest.fn(() => Promise.resolve({ rows: [] })),
+    connect: jest.fn(),
+}));
+
+const pool = require('../db');
+const createIvantiTodoQueueRouter = require('../routes/ivantiTodoQueue');
+
+/**
+ * Helper: send an HTTP request and return { statusCode, body }.
+ */
+function request(server, method, path) {
+    return new Promise((resolve, reject) => {
+        const addr = server.address();
+        const options = {
+            hostname: '127.0.0.1',
+            port: addr.port,
+            path,
+            method,
+            headers: { 'Content-Type': 'application/json' },
+        };
+
+        const req = http.request(options, (res) => {
+            const chunks = [];
+            res.on('data', (chunk) => chunks.push(chunk));
+            res.on('end', () => {
+                const raw = Buffer.concat(chunks).toString();
+                let body;
+                try { body = JSON.parse(raw); } catch { body = raw; }
+                resolve({ statusCode: res.statusCode, body });
+            });
+        });
+
+        req.on('error', reject);
+        req.end();
+    });
+}
+
+describe('GET /api/ivanti/todo-queue/ticket-links', () => {
+    let app;
+    let server;
+
+    beforeAll((done) => {
+        app = express();
+        app.use(express.json());
+        app.use('/api/ivanti/todo-queue', createIvantiTodoQueueRouter());
+        server = app.listen(0, '127.0.0.1', done);
+    });
+
+    afterAll((done) => {
+        server.close(done);
+    });
+
+    beforeEach(() => {
+        jest.clearAllMocks();
+    });
+
+    it('returns an empty links object when no associations exist', async () => {
+        pool.query.mockResolvedValueOnce({ rows: [] });
+
+        const res = await request(server, 'GET', '/api/ivanti/todo-queue/ticket-links');
+
+        expect(res.statusCode).toBe(200);
+        expect(res.body).toEqual({ links: {} });
+    });
+
+    it('returns a map of queue_item_id to ticket info', async () => {
+        pool.query.mockResolvedValueOnce({
+            rows: [
+                { queue_item_id: 12, ticket_key: 'VULN-789', jira_url: 'https://jira.example.com/browse/VULN-789' },
+                { queue_item_id: 15, ticket_key: 'VULN-789', jira_url: 'https://jira.example.com/browse/VULN-789' },
+                { queue_item_id: 22, ticket_key: 'VULN-801', jira_url: 'https://jira.example.com/browse/VULN-801' },
+            ],
+        });
+
+        const res = await request(server, 'GET', '/api/ivanti/todo-queue/ticket-links');
+
+        expect(res.statusCode).toBe(200);
+        expect(res.body).toEqual({
+            links: {
+                '12': { ticket_key: 'VULN-789', jira_url: 'https://jira.example.com/browse/VULN-789' },
+                '15': { ticket_key: 'VULN-789', jira_url: 'https://jira.example.com/browse/VULN-789' },
+                '22': { ticket_key: 'VULN-801', jira_url: 'https://jira.example.com/browse/VULN-801' },
+            },
+        });
+    });
+
+    it('filters by the authenticated user ID', async () => {
+        pool.query.mockResolvedValueOnce({ rows: [] });
+
+        await request(server, 'GET', '/api/ivanti/todo-queue/ticket-links');
+
+        const [sql, params] = pool.query.mock.calls[0];
+        expect(sql).toContain('q.user_id = $1');
+        expect(params).toEqual([7]);
+    });
+
+    it('joins jira_ticket_queue_items with jira_tickets and ivanti_todo_queue', async () => {
+        pool.query.mockResolvedValueOnce({ rows: [] });
+
+        await request(server, 'GET', '/api/ivanti/todo-queue/ticket-links');
+
+        const [sql] = pool.query.mock.calls[0];
+        expect(sql).toContain('jira_ticket_queue_items');
+        expect(sql).toContain('JOIN jira_tickets');
+        expect(sql).toContain('JOIN ivanti_todo_queue');
+    });
+
+    it('returns 500 on database error', async () => {
+        pool.query.mockRejectedValueOnce(new Error('DB connection failed'));
+
+        const res = await request(server, 'GET', '/api/ivanti/todo-queue/ticket-links');
+
+        expect(res.statusCode).toBe(500);
+        expect(res.body).toEqual({ error: 'Internal server error.' });
+    });
+});

backend/__tests__/jira-ticket-queue-items.test.js

@@ -0,0 +1,214 @@
+/**
+ * Unit Tests: POST /api/jira-tickets/:id/queue-items
+ *
+ * Feature: multi-item-jira-ticket
+ *
+ * Tests the junction endpoint that links queue items to a Jira ticket.
+ * Validates: Requirements 5.3, 6.1, 6.2
+ */
+
+const http = require('http');
+const express = require('express');
+
+// Mock the auth middleware so routes don't require real sessions/cookies.
+jest.mock('../middleware/auth', () => ({
+  requireAuth: () => (req, res, next) => {
+    req.user = { id: 1, username: 'test', group: 'Admin' };
+    next();
+  },
+  requireGroup: (...groups) => (req, res, next) => next(),
+}));
+
+// Mock the audit log helper to be a no-op.
+jest.mock('../helpers/auditLog', () => jest.fn());
+
+// Mock the jiraApi helper
+jest.mock('../helpers/jiraApi', () => ({
+  isConfigured: false,
+  getRateLimitStatus: jest.fn(() => ({
+    burst: { remaining: 60, limit: 60 },
+    daily: { remaining: 1440, limit: 1440 },
+  })),
+}));
+
+const pool = require('../db');
+jest.mock('../db', () => ({
+  query: jest.fn(),
+}));
+
+const createJiraTicketsRouter = require('../routes/jiraTickets');
+
+/**
+ * Helper: send an HTTP request to the test server and return { statusCode, body }.
+ */
+function request(server, method, path, body) {
+  return new Promise((resolve, reject) => {
+    const addr = server.address();
+    const options = {
+      hostname: '127.0.0.1',
+      port: addr.port,
+      path,
+      method,
+      headers: { 'Content-Type': 'application/json' },
+    };
+
+    const req = http.request(options, (res) => {
+      const chunks = [];
+      res.on('data', (chunk) => chunks.push(chunk));
+      res.on('end', () => {
+        const raw = Buffer.concat(chunks).toString();
+        let parsed;
+        try { parsed = JSON.parse(raw); } catch { parsed = raw; }
+        resolve({ statusCode: res.statusCode, body: parsed });
+      });
+    });
+
+    req.on('error', reject);
+
+    if (body) {
+      req.write(JSON.stringify(body));
+    }
+    req.end();
+  });
+}
+
+describe('POST /api/jira-tickets/:id/queue-items', () => {
+  let app;
+  let server;
+
+  beforeAll((done) => {
+    app = express();
+    app.use(express.json());
+    app.use('/api/jira-tickets', createJiraTicketsRouter());
+    server = app.listen(0, '127.0.0.1', done);
+  });
+
+  afterAll((done) => {
+    server.close(done);
+  });
+
+  beforeEach(() => {
+    pool.query.mockReset();
+  });
+
+  // -------------------------------------------------------------------------
+  // Validation tests
+  // -------------------------------------------------------------------------
+
+  it('returns 400 when queue_item_ids is missing', async () => {
+    const res = await request(server, 'POST', '/api/jira-tickets/1/queue-items', {});
+    expect(res.statusCode).toBe(400);
+    expect(res.body.error).toBe('queue_item_ids must be a non-empty array of integers');
+  });
+
+  it('returns 400 when queue_item_ids is an empty array', async () => {
+    const res = await request(server, 'POST', '/api/jira-tickets/1/queue-items', {
+      queue_item_ids: [],
+    });
+    expect(res.statusCode).toBe(400);
+    expect(res.body.error).toBe('queue_item_ids must be a non-empty array of integers');
+  });
+
+  it('returns 400 when queue_item_ids is not an array', async () => {
+    const res = await request(server, 'POST', '/api/jira-tickets/1/queue-items', {
+      queue_item_ids: 'not-an-array',
+    });
+    expect(res.statusCode).toBe(400);
+    expect(res.body.error).toBe('queue_item_ids must be a non-empty array of integers');
+  });
+
+  it('returns 400 when queue_item_ids contains non-integers', async () => {
+    const res = await request(server, 'POST', '/api/jira-tickets/1/queue-items', {
+      queue_item_ids: [1, 2.5, 3],
+    });
+    expect(res.statusCode).toBe(400);
+    expect(res.body.error).toBe('queue_item_ids must be a non-empty array of integers');
+  });
+
+  it('returns 400 when queue_item_ids contains strings', async () => {
+    const res = await request(server, 'POST', '/api/jira-tickets/1/queue-items', {
+      queue_item_ids: [1, 'abc', 3],
+    });
+    expect(res.statusCode).toBe(400);
+    expect(res.body.error).toBe('queue_item_ids must be a non-empty array of integers');
+  });
+
+  // -------------------------------------------------------------------------
+  // Ticket existence check
+  // -------------------------------------------------------------------------
+
+  it('returns 404 when jira ticket does not exist', async () => {
+    pool.query.mockResolvedValueOnce({ rows: [] }); // ticket lookup
+
+    const res = await request(server, 'POST', '/api/jira-tickets/999/queue-items', {
+      queue_item_ids: [1, 2, 3],
+    });
+    expect(res.statusCode).toBe(404);
+    expect(res.body.error).toBe('Jira ticket not found');
+  });
+
+  // -------------------------------------------------------------------------
+  // Queue item existence check
+  // -------------------------------------------------------------------------
+
+  it('returns 400 when some queue items do not exist', async () => {
+    pool.query
+      .mockResolvedValueOnce({ rows: [{ id: 42 }] }) // ticket exists
+      .mockResolvedValueOnce({ rows: [{ id: 1 }, { id: 2 }] }); // only 2 of 3 exist
+
+    const res = await request(server, 'POST', '/api/jira-tickets/42/queue-items', {
+      queue_item_ids: [1, 2, 3],
+    });
+    expect(res.statusCode).toBe(400);
+    expect(res.body.error).toBe('One or more queue items not found');
+  });
+
+  // -------------------------------------------------------------------------
+  // Successful linking
+  // -------------------------------------------------------------------------
+
+  it('returns 201 with linked_count on success', async () => {
+    pool.query
+      .mockResolvedValueOnce({ rows: [{ id: 42 }] }) // ticket exists
+      .mockResolvedValueOnce({ rows: [{ id: 12 }, { id: 15 }, { id: 18 }] }) // all queue items exist
+      .mockResolvedValueOnce({ rowCount: 3 }); // insert result
+
+    const res = await request(server, 'POST', '/api/jira-tickets/42/queue-items', {
+      queue_item_ids: [12, 15, 18],
+    });
+    expect(res.statusCode).toBe(201);
+    expect(res.body.message).toBe('Queue items linked to ticket');
+    expect(res.body.ticket_id).toBe(42);
+    expect(res.body.linked_count).toBe(3);
+  });
+
+  it('returns linked_count reflecting ON CONFLICT DO NOTHING (duplicates ignored)', async () => {
+    pool.query
+      .mockResolvedValueOnce({ rows: [{ id: 42 }] }) // ticket exists
+      .mockResolvedValueOnce({ rows: [{ id: 12 }, { id: 15 }] }) // all queue items exist
+      .mockResolvedValueOnce({ rowCount: 1 }); // only 1 new row (1 was duplicate)
+
+    const res = await request(server, 'POST', '/api/jira-tickets/42/queue-items', {
+      queue_item_ids: [12, 15],
+    });
+    expect(res.statusCode).toBe(201);
+    expect(res.body.linked_count).toBe(1);
+  });
+
+  // -------------------------------------------------------------------------
+  // Error handling
+  // -------------------------------------------------------------------------
+
+  it('returns 500 on database error', async () => {
+    pool.query
+      .mockResolvedValueOnce({ rows: [{ id: 42 }] }) // ticket exists
+      .mockResolvedValueOnce({ rows: [{ id: 12 }] }) // queue items exist
+      .mockRejectedValueOnce(new Error('Connection lost')); // insert fails
+
+    const res = await request(server, 'POST', '/api/jira-tickets/42/queue-items', {
+      queue_item_ids: [12],
+    });
+    expect(res.statusCode).toBe(500);
+    expect(res.body.error).toContain('Connection lost');
+  });
+});

backend/__tests__/migrations-idempotency.integration.test.js

@@ -0,0 +1,115 @@
+// Migration Idempotency Integration Test
+// This test requires a running PostgreSQL instance with DATABASE_URL configured in backend/.env.
+// It runs ALL Postgres migrations twice (via run-all.js) to verify they are idempotent (safe to re-run),
+// then checks that key tables and columns exist.
+//
+// SKIPS AUTOMATICALLY when DATABASE_URL is not set (e.g., in CI environments without DB access).
+//
+// Run separately: npx jest backend/__tests__/migrations-idempotency.integration.test.js --forceExit
+
+const { execSync } = require('child_process');
+const path = require('path');
+const fs = require('fs');
+
+const BACKEND_DIR = path.join(__dirname, '..');
+
+// Load .env manually to check for DATABASE_URL without triggering db.js process.exit
+function loadEnvFile() {
+    const envPath = path.join(BACKEND_DIR, '.env');
+    if (!fs.existsSync(envPath)) return {};
+    const content = fs.readFileSync(envPath, 'utf8');
+    const vars = {};
+    for (const line of content.split('\n')) {
+        const trimmed = line.trim();
+        if (!trimmed || trimmed.startsWith('#')) continue;
+        const eqIdx = trimmed.indexOf('=');
+        if (eqIdx === -1) continue;
+        vars[trimmed.slice(0, eqIdx)] = trimmed.slice(eqIdx + 1);
+    }
+    return vars;
+}
+
+const envVars = loadEnvFile();
+const hasDatabase = !!(process.env.DATABASE_URL || envVars.DATABASE_URL);
+
+// Skip entire suite if no database is available
+const describeIfDb = hasDatabase ? describe : describe.skip;
+
+let pool;
+
+if (hasDatabase) {
+    // Set DATABASE_URL in process.env so db.js picks it up
+    if (!process.env.DATABASE_URL && envVars.DATABASE_URL) {
+        process.env.DATABASE_URL = envVars.DATABASE_URL;
+    }
+    pool = require('../db');
+}
+
+function runAllMigrations() {
+    execSync('node migrations/run-all.js', {
+        cwd: BACKEND_DIR,
+        stdio: 'pipe',
+        timeout: 30000,
+    });
+}
+
+afterAll(async () => {
+    if (pool) await pool.end();
+});
+
+describeIfDb('Migration Idempotency', () => {
+    it('runs all migrations twice without errors (idempotent)', () => {
+        // First run
+        runAllMigrations();
+        // Second run — should not throw if migrations are truly idempotent
+        runAllMigrations();
+    }, 30000);
+
+    it('key tables exist after migrations', async () => {
+        const expectedTables = [
+            'compliance_items',
+            'compliance_item_history',
+            'compliance_notes',
+            'jira_tickets',
+            'ivanti_fp_submissions',
+        ];
+
+        const { rows } = await pool.query(`
+            SELECT table_name
+            FROM information_schema.tables
+            WHERE table_schema = 'public'
+              AND table_name = ANY($1)
+        `, [expectedTables]);
+
+        const foundTables = rows.map(r => r.table_name);
+        for (const table of expectedTables) {
+            expect(foundTables).toContain(table);
+        }
+    }, 30000);
+
+    it('compliance_item_history has expected columns', async () => {
+        const expectedColumns = [
+            'id',
+            'hostname',
+            'field_name',
+            'old_value',
+            'new_value',
+            'change_reason',
+            'changed_by',
+            'changed_at',
+            'metric_id',
+        ];
+
+        const { rows } = await pool.query(`
+            SELECT column_name
+            FROM information_schema.columns
+            WHERE table_schema = 'public'
+              AND table_name = 'compliance_item_history'
+        `);
+
+        const foundColumns = rows.map(r => r.column_name);
+        for (const col of expectedColumns) {
+            expect(foundColumns).toContain(col);
+        }
+    }, 30000);
+});

backend/__tests__/vendor-issue-type-dropdown.property.test.js

@@ -0,0 +1,190 @@
+/**
+ * Property-Based Tests: Vendor Issue Type Dropdown
+ *
+ * Feature: vendor-issue-type-dropdown
+ *
+ * Tests the pure determination logic that decides which issue type list
+ * to display based on the project key input.
+ *
+ * Validates: Requirements 1.2, 1.3, 1.4, 1.5, 2.1, 2.3, 3.4, 3.5, 4.1, 4.2, 6.3
+ */
+
+const fc = require('fast-check');
+
+// ---------------------------------------------------------------------------
+// Replicate the pure functions from JiraPage.js for testing
+// ---------------------------------------------------------------------------
+
+const VENDOR_PROJECT_KEYS = [
+  'AA_ADTRAN',
+  'AA_ADVA',
+  'AA_CASA',
+  'AA_CISCO',
+  'AACOMMSCOP',
+  'AA_COMMSCOP',
+  'AA_HARMONI',
+  'AA_JUNIPER',
+  'AA_VECIMA',
+  'AA_VIAVI',
+];
+
+const VENDOR_ISSUE_TYPES = [
+  'Epic',
+  'Story',
+  'Task',
+  'Defect',
+  'Production Defect/Incident Fix',
+  'New Feature',
+  'Spike',
+  'Release Candidate',
+  'Documentation',
+];
+
+const STEAM_ISSUE_TYPES = [
+  'Story',
+  'Epic',
+  'Program',
+  'Project',
+  'Reservation',
+  'Automation Maintenance',
+];
+
+function isVendorProject(projectKey, vendorKeys) {
+  if (!projectKey || typeof projectKey !== 'string') return false;
+  const normalized = projectKey.trim().toUpperCase();
+  if (normalized.length === 0) return false;
+  return vendorKeys.includes(normalized);
+}
+
+function getIssueTypesForProject(projectKey, vendorKeys, vendorTypes, steamTypes) {
+  return isVendorProject(projectKey, vendorKeys) ? vendorTypes : steamTypes;
+}
+
+/**
+ * Simulates the project_key onChange logic: resets issue_type only on context switch.
+ */
+function simulateProjectKeyChange(oldKey, newKey, currentIssueType, vendorKeys) {
+  const wasVendor = isVendorProject(oldKey, vendorKeys);
+  const isNowVendor = isVendorProject(newKey, vendorKeys);
+  return (wasVendor !== isNowVendor) ? '' : currentIssueType;
+}
+
+// Helper: generate a vendor key with random casing and optional whitespace
+const arbVendorKey = fc.constantFrom(...VENDOR_PROJECT_KEYS).chain(key =>
+  fc.oneof(
+    fc.constant(key),
+    fc.constant(key.toLowerCase()),
+    fc.constant(`  ${key}  `),
+  )
+);
+
+// Helper: generate a string that does NOT match any vendor key after normalization
+const arbNonVendorKey = fc.string({ minLength: 0, maxLength: 50 }).filter(s => {
+  const normalized = s.trim().toUpperCase();
+  return !VENDOR_PROJECT_KEYS.includes(normalized);
+});
+
+const arbNonVendorKeyNonEmpty = fc.string({ minLength: 1, maxLength: 30 }).filter(s => {
+  const normalized = s.trim().toUpperCase();
+  return !VENDOR_PROJECT_KEYS.includes(normalized) && normalized.length > 0;
+});
+
+// ---------------------------------------------------------------------------
+// Property 1: Issue type list determination
+// ---------------------------------------------------------------------------
+describe('Feature: vendor-issue-type-dropdown, Property 1: Issue type list determination', () => {
+  it('returns VENDOR_ISSUE_TYPES when project key matches a vendor key (case-insensitive, trimmed)', () => {
+    fc.assert(
+      fc.property(arbVendorKey, (key) => {
+        const result = getIssueTypesForProject(key, VENDOR_PROJECT_KEYS, VENDOR_ISSUE_TYPES, STEAM_ISSUE_TYPES);
+        expect(result).toBe(VENDOR_ISSUE_TYPES);
+      }),
+      { numRuns: 100 }
+    );
+  });
+
+  it('returns STEAM_ISSUE_TYPES for any string that does not match a vendor key after normalization', () => {
+    fc.assert(
+      fc.property(arbNonVendorKey, (key) => {
+        const result = getIssueTypesForProject(key, VENDOR_PROJECT_KEYS, VENDOR_ISSUE_TYPES, STEAM_ISSUE_TYPES);
+        expect(result).toBe(STEAM_ISSUE_TYPES);
+      }),
+      { numRuns: 100 }
+    );
+  });
+
+  it('returns STEAM_ISSUE_TYPES for null, undefined, and empty string', () => {
+    const emptyInputs = fc.oneof(
+      fc.constant(null),
+      fc.constant(undefined),
+      fc.constant(''),
+      fc.constant('   '),
+    );
+
+    fc.assert(
+      fc.property(emptyInputs, (key) => {
+        const result = getIssueTypesForProject(key, VENDOR_PROJECT_KEYS, VENDOR_ISSUE_TYPES, STEAM_ISSUE_TYPES);
+        expect(result).toBe(STEAM_ISSUE_TYPES);
+      }),
+      { numRuns: 100 }
+    );
+  });
+});
+
+// ---------------------------------------------------------------------------
+// Property 2: Context switch resets issue type selection
+// ---------------------------------------------------------------------------
+describe('Feature: vendor-issue-type-dropdown, Property 2: Context switch resets issue type', () => {
+  it('resets issue_type to empty when switching from vendor to non-vendor context', () => {
+    const anyIssueType = fc.string({ minLength: 1, maxLength: 50 });
+
+    fc.assert(
+      fc.property(arbVendorKey, arbNonVendorKeyNonEmpty, anyIssueType, (oldKey, newKey, issueType) => {
+        const result = simulateProjectKeyChange(oldKey, newKey, issueType, VENDOR_PROJECT_KEYS);
+        expect(result).toBe('');
+      }),
+      { numRuns: 100 }
+    );
+  });
+
+  it('resets issue_type to empty when switching from non-vendor to vendor context', () => {
+    const anyIssueType = fc.string({ minLength: 1, maxLength: 50 });
+
+    fc.assert(
+      fc.property(arbNonVendorKeyNonEmpty, arbVendorKey, anyIssueType, (oldKey, newKey, issueType) => {
+        const result = simulateProjectKeyChange(oldKey, newKey, issueType, VENDOR_PROJECT_KEYS);
+        expect(result).toBe('');
+      }),
+      { numRuns: 100 }
+    );
+  });
+});
+
+// ---------------------------------------------------------------------------
+// Property 3: Same context preserves issue type selection
+// ---------------------------------------------------------------------------
+describe('Feature: vendor-issue-type-dropdown, Property 3: Same context preserves issue type', () => {
+  it('preserves issue_type when both old and new keys resolve to STEAM context', () => {
+    const anyIssueType = fc.string({ minLength: 0, maxLength: 50 });
+
+    fc.assert(
+      fc.property(arbNonVendorKey, arbNonVendorKey, anyIssueType, (oldKey, newKey, issueType) => {
+        const result = simulateProjectKeyChange(oldKey, newKey, issueType, VENDOR_PROJECT_KEYS);
+        expect(result).toBe(issueType);
+      }),
+      { numRuns: 100 }
+    );
+  });
+
+  it('preserves issue_type when both old and new keys resolve to vendor context', () => {
+    const anyIssueType = fc.string({ minLength: 0, maxLength: 50 });
+
+    fc.assert(
+      fc.property(arbVendorKey, arbVendorKey, anyIssueType, (oldKey, newKey, issueType) => {
+        const result = simulateProjectKeyChange(oldKey, newKey, issueType, VENDOR_PROJECT_KEYS);
+        expect(result).toBe(issueType);
+      }),
+      { numRuns: 100 }
+    );
+  });
+});

backend/db-schema.sql

@@ -126,7 +126,7 @@ CREATE TABLE IF NOT EXISTS jira_tickets (
     ticket_key TEXT NOT NULL,
     url TEXT,
     summary TEXT,
-    status TEXT DEFAULT 'Open' CHECK (status IN ('Open', 'In Progress', 'Closed')),
+    status TEXT DEFAULT 'Open',
     created_at TIMESTAMPTZ DEFAULT NOW(),
     updated_at TIMESTAMPTZ DEFAULT NOW()
 );
@@ -398,6 +398,7 @@ CREATE TABLE IF NOT EXISTS atlas_action_plans_cache (
     has_action_plan BOOLEAN NOT NULL DEFAULT FALSE,
     plan_count INTEGER NOT NULL DEFAULT 0,
     plans_json TEXT NOT NULL DEFAULT '[]',
+    atlas_known BOOLEAN NOT NULL DEFAULT FALSE,
     synced_at TIMESTAMPTZ NOT NULL DEFAULT NOW()
 );
 

backend/helpers/cardApi.js

@@ -9,6 +9,11 @@
 
 const https = require('https');
 const http  = require('http');
+const dns   = require('dns');
+
+// Force IPv4-first DNS resolution — card.charter.com has both IPv4 and IPv6
+// records but IPv6 is unreachable from this network, causing timeouts.
+dns.setDefaultResultOrder('ipv4first');
 
 // ---------------------------------------------------------------------------
 // Configuration — read from process.env at module load
@@ -57,12 +62,13 @@ function acquireToken(timeout) {
             port:     fullUrl.port || (isHttps ? 443 : 80),
             path:     fullUrl.pathname + fullUrl.search,
             method:   'POST',
+            family:   4, // Force IPv4 — IPv6 is unreachable from this network
             headers:  {
                 'accept':        'application/json',
                 'authorization': 'Basic ' + authString,
                 'content-length': '0',
             },
-            timeout: timeout || 15000,
+            timeout: timeout || 30000,
         };
 
         if (isHttps) {
@@ -123,7 +129,7 @@ async function ensureToken(timeout) {
 // Generic request — supports GET and POST with Bearer auth + 401 retry
 // ---------------------------------------------------------------------------
 async function cardRequest(method, urlPath, body, options) {
-    const timeout = (options && options.timeout) || 15000;
+    const timeout = (options && options.timeout) || 30000;
     const skipAuth = (options && options.skipAuth) || false;
 
     async function doRequest(bearerToken) {
@@ -150,6 +156,7 @@ async function cardRequest(method, urlPath, body, options) {
                 port:     fullUrl.port || (isHttps ? 443 : 80),
                 path:     fullUrl.pathname + fullUrl.search,
                 method,
+                family:   4, // Force IPv4 — IPv6 is unreachable from this network
                 headers,
                 timeout,
             };
@@ -245,8 +252,8 @@ async function getTeamAssets(teamName, { disposition, page, pageSize } = {}) {
 /**
  * GET /api/v1/owner/{assetId} — get owner record including update_token.
  */
-async function getOwner(assetId) {
-    const res = await cardGet(`/api/v1/owner/${encodeURIComponent(assetId)}`);
+async function getOwner(assetId, options) {
+    const res = await cardGet(`/api/v1/owner/${encodeURIComponent(assetId)}`, options);
     return { status: res.status, body: res.body, ok: res.status >= 200 && res.status < 300 };
 }
 
@@ -288,6 +295,79 @@ async function redirectAsset(assetId, fromTeam, toTeam, updateToken) {
     return { status: res.status, body: res.body, ok: res.status >= 200 && res.status < 300 };
 }
 
+/**
+ * GET /api/v2/asset-search/{ivantiHostId}?search_param=deep_search
+ * Search CARD by Ivanti Asset ID (8-digit integer). Returns the CARD asset
+ * record directly — no suffix guessing required.
+ *
+ * @param {string|number} ivantiHostId - 8-character integer Ivanti Host ID
+ * @param {object} [options] - { timeout }
+ */
+async function searchByIvantiHostId(ivantiHostId, options) {
+    const hostId = String(ivantiHostId).trim();
+    if (!hostId || !/^\d+$/.test(hostId)) {
+        return { status: 400, body: '{"error":"Invalid Ivanti host ID — must be an integer."}', ok: false };
+    }
+    const res = await cardGet(`/api/v2/asset-search/${hostId}?search_param=deep_search`, options);
+    return { status: res.status, body: res.body, ok: res.status >= 200 && res.status < 300 };
+}
+
+/**
+ * Resolve a bare IP address to a full CARD asset ID by trying known suffixes.
+ * Returns the first asset ID that returns a valid owner record, or null if none found.
+ *
+ * @param {string} ip - IP address or existing asset ID
+ * @param {object} [options] - { quick: true } to only try CTEC suffix (for tooltip/hover use)
+ */
+async function resolveAssetId(ip, options) {
+    const quick = options && options.quick;
+    const SUFFIXES = quick ? ['CTEC'] : ['CTEC', 'NATL', 'CHTR', 'COML', 'RESI', 'WIFI', 'VOIP'];
+    const timeout = quick ? 15000 : undefined; // 15s timeout for quick mode
+    const trimmedIp = (ip || '').trim();
+    if (!trimmedIp) return null;
+
+    // If it already has a suffix (contains a dash followed by letters), use as-is
+    if (/\d+-[A-Z]+$/i.test(trimmedIp)) {
+        try {
+            const result = await getOwner(trimmedIp, timeout ? { timeout } : undefined);
+            if (result.ok) return trimmedIp;
+        } catch (err) {
+            // Timeout — throw so caller can distinguish from "not found"
+            if (quick && err.message && err.message.includes('timed out')) {
+                throw new Error('CARD_TIMEOUT');
+            }
+            return null;
+        }
+    }
+
+    // Try each suffix
+    for (const suffix of SUFFIXES) {
+        const candidate = `${trimmedIp}-${suffix}`;
+        try {
+            const result = await getOwner(candidate, timeout ? { timeout } : undefined);
+            if (result.ok) return candidate;
+        } catch (err) {
+            // Timeout — throw so caller can distinguish from "not found"
+            if (quick && err.message && err.message.includes('timed out')) {
+                throw new Error('CARD_TIMEOUT');
+            }
+            // Continue to next suffix
+        }
+    }
+
+    // Try bare IP as last resort (skip in quick mode to avoid extra delay)
+    if (!quick) {
+        try {
+            const result = await getOwner(trimmedIp);
+            if (result.ok) return trimmedIp;
+        } catch (_) {
+            // Not found
+        }
+    }
+
+    return null;
+}
+
 module.exports = {
     isConfigured,
     missingVars,
@@ -302,4 +382,6 @@ module.exports = {
     declineAsset,
     redirectAsset,
     invalidateToken,
+    resolveAssetId,
+    searchByIvantiHostId,
 };

backend/helpers/jiraApi.js

@@ -276,8 +276,9 @@ function jiraDelete(urlPath, options) {
  * @param {string[]} [fields] - Jira field names to return
  */
 async function getIssue(issueKey, fields) {
-    // Don't filter by project — issue keys are globally unique in Jira and
-    // tickets may belong to projects other than JIRA_PROJECT_KEY (e.g. AA_ADTRAN).
+    // Use JQL search to look up a single issue by key.
+    // Issue keys are globally unique in Jira — no project filter needed.
+    // Charter compliance: uses GET /rest/api/2/search with explicit field list.
     const jql = `key = "${issueKey}"`;
     const result = await searchIssues(jql, { fields: fields || DEFAULT_FIELDS, maxResults: 1, startAt: 0 });
     if (result.ok && result.data.issues && result.data.issues.length > 0) {

backend/helpers/vclHelpers.js

@@ -476,7 +476,11 @@ function computeMetricForecastBurndown(currentDevices, totalAssets, historicalSn
     const buckets = {};
     for (const device of currentDevices) {
         if (device.resolution_date == null) continue;
-        const resMonth = device.resolution_date.slice(0, 7); // YYYY-MM
+        // Handle both Date objects (from PostgreSQL) and YYYY-MM-DD strings
+        const dateStr = device.resolution_date instanceof Date
+            ? device.resolution_date.toISOString().slice(0, 7)
+            : String(device.resolution_date).slice(0, 7);
+        const resMonth = dateStr; // YYYY-MM
         if (resMonth < currentMonthStr) {
             // Past-due: treat as remediated in current month
             buckets[currentMonthStr] = (buckets[currentMonthStr] || 0) + 1;
@@ -485,11 +489,16 @@ function computeMetricForecastBurndown(currentDevices, totalAssets, historicalSn
         }
     }
 
-    // Generate forecast months starting from current month, up to 12 months max
+    // Generate forecast months starting from NEXT month, up to 12 months max
     const forecast = [];
     let remainingNonCompliant = nonCompliant;
 
-    for (let i = 0; i < 12; i++) {
+    // Account for devices remediated in the current month (past-due dates bucketed here)
+    if (buckets[currentMonthStr]) {
+        remainingNonCompliant -= buckets[currentMonthStr];
+    }
+
+    for (let i = 1; i <= 12; i++) {
         const forecastYear = currentYear + Math.floor((currentMonth + i) / 12);
         const forecastMonth = (currentMonth + i) % 12;
         const monthStr = formatMonth(forecastYear, forecastMonth);

backend/migrations/add_archer_templates_table.js

@@ -0,0 +1,60 @@
+// Migration: Add archer_templates table for the Archer Template Library feature
+const pool = require('../db');
+
+async function run() {
+    console.log('Starting archer_templates table migration...');
+    try {
+        await pool.query(`
+            CREATE TABLE IF NOT EXISTS archer_templates (
+                id SERIAL PRIMARY KEY,
+                vendor VARCHAR(100) NOT NULL,
+                platform VARCHAR(100) NOT NULL,
+                model VARCHAR(100) NOT NULL,
+                environment_overview TEXT NOT NULL DEFAULT '',
+                segmentation TEXT NOT NULL DEFAULT '',
+                mitigating_controls TEXT NOT NULL DEFAULT '',
+                additional_info TEXT NOT NULL DEFAULT '',
+                charter_network_banner TEXT NOT NULL DEFAULT '',
+                data_classification TEXT NOT NULL DEFAULT '',
+                charter_network TEXT NOT NULL DEFAULT '',
+                additional_access_list TEXT NOT NULL DEFAULT '',
+                created_by INTEGER REFERENCES users(id) ON DELETE SET NULL,
+                created_at TIMESTAMPTZ DEFAULT NOW(),
+                updated_at TIMESTAMPTZ DEFAULT NOW()
+            )
+        `);
+        console.log('✓ archer_templates table created (or already exists)');
+
+        // Case-insensitive uniqueness on trimmed vendor/platform/model
+        await pool.query(`
+            CREATE UNIQUE INDEX IF NOT EXISTS idx_archer_templates_unique_combo
+            ON archer_templates (LOWER(TRIM(vendor)), LOWER(TRIM(platform)), LOWER(TRIM(model)))
+        `);
+        console.log('✓ idx_archer_templates_unique_combo index created (or already exists)');
+
+        // Indexes for list query performance
+        await pool.query(`
+            CREATE INDEX IF NOT EXISTS idx_archer_templates_vendor
+            ON archer_templates(vendor)
+        `);
+        console.log('✓ idx_archer_templates_vendor index created (or already exists)');
+
+        await pool.query(`
+            CREATE INDEX IF NOT EXISTS idx_archer_templates_platform
+            ON archer_templates(platform)
+        `);
+        console.log('✓ idx_archer_templates_platform index created (or already exists)');
+
+        console.log('Migration complete.');
+    } catch (err) {
+        console.error('Migration failed:', err.message);
+        throw err;
+    }
+}
+
+module.exports = { run };
+
+// Self-execute when run directly
+if (require.main === module) {
+    run().then(() => process.exit(0)).catch(() => process.exit(1));
+}

backend/migrations/add_atlas_known_column.js

@@ -0,0 +1,61 @@
+// Migration: Add atlas_known column to atlas_action_plans_cache
+//
+// Distinguishes between hosts Atlas actively tracks (atlas_known = true)
+// and hosts that were synced but Atlas has no data for (atlas_known = false).
+// The badge only renders for atlas_known hosts, preventing noise from BUs
+// not covered by Atlas.
+//
+// Safe to re-run — uses ADD COLUMN IF NOT EXISTS pattern.
+//
+// Usage: node backend/migrations/add_atlas_known_column.js
+
+const pool = require('../db');
+
+async function migrate() {
+    console.log('Starting atlas_known column migration...');
+
+    // Add column (IF NOT EXISTS not supported for ADD COLUMN in all PG versions, use DO block)
+    await pool.query(`
+        DO $$
+        BEGIN
+            IF NOT EXISTS (
+                SELECT 1 FROM information_schema.columns
+                WHERE table_name = 'atlas_action_plans_cache' AND column_name = 'atlas_known'
+            ) THEN
+                ALTER TABLE atlas_action_plans_cache ADD COLUMN atlas_known BOOLEAN NOT NULL DEFAULT FALSE;
+            END IF;
+        END $$;
+    `);
+    console.log('✓ atlas_known column ready');
+
+    // Backfill: mark hosts that have at least one plan as atlas_known = true
+    const { rowCount } = await pool.query(`
+        UPDATE atlas_action_plans_cache SET atlas_known = true WHERE has_action_plan = true
+    `);
+    console.log(`✓ Backfilled ${rowCount} rows with atlas_known = true (hosts with plans)`);
+
+    // Also mark hosts belonging to managed BUs as atlas_known
+    // These are the BUs Atlas is supposed to cover
+    const managedBUs = (process.env.IVANTI_MANAGED_BUS || 'NTS-AEO-ACCESS-ENG,NTS-AEO-STEAM')
+        .split(',').map(b => b.trim()).filter(Boolean);
+    const patterns = managedBUs.map(b => `%${b}%`);
+
+    const { rowCount: buCount } = await pool.query(`
+        UPDATE atlas_action_plans_cache SET atlas_known = true
+        WHERE host_id IN (
+            SELECT DISTINCT host_id FROM ivanti_findings
+            WHERE bu_ownership ILIKE ANY($1::text[])
+        )
+    `, [patterns]);
+    console.log(`✓ Backfilled ${buCount} rows for managed BU hosts as atlas_known = true`);
+
+    console.log('Migration complete.');
+}
+
+migrate()
+    .then(() => { pool.end(); })
+    .catch((err) => {
+        console.error('Migration failed:', err);
+        pool.end();
+        process.exit(1);
+    });

backend/migrations/add_compliance_history_metric_id.js

@@ -0,0 +1,42 @@
+const pool = require('../db');
+
+async function run() {
+    console.log('Starting compliance_item_history metric_id column migration...');
+    try {
+        // Idempotent: only add column if it doesn't already exist
+        const { rows } = await pool.query(`
+            SELECT column_name
+            FROM information_schema.columns
+            WHERE table_name = 'compliance_item_history'
+              AND column_name = 'metric_id'
+        `);
+
+        if (rows.length === 0) {
+            await pool.query(`
+                ALTER TABLE compliance_item_history
+                ADD COLUMN metric_id TEXT
+            `);
+            console.log('✓ metric_id column added to compliance_item_history');
+        } else {
+            console.log('✓ metric_id column already exists (skipped)');
+        }
+
+        await pool.query(`
+            CREATE INDEX IF NOT EXISTS idx_compliance_history_hostname_metric
+            ON compliance_item_history(hostname, metric_id)
+        `);
+        console.log('✓ hostname/metric_id index created');
+
+        console.log('Migration complete.');
+    } catch (err) {
+        console.error('Migration failed:', err.message);
+        throw err;
+    }
+}
+
+module.exports = { run };
+
+// Self-execute when run directly
+if (require.main === module) {
+    run().then(() => process.exit(0)).catch(() => process.exit(1));
+}

backend/migrations/add_decom_workflow_type.js

@@ -17,7 +17,7 @@ async function migrate() {
         await pool.query(`
             ALTER TABLE ivanti_todo_queue
             ADD CONSTRAINT ivanti_todo_queue_workflow_type_check
-            CHECK (workflow_type IN ('FP', 'Archer', 'CARD', 'GRANITE', 'DECOM'))
+            CHECK (workflow_type IN ('FP', 'Archer', 'CARD', 'GRANITE', 'DECOM', 'Remediate'))
         `);
         console.log('✓ Added updated workflow_type constraint (includes DECOM)');
 

backend/migrations/add_flexible_jira_ticket_creation.js

@@ -0,0 +1,90 @@
+// Migration: Add flexible Jira ticket creation support
+// - Drops NOT NULL on cve_id and vendor columns
+// - Adds source_context column with CHECK constraint
+// - Backfills existing rows with source_context = 'manual'
+// - Adds index on source_context
+// Idempotent — safe to run multiple times.
+const pool = require('../db');
+
+async function run() {
+    console.log('Starting flexible Jira ticket creation migration...');
+
+    // Verify jira_tickets table exists before proceeding
+    const { rows } = await pool.query(`
+        SELECT 1 FROM information_schema.tables
+        WHERE table_schema = 'public' AND table_name = 'jira_tickets'
+    `);
+    if (rows.length === 0) {
+        console.error('✗ jira_tickets table does not exist. Cannot proceed.');
+        process.exit(1);
+    }
+    console.log('✓ jira_tickets table exists');
+
+    // Drop NOT NULL constraint on cve_id (idempotent — no-op if already nullable)
+    await pool.query(`ALTER TABLE jira_tickets ALTER COLUMN cve_id DROP NOT NULL`);
+    console.log('✓ cve_id NOT NULL constraint dropped (or was already nullable)');
+
+    // Drop NOT NULL constraint on vendor (idempotent — no-op if already nullable)
+    await pool.query(`ALTER TABLE jira_tickets ALTER COLUMN vendor DROP NOT NULL`);
+    console.log('✓ vendor NOT NULL constraint dropped (or was already nullable)');
+
+    // Add jira_id, jira_status, last_synced_at, created_by columns
+    // (originally from SQLite migration add_jira_sync_columns.js — never ported to Postgres run-all)
+    await pool.query(`ALTER TABLE jira_tickets ADD COLUMN IF NOT EXISTS jira_id TEXT`);
+    console.log('✓ jira_id column added (or already exists)');
+
+    await pool.query(`ALTER TABLE jira_tickets ADD COLUMN IF NOT EXISTS jira_status TEXT`);
+    console.log('✓ jira_status column added (or already exists)');
+
+    await pool.query(`ALTER TABLE jira_tickets ADD COLUMN IF NOT EXISTS last_synced_at TIMESTAMPTZ`);
+    console.log('✓ last_synced_at column added (or already exists)');
+
+    await pool.query(`ALTER TABLE jira_tickets ADD COLUMN IF NOT EXISTS created_by INTEGER`);
+    console.log('✓ created_by column added (or already exists)');
+
+    await pool.query(`CREATE INDEX IF NOT EXISTS idx_jira_tickets_jira_id ON jira_tickets(jira_id)`);
+    console.log('✓ jira_id index created (or already exists)');
+
+    // Add source_context column with default value (IF NOT EXISTS makes it idempotent)
+    await pool.query(`
+        ALTER TABLE jira_tickets
+        ADD COLUMN IF NOT EXISTS source_context TEXT DEFAULT 'manual'
+    `);
+    console.log('✓ source_context column added (or already exists)');
+
+    // Add CHECK constraint for allowed source_context values (idempotent guard)
+    await pool.query(`
+        DO $$
+        BEGIN
+            IF NOT EXISTS (
+                SELECT 1 FROM pg_constraint WHERE conname = 'jira_tickets_source_context_check'
+            ) THEN
+                ALTER TABLE jira_tickets
+                ADD CONSTRAINT jira_tickets_source_context_check
+                CHECK (source_context IN ('cve', 'archer', 'ivanti_queue', 'email', 'manual'));
+            END IF;
+        END $$;
+    `);
+    console.log('✓ source_context CHECK constraint added (or already exists)');
+
+    // Backfill existing rows where source_context is NULL
+    const result = await pool.query(`
+        UPDATE jira_tickets SET source_context = 'manual' WHERE source_context IS NULL
+    `);
+    console.log(`✓ Backfilled ${result.rowCount} rows with source_context = 'manual'`);
+
+    // Add index on source_context for filtering performance
+    await pool.query(`
+        CREATE INDEX IF NOT EXISTS idx_jira_tickets_source_context
+        ON jira_tickets(source_context)
+    `);
+    console.log('✓ source_context index created (or already exists)');
+
+    console.log('Migration complete.');
+    process.exit(0);
+}
+
+run().catch(err => {
+    console.error('Migration failed:', err.message);
+    process.exit(1);
+});

backend/migrations/add_ivanti_findings_ipv6_columns.js

@@ -0,0 +1,32 @@
+#!/usr/bin/env node
+// Migration: Add qualys_ipv6 and primary_ipv6 columns to ivanti_findings
+// These capture IPv6 addresses for findings that have no IPv4.
+// Qualys IPv6 comes from hostAdditionalDetails; Primary IPv6 from assetCustomAttributes.
+
+const pool = require('../db');
+
+async function run() {
+    console.log('Adding IPv6 columns to ivanti_findings...');
+    try {
+        await pool.query(`
+            ALTER TABLE ivanti_findings
+            ADD COLUMN IF NOT EXISTS qualys_ipv6 TEXT DEFAULT NULL
+        `);
+        console.log('✓ qualys_ipv6 column added (or already exists)');
+
+        await pool.query(`
+            ALTER TABLE ivanti_findings
+            ADD COLUMN IF NOT EXISTS primary_ipv6 TEXT DEFAULT NULL
+        `);
+        console.log('✓ primary_ipv6 column added (or already exists)');
+
+        console.log('Migration complete.');
+    } catch (err) {
+        console.error('Migration failed:', err.message);
+        process.exit(1);
+    } finally {
+        await pool.end();
+    }
+}
+
+run();

backend/migrations/add_jira_sync_columns_pg.js

@@ -0,0 +1,42 @@
+// Migration: Add Jira sync columns to jira_tickets (Postgres version)
+// Adds jira_id, jira_status, last_synced_at, and created_by columns.
+// These were originally added via a SQLite migration that was never ported to Postgres.
+// Idempotent — safe to run multiple times.
+const pool = require('../db');
+
+async function run() {
+    console.log('Adding Jira sync columns to jira_tickets (Postgres)...');
+
+    // Verify table exists
+    const { rows } = await pool.query(`
+        SELECT 1 FROM information_schema.tables
+        WHERE table_schema = 'public' AND table_name = 'jira_tickets'
+    `);
+    if (rows.length === 0) {
+        console.error('✗ jira_tickets table does not exist. Cannot proceed.');
+        process.exit(1);
+    }
+
+    await pool.query(`ALTER TABLE jira_tickets ADD COLUMN IF NOT EXISTS jira_id TEXT`);
+    console.log('✓ jira_id column added (or already exists)');
+
+    await pool.query(`ALTER TABLE jira_tickets ADD COLUMN IF NOT EXISTS jira_status TEXT`);
+    console.log('✓ jira_status column added (or already exists)');
+
+    await pool.query(`ALTER TABLE jira_tickets ADD COLUMN IF NOT EXISTS last_synced_at TIMESTAMPTZ`);
+    console.log('✓ last_synced_at column added (or already exists)');
+
+    await pool.query(`ALTER TABLE jira_tickets ADD COLUMN IF NOT EXISTS created_by INTEGER`);
+    console.log('✓ created_by column added (or already exists)');
+
+    await pool.query(`CREATE INDEX IF NOT EXISTS idx_jira_tickets_jira_id ON jira_tickets(jira_id)`);
+    console.log('✓ jira_id index created (or already exists)');
+
+    console.log('Migration complete.');
+    process.exit(0);
+}
+
+run().catch(err => {
+    console.error('Migration failed:', err.message);
+    process.exit(1);
+});

backend/migrations/add_multi_item_jira_ticket.js

@@ -0,0 +1,65 @@
+// Migration: Add multi-item Jira ticket junction table
+// - Creates jira_ticket_queue_items table linking jira_tickets to ivanti_todo_queue items
+// - Adds UNIQUE constraint on (jira_ticket_id, queue_item_id)
+// - Adds indexes on queue_item_id and jira_ticket_id
+// Idempotent — safe to run multiple times.
+const pool = require('../db');
+
+async function run() {
+    console.log('Starting multi-item Jira ticket migration...');
+
+    // Verify prerequisite tables exist
+    const { rows: jiraTable } = await pool.query(`
+        SELECT 1 FROM information_schema.tables
+        WHERE table_schema = 'public' AND table_name = 'jira_tickets'
+    `);
+    if (jiraTable.length === 0) {
+        console.error('✗ jira_tickets table does not exist. Cannot proceed.');
+        process.exit(1);
+    }
+    console.log('✓ jira_tickets table exists');
+
+    const { rows: queueTable } = await pool.query(`
+        SELECT 1 FROM information_schema.tables
+        WHERE table_schema = 'public' AND table_name = 'ivanti_todo_queue'
+    `);
+    if (queueTable.length === 0) {
+        console.error('✗ ivanti_todo_queue table does not exist. Cannot proceed.');
+        process.exit(1);
+    }
+    console.log('✓ ivanti_todo_queue table exists');
+
+    // Create junction table
+    await pool.query(`
+        CREATE TABLE IF NOT EXISTS jira_ticket_queue_items (
+            id SERIAL PRIMARY KEY,
+            jira_ticket_id INTEGER NOT NULL REFERENCES jira_tickets(id),
+            queue_item_id INTEGER NOT NULL REFERENCES ivanti_todo_queue(id),
+            created_at TIMESTAMPTZ DEFAULT NOW(),
+            UNIQUE (jira_ticket_id, queue_item_id)
+        )
+    `);
+    console.log('✓ jira_ticket_queue_items table created (or already exists)');
+
+    // Add index on queue_item_id for efficient lookup of tickets by queue item
+    await pool.query(`
+        CREATE INDEX IF NOT EXISTS idx_jira_ticket_queue_items_queue_item
+        ON jira_ticket_queue_items(queue_item_id)
+    `);
+    console.log('✓ queue_item_id index created (or already exists)');
+
+    // Add index on jira_ticket_id for efficient lookup of queue items by ticket
+    await pool.query(`
+        CREATE INDEX IF NOT EXISTS idx_jira_ticket_queue_items_ticket
+        ON jira_ticket_queue_items(jira_ticket_id)
+    `);
+    console.log('✓ jira_ticket_id index created (or already exists)');
+
+    console.log('Migration complete.');
+    process.exit(0);
+}
+
+run().catch(err => {
+    console.error('Migration failed:', err.message);
+    process.exit(1);
+});

backend/migrations/add_queue_remediation_notes_table.js

@@ -0,0 +1,49 @@
+// Migration: Create queue_remediation_notes table
+// Stores remediation notes for Ivanti todo queue items (append-only).
+// FK cascade ensures notes are deleted when the parent queue item is removed.
+// Idempotent — safe to re-run multiple times.
+const pool = require('../db');
+
+async function run() {
+    console.log('Starting queue_remediation_notes migration...');
+
+    // Verify prerequisite table exists
+    const { rows: queueTable } = await pool.query(`
+        SELECT 1 FROM information_schema.tables
+        WHERE table_schema = 'public' AND table_name = 'ivanti_todo_queue'
+    `);
+    if (queueTable.length === 0) {
+        console.error('✗ ivanti_todo_queue table does not exist. Cannot proceed.');
+        process.exit(1);
+    }
+    console.log('✓ ivanti_todo_queue table exists');
+
+    // Create queue_remediation_notes table
+    await pool.query(`
+        CREATE TABLE IF NOT EXISTS queue_remediation_notes (
+            id SERIAL PRIMARY KEY,
+            queue_item_id INTEGER NOT NULL REFERENCES ivanti_todo_queue(id) ON DELETE CASCADE,
+            user_id INTEGER NOT NULL,
+            username VARCHAR(100) NOT NULL,
+            note_text TEXT NOT NULL,
+            created_at TIMESTAMPTZ DEFAULT NOW(),
+            CONSTRAINT chk_note_text_length CHECK (char_length(note_text) <= 5000)
+        )
+    `);
+    console.log('✓ queue_remediation_notes table created (or already exists)');
+
+    // Create index on queue_item_id for efficient lookup
+    await pool.query(`
+        CREATE INDEX IF NOT EXISTS idx_remediation_notes_queue_item
+        ON queue_remediation_notes(queue_item_id)
+    `);
+    console.log('✓ queue_item_id index created (or already exists)');
+
+    console.log('Migration complete.');
+    process.exit(0);
+}
+
+run().catch(err => {
+    console.error('Migration failed:', err.message);
+    process.exit(1);
+});

backend/migrations/add_remediate_workflow_type.js

@@ -0,0 +1,48 @@
+// Migration: Add 'Remediate' to the ivanti_todo_queue workflow_type constraint
+// Uses idempotent pattern: drop constraint IF EXISTS, then re-add with full set.
+// Safe to re-run multiple times.
+const pool = require('../db');
+
+async function run() {
+    console.log('Starting add_remediate_workflow_type migration...');
+
+    // Verify prerequisite table exists
+    const { rows: queueTable } = await pool.query(`
+        SELECT 1 FROM information_schema.tables
+        WHERE table_schema = 'public' AND table_name = 'ivanti_todo_queue'
+    `);
+    if (queueTable.length === 0) {
+        console.error('✗ ivanti_todo_queue table does not exist. Cannot proceed.');
+        process.exit(1);
+    }
+    console.log('✓ ivanti_todo_queue table exists');
+
+    // Drop the existing workflow_type check constraint if it exists
+    await pool.query(`
+        ALTER TABLE ivanti_todo_queue
+        DROP CONSTRAINT IF EXISTS ivanti_todo_queue_workflow_type_check
+    `);
+    console.log('✓ Dropped existing workflow_type check constraint (if any)');
+
+    // Also drop alternative constraint name patterns
+    await pool.query(`
+        ALTER TABLE ivanti_todo_queue
+        DROP CONSTRAINT IF EXISTS chk_workflow_type
+    `);
+
+    // Re-add the constraint with 'Remediate' included
+    await pool.query(`
+        ALTER TABLE ivanti_todo_queue
+        ADD CONSTRAINT ivanti_todo_queue_workflow_type_check
+        CHECK (workflow_type IN ('FP', 'Archer', 'CARD', 'GRANITE', 'DECOM', 'Remediate'))
+    `);
+    console.log('✓ Added workflow_type check constraint with Remediate included');
+
+    console.log('Migration complete.');
+    process.exit(0);
+}
+
+run().catch(err => {
+    console.error('Migration failed:', err.message);
+    process.exit(1);
+});

backend/migrations/add_user_ivanti_identity.js

@@ -0,0 +1,31 @@
+#!/usr/bin/env node
+// Migration: Add ivanti_first_name and ivanti_last_name to users table
+// Allows per-user Ivanti identity for workflow filtering.
+
+const pool = require('../db');
+
+async function run() {
+    console.log('Adding Ivanti identity columns to users table...');
+    try {
+        await pool.query(`
+            ALTER TABLE users
+            ADD COLUMN IF NOT EXISTS ivanti_first_name VARCHAR(100) DEFAULT NULL
+        `);
+        console.log('✓ ivanti_first_name column added (or already exists)');
+
+        await pool.query(`
+            ALTER TABLE users
+            ADD COLUMN IF NOT EXISTS ivanti_last_name VARCHAR(100) DEFAULT NULL
+        `);
+        console.log('✓ ivanti_last_name column added (or already exists)');
+
+        console.log('Migration complete.');
+    } catch (err) {
+        console.error('Migration failed:', err.message);
+        process.exit(1);
+    } finally {
+        await pool.end();
+    }
+}
+
+run();

backend/migrations/drop_jira_status_check_constraint.js

@@ -0,0 +1,18 @@
+// Migration: Drop CHECK constraint on jira_tickets.status
+// Allows storing raw Jira status strings (e.g. "Approval/Handoff", "Prioritizing")
+// instead of mapping to the limited set of Open/In Progress/Closed.
+// Idempotent — safe to run multiple times.
+
+const pool = require('../db');
+
+async function run() {
+    console.log('[Migration] Dropping jira_tickets_status_check constraint...');
+    await pool.query(`ALTER TABLE jira_tickets DROP CONSTRAINT IF EXISTS jira_tickets_status_check`);
+    console.log('✓ jira_tickets status CHECK constraint dropped (or did not exist)');
+    await pool.end();
+}
+
+run().catch(err => {
+    console.error('Migration failed:', err.message);
+    process.exit(1);
+});

backend/migrations/run-all.js

@@ -21,6 +21,18 @@ const POSTGRES_MIGRATIONS = [
     'add_vcl_vertical_metadata.js',
     'add_vcl_multi_vertical.js',
     'add_compliance_item_history.js',
+    'add_jira_sync_columns_pg.js',
+    'add_flexible_jira_ticket_creation.js',
+    'add_multi_item_jira_ticket.js',
+    'drop_jira_status_check_constraint.js',
+    'add_compliance_history_metric_id.js',
+    'add_archer_templates_table.js',
+    'add_queue_remediation_notes_table.js',
+    'add_remediate_workflow_type.js',
+    'add_notifications_table.js',
+    'add_ivanti_findings_ipv6_columns.js',
+    'add_user_ivanti_identity.js',
+    'add_atlas_known_column.js',
 ];
 
 async function runAll() {

backend/routes/archerTemplates.js

@@ -0,0 +1,543 @@
+// routes/archerTemplates.js
+const express = require('express');
+const pool = require('../db');
+const { requireAuth, requireGroup } = require('../middleware/auth');
+const logAudit = require('../helpers/auditLog');
+
+// Section fields and their max length
+const SECTION_FIELDS = [
+  'environment_overview',
+  'segmentation',
+  'mitigating_controls',
+  'additional_info',
+  'charter_network_banner',
+  'data_classification',
+  'charter_network',
+  'additional_access_list'
+];
+const SECTION_MAX_LENGTH = 10000;
+
+function createArcherTemplatesRouter() {
+  const router = express.Router();
+
+  // --- Hierarchy endpoints (MUST be defined before /:id to avoid route conflicts) ---
+
+  /**
+   * GET /api/archer-templates/hierarchy/vendors
+   *
+   * Returns a sorted array of distinct vendor names across all templates.
+   *
+   * @returns {string[]} 200 - Array of vendor names sorted alphabetically
+   * @returns {object} 500 - { error: 'Internal server error' }
+   */
+  router.get('/hierarchy/vendors', requireAuth(), async (req, res) => {
+    try {
+      const { rows } = await pool.query(
+        'SELECT DISTINCT vendor FROM archer_templates ORDER BY vendor ASC'
+      );
+      res.json(rows.map(r => r.vendor));
+    } catch (err) {
+      console.error('Error fetching template vendors:', err);
+      res.status(500).json({ error: 'Internal server error' });
+    }
+  });
+
+  /**
+   * GET /api/archer-templates/hierarchy/platforms
+   *
+   * Returns a sorted array of distinct platform names for a given vendor.
+   *
+   * @query {string} vendor - (required) The vendor to filter platforms by
+   * @returns {string[]} 200 - Array of platform names sorted alphabetically
+   * @returns {object} 400 - { error: 'vendor query parameter is required' }
+   * @returns {object} 500 - { error: 'Internal server error' }
+   */
+  router.get('/hierarchy/platforms', requireAuth(), async (req, res) => {
+    const { vendor } = req.query;
+    if (!vendor) {
+      return res.status(400).json({ error: 'vendor query parameter is required' });
+    }
+    try {
+      const { rows } = await pool.query(
+        'SELECT DISTINCT platform FROM archer_templates WHERE LOWER(TRIM(vendor)) = LOWER(TRIM($1)) ORDER BY platform ASC',
+        [vendor]
+      );
+      res.json(rows.map(r => r.platform));
+    } catch (err) {
+      console.error('Error fetching template platforms:', err);
+      res.status(500).json({ error: 'Internal server error' });
+    }
+  });
+
+  /**
+   * GET /api/archer-templates/hierarchy/models
+   *
+   * Returns a sorted array of distinct model names for a given vendor and platform.
+   *
+   * @query {string} vendor - (required) The vendor to filter by
+   * @query {string} platform - (required) The platform to filter by
+   * @returns {string[]} 200 - Array of model names sorted alphabetically
+   * @returns {object} 400 - { error: 'Missing required query parameters: ...' }
+   * @returns {object} 500 - { error: 'Internal server error' }
+   */
+  router.get('/hierarchy/models', requireAuth(), async (req, res) => {
+    const { vendor, platform } = req.query;
+    const missing = [];
+    if (!vendor) missing.push('vendor');
+    if (!platform) missing.push('platform');
+    if (missing.length > 0) {
+      return res.status(400).json({ error: `Missing required query parameters: ${missing.join(', ')}` });
+    }
+    try {
+      const { rows } = await pool.query(
+        'SELECT DISTINCT model FROM archer_templates WHERE LOWER(TRIM(vendor)) = LOWER(TRIM($1)) AND LOWER(TRIM(platform)) = LOWER(TRIM($2)) ORDER BY model ASC',
+        [vendor, platform]
+      );
+      res.json(rows.map(r => r.model));
+    } catch (err) {
+      console.error('Error fetching template models:', err);
+      res.status(500).json({ error: 'Internal server error' });
+    }
+  });
+
+  // --- Core CRUD endpoints ---
+
+  /**
+   * POST /api/archer-templates
+   *
+   * Creates a new Archer template with vendor/platform/model hierarchy and section content.
+   * Requires Admin or Standard_User group.
+   *
+   * @body {string} vendor - (required) Vendor name, 1-100 chars after trim
+   * @body {string} platform - (required) Platform name, 1-100 chars after trim
+   * @body {string} model - (required) Model name, 1-100 chars after trim
+   * @body {string} [environment_overview] - Section content, max 10,000 chars
+   * @body {string} [segmentation] - Section content, max 10,000 chars
+   * @body {string} [mitigating_controls] - Section content, max 10,000 chars
+   * @body {string} [additional_info] - Section content, max 10,000 chars
+   * @body {string} [charter_network_banner] - Section content, max 10,000 chars
+   * @body {string} [data_classification] - Section content, max 10,000 chars
+   * @body {string} [charter_network] - Section content, max 10,000 chars
+   * @body {string} [additional_access_list] - Section content, max 10,000 chars
+   * @returns {object} 201 - The created template record (all columns)
+   * @returns {object} 400 - { error: 'validation message' }
+   * @returns {object} 409 - { error: 'A template with this vendor/platform/model combination already exists' }
+   * @returns {object} 500 - { error: 'Internal server error' }
+   */
+  router.post('/', requireAuth(), requireGroup('Admin', 'Standard_User'), async (req, res) => {
+    const { vendor, platform, model } = req.body;
+
+    // Validate vendor, platform, model — required, 1-100 chars after trim, non-empty after trim
+    const errors = [];
+    for (const [field, value] of [['vendor', vendor], ['platform', platform], ['model', model]]) {
+      if (value === undefined || value === null || typeof value !== 'string' || value.trim().length === 0) {
+        errors.push(`${field} is required`);
+      } else if (value.trim().length > 100) {
+        errors.push(`${field} must be 100 characters or fewer`);
+      }
+    }
+    if (errors.length > 0) {
+      return res.status(400).json({ error: errors.join('; ') });
+    }
+
+    // Validate section fields — max 10,000 chars each, default to empty string
+    const sectionValues = {};
+    for (const field of SECTION_FIELDS) {
+      const val = req.body[field];
+      if (val !== undefined && val !== null && typeof val === 'string') {
+        if (val.length > SECTION_MAX_LENGTH) {
+          return res.status(400).json({ error: `${field} must be 10,000 characters or fewer` });
+        }
+        sectionValues[field] = val;
+      } else {
+        sectionValues[field] = '';
+      }
+    }
+
+    try {
+      const { rows } = await pool.query(
+        `INSERT INTO archer_templates (vendor, platform, model, environment_overview, segmentation, mitigating_controls, additional_info, charter_network_banner, data_classification, charter_network, additional_access_list, created_by)
+         VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12)
+         RETURNING *`,
+        [
+          vendor.trim(),
+          platform.trim(),
+          model.trim(),
+          sectionValues.environment_overview,
+          sectionValues.segmentation,
+          sectionValues.mitigating_controls,
+          sectionValues.additional_info,
+          sectionValues.charter_network_banner,
+          sectionValues.data_classification,
+          sectionValues.charter_network,
+          sectionValues.additional_access_list,
+          req.user.id
+        ]
+      );
+
+      // Fire-and-forget audit log
+      logAudit({
+        userId: req.user.id,
+        username: req.user.username,
+        action: 'template_created',
+        entityType: 'archer_template',
+        entityId: String(rows[0].id),
+        details: { vendor: vendor.trim(), platform: platform.trim(), model: model.trim() },
+        ipAddress: req.ip
+      });
+
+      res.status(201).json(rows[0]);
+    } catch (err) {
+      if (err.code === '23505') {
+        return res.status(409).json({ error: 'A template with this vendor/platform/model combination already exists' });
+      }
+      console.error('Error creating template:', err);
+      res.status(500).json({ error: 'Internal server error' });
+    }
+  });
+
+  /**
+   * GET /api/archer-templates
+   *
+   * Lists all templates with optional search and exact-match filters.
+   * Results are sorted by vendor, platform, model (ascending).
+   *
+   * @query {string} [search] - Substring search across vendor, platform, and model (ILIKE)
+   * @query {string} [vendor] - Exact-match filter on vendor (case-insensitive)
+   * @query {string} [platform] - Exact-match filter on platform (case-insensitive)
+   * @query {string} [model] - Exact-match filter on model (case-insensitive)
+   * @returns {object[]} 200 - Array of template records sorted by vendor/platform/model
+   * @returns {object} 500 - { error: 'Internal server error' }
+   */
+  router.get('/', requireAuth(), async (req, res) => {
+    const { search, vendor, platform, model } = req.query;
+
+    let query = 'SELECT * FROM archer_templates WHERE 1=1';
+    const params = [];
+    let paramIndex = 1;
+
+    // Search — ILIKE substring match across vendor, platform, model
+    const trimmedSearch = search ? search.trim() : '';
+    if (trimmedSearch.length > 0) {
+      query += ` AND (vendor ILIKE $${paramIndex} OR platform ILIKE $${paramIndex} OR model ILIKE $${paramIndex})`;
+      params.push(`%${trimmedSearch}%`);
+      paramIndex++;
+    }
+
+    // Exact-match filters (case-insensitive via LOWER/TRIM)
+    if (vendor) {
+      query += ` AND LOWER(TRIM(vendor)) = LOWER(TRIM($${paramIndex}))`;
+      params.push(vendor);
+      paramIndex++;
+    }
+    if (platform) {
+      query += ` AND LOWER(TRIM(platform)) = LOWER(TRIM($${paramIndex}))`;
+      params.push(platform);
+      paramIndex++;
+    }
+    if (model) {
+      query += ` AND LOWER(TRIM(model)) = LOWER(TRIM($${paramIndex}))`;
+      params.push(model);
+      paramIndex++;
+    }
+
+    query += ' ORDER BY vendor ASC, platform ASC, model ASC';
+
+    try {
+      const { rows } = await pool.query(query, params);
+      res.json(rows);
+    } catch (err) {
+      console.error('Error fetching templates:', err);
+      res.status(500).json({ error: 'Internal server error' });
+    }
+  });
+
+  /**
+   * POST /api/archer-templates/:id/clone
+   *
+   * Clones an existing template's section content into a new template with different
+   * vendor/platform/model hierarchy values. Requires Admin or Standard_User group.
+   *
+   * @param {number} id - The ID of the source template to clone from
+   * @body {string} vendor - (required) New vendor name, 1-100 chars after trim
+   * @body {string} platform - (required) New platform name, 1-100 chars after trim
+   * @body {string} model - (required) New model name, 1-100 chars after trim
+   * @returns {object} 201 - The newly created cloned template record
+   * @returns {object} 400 - { error: 'validation message' }
+   * @returns {object} 404 - { error: 'Template not found' }
+   * @returns {object} 409 - { error: 'A template with this vendor/platform/model combination already exists' }
+   * @returns {object} 500 - { error: 'Internal server error' }
+   */
+  router.post('/:id/clone', requireAuth(), requireGroup('Admin', 'Standard_User'), async (req, res) => {
+    const { id } = req.params;
+    const { vendor, platform, model } = req.body;
+
+    // Validate vendor, platform, model — required, 1-100 chars after trim, non-empty after trim
+    const errors = [];
+    for (const [field, value] of [['vendor', vendor], ['platform', platform], ['model', model]]) {
+      if (value === undefined || value === null || typeof value !== 'string' || value.trim().length === 0) {
+        errors.push(`${field} is required`);
+      } else if (value.trim().length > 100) {
+        errors.push(`${field} must be 100 characters or fewer`);
+      }
+    }
+    if (errors.length > 0) {
+      return res.status(400).json({ error: errors.join('; ') });
+    }
+
+    try {
+      // Verify source template exists
+      const { rows: sourceRows } = await pool.query('SELECT * FROM archer_templates WHERE id = $1', [id]);
+      if (sourceRows.length === 0) {
+        return res.status(404).json({ error: 'Template not found' });
+      }
+      const source = sourceRows[0];
+
+      // INSERT copying all 8 section fields from source with new hierarchy values
+      const { rows } = await pool.query(
+        `INSERT INTO archer_templates (vendor, platform, model, environment_overview, segmentation, mitigating_controls, additional_info, charter_network_banner, data_classification, charter_network, additional_access_list, created_by)
+         VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12)
+         RETURNING *`,
+        [
+          vendor.trim(),
+          platform.trim(),
+          model.trim(),
+          source.environment_overview,
+          source.segmentation,
+          source.mitigating_controls,
+          source.additional_info,
+          source.charter_network_banner,
+          source.data_classification,
+          source.charter_network,
+          source.additional_access_list,
+          req.user.id
+        ]
+      );
+
+      // Fire-and-forget audit log
+      logAudit({
+        userId: req.user.id,
+        username: req.user.username,
+        action: 'template_cloned',
+        entityType: 'archer_template',
+        entityId: String(rows[0].id),
+        details: { sourceId: Number(id), newId: rows[0].id, vendor: vendor.trim(), platform: platform.trim(), model: model.trim() },
+        ipAddress: req.ip
+      });
+
+      res.status(201).json(rows[0]);
+    } catch (err) {
+      if (err.code === '23505') {
+        return res.status(409).json({ error: 'A template with this vendor/platform/model combination already exists' });
+      }
+      console.error('Error cloning template:', err);
+      res.status(500).json({ error: 'Internal server error' });
+    }
+  });
+
+  /**
+   * GET /api/archer-templates/:id
+   *
+   * Fetches a single template by its ID.
+   *
+   * @param {number} id - The template ID
+   * @returns {object} 200 - The template record
+   * @returns {object} 404 - { error: 'Template not found' }
+   * @returns {object} 500 - { error: 'Internal server error' }
+   */
+  router.get('/:id', requireAuth(), async (req, res) => {
+    const { id } = req.params;
+    try {
+      const { rows } = await pool.query('SELECT * FROM archer_templates WHERE id = $1', [id]);
+      if (rows.length === 0) {
+        return res.status(404).json({ error: 'Template not found' });
+      }
+      res.json(rows[0]);
+    } catch (err) {
+      console.error('Error fetching template:', err);
+      res.status(500).json({ error: 'Internal server error' });
+    }
+  });
+
+  /**
+   * PUT /api/archer-templates/:id
+   *
+   * Updates an existing template. Supports partial updates — only provided fields are changed.
+   * Always updates `updated_at` to NOW(). Requires Admin or Standard_User group.
+   *
+   * @param {number} id - The template ID to update
+   * @body {string} [vendor] - New vendor name, 1-100 chars after trim
+   * @body {string} [platform] - New platform name, 1-100 chars after trim
+   * @body {string} [model] - New model name, 1-100 chars after trim
+   * @body {string} [environment_overview] - Section content, max 10,000 chars
+   * @body {string} [segmentation] - Section content, max 10,000 chars
+   * @body {string} [mitigating_controls] - Section content, max 10,000 chars
+   * @body {string} [additional_info] - Section content, max 10,000 chars
+   * @body {string} [charter_network_banner] - Section content, max 10,000 chars
+   * @body {string} [data_classification] - Section content, max 10,000 chars
+   * @body {string} [charter_network] - Section content, max 10,000 chars
+   * @body {string} [additional_access_list] - Section content, max 10,000 chars
+   * @returns {object} 200 - The updated template record
+   * @returns {object} 400 - { error: 'validation message' }
+   * @returns {object} 404 - { error: 'Template not found' }
+   * @returns {object} 409 - { error: 'A template with this vendor/platform/model combination already exists' }
+   * @returns {object} 500 - { error: 'Internal server error' }
+   */
+  router.put('/:id', requireAuth(), requireGroup('Admin', 'Standard_User'), async (req, res) => {
+    const { id } = req.params;
+
+    try {
+      // Verify template exists
+      const { rows: existingRows } = await pool.query('SELECT * FROM archer_templates WHERE id = $1', [id]);
+      if (existingRows.length === 0) {
+        return res.status(404).json({ error: 'Template not found' });
+      }
+      const existing = existingRows[0];
+
+      // Validate provided hierarchy fields
+      const errors = [];
+      const updatedFields = {};
+      const changedFieldNames = [];
+
+      for (const field of ['vendor', 'platform', 'model']) {
+        const value = req.body[field];
+        if (value !== undefined) {
+          if (value === null || typeof value !== 'string' || value.trim().length === 0) {
+            errors.push(`${field} is required`);
+          } else if (value.trim().length > 100) {
+            errors.push(`${field} must be 100 characters or fewer`);
+          } else {
+            updatedFields[field] = value.trim();
+            if (value.trim() !== existing[field]) {
+              changedFieldNames.push(field);
+            }
+          }
+        }
+      }
+
+      // Validate provided section fields
+      for (const field of SECTION_FIELDS) {
+        const val = req.body[field];
+        if (val !== undefined) {
+          if (val !== null && typeof val === 'string') {
+            if (val.length > SECTION_MAX_LENGTH) {
+              errors.push(`${field} must be 10,000 characters or fewer`);
+            } else {
+              updatedFields[field] = val;
+              if (val !== existing[field]) {
+                changedFieldNames.push(field);
+              }
+            }
+          } else {
+            updatedFields[field] = '';
+            if ('' !== existing[field]) {
+              changedFieldNames.push(field);
+            }
+          }
+        }
+      }
+
+      if (errors.length > 0) {
+        return res.status(400).json({ error: errors.join('; ') });
+      }
+
+      // Check uniqueness if vendor/platform/model changed (excluding self)
+      const newVendor = updatedFields.vendor || existing.vendor;
+      const newPlatform = updatedFields.platform || existing.platform;
+      const newModel = updatedFields.model || existing.model;
+
+      if (updatedFields.vendor !== undefined || updatedFields.platform !== undefined || updatedFields.model !== undefined) {
+        const { rows: conflictRows } = await pool.query(
+          `SELECT id FROM archer_templates WHERE LOWER(TRIM(vendor)) = LOWER(TRIM($1)) AND LOWER(TRIM(platform)) = LOWER(TRIM($2)) AND LOWER(TRIM(model)) = LOWER(TRIM($3)) AND id != $4`,
+          [newVendor, newPlatform, newModel, id]
+        );
+        if (conflictRows.length > 0) {
+          return res.status(409).json({ error: 'A template with this vendor/platform/model combination already exists' });
+        }
+      }
+
+      // Build dynamic UPDATE SET clause for only provided fields
+      const setClauses = [];
+      const params = [];
+      let paramIndex = 1;
+
+      for (const [field, value] of Object.entries(updatedFields)) {
+        setClauses.push(`${field} = $${paramIndex}`);
+        params.push(value);
+        paramIndex++;
+      }
+
+      // Always set updated_at = NOW()
+      setClauses.push(`updated_at = NOW()`);
+
+      // Execute update
+      params.push(id);
+      const { rows } = await pool.query(
+        `UPDATE archer_templates SET ${setClauses.join(', ')} WHERE id = $${paramIndex} RETURNING *`,
+        params
+      );
+
+      // Fire-and-forget audit log
+      logAudit({
+        userId: req.user.id,
+        username: req.user.username,
+        action: 'template_updated',
+        entityType: 'archer_template',
+        entityId: String(id),
+        details: { changedFields: changedFieldNames },
+        ipAddress: req.ip
+      });
+
+      res.json(rows[0]);
+    } catch (err) {
+      console.error('Error updating template:', err);
+      res.status(500).json({ error: 'Internal server error' });
+    }
+  });
+
+  /**
+   * DELETE /api/archer-templates/:id
+   *
+   * Permanently deletes a template. Requires Admin or Standard_User group.
+   *
+   * @param {number} id - The template ID to delete
+   * @returns {object} 200 - { message: 'Template deleted successfully' }
+   * @returns {object} 404 - { error: 'Template not found' }
+   * @returns {object} 500 - { error: 'Internal server error' }
+   */
+  router.delete('/:id', requireAuth(), requireGroup('Admin', 'Standard_User'), async (req, res) => {
+    const { id } = req.params;
+
+    try {
+      // Verify template exists
+      const { rows: existingRows } = await pool.query('SELECT * FROM archer_templates WHERE id = $1', [id]);
+      if (existingRows.length === 0) {
+        return res.status(404).json({ error: 'Template not found' });
+      }
+      const existing = existingRows[0];
+
+      // Delete the template
+      await pool.query('DELETE FROM archer_templates WHERE id = $1', [id]);
+
+      // Fire-and-forget audit log
+      logAudit({
+        userId: req.user.id,
+        username: req.user.username,
+        action: 'template_deleted',
+        entityType: 'archer_template',
+        entityId: String(id),
+        details: { vendor: existing.vendor, platform: existing.platform, model: existing.model },
+        ipAddress: req.ip
+      });
+
+      res.json({ message: 'Template deleted successfully' });
+    } catch (err) {
+      console.error('Error deleting template:', err);
+      res.status(500).json({ error: 'Internal server error' });
+    }
+  });
+
+  return router;
+}
+
+module.exports = createArcherTemplatesRouter;

backend/routes/atlas.js

@@ -74,7 +74,10 @@ function createAtlasRouter() {
      * GET /metrics
      *
      * Returns aggregated Atlas action plan metrics from the local cache.
+     * Accepts optional `teams` query parameter to scope metrics to hosts
+     * belonging to specific BUs (via JOIN on ivanti_findings).
      *
+     * @query {string} [teams] - Comma-separated team names (e.g. 'STEAM,ACCESS-ENG')
      * @returns {Object} 200 - { totalHosts, hostsWithPlans, hostsWithoutPlans, plansByType, plansByStatus, totalPlans }
      * @returns {Object} 503 - { error } when Atlas API is not configured
      * @returns {Object} 500 - { error } on database failure
@@ -85,9 +88,37 @@ function createAtlasRouter() {
         }
 
         try {
-            const { rows } = await pool.query(
-                `SELECT has_action_plan, plans_json FROM atlas_action_plans_cache`
-            );
+            const teamsParam = req.query.teams;
+            let rows;
+
+            if (teamsParam) {
+                const teams = teamsParam.split(',').map(t => t.trim()).filter(Boolean);
+                if (teams.length > 0) {
+                    const patterns = teams.map(t => `%${t}%`);
+                    const result = await pool.query(
+                        `SELECT a.has_action_plan, a.plans_json
+                         FROM atlas_action_plans_cache a
+                         INNER JOIN (
+                             SELECT DISTINCT host_id FROM ivanti_findings
+                             WHERE bu_ownership ILIKE ANY($1::text[])
+                         ) f ON a.host_id = f.host_id
+                         WHERE a.atlas_known = true`,
+                        [patterns]
+                    );
+                    rows = result.rows;
+                } else {
+                    const result = await pool.query(
+                        `SELECT has_action_plan, plans_json FROM atlas_action_plans_cache WHERE atlas_known = true`
+                    );
+                    rows = result.rows;
+                }
+            } else {
+                const result = await pool.query(
+                    `SELECT has_action_plan, plans_json FROM atlas_action_plans_cache WHERE atlas_known = true`
+                );
+                rows = result.rows;
+            }
+
             const metrics = aggregateAtlasMetrics(rows);
             res.json(metrics);
         } catch (err) {
@@ -99,9 +130,12 @@ function createAtlasRouter() {
     /**
      * GET /status
      *
-     * Returns the full atlas_action_plans_cache table contents for status display.
+     * Returns atlas_action_plans_cache contents for status display.
+     * Accepts optional `teams` query parameter to scope results to hosts
+     * belonging to specific BUs (via JOIN on ivanti_findings).
      *
-     * @returns {Array} 200 - Array of { host_id, has_action_plan, plan_count, plans_json, synced_at }
+     * @query {string} [teams] - Comma-separated team names (e.g. 'STEAM,ACCESS-ENG')
+     * @returns {Array} 200 - Array of { host_id, has_action_plan, plan_count, plans_json, atlas_known, synced_at }
      * @returns {Object} 503 - { error } when Atlas API is not configured
      * @returns {Object} 500 - { error } on database failure
      */
@@ -111,9 +145,36 @@ function createAtlasRouter() {
         }
 
         try {
-            const { rows } = await pool.query(
-                `SELECT host_id, has_action_plan, plan_count, plans_json, synced_at FROM atlas_action_plans_cache`
-            );
+            const teamsParam = req.query.teams;
+            let rows;
+
+            if (teamsParam) {
+                const teams = teamsParam.split(',').map(t => t.trim()).filter(Boolean);
+                if (teams.length > 0) {
+                    const patterns = teams.map(t => `%${t}%`);
+                    const result = await pool.query(
+                        `SELECT a.host_id, a.has_action_plan, a.plan_count, a.plans_json, a.atlas_known, a.synced_at
+                         FROM atlas_action_plans_cache a
+                         INNER JOIN (
+                             SELECT DISTINCT host_id FROM ivanti_findings
+                             WHERE bu_ownership ILIKE ANY($1::text[])
+                         ) f ON a.host_id = f.host_id`,
+                        [patterns]
+                    );
+                    rows = result.rows;
+                } else {
+                    const result = await pool.query(
+                        `SELECT host_id, has_action_plan, plan_count, plans_json, atlas_known, synced_at FROM atlas_action_plans_cache`
+                    );
+                    rows = result.rows;
+                }
+            } else {
+                const result = await pool.query(
+                    `SELECT host_id, has_action_plan, plan_count, plans_json, atlas_known, synced_at FROM atlas_action_plans_cache`
+                );
+                rows = result.rows;
+            }
+
             res.json(rows);
         } catch (err) {
             console.error('[Atlas] Error fetching status:', err.message);
@@ -126,8 +187,12 @@ function createAtlasRouter() {
      *
      * Syncs action plan data from Atlas for all hosts found in ivanti_findings.
      * Fetches plans per host in batches of 5 and upserts into the local cache.
+     * Scopes to the provided teams or falls back to IVANTI_MANAGED_BUS.
      * Requires Admin or Standard_User group.
      *
+     * @query {string} [teams] - Comma-separated team names to scope sync (e.g. 'STEAM,ACCESS-ENG')
+     * @param {Object} [req.body]
+     * @param {string} [req.body.teams] - Comma-separated team names (alternative to query param)
      * @returns {Object} 200 - { synced, withPlans, failed }
      * @returns {Object} 503 - { error } when Atlas API is not configured
      * @returns {Object} 500 - { error } on unexpected failure
@@ -138,10 +203,48 @@ function createAtlasRouter() {
         }
 
         try {
-            // Read Ivanti findings and extract unique non-null hostIds
-            const { rows: findingsRows } = await pool.query(
-                `SELECT DISTINCT host_id FROM ivanti_findings WHERE host_id IS NOT NULL AND host_id > 0`
-            );
+            // Scope sync to the user's active teams if provided, otherwise sync only
+            // findings from managed BUs (IVANTI_MANAGED_BUS) to avoid polluting cache
+            // with "no plan" entries for BUs not covered by Atlas.
+            const teamsParam = req.query.teams || req.body.teams || '';
+            const managedBUs = (process.env.IVANTI_MANAGED_BUS || 'NTS-AEO-ACCESS-ENG,NTS-AEO-STEAM')
+                .split(',').map(b => b.trim()).filter(Boolean);
+
+            let findingsRows;
+            if (teamsParam) {
+                const teams = teamsParam.split(',').map(t => t.trim()).filter(Boolean);
+                if (teams.length > 0) {
+                    const patterns = teams.map(t => `%${t}%`);
+                    const result = await pool.query(
+                        `SELECT DISTINCT host_id FROM ivanti_findings
+                         WHERE host_id IS NOT NULL AND host_id > 0
+                           AND bu_ownership ILIKE ANY($1::text[])`,
+                        [patterns]
+                    );
+                    findingsRows = result.rows;
+                } else {
+                    // No valid teams — fall back to managed BUs
+                    const patterns = managedBUs.map(b => `%${b}%`);
+                    const result = await pool.query(
+                        `SELECT DISTINCT host_id FROM ivanti_findings
+                         WHERE host_id IS NOT NULL AND host_id > 0
+                           AND bu_ownership ILIKE ANY($1::text[])`,
+                        [patterns]
+                    );
+                    findingsRows = result.rows;
+                }
+            } else {
+                // No teams specified — default to managed BUs only
+                const patterns = managedBUs.map(b => `%${b}%`);
+                const result = await pool.query(
+                    `SELECT DISTINCT host_id FROM ivanti_findings
+                     WHERE host_id IS NOT NULL AND host_id > 0
+                       AND bu_ownership ILIKE ANY($1::text[])`,
+                    [patterns]
+                );
+                findingsRows = result.rows;
+            }
+
             const hostIds = findingsRows.map(r => r.host_id);
 
             if (hostIds.length === 0) {
@@ -191,6 +294,9 @@ function createAtlasRouter() {
 
                         const planCount = activePlans.length;
                         const hasActionPlan = planCount > 0;
+                        // Atlas "knows" this host if it returned any plans (active or inactive).
+                        // Hosts with completely empty responses are not tracked by Atlas.
+                        const atlasKnown = allPlans.length > 0;
 
                         try {
                             if (!hasActionPlan) {
@@ -216,14 +322,15 @@ function createAtlasRouter() {
                             }
 
                             await pool.query(
-                                `INSERT INTO atlas_action_plans_cache (host_id, has_action_plan, plan_count, plans_json, synced_at)
-                                 VALUES ($1, $2, $3, $4, NOW())
+                                `INSERT INTO atlas_action_plans_cache (host_id, has_action_plan, plan_count, plans_json, atlas_known, synced_at)
+                                 VALUES ($1, $2, $3, $4, $5, NOW())
                                  ON CONFLICT(host_id) DO UPDATE SET
                                      has_action_plan = EXCLUDED.has_action_plan,
                                      plan_count = EXCLUDED.plan_count,
                                      plans_json = EXCLUDED.plans_json,
+                                     atlas_known = EXCLUDED.atlas_known,
                                      synced_at = EXCLUDED.synced_at`,
-                                [hostId, hasActionPlan, planCount, JSON.stringify(allPlans)]
+                                [hostId, hasActionPlan, planCount, JSON.stringify(allPlans), atlasKnown]
                             );
                         } catch (dbErr) {
                             console.error('[Atlas Sync] DB upsert failed for host', hostId, ':', dbErr.message);
@@ -478,12 +585,13 @@ function createAtlasRouter() {
                         const newCount = updatedPlans.length;
 
                         await pool.query(
-                            `INSERT INTO atlas_action_plans_cache (host_id, has_action_plan, plan_count, plans_json, synced_at)
-                             VALUES ($1, true, $2, $3, NOW())
+                            `INSERT INTO atlas_action_plans_cache (host_id, has_action_plan, plan_count, plans_json, atlas_known, synced_at)
+                             VALUES ($1, true, $2, $3, true, NOW())
                              ON CONFLICT(host_id) DO UPDATE SET
                                  has_action_plan = true,
                                  plan_count = EXCLUDED.plan_count,
                                  plans_json = EXCLUDED.plans_json,
+                                 atlas_known = true,
                                  synced_at = EXCLUDED.synced_at`,
                             [hid, newCount, JSON.stringify(updatedPlans)]
                         );
@@ -561,16 +669,18 @@ function createAtlasRouter() {
 
                     const planCount = activePlans.length;
                     const hasActionPlan = planCount > 0;
+                    const atlasKnown = allPlans.length > 0;
 
                     await pool.query(
-                        `INSERT INTO atlas_action_plans_cache (host_id, has_action_plan, plan_count, plans_json, synced_at)
-                         VALUES ($1, $2, $3, $4, NOW())
+                        `INSERT INTO atlas_action_plans_cache (host_id, has_action_plan, plan_count, plans_json, atlas_known, synced_at)
+                         VALUES ($1, $2, $3, $4, $5, NOW())
                          ON CONFLICT(host_id) DO UPDATE SET
                              has_action_plan = EXCLUDED.has_action_plan,
                              plan_count = EXCLUDED.plan_count,
                              plans_json = EXCLUDED.plans_json,
+                             atlas_known = EXCLUDED.atlas_known,
                              synced_at = EXCLUDED.synced_at`,
-                        [hostId, hasActionPlan, planCount, JSON.stringify(allPlans)]
+                        [hostId, hasActionPlan, planCount, JSON.stringify(allPlans), atlasKnown]
                     );
                 }
 

backend/routes/cardApi.js

@@ -15,6 +15,8 @@ const {
     confirmAsset,
     declineAsset,
     redirectAsset,
+    resolveAssetId,
+    searchByIvantiHostId,
 } = require('../helpers/cardApi');
 
 // ---------------------------------------------------------------------------
@@ -52,7 +54,14 @@ function handleCardError(err, res) {
 function createCardApiRouter() {
     const router = express.Router();
 
-    // GET /status
+    /**
+     * GET /status
+     *
+     * Returns whether the CARD API integration is configured.
+     *
+     * @response 200 - { configured: true }
+     * @response 503 - { configured: false, error: string, missingVars: string[] }
+     */
     router.get('/status', requireAuth(), (req, res) => {
         if (!isConfigured) {
             return res.status(503).json({ configured: false, error: 'CARD API is not configured.', missingVars });
@@ -60,7 +69,14 @@ function createCardApiRouter() {
         res.json({ configured: true });
     });
 
-    // GET /teams
+    /**
+     * GET /teams
+     *
+     * Returns the list of teams from the CARD API.
+     *
+     * @response 200 - Array of team objects from CARD
+     * @response 503 - { error: string, missingVars: string[] } — CARD not configured
+     */
     router.get('/teams', requireAuth(), requireGroup('Admin', 'Standard_User'), async (req, res) => {
         if (!isConfigured) {
             return res.status(503).json({ error: 'CARD API is not configured.', missingVars });
@@ -82,7 +98,19 @@ function createCardApiRouter() {
         }
     });
 
-    // GET /teams/:teamName/assets
+    /**
+     * GET /teams/:teamName/assets
+     *
+     * Returns paginated assets for a team filtered by disposition.
+     *
+     * @param {string} teamName - Team name (path parameter)
+     * @query {string} disposition - Required. Asset disposition filter.
+     * @query {number} [page] - Page number for pagination.
+     * @query {number} [page_size=50] - Number of results per page.
+     * @response 200 - { assets: object[], total: number, ... } from CARD
+     * @response 400 - { error: string } — missing disposition
+     * @response 503 - { error: string, missingVars: string[] } — CARD not configured
+     */
     router.get('/teams/:teamName/assets', requireAuth(), requireGroup('Admin', 'Standard_User'), async (req, res) => {
         if (!isConfigured) {
             return res.status(503).json({ error: 'CARD API is not configured.', missingVars });
@@ -133,7 +161,15 @@ function createCardApiRouter() {
         }
     });
 
-    // GET /owner/:assetId
+    /**
+     * GET /owner/:assetId
+     *
+     * Returns the CARD owner record for a given asset ID.
+     *
+     * @param {string} assetId - CARD asset identifier (path parameter)
+     * @response 200 - CARD owner/asset object
+     * @response 503 - { error: string, missingVars: string[] } — CARD not configured
+     */
     router.get('/owner/:assetId', requireAuth(), requireGroup('Admin', 'Standard_User'), async (req, res) => {
         if (!isConfigured) {
             return res.status(503).json({ error: 'CARD API is not configured.', missingVars });
@@ -156,22 +192,69 @@ function createCardApiRouter() {
         }
     });
 
-    // POST /queue/:queueItemId/confirm
+    /**
+     * POST /queue/:queueItemId/confirm
+     *
+     * Confirms ownership of a CARD asset for a queue item. Fetches the owner
+     * record to obtain the update_token, then calls the CARD confirm endpoint.
+     * Marks the queue item as complete on success.
+     *
+     * @param {string} queueItemId - Queue item ID (path parameter)
+     * @body {string} teamName - Team name to confirm ownership for (required)
+     * @body {string} assetId - CARD asset identifier (required)
+     * @body {string} [comment] - Optional comment for the confirmation
+     * @response 200 - { success: true, cardResponse: object }
+     * @response 400 - { error: string } — missing fields or item not pending
+     * @response 404 - { error: string } — queue item not found
+     * @response 502 - { error: string } — CARD API failure
+     * @response 503 - { error: string, missingVars: string[] } — CARD not configured
+     */
     router.post('/queue/:queueItemId/confirm', requireAuth(), requireGroup('Admin', 'Standard_User'), async (req, res) => {
         if (!isConfigured) {
             return res.status(503).json({ error: 'CARD API is not configured.', missingVars });
         }
 
         const { queueItemId } = req.params;
-        const { teamName, assetId, comment } = req.body;
+        const { teamName, assetId: rawAssetId, comment } = req.body;
 
         if (!teamName || typeof teamName !== 'string' || !teamName.trim()) {
             return res.status(400).json({ error: 'teamName is required.' });
         }
-        if (!assetId || typeof assetId !== 'string' || !assetId.trim()) {
+        if (!rawAssetId || typeof rawAssetId !== 'string' || !rawAssetId.trim()) {
             return res.status(400).json({ error: 'assetId is required.' });
         }
 
+        // Resolve bare IP to full CARD asset ID — try Ivanti host_id fast path first
+        let assetId = rawAssetId.trim();
+        if (!/\d+-[A-Z]+$/i.test(assetId)) {
+            let resolved = null;
+
+            // Fast path: look up the finding's host_id and search CARD directly
+            const findingRow = await pool.query(
+                'SELECT host_id FROM ivanti_findings WHERE ip_address = $1 LIMIT 1',
+                [assetId]
+            ).then(r => r.rows[0]).catch(() => null);
+
+            if (findingRow && findingRow.host_id) {
+                try {
+                    const searchResult = await searchByIvantiHostId(findingRow.host_id);
+                    if (searchResult.ok) {
+                        const searchData = JSON.parse(searchResult.body);
+                        resolved = searchData._id || searchData.asset_id || searchData.id || null;
+                    }
+                } catch (_) { /* fall through */ }
+            }
+
+            // Fallback: suffix guessing
+            if (!resolved) {
+                resolved = await resolveAssetId(assetId);
+            }
+            if (!resolved) {
+                return res.status(404).json({ error: `Asset not found in CARD for IP: ${assetId}` });
+            }
+            assetId = resolved;
+        }
+
         try {
             const { rows } = await pool.query(
                 'SELECT * FROM ivanti_todo_queue WHERE id = $1 AND user_id = $2 AND workflow_type = $3',
@@ -232,22 +315,69 @@ function createCardApiRouter() {
         }
     });
 
-    // POST /queue/:queueItemId/decline
+    /**
+     * POST /queue/:queueItemId/decline
+     *
+     * Declines ownership of a CARD asset for a queue item. Fetches the owner
+     * record to obtain the update_token, then calls the CARD decline endpoint.
+     * Marks the queue item as complete on success.
+     *
+     * @param {string} queueItemId - Queue item ID (path parameter)
+     * @body {string} teamName - Team name declining ownership (required)
+     * @body {string} assetId - CARD asset identifier (required)
+     * @body {string} [comment] - Optional comment for the decline
+     * @response 200 - { success: true, cardResponse: object }
+     * @response 400 - { error: string } — missing fields or item not pending
+     * @response 404 - { error: string } — queue item not found
+     * @response 502 - { error: string } — CARD API failure
+     * @response 503 - { error: string, missingVars: string[] } — CARD not configured
+     */
     router.post('/queue/:queueItemId/decline', requireAuth(), requireGroup('Admin', 'Standard_User'), async (req, res) => {
         if (!isConfigured) {
             return res.status(503).json({ error: 'CARD API is not configured.', missingVars });
         }
 
         const { queueItemId } = req.params;
-        const { teamName, assetId, comment } = req.body;
+        const { teamName, assetId: rawAssetId, comment } = req.body;
 
         if (!teamName || typeof teamName !== 'string' || !teamName.trim()) {
             return res.status(400).json({ error: 'teamName is required.' });
         }
-        if (!assetId || typeof assetId !== 'string' || !assetId.trim()) {
+        if (!rawAssetId || typeof rawAssetId !== 'string' || !rawAssetId.trim()) {
             return res.status(400).json({ error: 'assetId is required.' });
         }
 
+        // Resolve bare IP to full CARD asset ID — try Ivanti host_id fast path first
+        let assetId = rawAssetId.trim();
+        if (!/\d+-[A-Z]+$/i.test(assetId)) {
+            let resolved = null;
+
+            // Fast path: look up the finding's host_id and search CARD directly
+            const findingRow = await pool.query(
+                'SELECT host_id FROM ivanti_findings WHERE ip_address = $1 LIMIT 1',
+                [assetId]
+            ).then(r => r.rows[0]).catch(() => null);
+
+            if (findingRow && findingRow.host_id) {
+                try {
+                    const searchResult = await searchByIvantiHostId(findingRow.host_id);
+                    if (searchResult.ok) {
+                        const searchData = JSON.parse(searchResult.body);
+                        resolved = searchData._id || searchData.asset_id || searchData.id || null;
+                    }
+                } catch (_) { /* fall through */ }
+            }
+
+            // Fallback: suffix guessing
+            if (!resolved) {
+                resolved = await resolveAssetId(assetId);
+            }
+            if (!resolved) {
+                return res.status(404).json({ error: `Asset not found in CARD for IP: ${assetId}` });
+            }
+            assetId = resolved;
+        }
+
         try {
             const { rows } = await pool.query(
                 'SELECT * FROM ivanti_todo_queue WHERE id = $1 AND user_id = $2 AND workflow_type = $3',
@@ -276,8 +406,8 @@ function createCardApiRouter() {
             const updateToken = ownerData.owner && ownerData.owner.update_token;
 
             if (!updateToken) {
-                const errMsg = 'update_token not found in owner record.';
-                logAudit({ userId: req.user.id, username: req.user.username, action: 'card_action_failed', entityType: 'ivanti_todo_queue', entityId: String(queueItemId), details: { actionType: 'decline', assetId, error: errMsg, cardStatus: null }, ipAddress: req.ip });
+                const errMsg = 'update_token not found in owner record. The asset may have already been actioned or the owner record is in an unexpected state.';
+                logAudit({ userId: req.user.id, username: req.user.username, action: 'card_action_failed', entityType: 'ivanti_todo_queue', entityId: String(queueItemId), details: { actionType: 'decline', assetId, error: errMsg, cardStatus: null, ownerResponse: ownerData }, ipAddress: req.ip });
                 return res.status(502).json({ error: 'CARD API request failed.', details: errMsg });
             }
 
@@ -308,14 +438,30 @@ function createCardApiRouter() {
         }
     });
 
-    // POST /queue/:queueItemId/redirect
+    /**
+     * POST /queue/:queueItemId/redirect
+     *
+     * Redirects a CARD asset from one team to another for a queue item. Fetches
+     * the owner record to obtain the update_token, then calls the CARD redirect
+     * endpoint. Marks the queue item as complete on success.
+     *
+     * @param {string} queueItemId - Queue item ID (path parameter)
+     * @body {string} fromTeam - Current owning team (required)
+     * @body {string} toTeam - Target team to redirect to (required)
+     * @body {string} assetId - CARD asset identifier (required)
+     * @response 200 - { success: true, cardResponse: object }
+     * @response 400 - { error: string } — missing fields or item not pending
+     * @response 404 - { error: string } — queue item not found
+     * @response 502 - { error: string } — CARD API failure
+     * @response 503 - { error: string, missingVars: string[] } — CARD not configured
+     */
     router.post('/queue/:queueItemId/redirect', requireAuth(), requireGroup('Admin', 'Standard_User'), async (req, res) => {
         if (!isConfigured) {
             return res.status(503).json({ error: 'CARD API is not configured.', missingVars });
         }
 
         const { queueItemId } = req.params;
-        const { fromTeam, toTeam, assetId } = req.body;
+        const { fromTeam, toTeam, assetId: rawAssetId } = req.body;
 
         if (!fromTeam || typeof fromTeam !== 'string' || !fromTeam.trim()) {
             return res.status(400).json({ error: 'fromTeam is required.' });
@@ -323,10 +469,41 @@ function createCardApiRouter() {
         if (!toTeam || typeof toTeam !== 'string' || !toTeam.trim()) {
             return res.status(400).json({ error: 'toTeam is required.' });
         }
-        if (!assetId || typeof assetId !== 'string' || !assetId.trim()) {
+        if (!rawAssetId || typeof rawAssetId !== 'string' || !rawAssetId.trim()) {
             return res.status(400).json({ error: 'assetId is required.' });
         }
 
+        // Resolve bare IP to full CARD asset ID — try Ivanti host_id fast path first
+        let assetId = rawAssetId.trim();
+        if (!/\d+-[A-Z]+$/i.test(assetId)) {
+            let resolved = null;
+
+            // Fast path: look up the finding's host_id and search CARD directly
+            const findingRow = await pool.query(
+                'SELECT host_id FROM ivanti_findings WHERE ip_address = $1 LIMIT 1',
+                [assetId]
+            ).then(r => r.rows[0]).catch(() => null);
+
+            if (findingRow && findingRow.host_id) {
+                try {
+                    const searchResult = await searchByIvantiHostId(findingRow.host_id);
+                    if (searchResult.ok) {
+                        const searchData = JSON.parse(searchResult.body);
+                        resolved = searchData._id || searchData.asset_id || searchData.id || null;
+                    }
+                } catch (_) { /* fall through */ }
+            }
+
+            // Fallback: suffix guessing
+            if (!resolved) {
+                resolved = await resolveAssetId(assetId);
+            }
+            if (!resolved) {
+                return res.status(404).json({ error: `Asset not found in CARD for IP: ${assetId}` });
+            }
+            assetId = resolved;
+        }
+
         try {
             const { rows } = await pool.query(
                 'SELECT * FROM ivanti_todo_queue WHERE id = $1 AND user_id = $2 AND workflow_type = $3',
@@ -387,7 +564,661 @@ function createCardApiRouter() {
         }
     });
 
+    /**
+     * GET /owner-lookup/:ip
+     *
+     * Resolve an IP to a CARD asset ID and return the full owner record.
+     * Used by the CARD Action Modal to display ownership state before
+     * confirm/decline/redirect operations.
+     *
+     * @param {string} ip - IP address (path parameter)
+     * @query {string} [quick] - Set to "1" for quick mode (CTEC only, 15s timeout). Used for tooltip lookups.
+     * @query {string} [hostId] - Ivanti Host ID (integer). When provided, uses CARD asset-search for faster resolution.
+     * @response 200 - { asset_id, ip, confirmed, unconfirmed, declined, candidate, update_token }
+     * @response 400 - { error: string } — missing IP
+     * @response 404 - { error: string } — IP not found in CARD
+     * @response 504 - { error: string, timeout: true } — CARD lookup timed out
+     * @response 503 - { error: string } — CARD not configured
+     */
+    router.get('/owner-lookup/:ip', requireAuth(), requireGroup('Admin', 'Standard_User'), async (req, res) => {
+        if (!isConfigured) {
+            return res.status(503).json({ error: 'CARD API is not configured.', missingVars });
+        }
+
+        const ip = req.params.ip;
+        if (!ip || !ip.trim()) {
+            return res.status(400).json({ error: 'IP address is required.' });
+        }
+
+        // Use quick mode (CTEC only, 15s timeout) for tooltip lookups
+        const quick = req.query.quick === '1';
+        const hostId = req.query.hostId;
+
+        // Fast path: if Ivanti hostId is provided, try asset-search first
+        // The asset-search returns the full record including owner data, so we can
+        // often return directly without a separate getOwner() call.
+        // If update_token is missing, do a follow-up getOwner() to fetch it.
+        let assetId = null;
+        if (hostId && /^\d+$/.test(hostId)) {
+            try {
+                const searchResult = await searchByIvantiHostId(hostId);
+                if (searchResult.ok) {
+                    const searchData = JSON.parse(searchResult.body);
+                    const assets = searchData.assets || [];
+                    if (assets.length > 0) {
+                        const asset = assets[0];
+                        const owner = asset.owner || {};
+                        let updateToken = owner.update_token || null;
+
+                        // If no update_token, fetch it from the owner endpoint using the resolved _id
+                        if (!updateToken && asset._id) {
+                            try {
+                                const ownerResult = await getOwner(asset._id);
+                                if (ownerResult.ok) {
+                                    const ownerData = JSON.parse(ownerResult.body);
+                                    updateToken = (ownerData.owner && ownerData.owner.update_token) || null;
+                                }
+                            } catch (_) { /* best effort */ }
+                        }
+
+                        return res.json({
+                            asset_id: asset._id || null,
+                            ip: ip.trim(),
+                            confirmed: owner.confirmed || null,
+                            unconfirmed: owner.unconfirmed || null,
+                            declined: owner.declined || [],
+                            candidate: owner.candidate || [],
+                            update_token: updateToken,
+                        });
+                    }
+                }
+            } catch (_) {
+                // Fall through to suffix resolution
+            }
+        }
+
+        // Fallback: resolve via IP + suffix guessing
+        if (!assetId) {
+            try {
+                assetId = await resolveAssetId(ip.trim(), quick ? { quick: true } : undefined);
+            } catch (err) {
+                if (err.message === 'CARD_TIMEOUT') {
+                    return res.status(504).json({ error: 'CARD lookup timed out', timeout: true });
+                }
+                return handleCardError(err, res);
+            }
+        }
+
+        if (!assetId) {
+            return res.status(404).json({ error: `Asset not found in CARD for IP: ${ip}` });
+        }
+
+        // Fetch full owner record
+        try {
+            const ownerResult = await getOwner(assetId);
+            if (!ownerResult.ok) {
+                return res.status(ownerResult.status).json({ error: `Failed to fetch owner: HTTP ${ownerResult.status}` });
+            }
+
+            const data = JSON.parse(ownerResult.body);
+            const owner = data.owner || {};
+
+            res.json({
+                asset_id: assetId,
+                ip: ip.trim(),
+                confirmed: owner.confirmed || null,
+                unconfirmed: owner.unconfirmed || null,
+                declined: owner.declined || [],
+                candidate: owner.candidate || [],
+                update_token: owner.update_token || null,
+            });
+        } catch (err) {
+            return handleCardError(err, res);
+        }
+    });
+
+    /**
+     * POST /owner/:assetId/confirm
+     *
+     * Directly confirm ownership of a CARD asset (no queue item required).
+     * Fetches the owner record for the update_token, then calls CARD confirm.
+     *
+     * @param {string} assetId - CARD asset identifier or IP address (path parameter)
+     * @body {string} teamName - Team to confirm ownership for (required)
+     * @body {string} [comment] - Optional comment
+     * @response 200 - { success: true, cardResponse: object }
+     * @response 400 - { error: string } — missing fields
+     * @response 404 - { error: string } — asset not found
+     * @response 502 - { error: string } — CARD API failure
+     * @response 503 - { error: string, missingVars: string[] } — CARD not configured
+     */
+    router.post('/owner/:assetId/confirm', requireAuth(), requireGroup('Admin', 'Standard_User'), async (req, res) => {
+        if (!isConfigured) {
+            return res.status(503).json({ error: 'CARD API is not configured.', missingVars });
+        }
+
+        let assetId = req.params.assetId;
+        const { teamName, comment } = req.body || {};
+
+        if (!teamName || typeof teamName !== 'string' || !teamName.trim()) {
+            return res.status(400).json({ error: 'teamName is required.' });
+        }
+
+        // Resolve bare IP to full CARD asset ID
+        if (!/\d+-[A-Z]+$/i.test(assetId)) {
+            const resolved = await resolveAssetId(assetId);
+            if (!resolved) {
+                return res.status(404).json({ error: `Asset not found in CARD for: ${assetId}` });
+            }
+            assetId = resolved;
+        }
+
+        try {
+            const ownerResult = await getOwner(assetId);
+            if (!ownerResult.ok) {
+                return res.status(ownerResult.status).json({ error: `Failed to fetch owner record: HTTP ${ownerResult.status}` });
+            }
+
+            let ownerData;
+            try { ownerData = JSON.parse(ownerResult.body); } catch (_) { ownerData = {}; }
+            const updateToken = ownerData.owner && ownerData.owner.update_token;
+
+            if (!updateToken) {
+                return res.status(502).json({ error: 'update_token not found in owner record.' });
+            }
+
+            const confirmResult = await confirmAsset(assetId, teamName.trim(), updateToken, comment || '');
+
+            if (confirmResult.ok) {
+                let cardResponse;
+                try { cardResponse = JSON.parse(confirmResult.body); } catch (_) { cardResponse = confirmResult.body; }
+                logAudit({ userId: req.user.id, username: req.user.username, action: 'card_confirm_direct', entityType: 'card_asset', entityId: assetId, details: { teamName: teamName.trim(), comment: comment || '' }, ipAddress: req.ip });
+                return res.json({ success: true, cardResponse });
+            }
+
+            let errorBody;
+            try { errorBody = JSON.parse(confirmResult.body); } catch (_) { errorBody = { error: confirmResult.body }; }
+            return res.status(confirmResult.status).json(errorBody);
+        } catch (err) {
+            return handleCardError(err, res);
+        }
+    });
+
+    /**
+     * POST /owner/:assetId/decline
+     *
+     * Directly decline ownership of a CARD asset (no queue item required).
+     * Fetches the owner record for the update_token, then calls CARD decline.
+     *
+     * @param {string} assetId - CARD asset identifier or IP address (path parameter)
+     * @body {string} teamName - Team to decline ownership for (required)
+     * @body {string} [comment] - Optional comment
+     * @response 200 - { success: true, cardResponse: object }
+     * @response 400 - { error: string } — missing fields
+     * @response 404 - { error: string } — asset not found
+     * @response 502 - { error: string } — CARD API failure
+     * @response 503 - { error: string, missingVars: string[] } — CARD not configured
+     */
+    router.post('/owner/:assetId/decline', requireAuth(), requireGroup('Admin', 'Standard_User'), async (req, res) => {
+        if (!isConfigured) {
+            return res.status(503).json({ error: 'CARD API is not configured.', missingVars });
+        }
+
+        let assetId = req.params.assetId;
+        const { teamName, comment } = req.body || {};
+
+        if (!teamName || typeof teamName !== 'string' || !teamName.trim()) {
+            return res.status(400).json({ error: 'teamName is required.' });
+        }
+
+        if (!/\d+-[A-Z]+$/i.test(assetId)) {
+            const resolved = await resolveAssetId(assetId);
+            if (!resolved) {
+                return res.status(404).json({ error: `Asset not found in CARD for: ${assetId}` });
+            }
+            assetId = resolved;
+        }
+
+        try {
+            const ownerResult = await getOwner(assetId);
+            if (!ownerResult.ok) {
+                return res.status(ownerResult.status).json({ error: `Failed to fetch owner record: HTTP ${ownerResult.status}` });
+            }
+
+            let ownerData;
+            try { ownerData = JSON.parse(ownerResult.body); } catch (_) { ownerData = {}; }
+            const updateToken = ownerData.owner && ownerData.owner.update_token;
+
+            if (!updateToken) {
+                return res.status(502).json({ error: 'update_token not found in owner record.' });
+            }
+
+            const declineResult = await declineAsset(assetId, teamName.trim(), updateToken, comment || '');
+
+            if (declineResult.ok) {
+                let cardResponse;
+                try { cardResponse = JSON.parse(declineResult.body); } catch (_) { cardResponse = declineResult.body; }
+                logAudit({ userId: req.user.id, username: req.user.username, action: 'card_decline_direct', entityType: 'card_asset', entityId: assetId, details: { teamName: teamName.trim(), comment: comment || '' }, ipAddress: req.ip });
+                return res.json({ success: true, cardResponse });
+            }
+
+            let errorBody;
+            try { errorBody = JSON.parse(declineResult.body); } catch (_) { errorBody = { error: declineResult.body }; }
+            return res.status(declineResult.status).json(errorBody);
+        } catch (err) {
+            return handleCardError(err, res);
+        }
+    });
+
+    /**
+     * POST /owner/:assetId/redirect
+     *
+     * Directly redirect a CARD asset between teams (no queue item required).
+     * Fetches the owner record for the update_token, then calls CARD redirect.
+     *
+     * @param {string} assetId - CARD asset identifier or IP address (path parameter)
+     * @body {string} fromTeam - Current owning team (required)
+     * @body {string} toTeam - Target team (required)
+     * @response 200 - { success: true, cardResponse: object }
+     * @response 400 - { error: string } — missing fields
+     * @response 404 - { error: string } — asset not found
+     * @response 502 - { error: string } — CARD API failure
+     * @response 503 - { error: string, missingVars: string[] } — CARD not configured
+     */
+    router.post('/owner/:assetId/redirect', requireAuth(), requireGroup('Admin', 'Standard_User'), async (req, res) => {
+        if (!isConfigured) {
+            return res.status(503).json({ error: 'CARD API is not configured.', missingVars });
+        }
+
+        let assetId = req.params.assetId;
+        const { fromTeam, toTeam } = req.body || {};
+
+        if (!fromTeam || typeof fromTeam !== 'string' || !fromTeam.trim()) {
+            return res.status(400).json({ error: 'fromTeam is required.' });
+        }
+        if (!toTeam || typeof toTeam !== 'string' || !toTeam.trim()) {
+            return res.status(400).json({ error: 'toTeam is required.' });
+        }
+
+        if (!/\d+-[A-Z]+$/i.test(assetId)) {
+            const resolved = await resolveAssetId(assetId);
+            if (!resolved) {
+                return res.status(404).json({ error: `Asset not found in CARD for: ${assetId}` });
+            }
+            assetId = resolved;
+        }
+
+        try {
+            const ownerResult = await getOwner(assetId);
+            if (!ownerResult.ok) {
+                return res.status(ownerResult.status).json({ error: `Failed to fetch owner record: HTTP ${ownerResult.status}` });
+            }
+
+            let ownerData;
+            try { ownerData = JSON.parse(ownerResult.body); } catch (_) { ownerData = {}; }
+            const updateToken = ownerData.owner && ownerData.owner.update_token;
+
+            if (!updateToken) {
+                return res.status(502).json({ error: 'update_token not found in owner record.' });
+            }
+
+            const redirectResult = await redirectAsset(assetId, fromTeam.trim(), toTeam.trim(), updateToken);
+
+            if (redirectResult.ok) {
+                let cardResponse;
+                try { cardResponse = JSON.parse(redirectResult.body); } catch (_) { cardResponse = redirectResult.body; }
+                logAudit({ userId: req.user.id, username: req.user.username, action: 'card_redirect_direct', entityType: 'card_asset', entityId: assetId, details: { fromTeam: fromTeam.trim(), toTeam: toTeam.trim() }, ipAddress: req.ip });
+                return res.json({ success: true, cardResponse });
+            }
+
+            let errorBody;
+            try { errorBody = JSON.parse(redirectResult.body); } catch (_) { errorBody = { error: redirectResult.body }; }
+            return res.status(redirectResult.status).json(errorBody);
+        } catch (err) {
+            return handleCardError(err, res);
+        }
+    });
+
+    /**
+     * GET /asset-search/:hostId
+     *
+     * Search CARD by Ivanti Asset ID (integer). Uses CARD's v2 asset-search
+     * endpoint with deep_search to find the associated CARD asset directly,
+     * bypassing the IP + suffix guessing flow.
+     *
+     * @param {string} hostId - Ivanti Host ID (8-digit integer, from ivanti_findings.host_id)
+     * @response 200 - CARD asset record
+     * @response 400 - { error: string } — invalid host ID
+     * @response 404 - { error: string } — asset not found
+     * @response 503 - { error: string, missingVars: string[] } — CARD not configured
+     */
+    router.get('/asset-search/:hostId', requireAuth(), requireGroup('Admin', 'Standard_User'), async (req, res) => {
+        if (!isConfigured) {
+            return res.status(503).json({ error: 'CARD API is not configured.', missingVars });
+        }
+
+        const { hostId } = req.params;
+        if (!hostId || !/^\d+$/.test(hostId.trim())) {
+            return res.status(400).json({ error: 'hostId must be a numeric Ivanti Asset ID.' });
+        }
+
+        try {
+            const result = await searchByIvantiHostId(hostId.trim());
+
+            if (result.ok) {
+                let body;
+                try { body = JSON.parse(result.body); } catch (_) { body = result.body; }
+
+                logAudit({
+                    userId: req.user.id,
+                    username: req.user.username,
+                    action: 'card_asset_search',
+                    entityType: 'card_asset',
+                    entityId: hostId.trim(),
+                    details: { search_type: 'ivanti_host_id' },
+                    ipAddress: req.ip,
+                });
+
+                return res.json(body);
+            }
+
+            if (result.status === 404) {
+                return res.status(404).json({ error: `No CARD asset found for Ivanti Host ID: ${hostId}` });
+            }
+
+            let errorBody;
+            try { errorBody = JSON.parse(result.body); } catch (_) { errorBody = { error: result.body }; }
+            return res.status(result.status).json(errorBody);
+        } catch (err) {
+            return handleCardError(err, res);
+        }
+    });
+
+    /**
+     * POST /enrich-batch
+     *
+     * Batch lookup IPs and/or Ivanti host IDs in CARD to extract Granite loader
+     * fields. Accepts an array of IPs, an array of host_ids, or both. For IPs,
+     * fetches team assets (paginated, across confirmed, unconfirmed, and
+     * candidate dispositions) and matches against the provided IPs. For host_ids,
+     * performs direct CARD asset-search lookups. When no team is specified,
+     * searches both NTS-AEO-STEAM and NTS-AEO-ACCESS-ENG.
+     * Returns enrichment results for each IP.
+     *
+     * @body {string[]} [ips] - Array of IP address strings (max 200). At least one of ips or host_ids is required.
+     * @body {string[]} [host_ids] - Array of Ivanti Host ID strings (max 200). At least one of ips or host_ids is required.
+     * @body {string} [team] - Team name to search assets under. Defaults to both NTS-AEO-STEAM and NTS-AEO-ACCESS-ENG if omitted.
+     * @response 200 - { results: object[], enriched_count: number, not_found_count: number, total: number }
+     *   Each result: { ip: string, found: boolean, equip_inst_id: string|null, hostname: string|null, site_name?: string|null, mgmt_ip_asn?: string|null, responsible_team?: string|null, equipment_class?: string, equip_template?: string|null, equip_status?: string|null, serial_number?: string|null, error?: string }
+     * @response 400 - { error: string } — neither ips nor host_ids provided, or exceeds 200 items
+     * @response 503 - { error: string, missingVars: string[] } — CARD not configured
+     */
+    router.post('/enrich-batch', requireAuth(), requireGroup('Admin', 'Standard_User'), async (req, res) => {
+        if (!isConfigured) {
+            return res.status(503).json({ error: 'CARD API is not configured.', missingVars });
+        }
+
+        const { ips, host_ids, team } = req.body || {};
+
+        // Accept either ips array, host_ids array, or both
+        const hasIps = Array.isArray(ips) && ips.length > 0;
+        const hasHostIds = Array.isArray(host_ids) && host_ids.length > 0;
+
+        if (!hasIps && !hasHostIds) {
+            return res.status(400).json({ error: 'ips or host_ids array is required.' });
+        }
+        if ((ips && ips.length > 200) || (host_ids && host_ids.length > 200)) {
+            return res.status(400).json({ error: 'Maximum 200 items per request.' });
+        }
+
+        // Build a set of IPs we're looking for
+        const targetIps = new Set((ips || []).map(ip => (ip || '').trim()).filter(Boolean));
+        const resultMap = {};
+
+        // Direct host_id lookups — for items that have no IP but have a host_id
+        if (hasHostIds) {
+            for (const hostId of host_ids) {
+                if (!hostId) continue;
+                const key = `hostId:${hostId}`;
+                try {
+                    const searchResult = await searchByIvantiHostId(hostId);
+                    if (searchResult.ok) {
+                        const searchData = JSON.parse(searchResult.body);
+                        const assets = searchData.assets || [];
+                        if (assets.length > 0) {
+                            const asset = assets[0];
+                            const assetIp = (asset._id || '').replace(/-[A-Z]+$/i, '');
+                            resultMap[key] = { ...extractGraniteFields(asset, assetIp), ip: assetIp };
+                        }
+                    }
+                } catch (_) { /* skip */ }
+            }
+        }
+
+        // Fast path: look up host_ids from ivanti_findings and use asset-search
+        // The asset-search endpoint returns the full enriched record (same as team assets).
+        const ipsArray = [...targetIps];
+        if (ipsArray.length > 0) {
+            try {
+                const { rows: findingRows } = await pool.query(
+                    `SELECT DISTINCT ON (ip_address) ip_address, host_id
+                     FROM ivanti_findings
+                     WHERE ip_address = ANY($1) AND host_id IS NOT NULL`,
+                    [ipsArray]
+                );
+
+                for (const row of findingRows) {
+                    if (resultMap[row.ip_address]) continue;
+                    try {
+                        const searchResult = await searchByIvantiHostId(row.host_id);
+                        if (searchResult.ok) {
+                            const searchData = JSON.parse(searchResult.body);
+                            const assets = searchData.assets || [];
+                            if (assets.length > 0) {
+                                resultMap[row.ip_address] = extractGraniteFields(assets[0], row.ip_address);
+                            }
+                        }
+                    } catch (_) { /* fall through to paginated lookup */ }
+                }
+            } catch (err) {
+                console.error('[card-api] enrich-batch: Fast path DB lookup failed:', err.message);
+            }
+        }
+
+        let foundCount = Object.keys(resultMap).length;
+
+        // Fallback: paginated team-assets loop for any IPs not resolved by fast path
+        // The team assets endpoint returns the full enriched record with ncim_discovery,
+        // card_flags, netops_granite_allips, etc.
+        const teams = team ? [team] : ['NTS-AEO-STEAM', 'NTS-AEO-ACCESS-ENG'];
+        const dispositions = ['confirmed', 'unconfirmed', 'candidate'];
+
+        for (const teamName of teams) {
+            if (foundCount >= targetIps.size) break;
+
+            for (const disposition of dispositions) {
+                if (foundCount >= targetIps.size) break;
+
+            let page = 1;
+            const pageSize = 200;
+            let hasMore = true;
+
+            while (hasMore && foundCount < targetIps.size) {
+                try {
+                    const result = await getTeamAssets(teamName, { disposition, page, pageSize });
+                    if (!result.ok) break;
+
+                    const data = JSON.parse(result.body);
+                    const assets = data.assets || data.results || (Array.isArray(data) ? data : []);
+
+                    if (assets.length === 0) {
+                        hasMore = false;
+                        break;
+                    }
+
+                    // Match assets against target IPs
+                    for (const asset of assets) {
+                        const assetId = asset._id || '';
+                        // Extract IP from asset ID (e.g., "10.240.78.110-CTEC" → "10.240.78.110")
+                        const assetIp = assetId.replace(/-[A-Z]+$/i, '');
+
+                        if (targetIps.has(assetIp) && !resultMap[assetIp]) {
+                            resultMap[assetIp] = extractGraniteFields(asset, assetIp);
+                            foundCount++;
+                        }
+                    }
+
+                    // Check if there are more pages
+                    const total = data.total || data.count || 0;
+                    if (page * pageSize >= total || assets.length < pageSize) {
+                        hasMore = false;
+                    } else {
+                        page++;
+                    }
+                } catch (err) {
+                    console.error(`[card-api] enrich-batch: Error fetching ${teamName}/${disposition} page ${page}:`, err.message);
+                    hasMore = false;
+                }
+            }
+        }
+        }
+
+        // Build results array in the same order as input IPs
+        const results = [];
+        let enrichedCount = 0;
+        let notFoundCount = 0;
+
+        for (const ip of (ips || [])) {
+            const trimmedIp = (ip || '').trim();
+            if (!trimmedIp) {
+                results.push({ ip: '', found: false, equip_inst_id: null, hostname: null, error: 'Invalid IP' });
+                notFoundCount++;
+                continue;
+            }
+
+            if (resultMap[trimmedIp]) {
+                results.push({ ip: trimmedIp, found: true, ...resultMap[trimmedIp] });
+                enrichedCount++;
+            } else {
+                results.push({ ip: trimmedIp, found: false, equip_inst_id: null, hostname: null, error: 'IP not found in CARD' });
+                notFoundCount++;
+            }
+        }
+
+        // Include results for host_id lookups (items without IPs)
+        const hostIdResults = [];
+        if (hasHostIds) {
+            for (const hostId of host_ids) {
+                if (!hostId) continue;
+                const key = `hostId:${hostId}`;
+                if (resultMap[key]) {
+                    hostIdResults.push({ host_id: hostId, found: true, ...resultMap[key] });
+                    enrichedCount++;
+                } else {
+                    hostIdResults.push({ host_id: hostId, found: false, equip_inst_id: null, hostname: null, error: 'Host ID not found in CARD' });
+                    notFoundCount++;
+                }
+            }
+        }
+
+        res.json({ results, host_id_results: hostIdResults, enriched_count: enrichedCount, not_found_count: notFoundCount, total: (ips || []).length + (host_ids || []).length });
+    });
+
     return router;
 }
 
+/**
+ * Extract Granite-relevant fields from a CARD asset/owner record.
+ * The owner endpoint returns: owner (confirmed/unconfirmed/etc), card_flags, tmp.
+ * ncim_discovery is only available from the team assets endpoint.
+ */
+function extractGraniteFields(asset, ip) {
+    // card_flags can be an array or nested in the response differently
+    let flags = {};
+    if (asset.card_flags) {
+        flags = Array.isArray(asset.card_flags) ? (asset.card_flags[0] || {}) : asset.card_flags;
+    }
+    // Also check if flags are at the top level (owner endpoint format)
+    if (!flags.CARD_HOSTNAME && asset.CARD_HOSTNAME) {
+        flags = asset;
+    }
+
+    const ncim = asset.ncim_discovery || [];
+    const granite = asset.netops_granite_allips || [];
+    const iseGranite = asset.ise_granite_equipment || [];
+    const qualys = asset.qualys_hosts || [];
+    const ivanti = asset.ivanti_assets || [];
+
+    // EQUIP_INST_ID — from ncim_discovery or granite (only available from team assets endpoint)
+    let equip_inst_id = null;
+    let site_name = null;
+    let responsible_team = null;
+    let hostname = null;
+
+    if (ncim.length > 0) {
+        equip_inst_id = ncim[0].EQUIP_INST_ID || null;
+        responsible_team = ncim[0].GRANITE_RESP_TEAM || ncim[0].RESPONSIBLE_TEAM || null;
+        site_name = ncim[0].SITE_NAME || ncim[0].SITENAME || null;
+        hostname = ncim[0].HOSTNAME || null;
+    }
+
+    if (!equip_inst_id && Array.isArray(granite) && granite.length > 0) {
+        equip_inst_id = granite[0].EQUIP_INST_ID || null;
+        if (!site_name) site_name = granite[0].SITE_NAME || null;
+        if (!responsible_team) responsible_team = granite[0].RESPONSIBLE_TEAM || null;
+    }
+
+    if (!equip_inst_id && Array.isArray(iseGranite) && iseGranite.length > 0) {
+        equip_inst_id = iseGranite[0].EQUIP_INST_ID || null;
+    }
+
+    // Hostname from card_flags (primary source from owner endpoint)
+    if (!hostname && flags.CARD_HOSTNAME) {
+        const hostnames = Array.isArray(flags.CARD_HOSTNAME) ? flags.CARD_HOSTNAME : [flags.CARD_HOSTNAME];
+        hostname = hostnames[0] || null;
+    }
+    if (!hostname && qualys.length > 0) hostname = qualys[0].HOSTNAME || null;
+    if (!hostname && ivanti.length > 0) hostname = ivanti[0].hostName || null;
+
+    // ASN from card_flags
+    const mgmt_ip_asn = flags.CARD_ASN || null;
+
+    // CLLI → can be used as site hint
+    if (!site_name && flags.CARD_CLLI) {
+        site_name = flags.CARD_CLLI; // CLLI code, not full site name — user may need to map
+    }
+
+    // Equipment class — always S (Shelf) from CARD context
+    const equipment_class = 'S';
+
+    // Device ID → maps to SERIALNUMBER in Granite
+    const serial_number = flags.CARD_DEVICE_ID || null;
+
+    // Equip status from flags
+    const equip_status = flags.status || null;
+
+    // Vendor/model from card_flags
+    let equip_template = null;
+    if (flags.CARD_VENDOR_MODEL && Array.isArray(flags.CARD_VENDOR_MODEL) && flags.CARD_VENDOR_MODEL.length > 0) {
+        const vm = flags.CARD_VENDOR_MODEL[0];
+        equip_template = typeof vm === 'string' ? vm : (vm.vendor_model || null);
+    }
+
+    // Confirmed team from owner record
+    const confirmed_team = asset.owner && asset.owner.confirmed
+        ? asset.owner.confirmed.name : null;
+
+    return {
+        equip_inst_id: equip_inst_id ? String(equip_inst_id) : null,
+        hostname,
+        site_name,
+        mgmt_ip_asn: mgmt_ip_asn ? String(mgmt_ip_asn) : null,
+        responsible_team: responsible_team || confirmed_team || null,
+        equipment_class,
+        equip_template,
+        equip_status,
+        serial_number,
+    };
+}
+
 module.exports = createCardApiRouter;

backend/routes/compliance.js

@@ -227,6 +227,7 @@ function groupByHostname(rows, noteHostnames) {
                 seen_count: row.seen_count || 1, first_seen: row.first_seen || null,
                 last_seen: row.last_seen || null, resolved_on: row.resolved_on || null,
                 has_notes: noteHostnames.has(row.hostname),
+                resolution_date: null, remediation_plan: null,
             };
         }
         const dev = deviceMap[row.hostname];
@@ -237,6 +238,11 @@ function groupByHostname(rows, noteHostnames) {
         if ((row.seen_count || 1) > dev.seen_count) dev.seen_count = row.seen_count;
         if (row.first_seen && (!dev.first_seen || row.first_seen < dev.first_seen)) dev.first_seen = row.first_seen;
         if (row.last_seen && (!dev.last_seen || row.last_seen > dev.last_seen)) dev.last_seen = row.last_seen;
+        if (row.resolution_date && !dev.resolution_date) {
+            const rd = row.resolution_date;
+            dev.resolution_date = typeof rd === 'string' ? rd.slice(0, 10) : (rd instanceof Date ? rd.toISOString().slice(0, 10) : rd);
+        }
+        if (row.remediation_plan && !dev.remediation_plan) dev.remediation_plan = row.remediation_plan;
     }
     return Object.values(deviceMap).map(({ _seenMetricIds, ...dev }) => dev);
 }
@@ -346,7 +352,7 @@ function createComplianceRouter(upload) {
                 res.json({
                     drift, drift_error, schema: xlsxSchema,
                     diff: { new_count: diff.newCount, recurring_count: diff.recurringCount, resolved_count: diff.resolvedCount },
-                    tempFile: tempFilePath, filename: req.file.originalname,
+                    tempFile: tempFilename, filename: req.file.originalname,
                     report_date: parsed.report_date, total_items: parsed.total,
                 });
             } catch (err) {
@@ -399,11 +405,13 @@ function createComplianceRouter(upload) {
     router.post('/commit', requireGroup('Admin', 'Standard_User'), async (req, res) => {
         const { tempFile, filename, report_date } = req.body;
         if (!tempFile || typeof tempFile !== 'string') return res.status(400).json({ error: 'tempFile is required' });
-        if (!isSafeTempPath(tempFile)) return res.status(400).json({ error: 'Invalid tempFile path' });
-        if (!fs.existsSync(tempFile)) return res.status(400).json({ error: 'Preview session expired — please upload again' });
+        // Reconstruct full path from basename only — never trust a client-supplied absolute path
+        const resolvedTempFile = path.join(TEMP_DIR, path.basename(tempFile));
+        if (!isSafeTempPath(resolvedTempFile)) return res.status(400).json({ error: 'Invalid tempFile path' });
+        if (!fs.existsSync(resolvedTempFile)) return res.status(400).json({ error: 'Preview session expired — please upload again' });
 
         let parsed;
-        try { parsed = JSON.parse(fs.readFileSync(tempFile, 'utf8')); }
+        try { parsed = JSON.parse(fs.readFileSync(resolvedTempFile, 'utf8')); }
         catch { return res.status(400).json({ error: 'Could not read preview data — please upload again' }); }
 
         try {
@@ -413,7 +421,7 @@ function createComplianceRouter(upload) {
                 filename: filename || parsed.filename,
                 userId: req.user?.id || null,
             });
-            fs.unlink(tempFile, () => {});
+            fs.unlink(resolvedTempFile, () => {});
 
             const { rows } = await pool.query(
                 `SELECT id, filename, report_date, uploaded_at, new_count, resolved_count, recurring_count
@@ -598,6 +606,7 @@ function createComplianceRouter(upload) {
             const { rows } = await pool.query(
                 `SELECT DISTINCT ON (ci.hostname, ci.metric_id)
                      ci.hostname, ci.ip_address, ci.device_type, ci.team, ci.metric_id, ci.metric_desc, ci.category, ci.status, ci.seen_count,
+                     ci.resolution_date, ci.remediation_plan,
                      fu.report_date AS first_seen, lu.report_date AS last_seen, ru.report_date AS resolved_on
                  FROM compliance_items ci
                  LEFT JOIN compliance_uploads fu ON ci.first_seen_upload_id = fu.id
@@ -665,7 +674,7 @@ function createComplianceRouter(upload) {
             let history = [];
             try {
                 const { rows: historyRows } = await pool.query(
-                    `SELECT id, field_name, old_value, new_value, change_reason, changed_by, changed_at
+                    `SELECT id, metric_id, field_name, old_value, new_value, change_reason, changed_by, changed_at
                      FROM compliance_item_history WHERE hostname = $1 ORDER BY changed_at DESC LIMIT 10`,
                     [hostname]
                 );
@@ -943,13 +952,14 @@ function createComplianceRouter(upload) {
 
     /**
      * PATCH /items/:hostname/metadata
-     * Updates resolution_date and/or remediation_plan for all active compliance items matching a hostname.
+     * Updates resolution_date and/or remediation_plan for active compliance items matching a hostname.
+     * Supports optional per-metric scoping via metric_id (single) or metric_ids (array).
      * Records field-level change history in compliance_item_history for each modified field.
      *
      * @param hostname — the device hostname
-     * @body { resolution_date?: string|null, remediation_plan?: string|null, change_reason?: string|null }
+     * @body { resolution_date?: string|null, remediation_plan?: string|null, change_reason?: string|null, metric_id?: string, metric_ids?: string[] }
      * @response 200 { updated: number }
-     * @response 400 { error } — invalid hostname, invalid date format, plan exceeds 2000 chars, change_reason exceeds 500 chars, or no fields provided
+     * @response 400 { error } — invalid hostname, invalid date format, plan exceeds 2000 chars, change_reason exceeds 500 chars, no fields provided, or invalid metric_id
      * @response 404 { error } — device not found
      * @response 500 { error } — update failure
      */
@@ -957,7 +967,7 @@ function createComplianceRouter(upload) {
         const hostname = req.params.hostname;
         if (!hostname || hostname.length > 300) return res.status(400).json({ error: 'Invalid hostname' });
 
-        const { resolution_date, remediation_plan, change_reason } = req.body;
+        const { resolution_date, remediation_plan, change_reason, metric_id, metric_ids } = req.body;
 
         // Validate resolution_date: must be a valid ISO date string or null
         if (resolution_date !== undefined && resolution_date !== null) {
@@ -979,6 +989,31 @@ function createComplianceRouter(upload) {
             return res.status(400).json({ error: 'Change reason exceeds 500 characters' });
         }
 
+        // Resolve metric scoping: metric_ids takes precedence over metric_id
+        let resolvedMetricIds = null; // null means hostname-level (no metric scoping)
+        if (metric_ids !== undefined) {
+            if (!Array.isArray(metric_ids)) return res.status(400).json({ error: 'metric_ids must be an array' });
+            if (metric_ids.length === 0) return res.status(400).json({ error: 'metric_ids must contain at least one entry' });
+            for (let i = 0; i < metric_ids.length; i++) {
+                const mid = metric_ids[i];
+                if (!mid || typeof mid !== 'string' || mid.length === 0) {
+                    return res.status(400).json({ error: 'metric_id cannot be empty' });
+                }
+                if (mid.length > 100) {
+                    return res.status(400).json({ error: 'metric_id exceeds 100 characters' });
+                }
+            }
+            resolvedMetricIds = metric_ids;
+        } else if (metric_id !== undefined && metric_id !== null) {
+            if (typeof metric_id !== 'string' || metric_id.length === 0) {
+                return res.status(400).json({ error: 'metric_id cannot be empty' });
+            }
+            if (metric_id.length > 100) {
+                return res.status(400).json({ error: 'metric_id exceeds 100 characters' });
+            }
+            resolvedMetricIds = [metric_id];
+        }
+
         const setClauses = [];
         const values = [];
         let paramIdx = 1;
@@ -1000,69 +1035,148 @@ function createComplianceRouter(upload) {
         try {
             await client.query('BEGIN');
 
-            // Get current values before updating
-            const { rows: currentRows } = await client.query(
-                `SELECT DISTINCT ON (hostname) resolution_date, remediation_plan
-                 FROM compliance_items WHERE hostname = $1 AND status = 'active'
-                 ORDER BY hostname, id DESC LIMIT 1`,
-                [hostname]
-            );
-
-            if (currentRows.length === 0) {
-                await client.query('ROLLBACK');
-                client.release();
-                return res.status(404).json({ error: 'Device not found' });
-            }
-
-            const current = currentRows[0];
-            const currentResDate = current.resolution_date
-                ? (typeof current.resolution_date === 'string' ? current.resolution_date : current.resolution_date.toISOString().slice(0, 10))
-                : null;
-            const currentPlan = current.remediation_plan || null;
             const reasonText = change_reason && change_reason.trim() ? change_reason.trim() : null;
 
-            // Insert history for each changed field
-            if (resolution_date !== undefined) {
-                const newVal = resolution_date || null;
-                if (currentResDate !== newVal) {
-                    await client.query(
-                        `INSERT INTO compliance_item_history (hostname, field_name, old_value, new_value, change_reason, changed_by)
-                         VALUES ($1, 'resolution_date', $2, $3, $4, $5)`,
-                        [hostname, currentResDate, newVal, reasonText, req.user.username]
-                    );
+            if (resolvedMetricIds !== null) {
+                // --- Per-metric scoping path ---
+                // Validate that each metric_id corresponds to an active compliance_item for this hostname
+                const { rows: activeMetricRows } = await client.query(
+                    `SELECT metric_id, resolution_date, remediation_plan
+                     FROM compliance_items
+                     WHERE hostname = $1 AND metric_id = ANY($2) AND status = 'active'`,
+                    [hostname, resolvedMetricIds]
+                );
+
+                const activeMetricMap = new Map();
+                for (const row of activeMetricRows) {
+                    activeMetricMap.set(row.metric_id, row);
                 }
-            }
-            if (remediation_plan !== undefined) {
-                const newVal = remediation_plan || null;
-                if (currentPlan !== newVal) {
-                    await client.query(
-                        `INSERT INTO compliance_item_history (hostname, field_name, old_value, new_value, change_reason, changed_by)
-                         VALUES ($1, 'remediation_plan', $2, $3, $4, $5)`,
-                        [hostname, currentPlan, newVal, reasonText, req.user.username]
-                    );
+
+                // Check for invalid metric_ids
+                for (const mid of resolvedMetricIds) {
+                    if (!activeMetricMap.has(mid)) {
+                        await client.query('ROLLBACK');
+                        client.release();
+                        return res.status(400).json({ error: `Invalid metric_id: ${mid} — no active compliance item found` });
+                    }
                 }
+
+                // Insert history per metric per changed field
+                for (const mid of resolvedMetricIds) {
+                    const current = activeMetricMap.get(mid);
+                    const currentResDate = current.resolution_date
+                        ? (typeof current.resolution_date === 'string' ? current.resolution_date : current.resolution_date.toISOString().slice(0, 10))
+                        : null;
+                    const currentPlan = current.remediation_plan || null;
+
+                    if (resolution_date !== undefined) {
+                        const newVal = resolution_date || null;
+                        if (currentResDate !== newVal) {
+                            await client.query(
+                                `INSERT INTO compliance_item_history (hostname, metric_id, field_name, old_value, new_value, change_reason, changed_by)
+                                 VALUES ($1, $2, 'resolution_date', $3, $4, $5, $6)`,
+                                [hostname, mid, currentResDate, newVal, reasonText, req.user.username]
+                            );
+                        }
+                    }
+                    if (remediation_plan !== undefined) {
+                        const newVal = remediation_plan || null;
+                        if (currentPlan !== newVal) {
+                            await client.query(
+                                `INSERT INTO compliance_item_history (hostname, metric_id, field_name, old_value, new_value, change_reason, changed_by)
+                                 VALUES ($1, $2, 'remediation_plan', $3, $4, $5, $6)`,
+                                [hostname, mid, currentPlan, newVal, reasonText, req.user.username]
+                            );
+                        }
+                    }
+                }
+
+                // Update only matching rows
+                values.push(hostname);
+                values.push(resolvedMetricIds);
+                const result = await client.query(
+                    `UPDATE compliance_items SET ${setClauses.join(', ')} WHERE hostname = $${paramIdx} AND metric_id = ANY($${paramIdx + 1}) AND status = 'active'`,
+                    values
+                );
+
+                await client.query('COMMIT');
+
+                logAudit({
+                    userId: req.user.id,
+                    username: req.user.username,
+                    action: 'compliance_metadata_update',
+                    entityType: 'compliance_item',
+                    entityId: hostname,
+                    details: { resolution_date, remediation_plan, change_reason: reasonText, metric_ids: resolvedMetricIds },
+                    ipAddress: req.ip,
+                });
+
+                res.json({ updated: result.rowCount });
+            } else {
+                // --- Hostname-level path (backward compatible, NULL metric_id in history) ---
+                // Get current values before updating (pick one representative row)
+                const { rows: currentRows } = await client.query(
+                    `SELECT DISTINCT ON (hostname) resolution_date, remediation_plan
+                     FROM compliance_items WHERE hostname = $1 AND status = 'active'
+                     ORDER BY hostname, id DESC LIMIT 1`,
+                    [hostname]
+                );
+
+                if (currentRows.length === 0) {
+                    await client.query('ROLLBACK');
+                    client.release();
+                    return res.status(404).json({ error: 'Device not found' });
+                }
+
+                const current = currentRows[0];
+                const currentResDate = current.resolution_date
+                    ? (typeof current.resolution_date === 'string' ? current.resolution_date : current.resolution_date.toISOString().slice(0, 10))
+                    : null;
+                const currentPlan = current.remediation_plan || null;
+
+                // Insert history for each changed field with NULL metric_id
+                if (resolution_date !== undefined) {
+                    const newVal = resolution_date || null;
+                    if (currentResDate !== newVal) {
+                        await client.query(
+                            `INSERT INTO compliance_item_history (hostname, metric_id, field_name, old_value, new_value, change_reason, changed_by)
+                             VALUES ($1, NULL, 'resolution_date', $2, $3, $4, $5)`,
+                            [hostname, currentResDate, newVal, reasonText, req.user.username]
+                        );
+                    }
+                }
+                if (remediation_plan !== undefined) {
+                    const newVal = remediation_plan || null;
+                    if (currentPlan !== newVal) {
+                        await client.query(
+                            `INSERT INTO compliance_item_history (hostname, metric_id, field_name, old_value, new_value, change_reason, changed_by)
+                             VALUES ($1, NULL, 'remediation_plan', $2, $3, $4, $5)`,
+                            [hostname, currentPlan, newVal, reasonText, req.user.username]
+                        );
+                    }
+                }
+
+                // Update all active items for hostname
+                values.push(hostname);
+                const result = await client.query(
+                    `UPDATE compliance_items SET ${setClauses.join(', ')} WHERE hostname = $${paramIdx} AND status = 'active'`,
+                    values
+                );
+
+                await client.query('COMMIT');
+
+                logAudit({
+                    userId: req.user.id,
+                    username: req.user.username,
+                    action: 'compliance_metadata_update',
+                    entityType: 'compliance_item',
+                    entityId: hostname,
+                    details: { resolution_date, remediation_plan, change_reason: reasonText },
+                    ipAddress: req.ip,
+                });
+
+                res.json({ updated: result.rowCount });
             }
-
-            // Update the items
-            values.push(hostname);
-            const result = await client.query(
-                `UPDATE compliance_items SET ${setClauses.join(', ')} WHERE hostname = $${paramIdx}`,
-                values
-            );
-
-            await client.query('COMMIT');
-
-            logAudit({
-                userId: req.user.id,
-                username: req.user.username,
-                action: 'compliance_metadata_update',
-                entityType: 'compliance_item',
-                entityId: hostname,
-                details: { resolution_date, remediation_plan, change_reason: reasonText },
-                ipAddress: req.ip,
-            });
-
-            res.json({ updated: result.rowCount });
         } catch (err) {
             await client.query('ROLLBACK');
             console.error('[Compliance] PATCH /items/:hostname/metadata error:', err.message);
@@ -1631,4 +1745,4 @@ function createComplianceRouter(upload) {
     return router;
 }
 
-module.exports = { createComplianceRouter, bucketAgingItems, computeWaterfall, persistUpload };
+module.exports = { createComplianceRouter, bucketAgingItems, computeWaterfall, persistUpload, groupByHostname };

backend/routes/ivantiFindings.js

@@ -10,6 +10,19 @@ const pool = require('../db');
 
 const SYNC_INTERVAL_MS = 24 * 60 * 60 * 1000;
 
+// PostgreSQL DATE columns return JS Date objects — normalize to 'YYYY-MM-DD' strings
+function formatDate(val) {
+    if (!val) return null;
+    if (val instanceof Date) {
+        const y = val.getFullYear();
+        const m = String(val.getMonth() + 1).padStart(2, '0');
+        const d = String(val.getDate()).padStart(2, '0');
+        return `${y}-${m}-${d}`;
+    }
+    // Already a string — strip any time portion (e.g. "2025-05-22T00:00:00.000Z")
+    return String(val).slice(0, 10);
+}
+
 // Configurable BU filter — broadened via env var to support multi-tenancy.
 // Users see only their assigned teams' findings (filtered at query time).
 const BU_FILTER_VALUE = process.env.IVANTI_BU_FILTER || 'NTS-AEO-ACCESS-ENG,NTS-AEO-STEAM';
@@ -76,6 +89,22 @@ const CLOSED_COUNT_FILTERS = [
     }
 ];
 
+// ---------------------------------------------------------------------------
+// Extract Qualys IPv6 address from hostAdditionalDetails
+// Looks for "IPv6 Address" (string) or "IPv6 Addresses" (array) fields
+// in the scanner-specific details from Qualys.
+// ---------------------------------------------------------------------------
+function extractQualysIpv6(f) {
+    const details = f.hostAdditionalDetails || [];
+    for (const entry of details) {
+        if (entry['IPv6 Address']) return entry['IPv6 Address'];
+        if (Array.isArray(entry['IPv6 Addresses']) && entry['IPv6 Addresses'].length > 0) {
+            return entry['IPv6 Addresses'][0];
+        }
+    }
+    return '';
+}
+
 // ---------------------------------------------------------------------------
 // Extract only the fields we need from a raw finding object
 // ---------------------------------------------------------------------------
@@ -136,7 +165,10 @@ function extractFinding(f) {
         lastFoundOn: f.lastFoundOn || '',
         buOwnership,
         cves,
-        workflow
+        workflow,
+        // IPv6 fallbacks for findings with no IPv4
+        qualysIpv6: extractQualysIpv6(f),
+        primaryIpv6: f.assetCustomAttributes?.['1550_host_6']?.[0] || '',
     };
 }
 
@@ -173,7 +205,7 @@ async function upsertFindingsBatch(findings, state) {
         const placeholders = [];
 
         batch.forEach((f, idx) => {
-            const offset = idx * 18;
+            const offset = idx * 20;
             values.push(
                 f.id,
                 f.hostId,
@@ -192,13 +224,15 @@ async function upsertFindingsBatch(findings, state) {
                 f.workflow ? f.workflow.id : null,
                 f.workflow ? f.workflow.state : null,
                 f.workflow ? f.workflow.type : null,
-                state
+                state,
+                f.qualysIpv6 || null,
+                f.primaryIpv6 || null
             );
             placeholders.push(
                 `($${offset+1}, $${offset+2}, $${offset+3}, $${offset+4}, $${offset+5}, ` +
                 `$${offset+6}, $${offset+7}, $${offset+8}, $${offset+9}, $${offset+10}, ` +
                 `$${offset+11}, $${offset+12}, $${offset+13}, $${offset+14}, $${offset+15}, ` +
-                `$${offset+16}, $${offset+17}, $${offset+18})`
+                `$${offset+16}, $${offset+17}, $${offset+18}, $${offset+19}, $${offset+20})`
             );
         });
 
@@ -207,7 +241,8 @@ async function upsertFindingsBatch(findings, state) {
                 id, host_id, title, severity, vrr_group,
                 host_name, ip_address, dns, status, sla_status,
                 due_date, last_found_on, bu_ownership, cves,
-                workflow_id, workflow_state, workflow_type, state
+                workflow_id, workflow_state, workflow_type, state,
+                qualys_ipv6, primary_ipv6
             )
             VALUES ${placeholders.join(', ')}
             ON CONFLICT (id) DO UPDATE SET
@@ -228,6 +263,8 @@ async function upsertFindingsBatch(findings, state) {
                 workflow_state = EXCLUDED.workflow_state,
                 workflow_type = EXCLUDED.workflow_type,
                 state = EXCLUDED.state,
+                qualys_ipv6 = EXCLUDED.qualys_ipv6,
+                primary_ipv6 = EXCLUDED.primary_ipv6,
                 synced_at = NOW()
         `, values);
     }
@@ -697,7 +734,9 @@ async function runBUDriftChecker(newlyArchivedIds, apiKey, clientId, skipTls) {
                     const bu = f.assetCustomAttributes?.['1550_host_1']?.[0] || 'UNKNOWN';
                     const severity = typeof f.severity === 'number' ? f.severity : parseFloat(f.severity) || 0;
                     const state = f.status || f.generic_state || '';
-                    foundMap.set(String(f.id), { bu, severity, state });
+                    const title = f.title || '';
+                    const hostName = f.host?.hostName || f.hostName || '';
+                    foundMap.set(String(f.id), { bu, severity, state, title, hostName });
                 }
 
                 page++;
@@ -754,6 +793,25 @@ async function runBUDriftChecker(newlyArchivedIds, apiKey, clientId, skipTls) {
         } catch (err) {
             console.error(`[BU Drift Checker] Error updating transition reason for finding ${id}:`, err.message);
         }
+
+        // Record BU reassignment in ivanti_finding_bu_history for detail view
+        if (classification === 'bu_reassignment' && found) {
+            try {
+                // Determine previous BU — look up from the cached finding record
+                const { rows: prevRows } = await pool.query(
+                    `SELECT bu_ownership FROM ivanti_findings WHERE id = $1`,
+                    [id]
+                );
+                const previousBu = prevRows[0]?.bu_ownership || 'UNKNOWN';
+                await pool.query(
+                    `INSERT INTO ivanti_finding_bu_history (finding_id, finding_title, host_name, previous_bu, new_bu, detected_at)
+                     VALUES ($1, $2, $3, $4, $5, NOW())`,
+                    [id, found.title || '', found.hostName || '', previousBu, found.bu]
+                );
+            } catch (err) {
+                console.error(`[BU Drift Checker] Error recording BU change for finding ${id}:`, err.message);
+            }
+        }
     }
 
     console.log(`[BU Drift Checker] Classification complete:`, summary);
@@ -896,6 +954,21 @@ async function syncFindings() {
             console.error('[Ivanti Findings] Archive detection failed (non-fatal):', err.message);
         }
 
+        // Remove archived findings from ivanti_findings to prevent stale re-detection
+        if (archiveResult.disappearedIds && archiveResult.disappearedIds.length > 0) {
+            try {
+                const { rowCount } = await pool.query(
+                    `DELETE FROM ivanti_findings WHERE state = 'open' AND CAST(id AS TEXT) = ANY($1::text[])`,
+                    [archiveResult.disappearedIds.map(String)]
+                );
+                if (rowCount > 0) {
+                    console.log(`[Ivanti Findings] Removed ${rowCount} archived findings from ivanti_findings`);
+                }
+            } catch (err) {
+                console.error('[Ivanti Findings] Failed to clean archived findings from table (non-fatal):', err.message);
+            }
+        }
+
         // Read previous counts BEFORE syncClosedCount updates them — needed for anomaly deltas
         let previousOpenCount = 0;
         let previousClosedCount = 0;
@@ -915,9 +988,23 @@ async function syncFindings() {
         await syncFPWorkflowCounts(allFindings, apiKey, clientId, skipTls);
 
         // Post-sync: BU drift checker for newly archived findings
+        // Filter out findings that were already in ARCHIVED state from a previous sync —
+        // only pass genuinely new disappearances to avoid re-classifying the same set every cycle.
         let classificationBreakdown = { bu_reassignment: 0, severity_drift: 0, closed_on_platform: 0, decommissioned: 0 };
         try {
-            classificationBreakdown = await runBUDriftChecker(archiveResult.disappearedIds, apiKey, clientId, skipTls);
+            let idsToCheck = archiveResult.disappearedIds || [];
+            if (idsToCheck.length > 0) {
+                const { rows: alreadyArchived } = await pool.query(
+                    `SELECT finding_id FROM ivanti_finding_archives
+                     WHERE current_state = 'ARCHIVED'
+                       AND last_transition_at < NOW() - INTERVAL '2 hours'`
+                );
+                const alreadyArchivedSet = new Set(alreadyArchived.map(r => String(r.finding_id)));
+                const newlyArchivedOnly = idsToCheck.filter(id => !alreadyArchivedSet.has(String(id)));
+                console.log(`[BU Drift Checker] ${idsToCheck.length} disappeared total, ${newlyArchivedOnly.length} genuinely new (${alreadyArchivedSet.size} already archived, skipped)`);
+                idsToCheck = newlyArchivedOnly;
+            }
+            classificationBreakdown = await runBUDriftChecker(idsToCheck, apiKey, clientId, skipTls);
         } catch (err) {
             console.error('[Ivanti Findings] BU drift checker failed (non-fatal):', err.message);
         }
@@ -1033,12 +1120,14 @@ function createIvantiFindingsRouter(db, requireAuth) {
                 dns: row.dns,
                 status: row.status,
                 slaStatus: row.sla_status,
-                dueDate: row.due_date,
-                lastFoundOn: row.last_found_on,
+                dueDate: formatDate(row.due_date),
+                lastFoundOn: formatDate(row.last_found_on),
                 buOwnership: row.bu_ownership,
                 cves: row.cves || [],
                 workflow: row.workflow_id ? { id: row.workflow_id, state: row.workflow_state, type: row.workflow_type } : null,
                 note: row.note || '',
+                qualysIpv6: row.qualys_ipv6 || null,
+                primaryIpv6: row.primary_ipv6 || null,
                 overrides: {
                     ...(row.override_host_name ? { hostName: row.override_host_name } : {}),
                     ...(row.override_dns ? { dns: row.override_dns } : {})
@@ -1089,12 +1178,14 @@ function createIvantiFindingsRouter(db, requireAuth) {
                 dns: row.dns,
                 status: row.status,
                 slaStatus: row.sla_status,
-                dueDate: row.due_date,
-                lastFoundOn: row.last_found_on,
+                dueDate: formatDate(row.due_date),
+                lastFoundOn: formatDate(row.last_found_on),
                 buOwnership: row.bu_ownership,
                 cves: row.cves || [],
                 workflow: row.workflow_id ? { id: row.workflow_id, state: row.workflow_state, type: row.workflow_type } : null,
                 note: row.note || '',
+                qualysIpv6: row.qualys_ipv6 || null,
+                primaryIpv6: row.primary_ipv6 || null,
                 overrides: {
                     ...(row.override_host_name ? { hostName: row.override_host_name } : {}),
                     ...(row.override_dns ? { dns: row.override_dns } : {})
@@ -1392,18 +1483,40 @@ function createIvantiFindingsRouter(db, requireAuth) {
     /**
      * GET /api/ivanti/findings/bu-changes
      *
-     * Return all BU change events from ivanti_finding_bu_history.
+     * Return BU change events from ivanti_finding_bu_history.
+     * Accepts optional `since` to filter by date, or `limit` to cap the result count.
+     * If `since` is provided, returns all changes on or after that timestamp.
+     * If neither is provided, returns the most recent 200 rows (max 500).
      *
-     * @returns {Object} 200 - { changes: Array<Object> }
+     * @query {string} [since] - ISO timestamp; return changes where detected_at >= this value
+     * @query {string} [limit] - Maximum number of rows to return (default 200, max 500); ignored when `since` is provided
+     * @returns {Object} 200 - { changes: Array<{ id, finding_id, finding_title, host_name, previous_bu, new_bu, detected_at }> }
      * @returns {Object} 500 - { error: string } on database error
      */
     router.get('/bu-changes', async (req, res) => {
         try {
-            const { rows } = await pool.query(
-                `SELECT id, finding_id, finding_title, host_name, previous_bu, new_bu, detected_at
-                 FROM ivanti_finding_bu_history
-                 ORDER BY detected_at DESC`
-            );
+            const { since, limit } = req.query;
+            let rows;
+            if (since) {
+                const result = await pool.query(
+                    `SELECT id, finding_id, finding_title, host_name, previous_bu, new_bu, detected_at
+                     FROM ivanti_finding_bu_history
+                     WHERE detected_at >= $1
+                     ORDER BY detected_at DESC`,
+                    [since]
+                );
+                rows = result.rows;
+            } else {
+                const maxRows = Math.min(parseInt(limit) || 200, 500);
+                const result = await pool.query(
+                    `SELECT id, finding_id, finding_title, host_name, previous_bu, new_bu, detected_at
+                     FROM ivanti_finding_bu_history
+                     ORDER BY detected_at DESC
+                     LIMIT $1`,
+                    [maxRows]
+                );
+                rows = result.rows;
+            }
             res.json({ changes: rows });
         } catch (err) {
             console.error('[Ivanti Findings] GET /bu-changes error:', err.message);

backend/routes/ivantiFpWorkflow.js

@@ -260,6 +260,12 @@ function createIvantiFpWorkflowRouter() {
                     const foundIds = new Set(libraryDocs.map(d => d.id));
                     const missingIds = libraryDocIds.filter(id => !foundIds.has(id));
                     if (missingIds.length > 0) return res.status(400).json({ error: `Library document IDs not found: ${missingIds.join(', ')}` });
+                    // Validate file types for library docs (same rules as local uploads)
+                    const unsupportedDocs = libraryDocs.filter(d => !isAllowedFileExtension(d.name));
+                    if (unsupportedDocs.length > 0) {
+                        const names = unsupportedDocs.map(d => d.name).join(', ');
+                        return res.status(400).json({ error: `Library document file type not supported by Ivanti: ${names}. Allowed: ${[...ALLOWED_EXTENSIONS].join(', ')}` });
+                    }
                 }
 
                 const libraryFormFiles = [];
@@ -281,8 +287,19 @@ function createIvantiFpWorkflowRouter() {
 
                 if (createResult.status !== 200 && createResult.status !== 201 && createResult.status !== 202) {
                     const errorMap = { 401: 'Ivanti API key is invalid or missing.', 419: 'API key lacks workflow creation permissions.', 429: 'Ivanti API rate limit reached.' };
-                    const errorMsg = errorMap[createResult.status] || `Workflow creation failed: ${createResult.status}`;
-                    logAudit({ userId: req.user.id, username: req.user.username, action: 'ivanti_fp_workflow_failed', entityType: 'ivanti_workflow', details: { error: errorMsg, status: createResult.status, findingIds }, ipAddress: req.ip });
+                    let errorMsg = errorMap[createResult.status];
+                    if (!errorMsg) {
+                        // Try to extract detail from the Ivanti response body
+                        let bodyDetail = '';
+                        try {
+                            const parsed = JSON.parse(createResult.body);
+                            bodyDetail = parsed.message || parsed.error || parsed.detail || JSON.stringify(parsed);
+                        } catch (_) {
+                            bodyDetail = (createResult.body || '').slice(0, 500);
+                        }
+                        errorMsg = `Workflow creation failed (${createResult.status}): ${bodyDetail || 'No details returned by Ivanti API.'}`;
+                    }
+                    logAudit({ userId: req.user.id, username: req.user.username, action: 'ivanti_fp_workflow_failed', entityType: 'ivanti_workflow', details: { error: errorMsg, status: createResult.status, responseBody: (createResult.body || '').slice(0, 1000), findingIds }, ipAddress: req.ip });
                     return res.status(createResult.status === 429 ? 429 : 502).json({ success: false, error: errorMsg, step: 'create_workflow' });
                 }
 
@@ -810,6 +827,12 @@ function createIvantiFpWorkflowRouter() {
                     const foundIds = new Set(libraryDocs.map(d => d.id));
                     const missingIds = libraryDocIds.filter(id => !foundIds.has(id));
                     if (missingIds.length > 0) return res.status(400).json({ error: `Library document IDs not found: ${missingIds.join(', ')}` });
+                    // Validate file types for library docs
+                    const unsupportedDocs = libraryDocs.filter(d => !isAllowedFileExtension(d.name));
+                    if (unsupportedDocs.length > 0) {
+                        const names = unsupportedDocs.map(d => d.name).join(', ');
+                        return res.status(400).json({ error: `Library document file type not supported by Ivanti: ${names}. Allowed: ${[...ALLOWED_EXTENSIONS].join(', ')}` });
+                    }
                 }
 
                 const apiKey = process.env.IVANTI_API_KEY;

backend/routes/ivantiTodoQueue.js

@@ -4,7 +4,7 @@ const pool = require('../db');
 const { requireAuth, requireGroup } = require('../middleware/auth');
 const logAudit = require('../helpers/auditLog');
 
-const VALID_WORKFLOW_TYPES = ['FP', 'Archer', 'CARD', 'GRANITE', 'DECOM'];
+const VALID_WORKFLOW_TYPES = ['FP', 'Archer', 'CARD', 'GRANITE', 'DECOM', 'Remediate'];
 const INVENTORY_TYPES     = ['CARD', 'GRANITE', 'DECOM'];
 const VALID_STATUSES       = ['pending', 'complete'];
 
@@ -32,16 +32,25 @@ function createIvantiTodoQueueRouter() {
      *   - ip_address {string|null}
      *   - hostname {string|null}
      *   - vendor {string}
-     *   - workflow_type {string} One of: FP, Archer, CARD, GRANITE, DECOM
+     *   - workflow_type {string} One of: FP, Archer, CARD, GRANITE, DECOM, Remediate
      *   - status {string} pending | complete
+     *   - host_id {string|null} From the linked ivanti_findings record
+     *   - remediation_notes_count {number}
      *   - created_at {string}
      *   - updated_at {string}
      */
     router.get('/', requireAuth(), async (req, res) => {
         try {
             const { rows } = await pool.query(
-                `SELECT q.*
+                `SELECT q.*, COALESCE(nc.note_count, 0) AS remediation_notes_count,
+                        f.host_id AS host_id
                  FROM ivanti_todo_queue q
+                 LEFT JOIN (
+                     SELECT queue_item_id, COUNT(*) AS note_count
+                     FROM queue_remediation_notes
+                     GROUP BY queue_item_id
+                 ) nc ON nc.queue_item_id = q.id
+                 LEFT JOIN ivanti_findings f ON f.id = q.finding_id
                  WHERE q.user_id = $1
                  ORDER BY q.vendor ASC, q.created_at ASC`,
                 [req.user.id]
@@ -51,7 +60,7 @@ function createIvantiTodoQueueRouter() {
                 if (r.cves_json) {
                     try { cves = JSON.parse(r.cves_json); } catch (e) { cves = []; }
                 }
-                return { ...r, cves };
+                return { ...r, remediation_notes_count: parseInt(r.remediation_notes_count, 10), cves };
             });
             res.json(parsed);
         } catch (err) {
@@ -73,8 +82,8 @@ function createIvantiTodoQueueRouter() {
      *       - cves {Array<string>} Optional
      *       - ip_address {string} Optional, max 64 chars
      *       - hostname {string} Optional, max 255 chars
-     *   - workflow_type {string} Required. One of: FP, Archer, CARD, GRANITE, DECOM
-     *   - vendor {string} Required for FP, Archer, and DECOM workflows; max 200 chars
+     *   - workflow_type {string} Required. One of: FP, Archer, CARD, GRANITE, DECOM, Remediate
+     *   - vendor {string} Required for FP, Archer, and Remediate workflows; max 200 chars
      * @returns {Object} { items: Array<Object> } — inserted queue items with parsed `cves` array
      * @error 400 Invalid input
      * @error 500 Internal server error
@@ -94,12 +103,12 @@ function createIvantiTodoQueueRouter() {
         }
 
         if (!VALID_WORKFLOW_TYPES.includes(workflow_type)) {
-            return res.status(400).json({ error: 'workflow_type must be FP, Archer, CARD, GRANITE, or DECOM.' });
+            return res.status(400).json({ error: 'workflow_type must be FP, Archer, CARD, GRANITE, DECOM, or Remediate.' });
         }
 
         if (!INVENTORY_TYPES.includes(workflow_type)) {
             if (!isValidVendor(vendor)) {
-                return res.status(400).json({ error: 'vendor is required for FP and Archer workflows.' });
+                return res.status(400).json({ error: 'vendor is required for FP, Archer, and Remediate workflows.' });
             }
         }
 
@@ -184,8 +193,8 @@ function createIvantiTodoQueueRouter() {
      *   - cves {Array<string>} Optional
      *   - ip_address {string} Optional, max 64 chars
      *   - hostname {string} Optional, max 255 chars
-     *   - vendor {string} Required for FP, Archer, and DECOM workflows; max 200 chars
-     *   - workflow_type {string} Required. One of: FP, Archer, CARD, GRANITE, DECOM
+     *   - vendor {string} Required for FP, Archer, and Remediate workflows; max 200 chars
+     *   - workflow_type {string} Required. One of: FP, Archer, CARD, GRANITE, DECOM, Remediate
      * @returns {Object} The created queue item with parsed `cves` array
      * @error 400 Invalid input
      * @error 500 Internal server error
@@ -197,10 +206,10 @@ function createIvantiTodoQueueRouter() {
             return res.status(400).json({ error: 'finding_id is required.' });
         }
         if (!VALID_WORKFLOW_TYPES.includes(workflow_type)) {
-            return res.status(400).json({ error: 'workflow_type must be FP, Archer, CARD, GRANITE, or DECOM.' });
+            return res.status(400).json({ error: 'workflow_type must be FP, Archer, CARD, GRANITE, DECOM, or Remediate.' });
         }
         if (!INVENTORY_TYPES.includes(workflow_type) && !isValidVendor(vendor)) {
-            return res.status(400).json({ error: 'vendor is required for FP and Archer workflows.' });
+            return res.status(400).json({ error: 'vendor is required for FP, Archer, and Remediate workflows.' });
         }
         if (vendor !== undefined && vendor !== '' && !isValidVendor(vendor)) {
             return res.status(400).json({ error: 'vendor must be under 200 chars.' });
@@ -242,7 +251,7 @@ function createIvantiTodoQueueRouter() {
      * @param {string} id — Queue item ID (URL parameter)
      * @body {Object} At least one field required:
      *   - vendor {string} Optional, non-empty, max 200 chars
-     *   - workflow_type {string} Optional. One of: FP, Archer, CARD, GRANITE, DECOM
+     *   - workflow_type {string} Optional. One of: FP, Archer, CARD, GRANITE, DECOM, Remediate
      *   - status {string} Optional. One of: pending, complete
      * @returns {Object} The updated queue item with parsed `cves` array
      * @error 400 Invalid input or no fields to update
@@ -257,7 +266,7 @@ function createIvantiTodoQueueRouter() {
             return res.status(400).json({ error: 'vendor must be a non-empty string (max 200 chars).' });
         }
         if (workflow_type !== undefined && !VALID_WORKFLOW_TYPES.includes(workflow_type)) {
-            return res.status(400).json({ error: 'workflow_type must be FP, Archer, CARD, GRANITE, or DECOM.' });
+            return res.status(400).json({ error: 'workflow_type must be FP, Archer, CARD, GRANITE, DECOM, or Remediate.' });
         }
         if (status !== undefined && !VALID_STATUSES.includes(status)) {
             return res.status(400).json({ error: 'status must be pending or complete.' });
@@ -318,16 +327,17 @@ function createIvantiTodoQueueRouter() {
     /**
      * POST /api/ivanti/todo-queue/:id/redirect
      *
-     * Redirects a completed queue item to a different workflow by creating a new
-     * pending queue item with the same finding data but a new workflow type/vendor.
+     * Redirects a queue item to a different workflow type. If the item is pending,
+     * updates workflow_type in place. If the item is complete, creates a new pending
+     * queue item with the same finding data but a new workflow type/vendor.
      * Requires Admin or Standard_User group.
      *
-     * @param {string} id — Queue item ID of the completed item (URL parameter)
+     * @param {string} id — Queue item ID (URL parameter)
      * @body {Object}
-     *   - workflow_type {string} Required. One of: FP, Archer, CARD, GRANITE, DECOM
-     *   - vendor {string} Required for FP, Archer, and DECOM workflows; max 200 chars
-     * @returns {Object} The newly created queue item with parsed `cves` array
-     * @error 400 Invalid input or item not in complete status
+     *   - workflow_type {string} Required. One of: FP, Archer, CARD, GRANITE, DECOM, Remediate
+     *   - vendor {string} Required for FP, Archer, and Remediate workflows; max 200 chars
+     * @returns {Object} The updated or newly created queue item with parsed `cves` array
+     * @error 400 Invalid input
      * @error 404 Queue item not found
      * @error 500 Internal server error
      */
@@ -336,11 +346,11 @@ function createIvantiTodoQueueRouter() {
         const { workflow_type, vendor } = req.body;
 
         if (!VALID_WORKFLOW_TYPES.includes(workflow_type)) {
-            return res.status(400).json({ error: 'workflow_type must be FP, Archer, CARD, GRANITE, or DECOM.' });
+            return res.status(400).json({ error: 'workflow_type must be FP, Archer, CARD, GRANITE, DECOM, or Remediate.' });
         }
         if (!INVENTORY_TYPES.includes(workflow_type)) {
             if (!isValidVendor(vendor)) {
-                return res.status(400).json({ error: 'vendor is required for FP and Archer workflows.' });
+                return res.status(400).json({ error: 'vendor is required for FP, Archer, and Remediate workflows.' });
             }
         }
         if (vendor !== undefined && vendor !== '' && typeof vendor === 'string' && vendor.trim().length > 200) {
@@ -358,10 +368,38 @@ function createIvantiTodoQueueRouter() {
             if (!original) {
                 return res.status(404).json({ error: 'Queue item not found.' });
             }
-            if (original.status !== 'complete') {
-                return res.status(400).json({ error: 'Only completed queue items can be redirected.' });
+
+            // If the item is still pending, update workflow_type in place (no duplication)
+            if (original.status === 'pending') {
+                const { rows } = await pool.query(
+                    `UPDATE ivanti_todo_queue SET workflow_type = $1, vendor = $2, updated_at = NOW()
+                     WHERE id = $3 AND user_id = $4 RETURNING *`,
+                    [workflow_type, vendorVal, id, req.user.id]
+                );
+
+                logAudit({
+                    userId: req.user.id,
+                    username: req.user.username,
+                    action: 'queue_item_redirected',
+                    entityType: 'ivanti_todo_queue',
+                    entityId: String(original.id),
+                    details: {
+                        original_workflow_type: original.workflow_type,
+                        target_workflow_type: workflow_type,
+                        method: 'in_place_update',
+                        vendor: vendorVal,
+                    },
+                    ipAddress: req.ip,
+                });
+
+                const result = {
+                    ...rows[0],
+                    cves: rows[0].cves_json ? JSON.parse(rows[0].cves_json) : [],
+                };
+                return res.json(result);
             }
 
+            // If the item is complete, create a new pending item (legacy behavior)
             const { rows } = await pool.query(
                 `INSERT INTO ivanti_todo_queue
                      (user_id, finding_id, finding_title, cves_json, ip_address, hostname, vendor, workflow_type)
@@ -379,6 +417,7 @@ function createIvantiTodoQueueRouter() {
                 details: {
                     original_workflow_type: original.workflow_type,
                     target_workflow_type: workflow_type,
+                    method: 'new_item_from_complete',
                     new_item_id: rows[0].id,
                     vendor: vendorVal,
                 },
@@ -396,6 +435,41 @@ function createIvantiTodoQueueRouter() {
         }
     });
 
+    /**
+     * GET /api/ivanti/todo-queue/ticket-links
+     *
+     * Returns Jira ticket associations for the current user's queue items.
+     * Joins jira_ticket_queue_items with jira_tickets to get ticket_key and url.
+     *
+     * @returns {Object} { links: { [queue_item_id]: { ticket_key, jira_url } } }
+     * @error 500 Internal server error
+     */
+    router.get('/ticket-links', requireAuth(), async (req, res) => {
+        try {
+            const { rows } = await pool.query(
+                `SELECT jtqi.queue_item_id, jt.ticket_key, jt.url AS jira_url
+                 FROM jira_ticket_queue_items jtqi
+                 JOIN jira_tickets jt ON jt.id = jtqi.jira_ticket_id
+                 JOIN ivanti_todo_queue q ON q.id = jtqi.queue_item_id
+                 WHERE q.user_id = $1`,
+                [req.user.id]
+            );
+
+            const links = {};
+            for (const row of rows) {
+                links[row.queue_item_id] = {
+                    ticket_key: row.ticket_key,
+                    jira_url: row.jira_url
+                };
+            }
+
+            res.json({ links });
+        } catch (err) {
+            console.error('Error fetching ticket links:', err);
+            res.status(500).json({ error: 'Internal server error.' });
+        }
+    });
+
     /**
      * DELETE /api/ivanti/todo-queue/completed
      *
@@ -406,15 +480,43 @@ function createIvantiTodoQueueRouter() {
      * @error 500 Internal server error
      */
     router.delete('/completed', requireAuth(), requireGroup('Admin', 'Standard_User'), async (req, res) => {
+        const client = await pool.connect();
         try {
-            const result = await pool.query(
-                "DELETE FROM ivanti_todo_queue WHERE user_id = $1 AND status = 'complete'",
+            await client.query('BEGIN');
+
+            // Select completed item IDs for this user
+            const { rows: completedRows } = await client.query(
+                "SELECT id FROM ivanti_todo_queue WHERE user_id = $1 AND status = 'complete'",
                 [req.user.id]
             );
-            res.json({ message: 'Completed items cleared.', deleted: result.rowCount });
+
+            if (completedRows.length === 0) {
+                await client.query('COMMIT');
+                return res.json({ message: 'Completed items cleared.', deleted: 0 });
+            }
+
+            const ids = completedRows.map(r => r.id);
+
+            // Delete junction table references first
+            await client.query(
+                'DELETE FROM jira_ticket_queue_items WHERE queue_item_id = ANY($1::int[])',
+                [ids]
+            );
+
+            // Delete the completed queue items
+            const deleteResult = await client.query(
+                'DELETE FROM ivanti_todo_queue WHERE id = ANY($1::int[])',
+                [ids]
+            );
+
+            await client.query('COMMIT');
+            res.json({ message: 'Completed items cleared.', deleted: deleteResult.rowCount });
         } catch (err) {
+            await client.query('ROLLBACK');
             console.error('Error clearing completed queue items:', err);
             res.status(500).json({ error: 'Internal server error.' });
+        } finally {
+            client.release();
         }
     });
 
@@ -452,6 +554,118 @@ function createIvantiTodoQueueRouter() {
         }
     });
 
+    // =========================================================================
+    // Remediation Notes Routes
+    // =========================================================================
+
+    /**
+     * POST /api/ivanti/todo-queue/:id/notes
+     *
+     * Creates a remediation note for a queue item owned by the authenticated user.
+     * Requires Admin or Standard_User group.
+     *
+     * @param {string} id — Queue item ID (URL parameter)
+     * @body {Object}
+     *   - note_text {string} Required, 1–5000 characters, non-whitespace-only
+     * @returns {Object} The created note with id, queue_item_id, user_id, username, note_text, created_at
+     * @error 400 Invalid note_text
+     * @error 404 Queue item not found or not owned
+     * @error 500 Internal server error
+     */
+    router.post('/:id/notes', requireAuth(), requireGroup('Admin', 'Standard_User'), async (req, res) => {
+        const { id } = req.params;
+        const { note_text } = req.body;
+
+        // Validate queue item exists and belongs to user
+        try {
+            const { rows: itemRows } = await pool.query(
+                'SELECT id FROM ivanti_todo_queue WHERE id = $1 AND user_id = $2',
+                [id, req.user.id]
+            );
+            if (!itemRows[0]) {
+                return res.status(404).json({ error: 'Queue item not found.' });
+            }
+        } catch (err) {
+            console.error('Error checking queue item ownership:', err);
+            return res.status(500).json({ error: 'Internal server error.' });
+        }
+
+        // Validate note_text
+        if (!note_text || typeof note_text !== 'string' || note_text.trim().length === 0) {
+            return res.status(400).json({ error: 'Note text is required.' });
+        }
+        if (note_text.length > 5000) {
+            return res.status(400).json({ error: 'Note text must not exceed 5000 characters.' });
+        }
+
+        try {
+            const { rows } = await pool.query(
+                `INSERT INTO queue_remediation_notes (queue_item_id, user_id, username, note_text)
+                 VALUES ($1, $2, $3, $4)
+                 RETURNING id, queue_item_id, user_id, username, note_text, created_at`,
+                [id, req.user.id, req.user.username, note_text]
+            );
+
+            logAudit({
+                userId: req.user.id,
+                username: req.user.username,
+                action: 'create_remediation_note',
+                entityType: 'queue_remediation_notes',
+                entityId: String(rows[0].id),
+                details: { queue_item_id: parseInt(id, 10) },
+                ipAddress: req.ip,
+            });
+
+            return res.status(201).json(rows[0]);
+        } catch (err) {
+            console.error('Error creating remediation note:', err);
+            return res.status(500).json({ error: 'Internal server error.' });
+        }
+    });
+
+    /**
+     * GET /api/ivanti/todo-queue/:id/notes
+     *
+     * Returns all remediation notes for a queue item owned by the authenticated user.
+     * Notes are ordered by created_at descending (most recent first).
+     *
+     * @param {string} id — Queue item ID (URL parameter)
+     * @returns {Array<Object>} Array of note objects (empty array if none)
+     * @error 404 Queue item not found or not owned
+     * @error 500 Internal server error
+     */
+    router.get('/:id/notes', requireAuth(), async (req, res) => {
+        const { id } = req.params;
+
+        // Validate queue item exists and belongs to user
+        try {
+            const { rows: itemRows } = await pool.query(
+                'SELECT id FROM ivanti_todo_queue WHERE id = $1 AND user_id = $2',
+                [id, req.user.id]
+            );
+            if (!itemRows[0]) {
+                return res.status(404).json({ error: 'Queue item not found.' });
+            }
+        } catch (err) {
+            console.error('Error checking queue item ownership:', err);
+            return res.status(500).json({ error: 'Internal server error.' });
+        }
+
+        try {
+            const { rows } = await pool.query(
+                `SELECT id, queue_item_id, user_id, username, note_text, created_at
+                 FROM queue_remediation_notes
+                 WHERE queue_item_id = $1
+                 ORDER BY created_at DESC`,
+                [id]
+            );
+            return res.json(rows);
+        } catch (err) {
+            console.error('Error fetching remediation notes:', err);
+            return res.status(500).json({ error: 'Internal server error.' });
+        }
+    });
+
     return router;
 }
 

backend/routes/ivantiWorkflows.js

@@ -14,8 +14,6 @@ const SYNC_INTERVAL_MS = 24 * 60 * 60 * 1000; // 24 hours
 async function syncWorkflows() {
     const apiKey = process.env.IVANTI_API_KEY;
     const clientId = process.env.IVANTI_CLIENT_ID || '1550';
-    const firstName = process.env.IVANTI_FIRST_NAME || '';
-    const lastName = process.env.IVANTI_LAST_NAME || '';
     const skipTls = process.env.IVANTI_SKIP_TLS === 'true';
 
     if (!apiKey) {
@@ -28,89 +26,125 @@ async function syncWorkflows() {
         return;
     }
 
-    console.log('[Ivanti] Syncing workflows...');
+    // Get all unique Ivanti identities from users table
+    const { rows: ivantiUsers } = await pool.query(
+        `SELECT DISTINCT ivanti_first_name, ivanti_last_name
+         FROM users
+         WHERE ivanti_first_name IS NOT NULL AND ivanti_last_name IS NOT NULL
+           AND ivanti_first_name != '' AND ivanti_last_name != ''`
+    );
+
+    // Fallback to env var if no users have Ivanti identity configured
+    if (ivantiUsers.length === 0) {
+        const envFirst = process.env.IVANTI_FIRST_NAME || '';
+        const envLast = process.env.IVANTI_LAST_NAME || '';
+        if (envFirst && envLast) {
+            ivantiUsers.push({ ivanti_first_name: envFirst, ivanti_last_name: envLast });
+        } else {
+            const errMsg = 'No Ivanti identities configured — set ivanti_first_name/ivanti_last_name on user accounts';
+            console.warn('[Ivanti]', errMsg);
+            await pool.query(
+                `UPDATE ivanti_sync_state SET sync_status='error', error_message=$1, synced_at=NOW() WHERE id=1`,
+                [errMsg]
+            );
+            return;
+        }
+    }
+
+    console.log(`[Ivanti] Syncing workflows for ${ivantiUsers.length} user(s)...`);
 
     const urlPath = `/client/${encodeURIComponent(clientId)}/workflowBatch/search`;
-    const body = {
-        filters: [
-            {
-                field: 'created_by_last_name',
-                exclusive: false,
-                operator: 'IN',
-                orWithPrevious: false,
-                implicitFilters: [],
-                value: lastName,
-                caseSensitive: false
-            },
-            {
-                field: 'created_by_first_name',
-                exclusive: false,
-                operator: 'IN',
-                orWithPrevious: false,
-                implicitFilters: [],
-                value: firstName,
-                caseSensitive: false
+    let allWorkflows = [];
+
+    for (const user of ivantiUsers) {
+        const body = {
+            filters: [
+                {
+                    field: 'created_by_last_name',
+                    exclusive: false,
+                    operator: 'IN',
+                    orWithPrevious: false,
+                    implicitFilters: [],
+                    value: user.ivanti_last_name,
+                    caseSensitive: false
+                },
+                {
+                    field: 'created_by_first_name',
+                    exclusive: false,
+                    operator: 'IN',
+                    orWithPrevious: false,
+                    implicitFilters: [],
+                    value: user.ivanti_first_name,
+                    caseSensitive: false
+                }
+            ],
+            projection: 'internal',
+            sort: [{ field: 'created', direction: 'DESC' }],
+            page: 0,
+            size: 50
+        };
+
+        try {
+            const result = await ivantiPost(urlPath, body, apiKey, skipTls);
+
+            if (result.status === 401) {
+                throw new Error('Invalid or missing API key (401) — check IVANTI_API_KEY in .env');
+            }
+            if (result.status === 419) {
+                throw new Error('Insufficient privileges (419) — API key lacks workflow access');
+            }
+            if (result.status === 429) {
+                throw new Error('Rate limited (429) — will retry at next scheduled sync');
+            }
+            if (result.status !== 200) {
+                console.error(`[Ivanti] Workflow sync for ${user.ivanti_first_name} ${user.ivanti_last_name} returned ${result.status}`);
+                continue;
             }
-        ],
-        projection: 'internal',
-        sort: [{ field: 'created', direction: 'DESC' }],
-        page: 0,
-        size: 50
-    };
 
-    try {
-        const result = await ivantiPost(urlPath, body, apiKey, skipTls);
+            const data = JSON.parse(result.body);
+            let workflows = [];
 
-        if (result.status === 401) {
-            throw new Error('Invalid or missing API key (401) — check IVANTI_API_KEY in .env');
+            if (data.page && typeof data.page.totalElements === 'number') {
+                workflows = data._embedded?.workflowBatches
+                    || data._embedded?.workflowBatch
+                    || [];
+            } else if (typeof data.total === 'number') {
+                workflows = data.data || data.content || data.results || [];
+            } else if (typeof data.totalElements === 'number') {
+                workflows = data.content || data.data || [];
+            } else if (Array.isArray(data)) {
+                workflows = data;
+            }
+
+            // Tag each workflow with the Ivanti identity that owns it
+            workflows.forEach(w => {
+                w._ivanti_first_name = user.ivanti_first_name;
+                w._ivanti_last_name = user.ivanti_last_name;
+            });
+
+            allWorkflows = allWorkflows.concat(workflows);
+            console.log(`[Ivanti]   ${user.ivanti_first_name} ${user.ivanti_last_name}: ${workflows.length} workflows`);
+        } catch (err) {
+            console.error(`[Ivanti] Workflow sync failed for ${user.ivanti_first_name} ${user.ivanti_last_name}:`, err.message);
+            // If it's a fatal error (auth), break and report
+            if (err.message.includes('401') || err.message.includes('419')) {
+                await pool.query(
+                    `UPDATE ivanti_sync_state SET sync_status='error', error_message=$1, synced_at=NOW() WHERE id=1`,
+                    [err.message]
+                );
+                return;
+            }
         }
-        if (result.status === 419) {
-            throw new Error('Insufficient privileges (419) — API key lacks workflow access');
-        }
-        if (result.status === 429) {
-            throw new Error('Rate limited (429) — will retry at next scheduled sync');
-        }
-        if (result.status !== 200) {
-            throw new Error(`Ivanti API returned unexpected status ${result.status}`);
-        }
-
-        const data = JSON.parse(result.body);
-
-        let total = 0;
-        let workflows = [];
-
-        if (data.page && typeof data.page.totalElements === 'number') {
-            total = data.page.totalElements;
-            workflows = data._embedded?.workflowBatches
-                || data._embedded?.workflowBatch
-                || [];
-        } else if (typeof data.total === 'number') {
-            total = data.total;
-            workflows = data.data || data.content || data.results || [];
-        } else if (typeof data.totalElements === 'number') {
-            total = data.totalElements;
-            workflows = data.content || data.data || [];
-        } else if (Array.isArray(data)) {
-            workflows = data;
-            total = data.length;
-        }
-
-        await pool.query(
-            `UPDATE ivanti_sync_state
-             SET total=$1, workflows_json=$2, synced_at=NOW(), sync_status='success', error_message=NULL
-             WHERE id=1`,
-            [total, JSON.stringify(workflows)]
-        );
-
-        console.log(`[Ivanti] Sync complete — ${total} workflows`);
-    } catch (err) {
-        const msg = err.message || 'Unknown error';
-        console.error('[Ivanti] Sync failed:', msg);
-        await pool.query(
-            `UPDATE ivanti_sync_state SET sync_status='error', error_message=$1, synced_at=NOW() WHERE id=1`,
-            [msg]
-        );
     }
+
+    await pool.query(
+        `UPDATE ivanti_sync_state
+         SET total=$1, workflows_json=$2, synced_at=NOW(), sync_status='success', error_message=NULL
+         WHERE id=1`,
+        [allWorkflows.length, JSON.stringify(allWorkflows)]
+    );
+
+    console.log(`[Ivanti] Sync complete — ${allWorkflows.length} total workflows`);
 }
 
 // ---------------------------------------------------------------------------
@@ -174,16 +208,55 @@ function createIvantiWorkflowsRouter() {
     // All routes require authentication
     router.use(requireAuth());
 
-    // GET / — return cached data (fast, no external call)
+    /**
+     * GET /api/ivanti/workflows
+     *
+     * Returns cached Ivanti workflow data filtered by the logged-in user's
+     * Ivanti identity (ivanti_first_name / ivanti_last_name on their account).
+     * If the user has no Ivanti identity configured, returns all workflows (admin view).
+     *
+     * @returns {object} 200 - { total, workflows, synced_at, sync_status, error_message }
+     * @returns {object} 500 - { error: 'Database error reading sync state' }
+     */
     router.get('/', async (req, res) => {
         try {
-            res.json(await readState());
+            const state = await readState();
+
+            // Get logged-in user's Ivanti identity
+            const { rows: userRows } = await pool.query(
+                'SELECT ivanti_first_name, ivanti_last_name FROM users WHERE id = $1',
+                [req.user.id]
+            );
+            const ivantiUser = userRows[0];
+
+            // If user has Ivanti identity, filter workflows to only theirs
+            if (ivantiUser && ivantiUser.ivanti_first_name && ivantiUser.ivanti_last_name) {
+                state.workflows = state.workflows.filter(w =>
+                    (w._ivanti_first_name || '').toLowerCase() === ivantiUser.ivanti_first_name.toLowerCase() &&
+                    (w._ivanti_last_name || '').toLowerCase() === ivantiUser.ivanti_last_name.toLowerCase()
+                );
+                state.total = state.workflows.length;
+            }
+            // If no Ivanti identity configured, show all (admin view)
+
+            res.json(state);
         } catch {
             res.status(500).json({ error: 'Database error reading sync state' });
         }
     });
 
-    // POST /sync — trigger an immediate sync, await completion, return fresh state
+    /**
+     * POST /api/ivanti/workflows/sync
+     *
+     * Triggers an immediate Ivanti workflow sync for all configured user identities,
+     * awaits completion, and returns the updated cached state. Requires Admin or
+     * Standard_User group.
+     *
+     * @returns {object} 200 - { total, workflows, synced_at, sync_status, error_message }
+     * @returns {object} 401 - { error: 'Authentication required' }
+     * @returns {object} 403 - { error: 'Insufficient permissions', required: ['Admin', 'Standard_User'], current: '...' }
+     * @returns {object} 500 - { error: 'Sync ran but could not read updated state' }
+     */
     router.post('/sync', requireGroup('Admin', 'Standard_User'), async (req, res) => {
         await syncWorkflows();
         try {

backend/routes/jiraTickets.js

@@ -18,7 +18,6 @@ const jiraApi = require('../helpers/jiraApi');
 
 // Validation helpers
 const CVE_ID_PATTERN = /^CVE-\d{4}-\d{4,}$/;
-const VALID_TICKET_STATUSES = ['Open', 'In Progress', 'Closed'];
 
 function isValidCveId(cveId) {
     return typeof cveId === 'string' && CVE_ID_PATTERN.test(cveId);
@@ -35,6 +34,16 @@ function createJiraTicketsRouter() {
     // Jira API integration endpoints
     // -----------------------------------------------------------------------
 
+    /**
+     * GET /api/jira-tickets/connection-test
+     *
+     * Tests connectivity to the configured Jira instance.
+     *
+     * @requires Admin group
+     * @returns {object} 200 - { connected: true, user: { name, displayName, ... } }
+     * @returns {object} 502 - { connected: false, error: string } on connection failure
+     * @returns {object} 503 - { error: string } when Jira API is not configured
+     */
     router.get('/connection-test', requireAuth(), requireGroup('Admin'), async (req, res) => {
         if (!jiraApi.isConfigured) {
             return res.status(503).json({ error: 'Jira API is not configured. Set JIRA_BASE_URL and credentials in backend/.env.' });
@@ -60,10 +69,33 @@ function createJiraTicketsRouter() {
         }
     });
 
+    /**
+     * GET /api/jira-tickets/rate-limit
+     *
+     * Returns the current Jira API rate limit status (burst and daily counters).
+     *
+     * @requires Admin group
+     * @returns {object} 200 - { burst: { remaining, limit, ... }, daily: { remaining, limit, ... } }
+     */
     router.get('/rate-limit', requireAuth(), requireGroup('Admin'), (req, res) => {
         res.json(jiraApi.getRateLimitStatus());
     });
 
+    /**
+     * GET /api/jira-tickets/lookup/:issueKey
+     *
+     * Looks up a single Jira issue by its key (e.g., PROJECT-123) and returns
+     * a summary of its fields.
+     *
+     * @param {string} issueKey - Jira issue key (path parameter, format: PROJECT-123)
+     * @requires Authenticated user
+     * @returns {object} 200 - { key, summary, status, assignee, priority, issuetype, created, updated, self }
+     * @returns {object} 400 - { error: string } for invalid issue key format
+     * @returns {object} 404 - { error: string } when issue not found in Jira
+     * @returns {object} 429 - { error: string } when Jira rate limit exceeded
+     * @returns {object} 502 - { error: string } on Jira API error
+     * @returns {object} 503 - { error: string } when Jira API is not configured
+     */
     router.get('/lookup/:issueKey', requireAuth(), async (req, res) => {
         if (!jiraApi.isConfigured) {
             return res.status(503).json({ error: 'Jira API is not configured.' });
@@ -93,8 +125,24 @@ function createJiraTicketsRouter() {
             if (result.rateLimited) {
                 return res.status(429).json({ error: 'Jira rate limit exceeded. Try again later.' });
             }
+            // Build a meaningful error message from Jira's response
+            let errorMsg = result.status === 404 ? 'Issue not found in Jira.' : 'Jira API error.';
+            if (result.body) {
+                try {
+                    const parsed = typeof result.body === 'string' ? JSON.parse(result.body) : result.body;
+                    if (parsed.errorMessages && parsed.errorMessages.length > 0) {
+                        errorMsg = parsed.errorMessages.join('; ');
+                    } else if (parsed.errors && Object.keys(parsed.errors).length > 0) {
+                        errorMsg = Object.values(parsed.errors).join('; ');
+                    }
+                } catch (_) {
+                    if (typeof result.body === 'string' && result.body.length < 300) {
+                        errorMsg = result.body;
+                    }
+                }
+            }
             return res.status(result.status === 404 ? 404 : 502).json({
-                error: result.status === 404 ? 'Issue not found in Jira.' : 'Jira API error.',
+                error: errorMsg,
                 details: result.body
             });
         } catch (err) {
@@ -102,19 +150,63 @@ function createJiraTicketsRouter() {
         }
     });
 
+    /**
+     * POST /api/jira-tickets/create-in-jira
+     *
+     * Creates a new issue in Jira and saves a local tracking record.
+     *
+     * @requires Admin or Standard_User group
+     * @body {string} [cve_id] - Optional CVE ID (format: CVE-YYYY-NNNN+); stored as NULL if absent/empty
+     * @body {string} [vendor] - Optional vendor name (max 200 chars after trim); stored as NULL if absent/empty/whitespace
+     * @body {string} summary - Required issue summary (max 255 chars)
+     * @body {string} [description] - Optional issue description
+     * @body {string} [project_key] - Jira project key (defaults to JIRA_PROJECT_KEY env var)
+     * @body {string} [issue_type] - Jira issue type name (defaults to JIRA_ISSUE_TYPE env var)
+     * @body {string} [source_context] - One of: cve, archer, ivanti_queue, email, manual (defaults to 'manual')
+     * @returns {object} 201 - { id, ticket_key, jira_url, source_context, message }
+     * @returns {object} 207 - { warning, jira_key, jira_url, error } when Jira issue created but local DB save failed
+     * @returns {object} 400 - { error: string } for validation failures
+     * @returns {object} 429 - { error: string } when Jira rate limit exceeded
+     * @returns {object} 502 - { error: string } on Jira API error
+     * @returns {object} 503 - { error: string } when Jira API is not configured
+     */
     router.post('/create-in-jira', requireAuth(), requireGroup('Admin', 'Standard_User'), async (req, res) => {
         if (!jiraApi.isConfigured) {
             return res.status(503).json({ error: 'Jira API is not configured.' });
         }
 
-        const { cve_id, vendor, summary, description, project_key, issue_type } = req.body;
+        const { cve_id, vendor, summary, description, project_key, issue_type, source_context } = req.body;
 
-        if (!cve_id || !isValidCveId(cve_id)) {
-            return res.status(400).json({ error: 'Valid CVE ID is required.' });
+        // --- CVE ID validation: optional, but must match format if non-empty ---
+        let normalizedCveId = null;
+        if (cve_id !== undefined && cve_id !== null && cve_id !== '') {
+            if (!isValidCveId(cve_id)) {
+                return res.status(400).json({ error: 'CVE ID format is invalid. Expected CVE-YYYY-NNNN+.' });
+            }
+            normalizedCveId = cve_id;
         }
-        if (!vendor || !isValidVendor(vendor)) {
-            return res.status(400).json({ error: 'Valid vendor is required.' });
+
+        // --- Vendor validation: optional, but must be <= 200 chars after trim if non-empty ---
+        let normalizedVendor = null;
+        if (vendor !== undefined && vendor !== null && typeof vendor === 'string' && vendor.trim().length > 0) {
+            const trimmedVendor = vendor.trim();
+            if (trimmedVendor.length > 200) {
+                return res.status(400).json({ error: 'Vendor exceeds maximum length of 200 characters.' });
+            }
+            normalizedVendor = trimmedVendor;
         }
+
+        // --- source_context validation: must be in allowed set if provided, default to 'manual' ---
+        const ALLOWED_SOURCE_CONTEXTS = ['cve', 'archer', 'ivanti_queue', 'email', 'manual'];
+        let normalizedSourceContext = 'manual';
+        if (source_context !== undefined && source_context !== null) {
+            if (!ALLOWED_SOURCE_CONTEXTS.includes(source_context)) {
+                return res.status(400).json({ error: 'source_context must be one of: cve, archer, ivanti_queue, email, manual.' });
+            }
+            normalizedSourceContext = source_context;
+        }
+
+        // --- Summary validation: required, non-empty, max 255 chars ---
         if (!summary || typeof summary !== 'string' || summary.trim().length === 0 || summary.length > 255) {
             return res.status(400).json({ error: 'Summary is required (max 255 chars).' });
         }
@@ -153,10 +245,10 @@ function createJiraTicketsRouter() {
 
             try {
                 const { rows } = await pool.query(
-                    `INSERT INTO jira_tickets (cve_id, vendor, ticket_key, url, summary, status, jira_id, jira_status, last_synced_at, created_by)
-                     VALUES ($1, $2, $3, $4, $5, $6, $7, $8, NOW(), $9)
+                    `INSERT INTO jira_tickets (cve_id, vendor, ticket_key, url, summary, status, jira_id, jira_status, last_synced_at, created_by, source_context)
+                     VALUES ($1, $2, $3, $4, $5, $6, $7, $8, NOW(), $9, $10)
                      RETURNING id`,
-                    [cve_id, vendor, ticketKey, jiraUrl, summary.trim(), 'Open', jiraIssue.id, 'Open', req.user.id]
+                    [normalizedCveId, normalizedVendor, ticketKey, jiraUrl, summary.trim(), 'Open', jiraIssue.id, 'Open', req.user.id, normalizedSourceContext]
                 );
 
                 logAudit({
@@ -165,7 +257,7 @@ function createJiraTicketsRouter() {
                     action: 'jira_ticket_create_via_api',
                     entityType: 'jira_ticket',
                     entityId: rows[0].id.toString(),
-                    details: { cve_id, vendor, ticket_key: ticketKey, jira_id: jiraIssue.id, project_key: projectKey },
+                    details: { cve_id: normalizedCveId, vendor: normalizedVendor, ticket_key: ticketKey, jira_id: jiraIssue.id, project_key: projectKey, source_context: normalizedSourceContext },
                     ipAddress: req.ip
                 });
 
@@ -173,6 +265,7 @@ function createJiraTicketsRouter() {
                     id: rows[0].id,
                     ticket_key: ticketKey,
                     jira_url: jiraUrl,
+                    source_context: normalizedSourceContext,
                     message: 'Jira issue created and linked successfully'
                 });
             } catch (dbErr) {
@@ -189,32 +282,58 @@ function createJiraTicketsRouter() {
         }
     });
 
+    /**
+     * POST /api/jira-tickets/sync-all
+     *
+     * Syncs all local Jira ticket records with their current Jira status using
+     * bulk JQL search. Updates summary, status, and last_synced_at for each ticket.
+     * Stops early if rate limits are approaching.
+     *
+     * @requires Admin group
+     * @returns {object} 200 - { synced, failed, skipped, unchanged, errors: string[] }
+     * @returns {object} 500 - { error: string } on internal error
+     * @returns {object} 503 - { error: string } when Jira API is not configured
+     */
     router.post('/sync-all', requireAuth(), requireGroup('Admin'), async (req, res) => {
         if (!jiraApi.isConfigured) {
             return res.status(503).json({ error: 'Jira API is not configured.' });
         }
 
         try {
+            // Only sync tickets that are NOT in a completed/closed state.
+            // Completed tickets are pulled on the sync where they first become completed,
+            // but on subsequent syncs they are skipped to avoid unnecessary API calls.
             const { rows: tickets } = await pool.query(
                 "SELECT * FROM jira_tickets WHERE ticket_key IS NOT NULL AND ticket_key != ''"
             );
 
-            if (tickets.length === 0) {
-                return res.json({ synced: 0, failed: 0, skipped: 0, unchanged: 0, errors: [] });
+            // Separate active vs completed tickets
+            const CLOSED_STATUSES = ['closed', 'done', 'resolved', 'complete', 'completed', 'cancelled', 'canceled', "won't do", 'declined'];
+            const isCompleted = (status) => {
+                if (!status) return false;
+                const lower = status.toLowerCase();
+                return CLOSED_STATUSES.some(s => lower.includes(s));
+            };
+
+            const activeTickets = tickets.filter(t => !isCompleted(t.status));
+            const skippedCompleted = tickets.length - activeTickets.length;
+
+            if (activeTickets.length === 0) {
+                return res.json({ synced: 0, failed: 0, skipped: skippedCompleted, unchanged: 0, errors: [], skippedCompleted });
             }
 
             const results = { synced: 0, failed: 0, skipped: 0, unchanged: 0, errors: [] };
 
             const BATCH_SIZE = 100;
             const batches = [];
-            for (let i = 0; i < tickets.length; i += BATCH_SIZE) {
-                batches.push(tickets.slice(i, i + BATCH_SIZE));
+            for (let i = 0; i < activeTickets.length; i += BATCH_SIZE) {
+                batches.push(activeTickets.slice(i, i + BATCH_SIZE));
             }
 
             for (const batch of batches) {
                 const rateStatus = jiraApi.getRateLimitStatus();
                 if (rateStatus.burst.remaining <= 5 || rateStatus.daily.remaining <= 10) {
-                    const remaining = tickets.length - results.synced - results.failed - results.unchanged;
+                    const remaining = activeTickets.length - results.synced - results.failed - results.unchanged;
                     results.skipped += remaining;
                     results.errors.push('Rate limit approaching — stopped sync early to preserve budget.');
                     break;
@@ -248,12 +367,11 @@ function createJiraTicketsRouter() {
 
                         const jiraStatus = issue.fields.status ? issue.fields.status.name : null;
                         const jiraSummary = issue.fields.summary || ticket.summary;
-                        const localStatus = mapJiraStatusToLocal(jiraStatus);
 
                         try {
                             await pool.query(
                                 `UPDATE jira_tickets SET summary = $1, status = $2, jira_status = $3, last_synced_at = NOW(), updated_at = NOW() WHERE id = $4`,
-                                [jiraSummary, localStatus, jiraStatus, ticket.id]
+                                [jiraSummary, jiraStatus || 'Open', jiraStatus, ticket.id]
                             );
                             results.synced++;
                         } catch (dbErr) {
@@ -273,17 +391,33 @@ function createJiraTicketsRouter() {
                 action: 'jira_sync_all',
                 entityType: 'jira_integration',
                 entityId: null,
-                details: results,
+                details: { ...results, skippedCompleted },
                 ipAddress: req.ip
             });
 
-            res.json(results);
+            res.json({ ...results, skippedCompleted });
         } catch (err) {
             console.error(err);
-            return res.status(500).json({ error: 'Internal server error.' });
+            return res.status(500).json({ error: err.message || 'Internal server error.' });
         }
     });
 
+    /**
+     * POST /api/jira-tickets/:id/sync
+     *
+     * Syncs a single local Jira ticket record with its current Jira status.
+     * Fetches the issue by ticket_key and updates summary, status, and last_synced_at.
+     *
+     * @param {string} id - Local ticket ID (path parameter)
+     * @requires Admin or Standard_User group
+     * @returns {object} 200 - { message, ticket_key, jira_status, local_status, summary }
+     * @returns {object} 400 - { error: string } when ticket has no Jira key
+     * @returns {object} 404 - { error: string } when local ticket not found
+     * @returns {object} 429 - { error: string } when Jira rate limit exceeded
+     * @returns {object} 500 - { error: string } on internal error
+     * @returns {object} 502 - { error: string } on Jira API error
+     * @returns {object} 503 - { error: string } when Jira API is not configured
+     */
     router.post('/:id/sync', requireAuth(), requireGroup('Admin', 'Standard_User'), async (req, res) => {
         if (!jiraApi.isConfigured) {
             return res.status(503).json({ error: 'Jira API is not configured.' });
@@ -313,11 +447,10 @@ function createJiraTicketsRouter() {
             const issue = result.data;
             const jiraStatus = issue.fields.status ? issue.fields.status.name : null;
             const jiraSummary = issue.fields.summary || ticket.summary;
-            const localStatus = mapJiraStatusToLocal(jiraStatus);
 
             await pool.query(
                 `UPDATE jira_tickets SET summary = $1, status = $2, jira_status = $3, last_synced_at = NOW(), updated_at = NOW() WHERE id = $4`,
-                [jiraSummary, localStatus, jiraStatus, id]
+                [jiraSummary, jiraStatus || 'Open', jiraStatus, id]
             );
 
             logAudit({
@@ -339,7 +472,7 @@ function createJiraTicketsRouter() {
             });
         } catch (err) {
             console.error(err);
-            return res.status(500).json({ error: 'Internal server error.' });
+            return res.status(500).json({ error: err.message || 'Internal server error.' });
         }
     });
 
@@ -347,8 +480,22 @@ function createJiraTicketsRouter() {
     // Local CRUD endpoints
     // -----------------------------------------------------------------------
 
+    /**
+     * GET /api/jira-tickets
+     *
+     * Lists all Jira tickets with optional filtering by query parameters.
+     * Results are ordered by created_at descending.
+     *
+     * @query {string} [cve_id] - Filter by exact CVE ID
+     * @query {string} [vendor] - Filter by exact vendor name
+     * @query {string} [status] - Filter by ticket status (Open, In Progress, Closed)
+     * @query {string} [source_context] - Filter by source context (cve, archer, ivanti_queue, email, manual)
+     * @requires Authenticated user
+     * @returns {array} 200 - Array of jira_tickets rows
+     * @returns {object} 500 - { error: string } on internal error
+     */
     router.get('/', requireAuth(), async (req, res) => {
-        const { cve_id, vendor, status } = req.query;
+        const { cve_id, vendor, status, source_context } = req.query;
 
         let query = 'SELECT * FROM jira_tickets WHERE 1=1';
         const params = [];
@@ -366,6 +513,10 @@ function createJiraTicketsRouter() {
             query += ` AND status = $${paramIndex++}`;
             params.push(status);
         }
+        if (source_context) {
+            query += ` AND source_context = $${paramIndex++}`;
+            params.push(source_context);
+        }
 
         query += ' ORDER BY created_at DESC';
 
@@ -374,18 +525,45 @@ function createJiraTicketsRouter() {
             res.json(rows);
         } catch (err) {
             console.error('Error fetching JIRA tickets:', err);
-            res.status(500).json({ error: 'Internal server error.' });
+            res.status(500).json({ error: err.message || 'Internal server error.' });
         }
     });
 
+    /**
+     * POST /api/jira-tickets
+     *
+     * Creates a local Jira ticket record (without creating an issue in Jira).
+     * Used for manually tracking tickets that already exist in Jira.
+     *
+     * @requires Admin or Standard_User group
+     * @body {string} cve_id - Required CVE ID (format: CVE-YYYY-NNNN+)
+     * @body {string} vendor - Required vendor name (max 200 chars)
+     * @body {string} ticket_key - Required Jira ticket key (max 50 chars)
+     * @body {string} [url] - Optional Jira ticket URL (max 500 chars)
+     * @body {string} [summary] - Optional summary (max 500 chars)
+     * @body {string} [status] - Optional status: Open, In Progress, or Closed (defaults to Open)
+     * @returns {object} 201 - { id, message }
+     * @returns {object} 400 - { error: string } for validation failures
+     * @returns {object} 500 - { error: string } on internal error
+     */
     router.post('/', requireAuth(), requireGroup('Admin', 'Standard_User'), async (req, res) => {
         const { cve_id, vendor, ticket_key, url, summary, status } = req.body;
 
-        if (!cve_id || !isValidCveId(cve_id)) {
-            return res.status(400).json({ error: 'Valid CVE ID is required.' });
+        // CVE ID is optional — validate format only if provided and non-empty
+        let normalizedCveId = null;
+        if (cve_id && typeof cve_id === 'string' && cve_id.trim().length > 0) {
+            if (!isValidCveId(cve_id)) {
+                return res.status(400).json({ error: 'CVE ID format is invalid. Expected CVE-YYYY-NNNN+.' });
+            }
+            normalizedCveId = cve_id;
         }
-        if (!vendor || !isValidVendor(vendor)) {
-            return res.status(400).json({ error: 'Valid vendor is required.' });
+        // Vendor is optional — validate length only if provided and non-empty
+        let normalizedVendor = null;
+        if (vendor && typeof vendor === 'string' && vendor.trim().length > 0) {
+            if (vendor.trim().length > 200) {
+                return res.status(400).json({ error: 'Vendor exceeds maximum length of 200 characters.' });
+            }
+            normalizedVendor = vendor.trim();
         }
         if (!ticket_key || typeof ticket_key !== 'string' || ticket_key.trim().length === 0 || ticket_key.length > 50) {
             return res.status(400).json({ error: 'Ticket key is required (max 50 chars).' });
@@ -396,8 +574,8 @@ function createJiraTicketsRouter() {
         if (summary && (typeof summary !== 'string' || summary.length > 500)) {
             return res.status(400).json({ error: 'Summary must be under 500 characters.' });
         }
-        if (status && !VALID_TICKET_STATUSES.includes(status)) {
-            return res.status(400).json({ error: `Status must be one of: ${VALID_TICKET_STATUSES.join(', ')}` });
+        if (status && typeof status !== 'string') {
+            return res.status(400).json({ error: 'Status must be a string.' });
         }
 
         const ticketStatus = status || 'Open';
@@ -407,7 +585,7 @@ function createJiraTicketsRouter() {
                 `INSERT INTO jira_tickets (cve_id, vendor, ticket_key, url, summary, status, created_by)
                  VALUES ($1, $2, $3, $4, $5, $6, $7)
                  RETURNING id`,
-                [cve_id, vendor, ticket_key.trim(), url || null, summary || null, ticketStatus, req.user.id]
+                [normalizedCveId, normalizedVendor, ticket_key.trim(), url || null, summary || null, ticketStatus, req.user.id]
             );
 
             logAudit({
@@ -416,7 +594,7 @@ function createJiraTicketsRouter() {
                 action: 'jira_ticket_create',
                 entityType: 'jira_ticket',
                 entityId: rows[0].id.toString(),
-                details: { cve_id, vendor, ticket_key, status: ticketStatus },
+                details: { cve_id: normalizedCveId, vendor: normalizedVendor, ticket_key, status: ticketStatus },
                 ipAddress: req.ip
             });
 
@@ -426,14 +604,48 @@ function createJiraTicketsRouter() {
             });
         } catch (err) {
             console.error('Error creating JIRA ticket:', err);
-            res.status(500).json({ error: 'Internal server error.' });
+            res.status(500).json({ error: `Failed to save ticket: ${err.message}` });
         }
     });
 
+    /**
+     * PUT /api/jira-tickets/:id
+     *
+     * Updates an existing local Jira ticket record. Only provided fields are updated.
+     * The source_context field is immutable after creation — including it returns 400.
+     *
+     * @param {string} id - Local ticket ID (path parameter)
+     * @requires Admin or Standard_User group
+     * @body {string} [cve_id] - CVE ID (format: CVE-YYYY-NNNN+, null/empty to clear)
+     * @body {string} [vendor] - Vendor name (max 200 chars, null/empty to clear)
+     * @body {string} [ticket_key] - Jira ticket key (max 50 chars)
+     * @body {string} [url] - Jira ticket URL (max 500 chars, null to clear)
+     * @body {string} [summary] - Summary (max 500 chars, null to clear)
+     * @body {string} [status] - Status: Open, In Progress, or Closed
+     * @returns {object} 200 - { message, changes }
+     * @returns {object} 400 - { error: string } for validation failures or source_context mutation attempt
+     * @returns {object} 404 - { error: string } when ticket not found
+     * @returns {object} 500 - { error: string } on internal error
+     */
     router.put('/:id', requireAuth(), requireGroup('Admin', 'Standard_User'), async (req, res) => {
         const { id } = req.params;
-        const { ticket_key, url, summary, status } = req.body;
+        const { cve_id, vendor, ticket_key, url, summary, status } = req.body;
 
+        // source_context is immutable after creation (Requirement 3.6)
+        if ('source_context' in req.body) {
+            return res.status(400).json({ error: 'source_context is immutable after creation' });
+        }
+
+        // Validate cve_id if provided
+        if (cve_id !== undefined && cve_id !== null && cve_id !== '') {
+            if (!isValidCveId(cve_id)) {
+                return res.status(400).json({ error: 'CVE ID format is invalid. Expected CVE-YYYY-NNNN+.' });
+            }
+        }
+        // Validate vendor if provided
+        if (vendor !== undefined && vendor !== null && typeof vendor === 'string' && vendor.trim().length > 200) {
+            return res.status(400).json({ error: 'Vendor exceeds maximum length of 200 characters.' });
+        }
         if (ticket_key !== undefined && (typeof ticket_key !== 'string' || ticket_key.trim().length === 0 || ticket_key.length > 50)) {
             return res.status(400).json({ error: 'Ticket key must be under 50 chars.' });
         }
@@ -443,14 +655,16 @@ function createJiraTicketsRouter() {
         if (summary !== undefined && summary !== null && (typeof summary !== 'string' || summary.length > 500)) {
             return res.status(400).json({ error: 'Summary must be under 500 characters.' });
         }
-        if (status !== undefined && !VALID_TICKET_STATUSES.includes(status)) {
-            return res.status(400).json({ error: `Status must be one of: ${VALID_TICKET_STATUSES.join(', ')}` });
+        if (status !== undefined && typeof status !== 'string') {
+            return res.status(400).json({ error: 'Status must be a string.' });
         }
 
         const fields = [];
         const values = [];
         let paramIndex = 1;
 
+        if (cve_id !== undefined) { fields.push(`cve_id = $${paramIndex++}`); values.push(cve_id || null); }
+        if (vendor !== undefined) { fields.push(`vendor = $${paramIndex++}`); values.push(vendor ? vendor.trim() : null); }
         if (ticket_key !== undefined) { fields.push(`ticket_key = $${paramIndex++}`); values.push(ticket_key.trim()); }
         if (url !== undefined) { fields.push(`url = $${paramIndex++}`); values.push(url); }
         if (summary !== undefined) { fields.push(`summary = $${paramIndex++}`); values.push(summary); }
@@ -488,10 +702,24 @@ function createJiraTicketsRouter() {
             res.json({ message: 'JIRA ticket updated successfully', changes: result.rowCount });
         } catch (err) {
             console.error('Error updating JIRA ticket:', err);
-            res.status(500).json({ error: 'Internal server error.' });
+            res.status(500).json({ error: err.message || 'Internal server error.' });
         }
     });
 
+    /**
+     * DELETE /api/jira-tickets/:id
+     *
+     * Deletes a local Jira ticket record. Admin can delete any ticket.
+     * Standard_User can only delete tickets they created, and only if the ticket
+     * is not linked to an active compliance item.
+     *
+     * @param {string} id - Local ticket ID (path parameter)
+     * @requires Admin or Standard_User group
+     * @returns {object} 200 - { message }
+     * @returns {object} 403 - { error: string } when user lacks permission or ticket is linked to compliance
+     * @returns {object} 404 - { error: string } when ticket not found
+     * @returns {object} 500 - { error: string } on internal error
+     */
     router.delete('/:id', requireAuth(), requireGroup('Admin', 'Standard_User'), async (req, res) => {
         const { id } = req.params;
 
@@ -555,7 +783,91 @@ function createJiraTicketsRouter() {
             }
         } catch (err) {
             console.error('Error deleting JIRA ticket:', err);
-            res.status(500).json({ error: 'Internal server error.' });
+            res.status(500).json({ error: err.message || 'Internal server error.' });
+        }
+    });
+
+    // -----------------------------------------------------------------------
+    // Junction table endpoint — link queue items to a Jira ticket
+    // -----------------------------------------------------------------------
+
+    /**
+     * POST /api/jira-tickets/:id/queue-items
+     *
+     * Records associations between a Jira ticket and Ivanti queue items that
+     * contributed to it. Uses ON CONFLICT DO NOTHING to handle duplicates.
+     *
+     * @param {string} id - Local Jira ticket ID (path parameter)
+     * @requires Admin or Standard_User group
+     * @body {number[]} queue_item_ids - Non-empty array of ivanti_todo_queue IDs
+     * @returns {object} 201 - { message, ticket_id, linked_count }
+     * @returns {object} 400 - { error: string } for validation failures
+     * @returns {object} 404 - { error: string } when ticket not found
+     * @returns {object} 500 - { error: string } on internal error
+     */
+    router.post('/:id/queue-items', requireAuth(), requireGroup('Admin', 'Standard_User'), async (req, res) => {
+        const { id } = req.params;
+        const { queue_item_ids } = req.body;
+
+        // Validate queue_item_ids is a non-empty array of integers
+        if (!Array.isArray(queue_item_ids) || queue_item_ids.length === 0) {
+            return res.status(400).json({ error: 'queue_item_ids must be a non-empty array of integers' });
+        }
+
+        for (const qid of queue_item_ids) {
+            if (!Number.isInteger(qid)) {
+                return res.status(400).json({ error: 'queue_item_ids must be a non-empty array of integers' });
+            }
+        }
+
+        try {
+            // Verify the jira_ticket exists
+            const { rows: ticketRows } = await pool.query(
+                'SELECT id FROM jira_tickets WHERE id = $1',
+                [id]
+            );
+            if (ticketRows.length === 0) {
+                return res.status(404).json({ error: 'Jira ticket not found' });
+            }
+
+            // Verify all referenced queue items exist
+            const { rows: existingItems } = await pool.query(
+                'SELECT id FROM ivanti_todo_queue WHERE id = ANY($1::int[])',
+                [queue_item_ids]
+            );
+            if (existingItems.length !== queue_item_ids.length) {
+                return res.status(400).json({ error: 'One or more queue items not found' });
+            }
+
+            // Insert rows with ON CONFLICT DO NOTHING
+            const values = queue_item_ids.map((qid, idx) => `($1, $${idx + 2})`).join(', ');
+            const params = [id, ...queue_item_ids];
+
+            const { rowCount } = await pool.query(
+                `INSERT INTO jira_ticket_queue_items (jira_ticket_id, queue_item_id)
+                 VALUES ${values}
+                 ON CONFLICT (jira_ticket_id, queue_item_id) DO NOTHING`,
+                params
+            );
+
+            logAudit({
+                userId: req.user.id,
+                username: req.user.username,
+                action: 'jira_ticket_link_queue_items',
+                entityType: 'jira_ticket',
+                entityId: id,
+                details: { queue_item_ids, linked_count: rowCount },
+                ipAddress: req.ip
+            });
+
+            res.status(201).json({
+                message: 'Queue items linked to ticket',
+                ticket_id: parseInt(id, 10),
+                linked_count: rowCount
+            });
+        } catch (err) {
+            console.error('Error linking queue items to Jira ticket:', err);
+            res.status(500).json({ error: err.message || 'Internal server error.' });
         }
     });
 

backend/routes/knowledgeBase.js

@@ -40,7 +40,22 @@ function createKnowledgeBaseRouter(upload) {
     return ALLOWED_EXTENSIONS.has(ext);
   }
 
-  // POST /api/knowledge-base/upload
+  /**
+   * POST /api/knowledge-base/upload
+   *
+   * Uploads a new knowledge base document.
+   *
+   * @body {FormData} file - The file to upload (max 10MB)
+   * @body {string} title - Document title (required)
+   * @body {string} [description] - Optional description
+   * @body {string} [category] - Category name (defaults to 'General')
+   *
+   * @returns {object} 200 - { success: true, id, title, slug, category }
+   * @returns {object} 400 - { error } if title missing, no file, or invalid file type
+   * @returns {object} 500 - { error } on server failure
+   *
+   * @requires Admin | Standard_User
+   */
   router.post('/upload', requireAuth(), requireGroup('Admin', 'Standard_User'), (req, res, next) => {
     upload.single('file')(req, res, (err) => {
       if (err) {
@@ -144,7 +159,18 @@ function createKnowledgeBaseRouter(upload) {
     }
   });
 
-  // GET /api/knowledge-base
+  /**
+   * GET /api/knowledge-base
+   *
+   * Lists all knowledge base articles, ordered by creation date descending.
+   *
+   * @returns {Array<object>} 200 - Array of articles with fields:
+   *   id, title, slug, description, category, file_name, file_type,
+   *   file_size, created_at, updated_at, created_by_username
+   * @returns {object} 500 - { error } on server failure
+   *
+   * @requires Authenticated user (any group)
+   */
   router.get('/', requireAuth(), async (req, res) => {
     try {
       const { rows } = await pool.query(`
@@ -163,7 +189,21 @@ function createKnowledgeBaseRouter(upload) {
     }
   });
 
-  // GET /api/knowledge-base/:id
+  /**
+   * GET /api/knowledge-base/:id
+   *
+   * Retrieves metadata for a single knowledge base article.
+   *
+   * @param {number} id - Article ID (route param)
+   *
+   * @returns {object} 200 - Article metadata: id, title, slug, description,
+   *   category, file_name, file_type, file_size, created_at, updated_at,
+   *   created_by_username
+   * @returns {object} 404 - { error: 'Article not found' }
+   * @returns {object} 500 - { error } on server failure
+   *
+   * @requires Authenticated user (any group)
+   */
   router.get('/:id', requireAuth(), async (req, res) => {
     const { id } = req.params;
 
@@ -189,7 +229,21 @@ function createKnowledgeBaseRouter(upload) {
     }
   });
 
-  // GET /api/knowledge-base/:id/content
+  /**
+   * GET /api/knowledge-base/:id/content
+   *
+   * Serves the raw file content inline for rendering in the browser.
+   * Sets Content-Security-Policy frame-ancestors for iframe embedding.
+   * Logs a VIEW_KB_ARTICLE audit event.
+   *
+   * @param {number} id - Article ID (route param)
+   *
+   * @returns {file} 200 - Raw file content with appropriate Content-Type
+   * @returns {object} 404 - { error } if article or file not found
+   * @returns {object} 500 - { error } on server failure
+   *
+   * @requires Authenticated user (any group)
+   */
   router.get('/:id/content', requireAuth(), async (req, res) => {
     const { id } = req.params;
 
@@ -203,7 +257,12 @@ function createKnowledgeBaseRouter(upload) {
         return res.status(404).json({ error: 'Document not found' });
       }
 
-      if (!fs.existsSync(row.file_path)) {
+      // Resolve relative paths against the backend directory
+      const absoluteFilePath = path.isAbsolute(row.file_path)
+        ? row.file_path
+        : path.resolve(path.join(__dirname, '..'), row.file_path);
+
+      if (!fs.existsSync(absoluteFilePath)) {
         return res.status(404).json({ error: 'File not found on disk' });
       }
 
@@ -230,14 +289,27 @@ function createKnowledgeBaseRouter(upload) {
       res.removeHeader('X-Frame-Options');
       const corsOrigins = process.env.CORS_ORIGINS ? process.env.CORS_ORIGINS.split(',').join(' ') : 'http://localhost:3000';
       res.setHeader('Content-Security-Policy', `frame-ancestors 'self' ${corsOrigins}`);
-      res.sendFile(row.file_path);
+      res.sendFile(absoluteFilePath);
     } catch (err) {
       console.error('Error fetching document:', err);
       res.status(500).json({ error: 'Failed to fetch document' });
     }
   });
 
-  // GET /api/knowledge-base/:id/download
+  /**
+   * GET /api/knowledge-base/:id/download
+   *
+   * Downloads the file as an attachment (Content-Disposition: attachment).
+   * Logs a DOWNLOAD_KB_ARTICLE audit event.
+   *
+   * @param {number} id - Article ID (route param)
+   *
+   * @returns {file} 200 - File content with attachment disposition
+   * @returns {object} 404 - { error } if article or file not found
+   * @returns {object} 500 - { error } on server failure
+   *
+   * @requires Authenticated user (any group)
+   */
   router.get('/:id/download', requireAuth(), async (req, res) => {
     const { id } = req.params;
 
@@ -251,7 +323,12 @@ function createKnowledgeBaseRouter(upload) {
         return res.status(404).json({ error: 'Document not found' });
       }
 
-      if (!fs.existsSync(row.file_path)) {
+      // Resolve relative paths against the backend directory
+      const absoluteFilePath = path.isAbsolute(row.file_path)
+        ? row.file_path
+        : path.resolve(path.join(__dirname, '..'), row.file_path);
+
+      if (!fs.existsSync(absoluteFilePath)) {
         return res.status(404).json({ error: 'File not found on disk' });
       }
 
@@ -268,14 +345,29 @@ function createKnowledgeBaseRouter(upload) {
       const safeDownloadName = row.file_name.replace(/["\r\n\\]/g, '');
       res.setHeader('Content-Type', row.file_type || 'application/octet-stream');
       res.setHeader('Content-Disposition', `attachment; filename="${safeDownloadName}"`);
-      res.sendFile(row.file_path);
+      res.sendFile(absoluteFilePath);
     } catch (err) {
       console.error('Error fetching document:', err);
       res.status(500).json({ error: 'Failed to fetch document' });
     }
   });
 
-  // DELETE /api/knowledge-base/:id
+  /**
+   * DELETE /api/knowledge-base/:id
+   *
+   * Deletes a knowledge base article and its associated file from disk.
+   * Standard_User can only delete articles they created; Admin can delete any.
+   * Logs a DELETE_KB_ARTICLE audit event.
+   *
+   * @param {number} id - Article ID (route param)
+   *
+   * @returns {object} 200 - { success: true }
+   * @returns {object} 403 - { error } if Standard_User tries to delete another user's article
+   * @returns {object} 404 - { error: 'Article not found' }
+   * @returns {object} 500 - { error } on server failure
+   *
+   * @requires Admin | Standard_User
+   */
   router.delete('/:id', requireAuth(), requireGroup('Admin', 'Standard_User'), async (req, res) => {
     const { id } = req.params;
 

backend/routes/users.js

@@ -10,11 +10,28 @@ function createUsersRouter(requireAuth, requireGroup, logAudit) {
     // All routes require Admin group
     router.use(requireAuth(), requireGroup('Admin'));
 
-    // Get all users
+    /**
+     * GET /api/users
+     *
+     * Returns all user accounts ordered by creation date (newest first).
+     *
+     * @returns {Array<Object>} 200 - Array of user objects
+     * @returns {Object} 200[].id - User ID
+     * @returns {string} 200[].username - Username
+     * @returns {string} 200[].email - Email address
+     * @returns {string} 200[].group - Permission group (Admin, Standard_User, Leadership, Read_Only)
+     * @returns {string} 200[].bu_teams - Comma-separated BU team assignments
+     * @returns {Array<string>} 200[].teams - Parsed array of BU team assignments
+     * @returns {boolean} 200[].is_active - Whether the account is active
+     * @returns {string} 200[].created_at - ISO timestamp of account creation
+     * @returns {string|null} 200[].last_login - ISO timestamp of last login
+     * @returns {Object} 500 - { error: string }
+     */
     router.get('/', async (req, res) => {
         try {
             const { rows: users } = await pool.query(
-                `SELECT id, username, email, user_group AS "group", bu_teams, is_active, created_at, last_login
+                `SELECT id, username, email, user_group AS "group", bu_teams, is_active, created_at, last_login,
+                        ivanti_first_name, ivanti_last_name
                  FROM users ORDER BY created_at DESC`
             );
             // Parse bu_teams into teams array for each user
@@ -29,11 +46,21 @@ function createUsersRouter(requireAuth, requireGroup, logAudit) {
         }
     });
 
-    // Get single user
+    /**
+     * GET /api/users/:id
+     *
+     * Returns a single user account by ID.
+     *
+     * @param {string} req.params.id - User ID
+     * @returns {Object} 200 - User object with parsed teams array
+     * @returns {Object} 404 - { error: 'User not found' }
+     * @returns {Object} 500 - { error: string }
+     */
     router.get('/:id', async (req, res) => {
         try {
             const { rows } = await pool.query(
-                `SELECT id, username, email, user_group AS "group", bu_teams, is_active, created_at, last_login
+                `SELECT id, username, email, user_group AS "group", bu_teams, is_active, created_at, last_login,
+                        ivanti_first_name, ivanti_last_name
                  FROM users WHERE id = $1`,
                 [req.params.id]
             );
@@ -54,7 +81,21 @@ function createUsersRouter(requireAuth, requireGroup, logAudit) {
         }
     });
 
-    // Create new user
+    /**
+     * POST /api/users
+     *
+     * Creates a new user account.
+     *
+     * @body {string} username - Required. Unique username
+     * @body {string} email - Required. Unique email address
+     * @body {string} password - Required. Plain-text password (hashed before storage)
+     * @body {string} [group='Read_Only'] - Permission group (Admin, Standard_User, Leadership, Read_Only)
+     * @body {string} [bu_teams=''] - Comma-separated BU team assignments (STEAM, ACCESS-ENG, ACCESS-OPS, INTELDEV)
+     * @returns {Object} 201 - { message: string, user: { id, username, email, group, bu_teams, teams } }
+     * @returns {Object} 400 - { error: string } if required fields missing or invalid group/teams
+     * @returns {Object} 409 - { error: string } if username or email already exists
+     * @returns {Object} 500 - { error: string }
+     */
     router.post('/', async (req, res) => {
         const { username, email, password, group, bu_teams } = req.body;
         const VALID_GROUPS = ['Admin', 'Standard_User', 'Leadership', 'Read_Only'];
@@ -120,9 +161,28 @@ function createUsersRouter(requireAuth, requireGroup, logAudit) {
         }
     });
 
-    // Update user
+    /**
+     * PATCH /api/users/:id
+     *
+     * Updates one or more fields on an existing user account. Only provided fields are modified.
+     *
+     * @param {string} req.params.id - User ID to update
+     * @body {string} [username] - New username
+     * @body {string} [email] - New email address
+     * @body {string} [password] - New plain-text password (hashed before storage)
+     * @body {string} [group] - New permission group (Admin, Standard_User, Leadership, Read_Only)
+     * @body {boolean} [is_active] - Whether the account is active (deactivation deletes sessions)
+     * @body {string} [bu_teams] - Comma-separated BU team assignments (STEAM, ACCESS-ENG, ACCESS-OPS, INTELDEV)
+     * @body {string} [ivanti_first_name] - Ivanti first name for finding correlation
+     * @body {string} [ivanti_last_name] - Ivanti last name for finding correlation
+     * @returns {Object} 200 - { message: 'User updated successfully' }
+     * @returns {Object} 400 - { error: string } if invalid group, self-demotion, self-deactivation, invalid teams, or no fields provided
+     * @returns {Object} 404 - { error: 'User not found' }
+     * @returns {Object} 409 - { error: string } if username or email already exists
+     * @returns {Object} 500 - { error: string }
+     */
     router.patch('/:id', async (req, res) => {
-        const { username, email, password, group, is_active, bu_teams } = req.body;
+        const { username, email, password, group, is_active, bu_teams, ivanti_first_name, ivanti_last_name } = req.body;
         const VALID_GROUPS = ['Admin', 'Standard_User', 'Leadership', 'Read_Only'];
         const userId = req.params.id;
 
@@ -193,6 +253,14 @@ function createUsersRouter(requireAuth, requireGroup, logAudit) {
                 updates.push(`bu_teams = $${paramIndex++}`);
                 values.push(bu_teams);
             }
+            if (typeof ivanti_first_name === 'string') {
+                updates.push(`ivanti_first_name = $${paramIndex++}`);
+                values.push(ivanti_first_name.trim() || null);
+            }
+            if (typeof ivanti_last_name === 'string') {
+                updates.push(`ivanti_last_name = $${paramIndex++}`);
+                values.push(ivanti_last_name.trim() || null);
+            }
 
             if (updates.length === 0) {
                 return res.status(400).json({ error: 'No fields to update' });
@@ -212,6 +280,8 @@ function createUsersRouter(requireAuth, requireGroup, logAudit) {
             if (typeof is_active === 'boolean') updatedFields.is_active = is_active;
             if (password) updatedFields.password_changed = true;
             if (typeof bu_teams === 'string') updatedFields.bu_teams = bu_teams;
+            if (typeof ivanti_first_name === 'string') updatedFields.ivanti_first_name = ivanti_first_name.trim() || null;
+            if (typeof ivanti_last_name === 'string') updatedFields.ivanti_last_name = ivanti_last_name.trim() || null;
 
             logAudit({
                 userId: req.user.id,
@@ -270,7 +340,17 @@ function createUsersRouter(requireAuth, requireGroup, logAudit) {
         }
     });
 
-    // Delete user
+    /**
+     * DELETE /api/users/:id
+     *
+     * Deletes a user account and their associated sessions. Cannot delete your own account.
+     *
+     * @param {string} req.params.id - User ID to delete
+     * @returns {Object} 200 - { message: 'User deleted successfully' }
+     * @returns {Object} 400 - { error: string } if attempting self-deletion
+     * @returns {Object} 404 - { error: 'User not found' }
+     * @returns {Object} 500 - { error: string }
+     */
     router.delete('/:id', async (req, res) => {
         const userId = req.params.id;
 

backend/routes/vclMultiVertical.js

@@ -144,7 +144,8 @@ async function persistMultiVerticalUpload({ items, summary, reportDate, filename
     // Use summary data for accurate totals (compliance_items only has non-compliant devices).
     // IMPORTANT: Only use "ALL:" rollup rows to avoid double-counting. Each Summary sheet
     // has sub-team rows AND a rollup row per metric — the rollup already includes sub-teams.
-    const currentMonth = new Date().toISOString().slice(0, 7);
+    // Use the file's report_date month for the snapshot so historical uploads land in the correct bucket.
+    const snapshotMonth = reportDate ? reportDate.slice(0, 7) : new Date().toISOString().slice(0, 7);
     let totalDevices = 0, snapshotCompliant = 0, snapshotNonCompliant = 0;
 
     if (summary && summary.entries && summary.entries.length > 0) {
@@ -165,7 +166,7 @@ async function persistMultiVerticalUpload({ items, summary, reportDate, filename
          VALUES ($1, $2, $3, $4, $5, $6)
          ON CONFLICT (snapshot_month, vertical)
          DO UPDATE SET total_devices = $3, compliant = $4, non_compliant = $5, compliance_pct = $6`,
-        [currentMonth, vertical, totalDevices, snapshotCompliant, snapshotNonCompliant, compPct]
+        [snapshotMonth, vertical, totalDevices, snapshotCompliant, snapshotNonCompliant, compPct]
     );
 
     return { uploadId, newCount, recurringCount, resolvedCount };
@@ -279,7 +280,7 @@ function createVCLMultiVerticalRouter(upload) {
                         total_items: xlsxData.total || xlsxData.items.length,
                         summary_entries: (xlsxData.summary && xlsxData.summary.entries) ? xlsxData.summary.entries.length : 0,
                         diff: { new_count: diff.newCount, recurring_count: diff.recurringCount, resolved_count: diff.resolvedCount },
-                        tempFile: tempFilePath,
+                        tempFile: tempFilename,
                     });
                 } catch (parseErr) {
                     unrecognized.push({ filename: file.originalname, error: parseErr.message });
@@ -333,12 +334,15 @@ function createVCLMultiVerticalRouter(upload) {
 
         // Validate all temp files exist before starting transaction
         for (const file of files) {
-            if (!file.tempFile || !isSafeTempPath(file.tempFile)) {
+            const resolvedPath = path.join(TEMP_DIR, path.basename(file.tempFile || ''));
+            if (!file.tempFile || !isSafeTempPath(resolvedPath)) {
                 return res.status(400).json({ error: `Invalid tempFile path for ${file.vertical || 'unknown'}` });
             }
-            if (!fs.existsSync(file.tempFile)) {
+            if (!fs.existsSync(resolvedPath)) {
                 return res.status(400).json({ error: `Preview session expired for ${file.vertical || 'unknown'} — please upload again` });
             }
+            // Store resolved path for use in the transaction
+            file._resolvedTempFile = resolvedPath;
         }
 
         const client = await pool.connect();
@@ -348,7 +352,7 @@ function createVCLMultiVerticalRouter(upload) {
             const committed = [];
             for (const file of files) {
                 let parsed;
-                try { parsed = JSON.parse(fs.readFileSync(file.tempFile, 'utf8')); }
+                try { parsed = JSON.parse(fs.readFileSync(file._resolvedTempFile, 'utf8')); }
                 catch { throw new Error(`Could not read preview data for ${file.vertical}`); }
 
                 const result = await persistMultiVerticalUpload({
@@ -373,7 +377,7 @@ function createVCLMultiVerticalRouter(upload) {
 
             // Clean up temp files
             for (const file of files) {
-                fs.unlink(file.tempFile, () => {});
+                fs.unlink(file._resolvedTempFile, () => {});
             }
 
             // Audit log
@@ -400,7 +404,7 @@ function createVCLMultiVerticalRouter(upload) {
             await client.query('ROLLBACK');
             // Clean up temp files on failure too
             for (const file of files) {
-                if (file.tempFile) fs.unlink(file.tempFile, () => {});
+                if (file._resolvedTempFile) fs.unlink(file._resolvedTempFile, () => {});
             }
             console.error('[VCL Multi] Commit error:', err.message);
             res.status(500).json({ error: 'Failed to commit batch: ' + err.message });
@@ -1195,10 +1199,10 @@ function createVCLMultiVerticalRouter(upload) {
                 await client.query(`DELETE FROM vcl_multi_vertical_summary WHERE upload_id = $1`, [uploadId]);
                 await client.query(`DELETE FROM compliance_uploads WHERE id = $1`, [uploadId]);
 
-                const currentMonth = new Date().toISOString().slice(0, 7);
+                const rollbackMonth = upload.report_date ? upload.report_date.slice(0, 7) : new Date().toISOString().slice(0, 7);
                 await client.query(
                     `DELETE FROM compliance_snapshots WHERE vertical = $1 AND snapshot_month = $2`,
-                    [upload.vertical, currentMonth]
+                    [upload.vertical, rollbackMonth]
                 );
 
                 await client.query('COMMIT');
@@ -1240,6 +1244,144 @@ function createVCLMultiVerticalRouter(upload) {
         }
     });
 
+    // -----------------------------------------------------------------------
+    // GET /metric/:id/stats — Per-metric summary statistics + donut breakdown
+    // -----------------------------------------------------------------------
+
+    /**
+     * GET /metric/:id/stats
+     * Returns summary statistics and donut breakdown for a single metric,
+     * aggregated across all verticals using only ALL: rollup rows.
+     *
+     * @method GET
+     * @route /metric/:id/stats
+     * @param {string} id — metric identifier (e.g., "2.3.6i")
+     *
+     * @response 200
+     *   {
+     *     metric_id: string,
+     *     metric_desc: string,
+     *     category: string,
+     *     total_devices: number,
+     *     compliant: number,
+     *     non_compliant: number,
+     *     compliance_pct: number,
+     *     target: number,
+     *     donut: {
+     *       blocked: { count: number, pct: number },
+     *       in_progress: { count: number, pct: number }
+     *     }
+     *   }
+     * @response 400 { error: string } — metric ID exceeds 50 characters
+     * @response 500 { error: string }
+     */
+    router.get('/metric/:id/stats', async (req, res) => {
+        const metricId = req.params.id;
+        if (!metricId || metricId.length > 50) {
+            return res.status(400).json({ error: 'Invalid metric ID' });
+        }
+
+        try {
+            // Get latest upload ID per vertical (same pattern as existing /stats endpoint)
+            const { rows: latestUploads } = await pool.query(`
+                SELECT DISTINCT ON (vertical) id, vertical
+                FROM compliance_uploads
+                WHERE vertical IS NOT NULL
+                ORDER BY vertical, id DESC
+            `);
+
+            if (latestUploads.length === 0) {
+                return res.json({
+                    metric_id: metricId,
+                    metric_desc: '',
+                    category: '',
+                    total_devices: 0,
+                    compliant: 0,
+                    non_compliant: 0,
+                    compliance_pct: 0,
+                    target: 0,
+                    donut: {
+                        blocked: { count: 0, pct: 0 },
+                        in_progress: { count: 0, pct: 0 },
+                    },
+                });
+            }
+
+            const latestUploadIds = latestUploads.map(u => u.id);
+
+            // Query vcl_multi_vertical_summary for this metric, ALL: rollup rows only
+            const { rows: summaryRows } = await pool.query(`
+                SELECT metric_desc, category, total, compliant, non_compliant, target
+                FROM vcl_multi_vertical_summary
+                WHERE upload_id = ANY($1) AND metric_id = $2 AND team LIKE 'ALL:%'
+            `, [latestUploadIds, metricId]);
+
+            // If metric not found, return zero-filled response (HTTP 200, not 404)
+            if (summaryRows.length === 0) {
+                return res.json({
+                    metric_id: metricId,
+                    metric_desc: '',
+                    category: '',
+                    total_devices: 0,
+                    compliant: 0,
+                    non_compliant: 0,
+                    compliance_pct: 0,
+                    target: 0,
+                    donut: {
+                        blocked: { count: 0, pct: 0 },
+                        in_progress: { count: 0, pct: 0 },
+                    },
+                });
+            }
+
+            // Aggregate across verticals
+            let totalDevices = 0, totalCompliant = 0, totalNonCompliant = 0;
+            let targetSum = 0, targetCount = 0;
+            let metricDesc = '';
+            let category = '';
+
+            for (const row of summaryRows) {
+                totalDevices += row.total || 0;
+                totalCompliant += row.compliant || 0;
+                totalNonCompliant += row.non_compliant || 0;
+                targetSum += parseFloat(row.target) || 0;
+                targetCount++;
+                // Derive metric_desc and category from first non-empty value
+                if (!metricDesc && row.metric_desc) metricDesc = row.metric_desc;
+                if (!category && row.category) category = row.category;
+            }
+
+            const target = targetCount > 0 ? Math.round((targetSum / targetCount) * 100) / 100 : 0;
+            const compliancePct = totalDevices > 0 ? Math.round((totalCompliant / totalDevices) * 100) : 0;
+
+            // Donut breakdown: query compliance_items for this metric
+            const { rows: donutRows } = await pool.query(`
+                SELECT hostname, MAX(resolution_date) AS resolution_date
+                FROM compliance_items
+                WHERE metric_id = $1 AND status = 'active' AND vertical IS NOT NULL
+                GROUP BY hostname
+            `, [metricId]);
+
+            const donutItems = donutRows.map(r => ({ resolution_date: r.resolution_date }));
+            const donut = categorizeNonCompliant(donutItems);
+
+            res.json({
+                metric_id: metricId,
+                metric_desc: metricDesc,
+                category: category,
+                total_devices: totalDevices,
+                compliant: totalCompliant,
+                non_compliant: totalNonCompliant,
+                compliance_pct: compliancePct,
+                target: target,
+                donut,
+            });
+        } catch (err) {
+            console.error('[VCL Multi] GET /metric/:id/stats error:', err.message);
+            res.status(500).json({ error: 'Database error' });
+        }
+    });
+
     // -----------------------------------------------------------------------
     // GET /metric/:id/verticals — Per-vertical breakdown for a specific metric
     // -----------------------------------------------------------------------
@@ -1516,6 +1658,159 @@ function createVCLMultiVerticalRouter(upload) {
         }
     });
 
+    // -----------------------------------------------------------------------
+    // GET /metric/:id/trend — Per-metric monthly compliance trend with forecast
+    // -----------------------------------------------------------------------
+
+    /**
+     * GET /metric/:id/trend
+     * Returns monthly compliance history with linear regression forecast for a
+     * single metric. Groups by report month from compliance_uploads, aggregating
+     * only rollup rows (team LIKE 'ALL:%').
+     *
+     * @method GET
+     * @route /metric/:id/trend
+     * @param {string} id — metric identifier (e.g., "2.3.6i")
+     *
+     * @response 200
+     *   {
+     *     months: Array<{
+     *       month: string,
+     *       compliant_count: number|null,
+     *       non_compliant_count: number|null,
+     *       total_devices: number|null,
+     *       compliance_pct: number|null,
+     *       forecast_pct: number|null,
+     *       target: number
+     *     }>
+     *   }
+     * @response 400 { error: string } — metric ID exceeds 50 characters
+     * @response 500 { error: string }
+     */
+    router.get('/metric/:id/trend', async (req, res) => {
+        const metricId = req.params.id;
+        if (!metricId || metricId.length > 50) {
+            return res.status(400).json({ error: 'Invalid metric ID' });
+        }
+
+        try {
+            // Get the metric's target value from the latest uploads (same pattern as stats endpoint)
+            const { rows: latestUploads } = await pool.query(`
+                SELECT DISTINCT ON (vertical) id, vertical
+                FROM compliance_uploads
+                WHERE vertical IS NOT NULL
+                ORDER BY vertical, id DESC
+            `);
+
+            if (latestUploads.length === 0) {
+                return res.json({ months: [] });
+            }
+
+            const latestUploadIds = latestUploads.map(u => u.id);
+
+            // Get target from the latest uploads for this metric
+            const { rows: targetRows } = await pool.query(`
+                SELECT ROUND(AVG(target::numeric), 2) AS target
+                FROM vcl_multi_vertical_summary
+                WHERE upload_id = ANY($1) AND metric_id = $2 AND team LIKE 'ALL:%'
+            `, [latestUploadIds, metricId]);
+
+            const metricTarget = targetRows.length > 0 && targetRows[0].target !== null
+                ? parseFloat(targetRows[0].target)
+                : 0;
+
+            // Join vcl_multi_vertical_summary with compliance_uploads to group by report month.
+            // Use only the latest upload per vertical per month to avoid double-counting
+            // when a vertical is re-uploaded multiple times in the same month.
+            const { rows: monthlyData } = await pool.query(`
+                WITH latest_per_vertical_month AS (
+                    SELECT DISTINCT ON (cu.vertical, COALESCE(SUBSTRING(cu.report_date FROM 1 FOR 7), TO_CHAR(cu.uploaded_at, 'YYYY-MM')))
+                           cu.id AS upload_id,
+                           cu.vertical,
+                           COALESCE(SUBSTRING(cu.report_date FROM 1 FOR 7), TO_CHAR(cu.uploaded_at, 'YYYY-MM')) AS report_month
+                    FROM compliance_uploads cu
+                    WHERE cu.vertical IS NOT NULL
+                    ORDER BY cu.vertical, COALESCE(SUBSTRING(cu.report_date FROM 1 FOR 7), TO_CHAR(cu.uploaded_at, 'YYYY-MM')), cu.id DESC
+                )
+                SELECT lvm.report_month,
+                       SUM(s.compliant)::int AS compliant,
+                       SUM(s.non_compliant)::int AS non_compliant,
+                       SUM(s.total)::int AS total
+                FROM vcl_multi_vertical_summary s
+                JOIN latest_per_vertical_month lvm ON s.upload_id = lvm.upload_id
+                WHERE s.metric_id = $1 AND s.team LIKE 'ALL:%'
+                GROUP BY lvm.report_month
+                ORDER BY lvm.report_month ASC
+            `, [metricId]);
+
+            // If metric not found in any historical data, return empty months
+            if (monthlyData.length === 0) {
+                return res.json({ months: [] });
+            }
+
+            // Build historical months with compliance_pct
+            const months = monthlyData.map(row => {
+                const pct = row.total > 0
+                    ? Math.round((row.compliant / row.total) * 100 * 10) / 10
+                    : 0;
+                return {
+                    month: row.report_month,
+                    compliant_count: row.compliant,
+                    non_compliant_count: row.non_compliant,
+                    total_devices: row.total,
+                    compliance_pct: pct,
+                    forecast_pct: null,
+                    target: metricTarget,
+                };
+            });
+
+            // Compute forecast using linear regression if we have 3+ months
+            if (months.length >= 3) {
+                const n = months.length;
+                let sumX = 0, sumY = 0, sumXY = 0, sumX2 = 0;
+                for (let i = 0; i < n; i++) {
+                    sumX += i;
+                    sumY += months[i].compliance_pct;
+                    sumXY += i * months[i].compliance_pct;
+                    sumX2 += i * i;
+                }
+                const slope = (n * sumXY - sumX * sumY) / (n * sumX2 - sumX * sumX);
+                const intercept = (sumY - slope * sumX) / n;
+
+                // Set forecast_pct on the last historical month as the transition point
+                months[n - 1].forecast_pct = months[n - 1].compliance_pct;
+
+                // Project forward 3 months
+                for (let i = 0; i < 3; i++) {
+                    const futureIdx = n + i;
+                    const forecastPct = Math.min(100.0, Math.max(0.0,
+                        Math.round((slope * futureIdx + intercept) * 10) / 10
+                    ));
+
+                    const lastMonth = months[months.length - 1].month;
+                    const [year, mon] = lastMonth.split('-').map(Number);
+                    const futureDate = new Date(year, mon - 1 + 1, 1);
+                    const futureMonth = `${futureDate.getFullYear()}-${String(futureDate.getMonth() + 1).padStart(2, '0')}`;
+
+                    months.push({
+                        month: futureMonth,
+                        compliant_count: null,
+                        non_compliant_count: null,
+                        total_devices: null,
+                        compliance_pct: null,
+                        forecast_pct: forecastPct,
+                        target: metricTarget,
+                    });
+                }
+            }
+
+            res.json({ months });
+        } catch (err) {
+            console.error('[VCL Multi] GET /metric/:id/trend error:', err.message);
+            res.status(500).json({ error: 'Database error' });
+        }
+    });
+
     // -----------------------------------------------------------------------
     // GET /metric/:metricId/forecast-burndown — Per-metric forecast burndown
     // -----------------------------------------------------------------------
@@ -1568,8 +1863,10 @@ function createVCLMultiVerticalRouter(upload) {
                 });
             }
 
-            // 2. Determine the vertical from active devices (use the first one found)
-            const vertical = activeDevices[0].vertical;
+            // 2. Determine the vertical(s) from active devices
+            // Group by vertical to handle metrics that span multiple verticals
+            const verticalSet = new Set(activeDevices.map(d => d.vertical));
+            const vertical = activeDevices[0].vertical; // primary vertical for snapshot lookup
 
             // 3. Compute date range for 3 months of historical snapshots
             const now = new Date();
@@ -1578,22 +1875,26 @@ function createVCLMultiVerticalRouter(upload) {
             const threeMonthsAgo = new Date(now.getFullYear(), now.getMonth() - 3, 1);
             const startMonth = `${threeMonthsAgo.getFullYear()}-${String(threeMonthsAgo.getMonth() + 1).padStart(2, '0')}`;
 
-            // 4. Query historical snapshots for the vertical (3 months prior, excluding current month)
+            // 4. Query historical snapshots for ALL verticals this metric spans
+            const verticals = [...verticalSet];
             const { rows: snapshots } = await pool.query(
-                `SELECT snapshot_month AS month, total_devices AS total_assets,
-                        non_compliant, compliance_pct::numeric AS compliance_pct
+                `SELECT snapshot_month AS month,
+                        SUM(total_devices)::int AS total_assets,
+                        SUM(non_compliant)::int AS non_compliant,
+                        ROUND((SUM(compliant)::numeric / NULLIF(SUM(total_devices), 0)) * 100, 1) AS compliance_pct
                  FROM compliance_snapshots
-                 WHERE vertical = $1 AND snapshot_month >= $2 AND snapshot_month < $3
+                 WHERE vertical = ANY($1) AND snapshot_month >= $2 AND snapshot_month < $3
+                 GROUP BY snapshot_month
                  ORDER BY snapshot_month ASC`,
-                [vertical, startMonth, currentMonth]
+                [verticals, startMonth, currentMonth]
             );
 
-            // 5. Get total non-compliant devices for the vertical (for ratio computation)
+            // 5. Get total non-compliant devices across all verticals this metric spans
             const { rows: verticalNcRows } = await pool.query(
                 `SELECT COUNT(DISTINCT hostname) AS total_nc
                  FROM compliance_items
-                 WHERE vertical = $1 AND status = 'active'`,
-                [vertical]
+                 WHERE vertical = ANY($1) AND status = 'active'`,
+                [verticals]
             );
             const verticalTotalNc = parseInt(verticalNcRows[0].total_nc, 10) || 0;
 
@@ -1601,11 +1902,11 @@ function createVCLMultiVerticalRouter(upload) {
             const metricNcCount = new Set(activeDevices.map(d => d.hostname)).size;
 
             // 6. Compute per-metric historical non_compliant using the ratio method (Requirement 7.2)
+            // Use the metric's own total (from summary) rather than the vertical's total_devices
             const historicalSnapshots = snapshots.map(snap => {
                 const snapshotNc = parseInt(snap.non_compliant, 10) || 0;
                 let metricNc;
                 if (verticalTotalNc === 0) {
-                    // Requirement 7.3: if vertical's total non_compliant is 0, metric's is 0
                     metricNc = 0;
                 } else {
                     // Ratio method: vertical_snapshot_nc * (metric_nc / vertical_total_nc)
@@ -1614,26 +1915,44 @@ function createVCLMultiVerticalRouter(upload) {
 
                 return {
                     month: snap.month,
-                    total_assets: parseInt(snap.total_assets, 10) || 0,
+                    total_assets: 0, // Will be filled in after we get the metric's totalAssets
                     non_compliant: metricNc,
-                    compliance_pct: parseFloat(snap.compliance_pct) || 0,
+                    compliance_pct: 0, // Will be recomputed
                 };
             });
 
             // 7. Include current month as the most recent historical data point (from live data)
-            // Get totalAssets from the most recent snapshot's total_devices, or from live vertical count
+            // Get totalAssets from the per-metric summary (vcl_multi_vertical_summary)
+            // This gives us the actual total devices for THIS metric, not the entire vertical
             let totalAssets = 0;
-            const { rows: latestSnapshotRows } = await pool.query(
-                `SELECT total_devices
-                 FROM compliance_snapshots
-                 WHERE vertical = $1
-                 ORDER BY snapshot_month DESC
-                 LIMIT 1`,
-                [vertical]
+            const { rows: metricSummaryRows } = await pool.query(
+                `SELECT SUM(total)::int AS total
+                 FROM vcl_multi_vertical_summary
+                 WHERE metric_id = $1 AND team LIKE 'ALL:%'
+                   AND upload_id IN (
+                       SELECT id FROM compliance_uploads
+                       WHERE vertical IS NOT NULL
+                       ORDER BY id DESC
+                       LIMIT 20
+                   )`,
+                [metricId]
             );
 
-            if (latestSnapshotRows.length > 0) {
-                totalAssets = parseInt(latestSnapshotRows[0].total_devices, 10) || 0;
+            if (metricSummaryRows.length > 0 && metricSummaryRows[0].total) {
+                totalAssets = parseInt(metricSummaryRows[0].total, 10) || 0;
+            }
+
+            // Fallback: if no summary data, use non_compliant count as minimum
+            if (totalAssets === 0) {
+                totalAssets = metricNcCount;
+            }
+
+            // Backfill historical snapshots with the correct per-metric totalAssets and compliance_pct
+            for (const snap of historicalSnapshots) {
+                snap.total_assets = totalAssets;
+                snap.compliance_pct = totalAssets > 0
+                    ? Math.round(((totalAssets - snap.non_compliant) / totalAssets) * 1000) / 10
+                    : 0;
             }
 
             // Current month data point from live data
@@ -1649,11 +1968,19 @@ function createVCLMultiVerticalRouter(upload) {
                 compliance_pct: currentMonthCompliancePct,
             });
 
-            // 8. Prepare currentDevices for the helper (only need hostname and resolution_date)
-            const currentDevices = activeDevices.map(d => ({
-                hostname: d.hostname,
-                resolution_date: d.resolution_date || null,
-            }));
+            // 8. Prepare currentDevices for the helper — deduplicate by hostname
+            // A device may appear in multiple verticals; count it once, keeping the
+            // earliest resolution_date (or null if any row has no date)
+            const deviceMap = {};
+            for (const d of activeDevices) {
+                if (!deviceMap[d.hostname]) {
+                    deviceMap[d.hostname] = { hostname: d.hostname, resolution_date: d.resolution_date || null };
+                } else if (d.resolution_date && !deviceMap[d.hostname].resolution_date) {
+                    // If any row has a resolution_date and current doesn't, use it
+                    deviceMap[d.hostname].resolution_date = d.resolution_date;
+                }
+            }
+            const currentDevices = Object.values(deviceMap);
 
             // 9. Pass data to computeMetricForecastBurndown helper
             const result = computeMetricForecastBurndown(currentDevices, totalAssets, historicalSnapshots);

backend/scripts/card-connectivity-test.js

@@ -0,0 +1,69 @@
+#!/usr/bin/env node
+/**
+ * CARD API Connectivity Test
+ * Tests: token acquisition → teams list → sample asset lookup
+ */
+require('dns').setDefaultResultOrder('ipv4first');
+require('dotenv').config({ path: require('path').join(__dirname, '..', '.env') });
+
+const { isConfigured, missingVars, testConnection, getTeams } = require('../helpers/cardApi');
+
+async function main() {
+    console.log('=== CARD API Connectivity Test ===');
+    console.log(`Timestamp: ${new Date().toISOString()}`);
+    console.log(`Target: ${process.env.CARD_API_URL}`);
+    console.log(`User: ${process.env.CARD_API_USER}`);
+    console.log(`TLS Skip: ${process.env.CARD_SKIP_TLS}`);
+    console.log('');
+
+    if (!isConfigured) {
+        console.error('FAIL: CARD API not configured. Missing:', missingVars.join(', '));
+        process.exit(1);
+    }
+
+    // Step 1: Token acquisition
+    console.log('1. Acquiring Bearer token...');
+    const connResult = await testConnection();
+    if (!connResult.ok) {
+        console.error('   FAIL:', connResult.error);
+        process.exit(1);
+    }
+    console.log('   OK — token acquired:', connResult.token);
+
+    // Step 2: List teams
+    console.log('2. Fetching teams (GET /api/v1/teams)...');
+    const teamsResult = await getTeams();
+    console.log('   Status:', teamsResult.status);
+    if (!teamsResult.ok) {
+        console.error('   FAIL:', teamsResult.body.substring(0, 300));
+        process.exit(1);
+    }
+
+    let teams;
+    try {
+        teams = JSON.parse(teamsResult.body);
+    } catch (e) {
+        console.error('   FAIL: Could not parse response:', teamsResult.body.substring(0, 200));
+        process.exit(1);
+    }
+
+    if (Array.isArray(teams)) {
+        console.log(`   OK — ${teams.length} teams found`);
+        const sample = teams.slice(0, 8);
+        sample.forEach(t => {
+            const name = t.name || t.team_name || t.teamName || JSON.stringify(t).substring(0, 60);
+            console.log(`     • ${name}`);
+        });
+    } else {
+        console.log('   Response structure:', Object.keys(teams).join(', '));
+        console.log('   Preview:', JSON.stringify(teams).substring(0, 200));
+    }
+
+    console.log('');
+    console.log('=== RESULT: PASS — CARD API is reachable and authenticated ===');
+}
+
+main().catch(err => {
+    console.error('ERROR:', err.message);
+    process.exit(1);
+});

backend/server.js

@@ -1,6 +1,10 @@
 // CVE Management Backend API
 // Install: npm install express pg multer cors dotenv bcryptjs cookie-parser
 
+// Force IPv4-first DNS resolution globally — must be set before any network modules load.
+// card.charter.com has IPv6 AAAA records that are unreachable from this network.
+require('dns').setDefaultResultOrder('ipv4first');
+
 require('dotenv').config();
 
 const express = require('express');
@@ -22,6 +26,7 @@ const logAudit = require('./helpers/auditLog');
 const createNvdLookupRouter = require('./routes/nvdLookup');
 const createKnowledgeBaseRouter = require('./routes/knowledgeBase');
 const createArcherTicketsRouter = require('./routes/archerTickets');
+const createArcherTemplatesRouter = require('./routes/archerTemplates');
 const createIvantiWorkflowsRouter = require('./routes/ivantiWorkflows');
 const createIvantiFindingsRouter = require('./routes/ivantiFindings');
 const createIvantiTodoQueueRouter = require('./routes/ivantiTodoQueue');
@@ -133,7 +138,7 @@ app.use(express.json({
   type: 'application/json'
 }));
 app.use(cookieParser());
-app.use('/uploads', express.static('uploads', {
+app.use('/uploads', requireAuth(), express.static('uploads', {
     dotfiles: 'deny',
     index: false
 }));
@@ -197,6 +202,9 @@ app.use('/api/knowledge-base', createKnowledgeBaseRouter(upload));
 // Archer tickets routes (editor/admin for create/update/delete, all authenticated for view)
 app.use('/api/archer-tickets', createArcherTicketsRouter());
 
+// Archer template library routes (editor/admin for create/update/delete/clone, all authenticated for view)
+app.use('/api/archer-templates', createArcherTemplatesRouter());
+
 // Ivanti / RiskSense workflow routes (all authenticated users)
 app.use('/api/ivanti/workflows', createIvantiWorkflowsRouter());
 

docs/guides/full-reference-manual.md

@@ -1,6 +1,6 @@
 # STEAM Security Dashboard
 
-A self-hosted vulnerability management dashboard for the NTS-AEO-STEAM and NTS-AEO-ACCESS-ENG business units. Centralises CVE tracking, Ivanti host finding triage, AEO compliance posture, FP and Archer exception workflows, and internal documentation in a single interface.
+A self-hosted vulnerability management dashboard for the NTS-AEO-STEAM, NTS-AEO-ACCESS-ENG, NTS-AEO-ACCESS-OPS, and NTS-AEO-INTELDEV business units. Centralises CVE tracking, Ivanti host finding triage, AEO compliance posture monitoring, CCP Metrics cross-org compliance reporting, FP/Archer/CARD/GRANITE/DECOM exception workflows, CARD asset ownership management, Granite Loader Sheet generation, Jira ticket management, and internal documentation in a single interface.
 
 ---
 
@@ -18,11 +18,20 @@ A self-hosted vulnerability management dashboard for the NTS-AEO-STEAM and NTS-A
   - [Home — CVE Management](#home--cve-management)
   - [Reporting — Host Findings](#reporting--host-findings)
   - [Ivanti Queue](#ivanti-queue)
+  - [FP Workflow Submission](#fp-workflow-submission)
   - [Compliance — AEO Posture](#compliance--aeo-posture)
+  - [CCP Metrics — Multi-Vertical Compliance](#ccp-metrics--multi-vertical-compliance)
+  - [CARD Asset Ownership](#card-asset-ownership)
+  - [Granite Loader Sheet](#granite-loader-sheet)
+  - [Atlas Action Plans](#atlas-action-plans)
+  - [Finding Archive Tracking](#finding-archive-tracking)
   - [Knowledge Base](#knowledge-base)
   - [Exports](#exports)
   - [Jira Tickets](#jira-tickets)
   - [Archer Risk Acceptance Tickets](#archer-risk-acceptance-tickets)
+  - [Archer Template Library](#archer-template-library)
+  - [In-App Notifications](#in-app-notifications)
+  - [Feedback — GitLab Integration](#feedback--gitlab-integration)
   - [Admin Panel](#admin-panel)
 - [Scripts](#scripts)
 - [API Reference](#api-reference)
@@ -43,13 +52,24 @@ The application provides:
 
 - A searchable, filterable CVE list with per-vendor tracking and document storage
 - NVD API integration to auto-populate CVE metadata
-- **Ivanti/RiskSense integration** — sync open host findings with live FP workflow tracking
-- **Reporting page** with donut charts, advanced per-column filtering, inline editing, Ivanti Queue, and CSV/XLSX export
-- **Ivanti Queue** — personal staging list for batch-processing FP, Archer, and CARD workflows
+- **Ivanti/RiskSense integration** — sync open host findings with live FP workflow tracking, per-BU trend lines, and archive detection
+- **Reporting page** with donut charts, Group by Host toggle, CARD ownership tooltips, advanced per-column filtering, inline editing, Ivanti Queue, and CSV/XLSX export
+- **Ivanti Queue** — personal staging list for batch-processing FP, Archer, CARD, GRANITE, DECOM, and Remediate workflows
+- **FP Workflow Submission** — submit False Positive workflows directly to Ivanti API with attachments and lifecycle tracking
 - **AEO Compliance page** — weekly xlsx upload, diff preview, per-team metric health cards, device-level violation tracking with notes history
+- **CCP Metrics page** — multi-vertical VCL upload, cross-org compliance reporting with forecast burndown, metric drill-down, and data management
+- **CARD Asset Ownership** — owner lookup, confirm/decline/redirect actions, tooltip integration, Granite enrichment
+- **Granite Loader Sheet** — generate xlsx loader sheets with CARD enrichment, searchable picklists, per-row editing
+- **Atlas action plan tracking** with per-host vulnerability mapping and badge rendering
+- **Jira integration** — flexible ticket creation, multi-item consolidation, vendor-specific issue types, JQL sync
+- **Finding archive tracking** — automatic detection of disappeared/returned findings with anomaly logging
 - Archer risk acceptance ticket tracking (EXC numbers) linked to CVE/vendor pairs
+- **Archer Template Library** — store and clone static content for Archer Risk Acceptance forms
+- **In-app notifications** — native notification system for sync events and workflow completions
+- **Feedback integration** — submit bug reports and feature requests directly to GitLab as issues
 - A knowledge base for internal documentation and policies
 - Group-based access control (Admin, Standard_User, Leadership, Read_Only) with a full audit trail
+- Per-user BU team assignments and Ivanti identity for multi-tenant scoping
 
 ---
 
@@ -180,12 +200,22 @@ IVANTI_CLIENT_ID=1550
 # Optional: filter workflows to a specific person's submissions
 IVANTI_FIRST_NAME=
 IVANTI_LAST_NAME=
-# Set to 'true' if your network has SSL inspection / self-signed certs
-IVANTI_SKIP_TLS=false
+# Comma-separated list of BU values to sync from Ivanti.
+# Default if unset: NTS-AEO-ACCESS-ENG,NTS-AEO-STEAM
+IVANTI_BU_FILTER=NTS-AEO-ACCESS-ENG,NTS-AEO-STEAM
 # Comma-separated list of BUs considered "managed" for archive drift classification.
 # Findings leaving these BUs are classified as bu_reassignment.
 # Default if unset: NTS-AEO-ACCESS-ENG,NTS-AEO-STEAM
 IVANTI_MANAGED_BUS=NTS-AEO-ACCESS-ENG,NTS-AEO-STEAM
+# Set to 'true' if your network has SSL inspection / self-signed certs
+IVANTI_SKIP_TLS=false
+
+# Atlas InfoSec API (required for Atlas action plan tracking)
+ATLAS_API_URL=https://atlas-infosec.caas.charterlab.com
+ATLAS_API_USER=your-atlas-user
+ATLAS_API_PASS=your-atlas-password
+# Set to true if behind Charter's SSL inspection proxy
+ATLAS_SKIP_TLS=false
 
 # Jira Data Center REST API (required for Jira Tickets page)
 # VPN or Charter Network connection required for all Jira instances.
@@ -200,6 +230,25 @@ JIRA_API_TOKEN=your-api-token
 JIRA_PROJECT_KEY=VULN
 JIRA_ISSUE_TYPE=Task
 JIRA_SKIP_TLS=false
+
+# CARD Asset Ownership API (required for CARD integration)
+# OAuth Bearer token auth — service account must be onboarded with the CARD team.
+# Tokens are acquired automatically via Basic Auth and cached for 1 hour.
+CARD_API_URL=https://card.charter.com
+CARD_API_USER=your-card-user
+CARD_API_PASS=your-card-password
+# Set to true if behind Charter's SSL inspection proxy
+CARD_SKIP_TLS=false
+
+# GitLab Feedback Integration (bug reports and feature requests from the dashboard)
+# PAT needs 'api' scope. Project ID is the numeric ID from GitLab project settings.
+GITLAB_URL=http://steam-gitlab.charterlab.com
+GITLAB_PROJECT_ID=13
+GITLAB_PAT=glpat-xxxxxxxxxxxxx
+# Webhook secret — shared secret for validating incoming webhook requests.
+# Set this same value in GitLab project > Settings > Webhooks > Secret Token.
+# Generate with: openssl rand -hex 20
+GITLAB_WEBHOOK_SECRET=changeme_generate_a_random_secret
 ```
 
 **`SESSION_SECRET` is required.** The server will exit on startup if it is not set. Generate one with `openssl rand -base64 32`.
@@ -312,6 +361,10 @@ All routes require authentication. Four user groups are supported:
 
 Sessions expire after 24 hours. Session tokens are stored in `httpOnly` cookies. Login is rate-limited to 20 attempts per 15-minute window.
 
+**Per-user settings:**
+- `bu_teams` — comma-separated BU team assignments for multi-tenant scoping. Determines default BU filter on the Reporting page.
+- `ivanti_first_name` / `ivanti_last_name` — per-user Ivanti identity for filtering FP workflow views to their own submissions.
+
 **Migration from legacy roles:** The `add_user_groups.js` migration automatically maps existing users: `admin` → `Admin`, `editor` → `Standard_User`, `viewer` → `Read_Only`. Unrecognized or NULL roles default to `Read_Only`.
 
 ---
@@ -358,7 +411,7 @@ The home page is the primary CVE research and tracking tool.
 
 ### Reporting — Host Findings
 
-The Reporting page is the core operational view for remediation tracking. It integrates with Ivanti/RiskSense to show all host findings for the configured business units.
+The Reporting page is the core operational view for remediation tracking. It integrates with Ivanti/RiskSense to show all host findings for the configured business units, with CARD ownership integration and multi-BU scoping.
 
 #### Syncing Data
 
@@ -367,11 +420,38 @@ Click **Sync** (top right) to pull the latest findings from Ivanti. Sync require
 2. Fetches the closed finding count separately
 3. Sweeps closed findings to capture FP workflow states (including Approved FPs now closed)
 4. Stores findings as individual rows in the PostgreSQL `ivanti_findings` table
+5. Detects archived findings (present in previous sync, absent in current) and logs transitions
+6. Records per-BU counts in `ivanti_counts_history_by_bu` for trend analysis
+7. Logs sync anomalies when significant count deltas are detected
 
 Findings are also auto-synced on a 24-hour schedule. The last sync timestamp is shown at the top of the page.
 
 > `IVANTI_API_KEY` must be set in `backend/.env` for sync to work.
 
+#### Group by Host
+
+The **Group by Host** toggle in the toolbar collapses duplicate assets (same hostname + IP) with multiple finding IDs into expandable host rows. Hosts with only one finding remain as flat rows. Toggle between grouped and flat views. This reduces visual clutter when a single host has dozens of findings.
+
+#### CARD Ownership Tooltip
+
+Hover over any IP address in the findings table to see CARD asset ownership data in an interactive tooltip:
+- Confirmed, unconfirmed, and candidate team assignments with confidence scores
+- Click "Actions" to open the CARD Action Modal for direct confirm/decline/redirect operations
+- Results cached per session — re-hover displays instantly without API calls
+- Quick mode uses CTEC suffix only with 15s timeout to avoid multi-minute waits
+- Timeouts (504) are not cached — re-hover will retry the lookup
+- When Ivanti Host ID is available, uses the faster asset-search path
+
+#### Multi-BU Scope
+
+The multi-select BU picker at the top of the page replaces the previous binary scope toggle. Select one or more BUs to filter findings:
+- NTS-AEO-ACCESS-ENG
+- NTS-AEO-STEAM
+- NTS-AEO-ACCESS-OPS
+- NTS-AEO-INTELDEV
+
+Per-user BU team assignments (`bu_teams` on the user record) determine the default scope.
+
 #### Metric Charts
 
 | Chart | What it shows |
@@ -417,36 +497,72 @@ Each row represents a single Ivanti host finding.
 
 ### Ivanti Queue
 
-A personal staging list for batch-processing FP, Archer, and CARD workflows without context-switching into Ivanti mid-review. Requires Admin or Standard_User group.
+A personal staging list for batch-processing FP, Archer, CARD, GRANITE, DECOM, and Remediate workflows without context-switching into Ivanti mid-review. Requires Admin or Standard_User group.
 
 **Adding items:** Check the checkbox at the far left of any finding row. A popover appears:
 - For **FP** and **Archer** items: enter the Vendor / Platform (e.g., "Juniper MX", "Cisco IOS-XE")
-- For **CARD** items: no vendor entry required — the IP address is captured automatically
-- Select the workflow type: **FP**, **Archer**, or **CARD**
+- For **CARD** and **GRANITE** items: no vendor entry required — the IP address is captured automatically
+- For **DECOM** items: the finding is flagged for decommission workflow
+- For **Remediate** items: the finding is flagged for remediation tracking
+- Select the workflow type: **FP**, **Archer**, **CARD**, **GRANITE**, **DECOM**, or **Remediate**
 - Click **Add to Queue** — the row checkbox turns solid blue
 
 **Queue panel:** Click the **Queue** button (top right of Reporting page) to open the slide-out panel:
-- **CARD** items appear at the top in their own section with the IP address displayed
-- **FP and Archer** items are grouped alphabetically by vendor below
-- Badges show workflow type: amber = FP, sky = Archer, green = CARD
+- Collapsible sections per workflow type
+- **CARD** items appear with the IP address displayed
+- **GRANITE** items show IP and hostname for Granite Loader Sheet generation
+- **FP and Archer** items are grouped alphabetically by vendor
+- **DECOM** items auto-note and auto-hide the finding on completion
+- Badges show workflow type colour-coded by category
 
 **Working the queue:**
 - Check the green checkbox on an item to mark it complete (strikethrough at reduced opacity)
 - Delete individual items with the trash icon, or select multiple and use **Delete (N)**
-- **Clear Completed** removes all marked-complete items at once
+- **Clear Completed** removes all marked-complete items at once (FK-safe deletion)
 - **Create FP Workflow** — select pending FP items and click to open the FP Workflow modal, which submits a False Positive workflow batch directly to the Ivanti API with form fields, file attachments, and scope override. Attachments can be local file uploads or documents selected from the CVE document library — library documents are read from disk and sent to Ivanti identically to local uploads. Successful submission marks the queue items as complete and records the submission locally.
+- **Create Jira Ticket** — select multiple items and use the consolidation modal to create a single Jira ticket covering all selected findings. Ticket links are displayed on completed items.
+- **Loader Sheet** — select GRANITE items to generate a Granite Loader Sheet with CARD enrichment
+- **Archer Template** — select Archer items to open the template selector for pre-filling Archer Risk Acceptance forms
 
-**Redirecting completed items:**
+**Redirecting items:**
+- Pending items can be redirected to a different workflow type without duplication
 - Completed items show a redirect button (↱) next to the delete icon
-- Click redirect to open a modal where you select the target workflow type (FP, Archer, or CARD) and vendor (required for FP/Archer)
-- Redirecting creates a new pending queue item with the same finding data under the new workflow type — the original completed item is preserved
+- Click redirect to open a modal where you select the target workflow type and vendor (required for FP/Archer)
+- Redirecting creates a new pending queue item with the same finding data under the new workflow type — the original item is preserved
 - This is useful when a CARD inventory fix is done but the finding still needs an FP or Archer workflow, or when an item was assigned to the wrong workflow initially
-- Not every completed item needs a redirect — it's an optional action for items that require further processing
 
 Queue items are stored in the database, are **personal to your login**, and persist across sessions and page refreshes.
 
 ---
 
+### FP Workflow Submission
+
+Submit False Positive workflows directly to the Ivanti API with attachments and full lifecycle tracking. Accessible from the Ivanti Queue when FP items are selected.
+
+**Submission workflow:**
+1. Select pending FP items in the queue
+2. Fill in workflow name, reason, description, expiration date, and scope override
+3. Attach supporting documents (local uploads or library documents, 10MB limit per file)
+4. Submit — the workflow batch is created in Ivanti via API and recorded locally
+
+**Lifecycle tracking:** Each submission tracks its status through the lifecycle:
+- `submitted` — initial state after successful API submission
+- `approved` — FP workflow approved by Ivanti team
+- `rejected` — FP workflow rejected, requires rework
+- `rework` — submission is being edited for resubmission
+- `resubmitted` — edited submission resubmitted to Ivanti
+
+**Managing submissions:**
+- View submission history with attachment results and lifecycle status
+- Edit and resubmit rejected workflows (fields, findings, and attachments)
+- Dismiss rejected submissions (sets `dismissed_at` timestamp)
+- Re-queue findings from rejected submissions into the todo queue under a different workflow type
+- Auto-clear approved submissions from the active list
+- Collapsible submissions panel with per-user filtering
+- Sync lifecycle status from Ivanti `currentState` on fetch
+
+---
+
 ### Compliance — AEO Posture
 
 The Compliance page tracks NTS-AEO team posture against the AEO compliance framework using weekly xlsx reports exported from the NTS_AEO reporting system.
@@ -497,6 +613,170 @@ Only **STEAM** and **ACCESS-ENG** teams are tracked. The team selector at the to
 
 ---
 
+### CCP Metrics — Multi-Vertical Compliance
+
+The CCP Metrics page provides executive-level visibility into VCL (Vulnerability Compliance Level) compliance posture across multiple verticals (organisational units). It supports multi-file upload, forecast burndown charts, sub-team drill-down, and data management.
+
+**Upload workflow:**
+1. Click **Upload** and select 1–14 xlsx files (naming convention: `<VERTICAL>_YYYY_MM_DD.xlsx`)
+2. Each file is parsed, the vertical is extracted from the filename, and a scoped diff is computed against existing data for that vertical
+3. The preview shows per-file new/recurring/resolved counts and unrecognised files
+4. Click **Commit** to persist all files in a single transaction with vertical-scoped resolution
+
+**Executive overview:**
+- Aggregated stats across all verticals: total devices, compliant, non-compliant, compliance percentage vs target
+- Donut chart: blocked (no resolution date) vs in-progress (has resolution date)
+- Per-vertical breakdown cards with compliance percentage, burndown forecast, and last upload date
+- Cross-vertical metric breakdown table sorted by non-compliant count
+- LIVE and LAST REPORT badges showing data freshness
+
+**Metric drill-down:**
+- Click a metric ID to see per-vertical breakdown with sub-team data
+- Per-metric summary statistics and donut breakdown
+- Per-metric monthly compliance trend with linear regression forecast (3 months forward when 3+ months of history)
+- Device list per vertical/metric with optional team filtering
+- Compliant/total counts on metric summary cards
+- Non-Compliant stat clickable with metric breakdown buttons
+
+**Burndown forecasts:**
+- Per-vertical burndown: deduplicates devices by hostname, projects monthly resolution based on `resolution_date` fields
+- Aggregated burndown: cross-vertical forecast with projected clear date
+- Per-metric forecast burndown chart
+
+**Sub-team drill-down:**
+- Each metric shows sub-team rows (e.g., STEAM, ACCESS-OPS, ACCESS-ENG) beneath the rollup row
+- Intermediate view between overview and device list
+- Team filtering on the device list endpoint
+
+**Data management (Admin only):**
+- Delete a specific vertical (all items, uploads, summary, snapshots)
+- Rollback a specific upload (must be the most recent for that vertical)
+- Reset all multi-vertical data (nuclear option)
+
+**VCL metric calculations:** See `docs/guides/vcl-metric-calculations.md` for formula reference.
+
+---
+
+### CARD Asset Ownership
+
+CARD API integration for managing asset ownership — confirm, decline, and redirect ownership for network assets directly from the dashboard.
+
+**Owner lookup:**
+- Hover over any IP address in the findings table to see CARD ownership data in a tooltip (confirmed/unconfirmed/candidate teams)
+- Tooltip uses quick mode (CTEC suffix only, 15s timeout) for performance
+- Results cached per session for instant re-display — timeouts (504) are not cached and will retry on re-hover
+- When Ivanti Host ID is available, uses the CARD asset-search endpoint for faster resolution
+
+**Direct actions (no queue item required):**
+- Click "Actions" in the CARD tooltip to open the CARD Action Modal
+- Modal displays full owner context: confirmed, unconfirmed, declined, and candidate teams
+- Confirm, decline, or redirect ownership via the CARD API
+- Bare IPs are auto-resolved to CARD asset IDs (via host_id fast path or suffix guessing: CTEC, NATL, CHTR, COML, RESI, WIFI, VOIP)
+- IP address validation before mutation operations
+
+**Queue-based actions:**
+- Add findings to the queue with workflow type CARD
+- Confirm, decline, or redirect from the queue panel
+- Queue items are marked complete on successful CARD action
+- update_token handling for safe concurrent operations
+
+**Team assets endpoint:**
+- Paginated team asset lookup by disposition (confirmed, unconfirmed, candidate)
+- Used by the Granite enrichment batch endpoint for full data
+
+---
+
+### Granite Loader Sheet
+
+Generate Granite Loader Sheets with CARD enrichment for network device workflows.
+
+**Generation workflow:**
+1. Add findings to the queue with workflow type GRANITE
+2. Click **Loader Sheet** in the queue panel (or use the Loader Sheet button on the Reporting page)
+3. The modal fetches CARD data for each IP/host_id to enrich with NCIM, Qualys, and Netops Granite fields
+4. Review and edit per-row data with searchable picklists
+5. Export as formatted XLSX
+
+**CARD enrichment fields:**
+- `equip_inst_id` — NCIM equipment instance ID
+- `hostname` — resolved hostname from CARD
+- `site_name` — NCIM site name
+- `mgmt_ip_asn` — management IP ASN
+- `responsible_team` — NCIM responsible team
+- `equipment_class` — equipment classification
+- `equip_template` — equipment template
+- `equip_status` — equipment status
+- `serial_number` — device serial number
+
+**Features:**
+- Searchable picklists for teams, statuses, operation types (defined in `graniteLoaderPicklists.js`)
+- Column groups with configurable visibility (defined in `graniteLoaderConfig.js`)
+- Per-row inline editing before export
+- Batch enrichment: accepts up to 200 IPs or host_ids per request
+- When no team is specified, searches both NTS-AEO-STEAM and NTS-AEO-ACCESS-ENG
+
+---
+
+### Atlas Action Plans
+
+Atlas InfoSec action plan tracking with per-host vulnerability mapping. Provides visibility into which hosts have active remediation, risk acceptance, or compensating control plans.
+
+**AtlasBadge component:**
+- Appears on finding rows in the Reporting table when a host has one or more action plans
+- Badge colour indicates plan type: remediation, risk acceptance, or compensating control
+- Reads from local cache (`atlas_action_plans_cache` table) for instant rendering without API round-trips
+
+**Slide-out panel:**
+- Click the AtlasBadge to open the Atlas detail panel
+- Shows all plans for the host with type, status, and metadata
+- Qualys vulnerability mapping per host (resolved via `/hosts/vulnerabilities` endpoint)
+
+**Cache management:**
+- Local cache stores plan existence, count, and full plan JSON per host_id
+- Manual refresh triggers a re-fetch from the Atlas API and updates the cache
+- `atlas_known` flag indicates whether the host has been checked (avoids re-querying hosts with no plans)
+
+**Plan operations (Admin/Standard_User):**
+- Create action plans: remediation, risk_acceptance, or compensating_control
+- Update existing plans (PATCH)
+- Refresh cache per host
+
+---
+
+### Finding Archive Tracking
+
+Automatic detection of findings that disappear between Ivanti syncs, with lifecycle state tracking and anomaly logging.
+
+**How it works:**
+- On each sync, findings present in the previous sync but absent from the current sync are classified as archived
+- If a previously archived finding reappears, it transitions to RETURNED
+- Findings that remain absent are eventually classified as CLOSED or CLOSED_GONE
+
+**Lifecycle states:**
+| State | Meaning |
+|-------|---------|
+| ARCHIVED | Finding disappeared from Ivanti (first detection) |
+| RETURNED | Previously archived finding reappeared in a subsequent sync |
+| CLOSED | Finding confirmed closed by Ivanti (workflow completed) |
+| CLOSED_GONE | Finding disappeared and is confirmed gone (no workflow, long absence) |
+
+**Anomaly detection:**
+- Each sync logs open/closed count deltas, newly archived count, and returned count
+- Significance threshold triggers the AnomalyBanner component on the Reporting page
+- Classification JSON tracks the breakdown of archive reasons
+
+**BU reassignment tracking:**
+- Findings that change BU ownership between syncs are logged in `ivanti_finding_bu_history`
+- `IVANTI_MANAGED_BUS` env var defines which BUs are "managed" — findings leaving these BUs are classified as `bu_reassignment`
+- Return classification distinguishes between original finding restoration and new duplicates
+
+**UI components:**
+- **AnomalyBanner** — alert bar on the Reporting page when significant sync anomalies are detected
+- **ArchiveSummaryBar** — state distribution summary (ARCHIVED / RETURNED / CLOSED counts)
+- Archive view with transition history per finding
+
+---
+
 ### Knowledge Base
 
 A document library for internal reference material — policies, runbooks, vendor advisories, and process guides.
@@ -520,24 +800,29 @@ Bulk export tools for reports and data extracts. Available to Admin, Standard_Us
 
 ### Jira Tickets
 
-A dedicated page for managing Jira Data Center tickets linked to CVE/vendor pairs. Accessible from the navigation drawer. Requires a configured Jira API connection (see [Configuration](#configuration)).
+A dedicated page for managing Jira Data Center tickets linked to CVE/vendor pairs and Ivanti queue items. Accessible from the navigation drawer. Requires a configured Jira API connection (see [Configuration](#configuration)).
 
 **Ticket list**
 - View all tracked Jira tickets with status, CVE ID, vendor, summary, and Jira key
 - Filter by status or search by keyword
 - Click a Jira key to open the issue in Jira Data Center
+- Raw Jira status display — shows the actual Jira status field (no Open/In Progress/Closed mapping)
 
 **Jira API operations (Admin/Standard_User)**
 - **Lookup** — search for any Jira issue by key and view its current status, assignee, and summary
-- **Create in Jira** — create a new Jira issue directly from the dashboard with project key, issue type, summary, and description; the resulting ticket is automatically linked to a CVE/vendor pair in the local database
+- **Create in Jira** — create a new Jira issue directly from the dashboard with project key, issue type, summary, and description; the resulting ticket is automatically linked to a CVE/vendor pair in the local database. CVE/Vendor fields are optional — tickets can be created with source context tracking only.
+- **Multi-item creation** — from the Ivanti Queue consolidation modal, create a single Jira ticket covering multiple findings
+- **Save to Dashboard** — save a Jira issue found via lookup to the local database
 - **Sync** — refresh a single ticket's status and summary from Jira, or bulk-sync all tracked tickets via JQL search
 - **Create / Edit / Delete** — manage local ticket records linking Jira keys to CVE/vendor pairs
 
+**Vendor-specific issue types:** The Issue Type dropdown in the creation modal is context-aware. When the Project Key field matches a recognized vendor project key (e.g., `AA_VECIMA`, `AA_CISCO`, `AA_ADTRAN`), the dropdown switches to vendor-specific issue types (Epic, Story, Task, Defect, Production Defect/Incident Fix, New Feature, Spike, Release Candidate, Documentation). For all other project keys — including the default from `JIRA_PROJECT_KEY` — the dropdown shows STEAM issue types (Story, Epic, Program, Project, Reservation, Automation Maintenance). Matching is case-insensitive and trims whitespace. Changing the project key such that the context switches (STEAM to vendor or vice versa) resets the selected issue type. The same behavior applies when creating a Jira ticket from the Ivanti Queue. The list of recognized vendor project keys is defined in `VENDOR_PROJECT_KEYS` in `frontend/src/components/pages/JiraPage.js`.
+
 **Connection test (Admin)** — verify Jira API credentials and connectivity from the page header.
 
 **Rate limit monitoring (Admin)** — view current burst and daily rate limit usage against Charter's posted limits (60/minute burst, 1 440/day).
 
-All Jira API calls are proxied through the backend. Credentials are never exposed to the browser. Rate limits are enforced client-side with inter-request delays (1s for GETs, 2s for writes). See `docs/jira-api-use-cases.md` for the full API compliance summary.
+All Jira API calls are proxied through the backend. Credentials are never exposed to the browser. Rate limits are enforced client-side with inter-request delays (1s for GETs, 2s for writes). See `docs/api/jira-api-use-cases.md` for the full API compliance summary.
 
 ---
 
@@ -554,6 +839,75 @@ Track Archer exception tickets (EXC numbers) linked to specific CVE/vendor pairs
 
 ---
 
+### Archer Template Library
+
+Template management system for Archer Risk Acceptance forms. Stores static content (Environment Overview, Segmentation, Mitigating Controls, and 5 additional sections) organised by Vendor, Platform, and Model hierarchy.
+
+**Capabilities:**
+- Full CRUD — create, view, update, and delete templates
+- Clone existing templates into new vendor/platform/model combinations
+- Search/filter by vendor, platform, or model (case-insensitive)
+- Hierarchy browsing endpoints: list vendors, platforms per vendor, models per vendor+platform
+- Per-section copy-to-clipboard buttons in the inline view panel
+- Template selector integrated into the Ivanti Queue for Archer workflow items
+- Accessible from nav drawer (Template Mgr) and from Archer queue items
+
+**Template sections (8 content fields, each max 10,000 chars):**
+- Environment Overview
+- Segmentation
+- Mitigating Controls
+- Additional Info
+- Charter Network Banner
+- Data Classification
+- Charter Network
+- Additional Access List
+
+**Hierarchy:** Vendor > Platform > Model (unique constraint on the combination). Templates are sorted alphabetically by vendor, platform, model.
+
+---
+
+### In-App Notifications
+
+Native notification system providing per-user alerts for system events without external dependencies (replaces previous Webex bot integration).
+
+**Notification types:**
+- `issue_resolved` — GitLab feedback issue closed and deployed
+
+**UI:**
+- NotificationBell component in the header with unread count badge
+- Click to view list of unread notifications (newest first, limited to 50)
+- Mark individual notifications as read, or mark all as read
+- Only the owning user can mark their own notifications
+
+**Storage:** Notifications are stored in the `notifications` table with `user_id`, `username`, `type`, `title`, `message`, `issue_number`, and `read` flag.
+
+---
+
+### Feedback — GitLab Integration
+
+In-app bug reports and feature requests submitted directly to the GitLab project as issues. Keeps the GitLab PAT server-side so credentials are never exposed to the browser.
+
+**Submission workflow:**
+1. Click the feedback button in the nav drawer
+2. Select type: Bug Report or Feature Request
+3. Fill in title and description
+4. Optionally attach up to 3 screenshots (PNG, JPG, GIF, WebP — 5MB each)
+5. Submit — creates a GitLab issue with labels (`bug` or `enhancement`) and formatted description
+
+**Issue lifecycle:**
+- GitLab webhook receiver (`POST /api/webhooks/gitlab`) listens for issue close events
+- When a feedback issue is closed, the submitter username is parsed from the issue description
+- An in-app notification is created for the submitter: "Your bug report has been resolved and deployed"
+- Webhook secret validation prevents unauthorized requests
+
+**Configuration:**
+- `GITLAB_URL` — GitLab instance URL
+- `GITLAB_PROJECT_ID` — numeric project ID
+- `GITLAB_PAT` — project access token with `api` scope
+- `GITLAB_WEBHOOK_SECRET` — shared secret for webhook validation (set same value in GitLab webhook settings)
+
+---
+
 ### Admin Panel
 
 The Admin Panel is a full-page, tabbed interface accessible only to Admin-group users. It replaces the previous inline modal rendering and follows the dashboard's dark tactical intelligence theme. Three tabs provide consolidated access to administrative functions:
@@ -703,7 +1057,9 @@ All endpoints are prefixed with `/api`. All endpoints except `/api/auth/login` a
 
 | Method | Path | Group | Description |
 |---|---|---|---|
-| GET | `/api/ivanti/archive` | Any | Get finding archive data for severity score drift tracking |
+| GET | `/api/ivanti/archive` | Any | List archive records; optional filters: `state` (ACTIVE/ARCHIVED/RETURNED/CLOSED), `teams` (comma-separated BU names) |
+| GET | `/api/ivanti/archive/anomalies` | Any | Sync anomaly log (significant count deltas and classification data) |
+| GET | `/api/ivanti/archive/transitions/:archiveId` | Any | Transition history for a specific archive record |
 
 ### Compliance
 
@@ -742,6 +1098,91 @@ All endpoints are prefixed with `/api`. All endpoints except `/api/auth/login` a
 | PUT | `/api/archer-tickets/:id` | Admin, Standard_User | Update an Archer ticket |
 | DELETE | `/api/archer-tickets/:id` | Admin, Standard_User | Delete an Archer ticket (ownership + compliance check for Standard_User) |
 
+### Archer Templates
+
+| Method | Path | Group | Description |
+|---|---|---|---|
+| GET | `/api/archer-templates` | Any | List templates; optional filters: `search`, `vendor`, `platform`, `model` |
+| GET | `/api/archer-templates/:id` | Any | Get a single template by ID |
+| POST | `/api/archer-templates` | Admin, Standard_User | Create a new template |
+| PUT | `/api/archer-templates/:id` | Admin, Standard_User | Update a template (partial update supported) |
+| DELETE | `/api/archer-templates/:id` | Admin, Standard_User | Delete a template |
+| POST | `/api/archer-templates/:id/clone` | Admin, Standard_User | Clone a template with new vendor/platform/model |
+| GET | `/api/archer-templates/hierarchy/vendors` | Any | List distinct vendor names |
+| GET | `/api/archer-templates/hierarchy/platforms` | Any | List platforms for a vendor; query: `vendor` |
+| GET | `/api/archer-templates/hierarchy/models` | Any | List models for vendor+platform; query: `vendor`, `platform` |
+
+### CARD Asset Ownership
+
+| Method | Path | Group | Description |
+|---|---|---|---|
+| GET | `/api/card/status` | Any | Check if CARD API is configured |
+| GET | `/api/card/teams` | Admin, Standard_User | List all CARD teams |
+| GET | `/api/card/teams/:teamName/assets` | Admin, Standard_User | Paginated team assets by disposition |
+| GET | `/api/card/owner/:assetId` | Admin, Standard_User | Get owner record for an asset |
+| GET | `/api/card/owner-lookup/:ip` | Admin, Standard_User | Resolve IP to asset and return owner data; `?quick=1` for tooltip mode, `?hostId=N` for fast path |
+| POST | `/api/card/owner/:assetId/confirm` | Admin, Standard_User | Direct confirm ownership (no queue item) |
+| POST | `/api/card/owner/:assetId/decline` | Admin, Standard_User | Direct decline ownership (no queue item) |
+| POST | `/api/card/owner/:assetId/redirect` | Admin, Standard_User | Direct redirect between teams (no queue item) |
+| GET | `/api/card/asset-search/:hostId` | Admin, Standard_User | Search CARD by Ivanti Host ID (deep_search) |
+| POST | `/api/card/enrich-batch` | Admin, Standard_User | Batch lookup IPs/host_ids for Granite loader fields (max 200) |
+| POST | `/api/card/queue/:queueItemId/confirm` | Admin, Standard_User | Confirm ownership for a queue item |
+| POST | `/api/card/queue/:queueItemId/decline` | Admin, Standard_User | Decline ownership for a queue item |
+| POST | `/api/card/queue/:queueItemId/redirect` | Admin, Standard_User | Redirect ownership for a queue item |
+
+### Atlas Action Plans
+
+| Method | Path | Group | Description |
+|---|---|---|---|
+| GET | `/api/atlas/hosts/:hostId/plans` | Any | Get action plans for a host (from cache or API) |
+| PUT | `/api/atlas/hosts/:hostId/plans` | Admin, Standard_User | Create a new action plan |
+| PATCH | `/api/atlas/hosts/:hostId/plans` | Admin, Standard_User | Update an existing plan |
+| POST | `/api/atlas/hosts/:hostId/refresh` | Admin, Standard_User | Force cache refresh from Atlas API |
+
+### VCL Multi-Vertical (CCP Metrics)
+
+| Method | Path | Group | Description |
+|---|---|---|---|
+| POST | `/api/compliance/vcl-multi/preview` | Admin, Standard_User | Parse xlsx files, extract verticals, compute scoped diffs |
+| POST | `/api/compliance/vcl-multi/commit` | Admin, Standard_User | Commit previewed files in a single transaction |
+| GET | `/api/compliance/vcl-multi/stats` | Any | Aggregated cross-vertical executive summary |
+| GET | `/api/compliance/vcl-multi/trend` | Any | Monthly compliance trend with linear regression forecast |
+| GET | `/api/compliance/vcl-multi/burndown` | Any | Aggregated cross-vertical burndown forecast |
+| GET | `/api/compliance/vcl-multi/verticals` | Any | List known verticals |
+| GET | `/api/compliance/vcl-multi/metrics` | Any | All metrics aggregated across verticals |
+| GET | `/api/compliance/vcl-multi/metrics-list` | Any | Distinct metrics with active non-compliant device counts |
+| GET | `/api/compliance/vcl-multi/metric/:id/stats` | Any | Per-metric summary statistics and donut breakdown |
+| GET | `/api/compliance/vcl-multi/metric/:id/verticals` | Any | Per-vertical breakdown for a metric with sub-teams |
+| GET | `/api/compliance/vcl-multi/metric/:id/trend` | Any | Per-metric monthly trend with forecast |
+| GET | `/api/compliance/vcl-multi/vertical/:code/metrics` | Any | Per-metric breakdown for a specific vertical |
+| GET | `/api/compliance/vcl-multi/vertical/:code/metric/:metricId/devices` | Any | Device list for a vertical+metric; `?team=X` |
+| GET | `/api/compliance/vcl-multi/vertical/:code/burndown` | Any | Burndown forecast for a specific vertical |
+| GET | `/api/compliance/vcl-multi/uploads` | Any | Upload history (most recent 100) |
+| DELETE | `/api/compliance/vcl-multi/vertical/:code` | Admin | Delete all data for a vertical |
+| DELETE | `/api/compliance/vcl-multi/upload/:uploadId` | Admin | Rollback a specific upload (must be most recent for that vertical) |
+| DELETE | `/api/compliance/vcl-multi/all` | Admin | Delete all multi-vertical data |
+
+### Notifications
+
+| Method | Path | Group | Description |
+|---|---|---|---|
+| GET | `/api/notifications` | Any | Get unread notifications for current user (max 50) |
+| GET | `/api/notifications/count` | Any | Get unread count for badge display |
+| PATCH | `/api/notifications/:id/read` | Any | Mark a single notification as read (own only) |
+| POST | `/api/notifications/read-all` | Any | Mark all notifications as read |
+
+### Feedback
+
+| Method | Path | Group | Description |
+|---|---|---|---|
+| POST | `/api/feedback` | Any | Submit bug report or feature request to GitLab (multipart with optional screenshots) |
+
+### Webhooks
+
+| Method | Path | Group | Description |
+|---|---|---|---|
+| POST | `/api/webhooks/gitlab` | Public | GitLab issue webhook receiver (validated by `x-gitlab-token` header) |
+
 ### Users (Admin only)
 
 | Method | Path | Group | Description |
@@ -774,10 +1215,16 @@ All endpoints are prefixed with `/api`. All endpoints except `/api/auth/login` a
 cve-dashboard/
 ├── start-servers.sh          # Start backend + frontend via systemd
 ├── stop-servers.sh           # Stop both systemd services
+├── configure.js              # Interactive configuration wizard
 ├── docker-compose.yml        # PostgreSQL 16 container definition
 ├── package.json              # Root package.json (backend dependencies)
 ├── scripts/
-│   └── deploy-postgres.sh    # One-time deployment: container, schema, migration
+│   ├── deploy-postgres.sh    # One-time deployment: container, schema, migration
+│   └── reset-and-migrate.sh  # Dev utility: reset DB and re-run migrations
+├── deploy/
+│   ├── cve-backend-production.service
+│   ├── cve-backend-staging.service
+│   └── setup-staging.sh
 ├── systemd/                  # systemd unit files for auto-start on boot
 │   ├── cve-backend.service
 │   └── cve-frontend.service
@@ -787,6 +1234,7 @@ cve-dashboard/
 │   ├── db.js                 # PostgreSQL connection pool (pg)
 │   ├── db-schema.sql         # Complete DDL for fresh Postgres setup
 │   ├── setup-postgres.js     # Schema initializer (runs db-schema.sql)
+│   ├── setup.js              # One-time DB init + default admin creation
 │   ├── uploads/              # File storage root (gitignored)
 │   │   ├── <CVE-ID>/<vendor>/    # CVE documents
 │   │   ├── knowledge_base/       # Knowledge base documents
@@ -798,20 +1246,33 @@ cve-dashboard/
 │   │   ├── nvdLookup.js          # NVD API proxy
 │   │   ├── knowledgeBase.js      # Knowledge base document management
 │   │   ├── archerTickets.js      # Archer EXC ticket CRUD
+│   │   ├── archerTemplates.js    # Archer template library CRUD + clone + hierarchy
 │   │   ├── ivantiWorkflows.js    # Ivanti workflow batch sync and cache
 │   │   ├── ivantiFindings.js     # Ivanti host findings sync, notes, overrides, FP counts
-│   │   ├── ivantiTodoQueue.js    # Ivanti Queue — personal FP/Archer/CARD staging list
-│   │   ├── ivantiArchive.js      # Finding archive for severity score drift
-│   │   ├── jiraTickets.js        # Jira ticket CRUD + Jira REST API integration (lookup, sync, create)
-│   │   └── compliance.js         # AEO compliance upload, diff, device tracking, notes
+│   │   ├── ivantiTodoQueue.js    # Ivanti Queue — personal staging list
+│   │   ├── ivantiArchive.js      # Finding archive tracking, transitions, anomaly log
+│   │   ├── ivantiFpWorkflow.js   # FP workflow submission to Ivanti API + lifecycle
+│   │   ├── compliance.js         # AEO compliance upload, diff, device tracking, notes
+│   │   ├── vclMultiVertical.js   # VCL/CCP multi-vertical compliance reporting
+│   │   ├── atlas.js              # Atlas action plan proxy + cache
+│   │   ├── jiraTickets.js        # Jira ticket CRUD + Jira REST API integration
+│   │   ├── cardApi.js            # CARD ownership proxy, mutation, asset-search, enrich
+│   │   ├── notifications.js      # In-app notification system
+│   │   ├── feedback.js           # Bug reports/feature requests to GitLab
+│   │   └── webhooks.js           # GitLab webhook receiver for issue lifecycle
 │   ├── middleware/
 │   │   └── auth.js               # requireAuth and requireGroup middleware
 │   ├── helpers/
 │   │   ├── auditLog.js           # logAudit helper (fire-and-forget)
-│   │   ├── driftChecker.js       # Schema drift detection: compareSchemaToDrift(), loadConfig(), reconcileConfig()
+│   │   ├── cardApi.js            # CARD API — OAuth token, owner, confirm/decline/redirect, asset-search
 │   │   ├── ivantiApi.js          # Ivanti API HTTP helpers (multipart, JSON, form POST)
-│   │   └── jiraApi.js            # Jira Data Center REST API helpers (Basic/PAT auth, rate limiting)
-│   ├── migrations/               # Legacy SQLite migration scripts (not needed for Postgres)
+│   │   ├── atlasApi.js           # Atlas action plan API (Basic auth)
+│   │   ├── jiraApi.js            # Jira Data Center REST API helpers (Basic/PAT auth, rate limiting)
+│   │   ├── driftChecker.js       # Schema drift detection: compareSchemaToDrift(), loadConfig(), reconcileConfig()
+│   │   ├── vclHelpers.js         # VCL metric calculation helpers (burndown, forecast, dedup)
+│   │   └── teams.js              # Team validation helpers
+│   ├── migrations/               # Sequential migration scripts (idempotent)
+│   │   └── run-all.js            # Run all migrations in order
 │   └── scripts/
 │       ├── migrate-to-postgres.js        # One-time SQLite → Postgres data migration
 │       ├── compliance_config.json        # Shared parser config (metric_categories, core_cols, skip_sheets)
@@ -826,30 +1287,60 @@ cve-dashboard/
         ├── App.css                   # Global styles and CSS variables
         ├── contexts/
         │   └── AuthContext.js        # Auth state provider (login, logout, group helpers)
+        ├── utils/
+        │   ├── graniteLoaderConfig.js    # Granite column definitions and groups
+        │   ├── graniteLoaderExport.js    # XLSX generation logic
+        │   └── graniteLoaderPicklists.js # Searchable dropdown options
         └── components/
             ├── LoginForm.js              # Login page
-            ├── NavDrawer.js              # Side navigation drawer (pages + Admin Panel link for Admin group)
-            ├── UserMenu.js               # User dropdown in header (shows group badge)
-            ├── CalendarWidget.js         # Due-date calendar with Ivanti finding indicators
-            ├── UserManagement.js         # Admin user management modal (quick-access from UserMenu)
-            ├── AuditLog.js               # Admin audit log modal (quick-access from UserMenu)
+            ├── NavDrawer.js              # Side navigation drawer
+            ├── UserMenu.js               # User dropdown (shows group badge)
+            ├── UserProfilePanel.js       # User profile and password change
+            ├── CalendarWidget.js         # Due-date calendar with finding indicators
+            ├── UserManagement.js         # Admin user management modal
+            ├── AuditLog.js               # Admin audit log modal
             ├── NvdSyncModal.js           # Bulk NVD sync dialog
             ├── KnowledgeBaseModal.js     # Knowledge base upload/list modal
-            ├── KnowledgeBaseViewer.js    # Inline document viewer (sandboxed iframe, sanitized markdown)
-            ├── ConfirmModal.js           # Themed confirmation dialog (replaces window.confirm)
-            ├── CveTooltip.js             # Hover tooltip for CVE badges (portal-rendered, cached)
-            ├── RedirectModal.js          # Queue item redirect modal (workflow type + vendor selection)
+            ├── KnowledgeBaseViewer.js    # Inline document viewer
+            ├── CardOwnerTooltip.js       # CARD ownership hover tooltip
+            ├── CardDetailModal.js        # CARD asset detail (from reporting)
+            ├── CardActionModal.js        # CARD confirm/decline/redirect (from queue)
+            ├── RedirectModal.js          # Queue item redirect modal
+            ├── LoaderModal.js            # Granite Loader Sheet generator
+            ├── SearchableSelect.js       # Reusable searchable dropdown
+            ├── AtlasBadge.js             # Atlas action plan indicator badge
+            ├── AtlasIcon.js              # Atlas icon component
+            ├── AtlasSlideOutPanel.js     # Atlas plan detail panel
+            ├── AdminScopeToggle.js       # BU scope toggle
+            ├── ConfirmModal.js           # Themed confirmation dialog
+            ├── ConsolidationModal.js     # Multi-item Jira ticket consolidation
+            ├── CveTooltip.js             # Hover tooltip for CVE badges
+            ├── DeleteConfirmModal.js     # Delete confirmation with details
+            ├── FeedbackModal.js          # Bug report/feature request submission
+            ├── NotificationBell.js       # Notification bell with unread count
+            ├── RemediationModal.js       # Remediation plan editing
+            ├── TemplateFormModal.js      # Archer template create/edit form
+            ├── TemplateSelector.js       # Archer template picker for queue items
             └── pages/
-                ├── AdminPage.js              # Admin panel: user management, audit log, system info
+                ├── AdminPage.js              # Admin panel: users, audit log, system info
                 ├── ReportingPage.js          # Host findings: charts, table, queue, export
+                ├── IvantiTodoQueuePage.js    # Full-page queue view
+                ├── IvantiCountsChart.js      # Ivanti counts history chart
+                ├── AnomalyBanner.js          # Sync anomaly alert banner
+                ├── ArchiveSummaryBar.js      # Finding archive state distribution
                 ├── CompliancePage.js         # AEO compliance: metric cards, device table
-                ├── ComplianceUploadModal.js  # xlsx upload with diff preview
+                ├── ComplianceUploadModal.js  # xlsx upload with drift check + diff preview
                 ├── ComplianceDetailPanel.js  # Per-device metrics, history, notes
                 ├── ComplianceChartsPanel.js  # Compliance trend charts
-                ├── IvantiCountsChart.js      # Ivanti counts history chart
-                ├── ArchiveSummaryBar.js      # Finding archive summary
-                ├── JiraPage.js               # Jira ticket management and Jira API integration
-                ├── KnowledgeBasePage.js      # Knowledge base page
+                ├── CCPMetricsPage.js         # CCP Metrics: multi-vertical executive view
+                ├── VCLReportPage.js          # VCL exec report page
+                ├── MetricInfoPanel.js        # Metric detail drill-down panel
+                ├── BulkUploadModal.js        # Bulk VCL upload
+                ├── MultiVerticalUploadModal.js # Multi-vertical upload modal
+                ├── ArcherPage.js             # Archer tickets management
+                ├── ArcherTemplatePage.js      # Archer template library
+                ├── JiraPage.js               # Jira ticket management + API integration
+                ├── KnowledgeBasePage.js       # Knowledge base page
                 └── ExportsPage.js            # Exports page (group-gated)
 ```
 
@@ -889,9 +1380,31 @@ All tables are defined in `backend/db-schema.sql` and created by `setup-postgres
 
 **`ivanti_finding_overrides`** — Editor-applied overrides for `hostName` and `dns` fields. `UNIQUE(finding_id, field)`.
 
-**`ivanti_todo_queue`** — Personal per-user queue of findings staged for FP, Archer, or CARD processing. Keyed by `(user_id, finding_id)`. Completed items can be redirected to a different workflow type via `POST /:id/redirect`, which creates a new pending item preserving the original finding data.
+**`ivanti_todo_queue`** — Personal per-user queue of findings staged for FP, Archer, CARD, GRANITE, DECOM, or Remediate processing. Keyed by `(user_id, finding_id)`. Workflow type constraint: `FP`, `Archer`, `CARD`, `GRANITE`, `DECOM`. Completed items can be redirected to a different workflow type via `POST /:id/redirect`, which creates a new pending item preserving the original finding data.
 
-**`ivanti_fp_submissions`** — Record of FP workflow submissions to the Ivanti API. Tracks user, workflow batch ID, form fields, finding IDs, queue item IDs, attachment results, and submission status (success/partial/failed). Rejected submissions can be dismissed (`dismissed_at`) or re-queued to the todo queue under a different workflow type (`requeued_at`).
+**`ivanti_fp_submissions`** — Record of FP workflow submissions to the Ivanti API. Tracks user, workflow batch ID, form fields, finding IDs, queue item IDs, attachment results, and submission status (success/partial/failed). Lifecycle status tracks the workflow through: submitted, approved, rejected, rework, resubmitted. Rejected submissions can be dismissed (`dismissed_at`) or re-queued to the todo queue under a different workflow type (`requeued_at`).
+
+**`ivanti_fp_submission_history`** — Edit history for FP submissions. Tracks change_type (created, fields_updated, findings_added, attachments_added, status_changed) with change_details_json.
+
+**`ivanti_finding_archives`** — Archived finding records with lifecycle state tracking. States: ARCHIVED, RETURNED, CLOSED, CLOSED_GONE. Tracks severity at time of archival and transition timestamps.
+
+**`ivanti_archive_transitions`** — State transition history for archived findings. Records from_state, to_state, severity_at_transition, and reason for each transition.
+
+**`ivanti_sync_anomaly_log`** — Sync anomaly detection log. Records count deltas, newly archived/returned counts, classification breakdown, and significance flag per sync.
+
+**`ivanti_finding_bu_history`** — BU reassignment history per finding. Records previous_bu, new_bu, and detection timestamp.
+
+**`ivanti_counts_history_by_bu`** — Per-BU historical open/closed counts, enabling per-BU trend lines on the findings chart.
+
+**`atlas_action_plans_cache`** — Cached Atlas action plan data for badge rendering. Stores host_id, has_action_plan flag, plan_count, plans_json, and atlas_known flag. Indexed on host_id.
+
+**`archer_templates`** — Archer template library. Vendor/platform/model hierarchy with 8 section content fields (environment_overview, segmentation, mitigating_controls, additional_info, charter_network_banner, data_classification, charter_network, additional_access_list). `UNIQUE(vendor, platform, model)`.
+
+**`notifications`** — In-app notifications. Per-user notifications with type, title, message, issue_number, and read flag. Used by the NotificationBell component.
+
+**`vcl_multi_vertical_summary`** — Per-metric summary data from VCL multi-vertical uploads. Stores metric_id, metric_desc, category, team, priority, non_compliant, compliant, total, compliance_pct, target, and status per upload per vertical. Used for executive reporting without recalculating from items.
+
+**`compliance_snapshots`** — Monthly compliance snapshots per vertical. Used for trend charts and linear regression forecasting.
 
 **`compliance_uploads`** — Record of each compliance xlsx upload: filename, report date, uploader, timestamp, and new/resolved/recurring counts.
 
@@ -1020,32 +1533,63 @@ After upgrading, clear your browser cookies and log in fresh — session format
 
 ## Migrations
 
-> **Note:** The migration scripts in `backend/migrations/` are legacy SQLite migrations. They are not needed for PostgreSQL deployments — the complete schema is defined in `backend/db-schema.sql` and applied by `setup-postgres.js`. These scripts are retained for reference and for any remaining SQLite-based environments.
-
-For deployments still on SQLite, run them in the listed order. All are idempotent and safe to re-run.
+> **Note:** The migration scripts in `backend/migrations/` are used for both PostgreSQL and legacy SQLite deployments. Run them via `node migrations/run-all.js` which executes all migrations in order. All are idempotent and safe to re-run.
 
 ```bash
 cd backend
+node migrations/run-all.js
+```
+
+For manual execution or debugging, the individual scripts in order:
+
+```bash
+cd backend
+node migrations/add_user_groups.js
+node migrations/add_user_ivanti_identity.js
+node migrations/add_user_bu_teams.js
 node migrations/add_knowledge_base_table.js
-node migrations/add_archer_tickets_table.js
 node migrations/add_ivanti_sync_table.js
 node migrations/add_ivanti_findings_tables.js
-node migrations/add_ivanti_todo_queue_table.js
-node migrations/add_card_workflow_type.js
-node migrations/add_todo_queue_ip_address.js
-node migrations/add_todo_queue_hostname.js
-node migrations/add_compliance_tables.js
-node migrations/add_finding_archive_tables.js
-node migrations/add_archer_tickets_timestamps.js
+node migrations/add_ivanti_findings_ipv6_columns.js
 node migrations/add_ivanti_counts_history_table.js
+node migrations/add_ivanti_todo_queue_table.js
+node migrations/add_todo_queue_hostname.js
+node migrations/add_todo_queue_ip_address.js
+node migrations/add_granite_workflow_type.js
+node migrations/add_card_workflow_type.js
+node migrations/add_decom_workflow_type.js
+node migrations/add_remediate_workflow_type.js
+node migrations/add_compliance_tables.js
+node migrations/add_compliance_notes_group_id.js
+node migrations/add_compliance_history_metric_id.js
+node migrations/add_compliance_item_history.js
 node migrations/add_fp_submissions_table.js
-node migrations/add_user_groups.js
-node migrations/add_created_by_columns.js
 node migrations/add_fp_submission_editing.js
 node migrations/add_fp_submissions_dismissed.js
 node migrations/add_fp_submissions_requeued_at.js
-node migrations/add_granite_workflow_type.js
-node migrations/add_compliance_notes_group_id.js
+node migrations/add_archer_tickets_table.js
+node migrations/add_archer_tickets_timestamps.js
+node migrations/add_archer_templates_table.js
+node migrations/add_atlas_action_plans_cache.js
+node migrations/add_atlas_known_column.js
+node migrations/add_finding_archive_tables.js
+node migrations/add_closed_gone_state.js
+node migrations/add_return_classification.js
+node migrations/add_sync_anomaly_tables.js
+node migrations/add_flexible_jira_ticket_creation.js
+node migrations/add_multi_item_jira_ticket.js
+node migrations/add_jira_sync_columns.js
+node migrations/add_jira_sync_columns_pg.js
+node migrations/drop_jira_status_check_constraint.js
+node migrations/add_notifications_table.js
+node migrations/add_created_by_columns.js
+node migrations/add_queue_remediation_notes_table.js
+node migrations/add_vcl_multi_vertical.js
+node migrations/add_vcl_reporting_columns.js
+node migrations/add_vcl_vertical_metadata.js
+node migrations/backfill_anomaly_log.js
+node migrations/backfill_return_classification.js
+node migrations/reclassify_bu_roundtrips.js
 ```
 
 For deployments upgrading from an older schema, the following legacy migration scripts are also available in `backend/`:

docs/guides/vcl-metric-calculations.md

@@ -0,0 +1,988 @@
+# VCL Metric Calculations — Database Reference
+
+## Overview
+
+This document describes how every percentage, total, and forecast number on the VCL Report and CCP Metrics pages is computed from the underlying database. It is the single reference for verifying that what you see on the page matches what is in the data.
+
+Each section answers four questions:
+
+- **What it shows** — the field name on screen and the data path
+- **What feeds it** — the table(s) and columns the value is computed from
+- **How it is calculated** — the exact SQL or formula, plus any rounding rules
+- **Why it can drift** — known sources of inaccuracy and how the dashboard guards against them
+
+---
+
+## Table of Contents
+
+- [Data Sources](#data-sources)
+  - [compliance_items](#compliance_items)
+  - [compliance_uploads](#compliance_uploads)
+  - [compliance_snapshots](#compliance_snapshots)
+  - [vcl_multi_vertical_summary](#vcl_multi_vertical_summary)
+- [VCL Report Page (Single-Vertical / Legacy AEO)](#vcl-report-page-single-vertical--legacy-aeo)
+  - [Stats Bar](#stats-bar)
+  - [Donut Chart — Status of Non-Compliant Assets](#donut-chart--status-of-non-compliant-assets)
+  - [Heavy Hitters Table](#heavy-hitters-table)
+  - [Vertical Breakdown Table](#vertical-breakdown-table)
+  - [Compliance Trend Chart](#compliance-trend-chart)
+- [CCP Metrics Page (Multi-Vertical)](#ccp-metrics-page-multi-vertical)
+  - [Aggregated Stats Bar](#aggregated-stats-bar)
+  - [Donut — Blocked vs In-Progress](#donut--blocked-vs-in-progress)
+  - [Trend Chart](#trend-chart)
+  - [Aggregated Burndown Forecast](#aggregated-burndown-forecast)
+  - [Metric Table (Cross-Vertical)](#metric-table-cross-vertical)
+  - [Metric Detail View — Per-Vertical Breakdown](#metric-detail-view--per-vertical-breakdown)
+  - [Per-Metric Forecast Burndown Chart](#per-metric-forecast-burndown-chart)
+  - [Per-Vertical Detail and Burndown](#per-vertical-detail-and-burndown)
+- [Forecast Algorithms](#forecast-algorithms)
+  - [Linear Regression Forecast (Trend)](#linear-regression-forecast-trend)
+  - [Resolution-Date Burndown Forecast](#resolution-date-burndown-forecast)
+  - [Per-Metric Forecast (Historical + Projected)](#per-metric-forecast-historical--projected)
+- [Cross-Cutting Correctness Rules](#cross-cutting-correctness-rules)
+- [Verifying Values by Hand](#verifying-values-by-hand)
+- [Worked Example — Vulns_Aging vs 7.1.1 Forecast Charts](#worked-example--vulns_aging-vs-711-forecast-charts)
+
+---
+
+## Data Sources
+
+The VCL pages read from four tables. Knowing what each one stores is the prerequisite for understanding the calculations.
+
+### compliance_items
+
+One row per `(hostname, metric_id, vertical)` combination per upload. **Only non-compliant findings are stored here.** Compliant devices never appear in this table — they are inferred from the Summary sheet's totals minus what is in `compliance_items`.
+
+| Column | Type | Notes |
+|---|---|---|
+| `hostname` | TEXT | Device hostname |
+| `metric_id` | TEXT | Compliance metric identifier (e.g., `2.3.5`, `7.1.1`) |
+| `team` | TEXT | Sub-team responsible (`STEAM`, `ACCESS-ENG`, etc.) |
+| `vertical` | TEXT | Vertical code (`NTS_AEO`, `SDIT_CISO`, `TSI`); `NULL` for legacy AEO uploads |
+| `status` | TEXT | `'active'` if currently failing, `'resolved'` once the device drops off the next upload |
+| `resolution_date` | DATE | Target remediation date (manual entry) |
+| `seen_count` | INTEGER | Number of consecutive uploads this finding has appeared on |
+| `first_seen_upload_id` / `upload_id` / `resolved_upload_id` | INTEGER | Upload references for first appearance, latest, and resolution |
+
+> A device is "compliant" when **no** active row exists for it in this table.
+
+### compliance_uploads
+
+One row per uploaded xlsx. A multi-vertical upload day produces multiple rows that share the same `report_date`.
+
+| Column | Type | Notes |
+|---|---|---|
+| `report_date` | TEXT | The reporting period the file covers (`YYYY-MM-DD`) |
+| `vertical` | TEXT | Same vertical code as `compliance_items.vertical`; `NULL` for legacy AEO |
+| `new_count` / `recurring_count` / `resolved_count` | INTEGER | Per-upload deltas (vertical-scoped) |
+| `summary_json` | TEXT | The raw parsed Summary sheet — used as a fallback by `/summary` |
+
+### compliance_snapshots
+
+Monthly aggregated snapshot keyed by `(snapshot_month, vertical)`. The trend chart reads exclusively from here. Snapshots are written automatically inside the upload commit transaction.
+
+| Column | Type | Notes |
+|---|---|---|
+| `snapshot_month` | TEXT | `YYYY-MM` |
+| `vertical` | TEXT | Vertical code or team name (legacy) |
+| `total_devices` / `compliant` / `non_compliant` | INTEGER | Counts at month end |
+| `compliance_pct` | NUMERIC(5,2) | Pre-computed for that month |
+
+> The `(snapshot_month, vertical)` pair is `UNIQUE`. Re-uploading inside the same calendar month overwrites the row via `ON CONFLICT DO UPDATE`.
+
+### vcl_multi_vertical_summary
+
+One row per `(metric_id, team)` pair per upload, populated from the Summary sheet of a multi-vertical xlsx. This is the **source of truth for compliant counts** — `compliance_items` only has non-compliant rows.
+
+| Column | Type | Notes |
+|---|---|---|
+| `upload_id` | INTEGER | FK → `compliance_uploads` |
+| `vertical` | TEXT | Vertical code |
+| `metric_id` | TEXT | Metric identifier |
+| `team` | TEXT | Either an `ALL: <vertical>` rollup row or a sub-team row (`STEAM`, `ACCESS-ENG`) |
+| `non_compliant` / `compliant` / `total` | INTEGER | From the Summary sheet |
+| `compliance_pct` | NUMERIC(5,2) | From the Summary sheet (decimal — `0.95` = 95%) |
+| `target` | NUMERIC(5,2) | Per-metric target from the spreadsheet |
+
+> **Critical aggregation rule:** rows where `team LIKE 'ALL:%'` are vertical-level rollups that already include their sub-teams. **Aggregating both rollup and sub-team rows would double-count.** Every cross-vertical query in this codebase filters with `WHERE team LIKE 'ALL:%'`.
+
+---
+
+## VCL Report Page (Single-Vertical / Legacy AEO)
+
+This is the original VCL Report at `/api/compliance/vcl/...`. It aggregates across whatever data exists in `compliance_items` regardless of vertical, and is primarily used for the AEO single-team view.
+
+Source: `backend/routes/compliance.js` (`router.get('/vcl/stats', ...)` and `router.get('/vcl/trend', ...)`)
+
+### Stats Bar
+
+**What it shows:** Total Devices, In-Scope, Compliant, Non-Compliant, Remediations Required, Current %, Target %.
+
+**What feeds it:** `compliance_items` — every distinct hostname.
+
+**How it is calculated:**
+
+```sql
+SELECT
+    COUNT(DISTINCT hostname) AS total_devices,
+    COUNT(DISTINCT hostname) AS in_scope,
+    COUNT(DISTINCT CASE
+        WHEN hostname NOT IN (SELECT DISTINCT hostname FROM compliance_items WHERE status = 'active')
+        THEN hostname END) AS compliant,
+    COUNT(DISTINCT CASE
+        WHEN hostname IN (SELECT DISTINCT hostname FROM compliance_items WHERE status = 'active')
+        THEN hostname END) AS non_compliant
+FROM compliance_items;
+```
+
+Then in JavaScript:
+
+```javascript
+compliance_pct = in_scope > 0 ? Math.round((compliant / in_scope) * 100) : 0
+remediations_required = non_compliant
+target_pct = process.env.VCL_TARGET_PCT || 95
+```
+
+**Field-by-field:**
+
+| Field | Definition |
+|---|---|
+| Total Devices | Count of unique hostnames that have ever appeared in any upload |
+| In-Scope | Same as Total Devices — every tracked device is in-scope by definition |
+| Compliant | Hostnames with **zero** rows where `status = 'active'` |
+| Non-Compliant | Hostnames with **at least one** row where `status = 'active'` |
+| Remediations Required | Equals Non-Compliant — every non-compliant device needs at least one fix |
+| Current % | `ROUND((Compliant / In-Scope) * 100)` — whole-number percent |
+| Target % | `VCL_TARGET_PCT` env var on the backend, default 95 |
+
+**Why it can drift:**
+
+- If a hostname has both an `active` row in one vertical and a `resolved` row in another, the `IN`/`NOT IN` subqueries above already classify correctly — `active` wins because the `IN` subquery includes any active row.
+- Compliant devices are inferred. If `compliance_items` is missing rows that the Summary sheet reported (e.g., truncated upload), the count silently undercounts.
+
+### Donut Chart — Status of Non-Compliant Assets
+
+**What it shows:** Two slices — Blocked (red) and In-Progress (amber) — with counts and percentages.
+
+**What feeds it:** `compliance_items` rows where `status = 'active'`, deduplicated to one row per hostname using `MAX(resolution_date)`.
+
+**How it is calculated:**
+
+```sql
+SELECT hostname, MAX(resolution_date) AS resolution_date
+FROM compliance_items
+WHERE status = 'active'
+GROUP BY hostname;
+```
+
+Then `categorizeNonCompliant()` partitions:
+
+```javascript
+blocked    = items.filter(i => i.resolution_date == null)
+in_progress = items.filter(i => i.resolution_date != null)
+blocked.pct     = Math.round((blocked.count    / total) * 100)
+in_progress.pct = Math.round((in_progress.count / total) * 100)
+```
+
+> A device with **any** resolution date set on **any** of its active findings is considered In-Progress. Only when every active finding lacks a date is the device counted as Blocked.
+
+**Why it can drift:**
+
+- The `MAX(resolution_date)` clause means a device with one dated finding and one undated finding is classified as In-Progress, not Blocked. This is intentional — once one team commits to a date, the device is no longer fully blocked.
+- Rounding to whole numbers means `blocked.pct + in_progress.pct` may total 99 or 101 in edge cases. The chart still displays the correct underlying counts.
+
+### Heavy Hitters Table
+
+**What it shows:** One row per team, sorted by non-compliant device count descending. Columns: Vertical/Team, Non-Compliant, Compliance Date, Notes.
+
+**What feeds it:** `compliance_items` deduplicated to one team per hostname, plus `vcl_vertical_metadata` for manual fields (Notes, Compliance Date, RAs).
+
+**How it is calculated:**
+
+```sql
+WITH device_team AS (
+    SELECT DISTINCT ON (hostname)
+           hostname,
+           COALESCE(team, 'Unknown') AS team,
+           resolution_date
+    FROM compliance_items
+    WHERE status = 'active'
+    ORDER BY hostname, seen_count DESC, upload_id DESC
+)
+SELECT team,
+       COUNT(DISTINCT hostname)::int AS non_compliant,
+       MAX(resolution_date) AS compliance_date
+FROM device_team
+GROUP BY team
+ORDER BY COUNT(DISTINCT hostname) DESC;
+```
+
+The CTE picks one representative row per hostname using the `(seen_count DESC, upload_id DESC)` rule — the longest-running, most recently seen team assignment wins. This guarantees `SUM(heavy_hitters[*].non_compliant) == stats.non_compliant`.
+
+**Why it can drift:**
+
+- Before the fix tracked under spec `compliance-duplicate-failing-metrics`, a hostname that appeared with different `team` values across verticals was double-counted. The CTE above is the fix — confirmed by Property 3 of that spec.
+- `compliance_date` here is the latest resolution date across the team's devices, used as a default. The team's manually entered Compliance Date in `vcl_vertical_metadata` overrides it when present.
+
+### Vertical Breakdown Table
+
+**What it shows:** Same teams as Heavy Hitters, plus per-team Compliance %, Forecast Burndown columns, Blockers count, RAs, Notes.
+
+**What feeds it:**
+- Per-team total devices: same `device_team` CTE as Heavy Hitters but without the `status = 'active'` filter.
+- Forecast: `compliance_items` with non-null `resolution_date`.
+- Manual fields: `vcl_vertical_metadata`.
+
+**How it is calculated (per team):**
+
+```sql
+-- Total devices for the team
+WITH device_team AS (
+    SELECT DISTINCT ON (hostname)
+           hostname,
+           COALESCE(team, 'Unknown') AS team
+    FROM compliance_items
+    ORDER BY hostname, seen_count DESC, upload_id DESC
+)
+SELECT COUNT(*)::int AS total FROM device_team WHERE team = $1;
+
+-- Forecast resolution dates for the team
+SELECT DISTINCT ON (hostname, metric_id) resolution_date
+FROM compliance_items
+WHERE status = 'active'
+  AND COALESCE(team, 'Unknown') = $1
+  AND resolution_date IS NOT NULL
+ORDER BY hostname, metric_id, seen_count DESC, upload_id DESC;
+```
+
+In JavaScript:
+
+```javascript
+team_compliant     = team_total - team_non_compliant
+compliance_pct     = team_total > 0 ? Math.round((team_compliant / team_total) * 100) : 0
+forecast_burndown  = computeForecastBurndown(forecastItems)   // YYYY-MM → count
+blockers           = Math.max(team_non_compliant - forecastItems.length, 0)
+```
+
+`computeForecastBurndown` buckets each device's resolution date into a `YYYY-MM` key. The result is `{ "2026-06": 12, "2026-07": 8, ... }` — the count of devices expected to resolve each month.
+
+**Why it can drift:**
+
+- The `DISTINCT ON (hostname, metric_id)` in the forecast query was added by the duplicate-failing-metrics fix. Without it, a device failing the same metric in two verticals would have its resolution date counted twice and `blockers` would go negative (the `Math.max` clamp protects the UI but masks the inconsistency).
+- The team total uses **all rows** in `compliance_items` (active and resolved), so a team's `total` here is "every device that has ever been part of this team," not just current devices.
+
+### Compliance Trend Chart
+
+**What it shows:** Bar chart of compliant device count per month, plus a solid line (actual %) and a dashed line (forecasted %) on a secondary axis. A horizontal reference line marks the target.
+
+**What feeds it:** `compliance_snapshots`, aggregated across all verticals.
+
+**How it is calculated:**
+
+```sql
+SELECT snapshot_month,
+       SUM(compliant)::int AS compliant_count,
+       CASE WHEN SUM(total_devices) > 0
+            THEN ROUND((SUM(compliant)::numeric / SUM(total_devices)::numeric) * 100, 1)
+            ELSE 0 END AS compliance_pct
+FROM compliance_snapshots
+GROUP BY snapshot_month
+ORDER BY snapshot_month ASC;
+```
+
+The forecast logic is described in [Linear Regression Forecast](#linear-regression-forecast-trend). Snapshots are persisted in `persistUpload()` using the upload's `report_date` month so historical uploads land in the correct bucket. See [Cross-Cutting Correctness Rules](#cross-cutting-correctness-rules) for the snapshot upsert behavior.
+
+**Why it can drift:**
+
+- Snapshots are keyed `(snapshot_month, vertical)`, so re-uploading the same month overwrites — only the latest upload's totals are preserved per month.
+- Pre-fix snapshots from before the duplicate-failing-metrics correction may have `compliant + non_compliant > total_devices` if a hostname had both active and resolved rows across verticals. The fix uses `MIN(status)` inside a CTE so each hostname is classified once. Older snapshots written before the fix should be regenerated by re-running the affected uploads.
+
+---
+
+## CCP Metrics Page (Multi-Vertical)
+
+The CCP Metrics page is the executive cross-vertical view. It uses the multi-vertical Summary sheet data as the source of truth for totals (since `compliance_items` only contains non-compliant devices).
+
+Source: `backend/routes/vclMultiVertical.js`. Mounted at `/api/compliance/vcl-multi/...`.
+
+### Aggregated Stats Bar
+
+**What it shows:** Total Devices, Compliant, Non-Compliant, Current %, Target % across **every** vertical's latest upload.
+
+**What feeds it:** `vcl_multi_vertical_summary` filtered to ALL: rollup rows of the latest upload per vertical.
+
+**How it is calculated:**
+
+```sql
+-- 1. Find the latest upload ID per vertical
+SELECT DISTINCT ON (vertical) id, vertical
+FROM compliance_uploads
+WHERE vertical IS NOT NULL
+ORDER BY vertical, id DESC;
+
+-- 2. Sum totals from rollup rows only (avoids double-counting sub-teams)
+SELECT vertical,
+       SUM(total)::int AS total_devices,
+       SUM(compliant)::int AS compliant,
+       SUM(non_compliant)::int AS non_compliant
+FROM vcl_multi_vertical_summary
+WHERE upload_id = ANY($1) AND team LIKE 'ALL:%'
+GROUP BY vertical;
+```
+
+In JavaScript:
+
+```javascript
+agg_total         = SUM(vertical.total_devices for each vertical)
+agg_compliant     = SUM(vertical.compliant     for each vertical)
+agg_non_compliant = SUM(vertical.non_compliant for each vertical)
+compliance_pct    = agg_total > 0 ? Math.round((agg_compliant / agg_total) * 100) : 0
+```
+
+> **The `team LIKE 'ALL:%'` filter is the most important rule on this page.** Each Summary sheet contains one rollup row per metric (`ALL: NTS-AEO`) plus one row per sub-team (`STEAM`, `ACCESS-ENG`). Summing both rollup and sub-team rows would double the totals. Every cross-vertical query enforces this filter.
+
+**Why it can drift:**
+
+- If a Summary sheet ever omits the `ALL:` rollup row for a metric, that metric's totals will be missing from the aggregate. The Python parser does not fabricate rollup rows, so this is a function of what the upstream xlsx contains.
+- Verticals with no rows in `vcl_multi_vertical_summary` (e.g., the legacy AEO data) do not contribute. Their data is visible only on the original VCL Report, not the CCP Metrics page.
+
+### Donut — Blocked vs In-Progress
+
+**What it shows:** Same as the legacy donut, scoped to multi-vertical data.
+
+**What feeds it:** `compliance_items` where `vertical IS NOT NULL`, deduplicated by hostname.
+
+**How it is calculated:** Identical formula to the [legacy donut](#donut-chart--status-of-non-compliant-assets), but the filter is `WHERE vertical IS NOT NULL AND status = 'active'`.
+
+```sql
+SELECT hostname, MAX(resolution_date) AS resolution_date
+FROM compliance_items
+WHERE vertical IS NOT NULL AND status = 'active'
+GROUP BY hostname;
+```
+
+### Trend Chart
+
+**What it shows:** Cross-vertical monthly trend of compliant device count and compliance percentage with a 3-month forecast.
+
+**What feeds it:** `compliance_snapshots` where `vertical IS NOT NULL AND vertical != ''`.
+
+**How it is calculated:**
+
+```sql
+SELECT snapshot_month,
+       SUM(total_devices)::int AS total_devices,
+       SUM(compliant)::int     AS compliant,
+       SUM(non_compliant)::int AS non_compliant
+FROM compliance_snapshots
+WHERE vertical IS NOT NULL AND vertical != ''
+GROUP BY snapshot_month
+ORDER BY snapshot_month ASC;
+```
+
+Each row's `compliance_pct` is `ROUND((compliant / total_devices) * 100, 1)` — one decimal place. The forecast then uses the [Linear Regression Forecast](#linear-regression-forecast-trend) logic.
+
+### Aggregated Burndown Forecast
+
+**What it shows:** A bar chart of expected device remediations per month across all verticals, plus stat cards for In-Progress, Blockers, and Projected Clear date.
+
+**What feeds it:** `compliance_items` where `vertical IS NOT NULL AND status = 'active'`.
+
+**How it is calculated:**
+
+```sql
+SELECT hostname, resolution_date, vertical
+FROM compliance_items
+WHERE vertical IS NOT NULL AND status = 'active';
+```
+
+Then the rows pass through two pure helpers:
+
+1. `deduplicateByHostname(rows)` — collapses each hostname to one entry, keeping the **earliest non-null** `resolution_date`. A device that fails three metrics with different planned dates is bucketed by its earliest commitment.
+
+2. `computeAggregatedBurndown(devices)` — computes:
+
+   ```javascript
+   total       = devices.length
+   blockers    = devices.filter(d => d.resolution_date == null).length
+   with_dates  = total - blockers
+   monthly[m]  = count of devices whose resolution_date falls in month m   // YYYY-MM
+   projection[m] = { remediated: monthly[m], remaining: running_remainder }
+   projected_clear_date = (blockers === 0 && monthly is non-empty)
+       ? last_month_in_monthly_keys
+       : null
+   ```
+
+> Projected Clear is **only computed when `blockers === 0`**. Any device without a resolution date prevents the projection from showing — the dashboard is honest about the fact that an open-ended commitment cannot be projected.
+
+**Why it can drift:**
+
+- Devices with multiple `compliance_items` rows (one per failing metric) are deduplicated by hostname before bucketing. Without deduplication, a device with three failing metrics and one resolution date would count three times.
+- A resolution date in the **past** still buckets into its actual month — `computeAggregatedBurndown` does not roll past-due dates forward. The per-metric chart does roll them forward; see [Per-Metric Forecast](#per-metric-forecast-historical--projected) for that distinction.
+
+### Metric Table (Cross-Vertical)
+
+**What it shows:** One row per metric, with non-compliant, compliant, total, compliance %, and target % aggregated across **every** vertical's latest upload. Sorted by non-compliant descending.
+
+**What feeds it:** `vcl_multi_vertical_summary` rollup rows from the latest upload per vertical.
+
+**How it is calculated:**
+
+```sql
+SELECT metric_id,
+       MAX(metric_desc) AS metric_desc,
+       MAX(category)    AS category,
+       SUM(non_compliant)::int   AS non_compliant,
+       SUM(compliant)::int       AS compliant,
+       SUM(total)::int           AS total,
+       ROUND(AVG(target::numeric), 4) AS target
+FROM vcl_multi_vertical_summary
+WHERE upload_id = ANY($1) AND team LIKE 'ALL:%'
+GROUP BY metric_id
+ORDER BY non_compliant DESC;
+```
+
+Then for each row:
+
+```javascript
+compliance_pct = total > 0 ? compliant / total : 0   // stored as decimal
+```
+
+The frontend renders the percentage with one decimal: `(compliance_pct * 100).toFixed(1) + '%'`.
+
+> **`target` is the arithmetic mean across verticals**, not the worst or best. If two verticals report a target of 0.90 and 0.95 for the same metric, the cross-vertical target is 0.925. This is a deliberate choice — the page shows a fleet-wide composite target, not the strictest individual one.
+
+**Why it can drift:**
+
+- `MAX(metric_desc)` and `MAX(category)` rely on every Summary sheet using the same description for the same `metric_id`. If two verticals describe the same metric differently, the alphabetically-last description wins.
+
+### Metric Detail View — Per-Vertical Breakdown
+
+**What it shows:** For a selected metric, one row per vertical with that metric's numbers, plus a `sub_teams` array per vertical.
+
+**What feeds it:** `vcl_multi_vertical_summary` for the selected metric, latest upload per vertical, both rollup and sub-team rows.
+
+**How it is calculated:**
+
+```sql
+SELECT vertical, metric_desc, category, team,
+       non_compliant, compliant, total, compliance_pct, target
+FROM vcl_multi_vertical_summary
+WHERE upload_id = ANY($1) AND metric_id = $2
+ORDER BY vertical, team;
+```
+
+The handler then separates rollup rows (`team LIKE 'ALL:%'`) from sub-team rows in JavaScript:
+
+- The rollup row for each vertical becomes the primary entry.
+- Each sub-team row is attached to its vertical's `sub_teams` array.
+- Rows where `team = '(Other)'` are skipped — they are catch-all rows already counted in the rollup.
+
+`compliance_pct` is read directly from the table (already a decimal — `0.95` = 95%).
+
+**Why it can drift:**
+
+- A sub-team named `(Other)` is used by the spreadsheet for unassignable devices — it is intentionally excluded from the sub-team breakdown to avoid duplication.
+- The vertical-level `compliance_pct` is what was in the Summary sheet at upload time. It is not recomputed from `compliant / total`. If those numbers ever disagree (Summary rounded differently), the table shows the spreadsheet's number.
+
+### Per-Metric Forecast Burndown Chart
+
+**What it shows:** A combined chart with up to 4 historical monthly snapshots (left of the divider) and up to 12 forecast months (right of the divider). Each data point shows total assets, non-compliant count, and compliance %.
+
+**What feeds it:** Three sources combined:
+1. `compliance_snapshots` for historical totals (3 months back).
+2. `vcl_multi_vertical_summary` for the metric's `total` (used as `total_assets`).
+3. `compliance_items` for current devices and their resolution dates.
+
+**How it is calculated:**
+
+```sql
+-- Active devices for this metric across every vertical it spans
+SELECT hostname, resolution_date, vertical
+FROM compliance_items
+WHERE metric_id = $1 AND status = 'active' AND vertical IS NOT NULL;
+
+-- Historical snapshots for those verticals (3 months back)
+SELECT snapshot_month AS month,
+       SUM(total_devices)::int AS total_assets,
+       SUM(non_compliant)::int AS non_compliant,
+       ROUND((SUM(compliant)::numeric / NULLIF(SUM(total_devices), 0)) * 100, 1) AS compliance_pct
+FROM compliance_snapshots
+WHERE vertical = ANY($1) AND snapshot_month >= $2 AND snapshot_month < $3
+GROUP BY snapshot_month
+ORDER BY snapshot_month ASC;
+
+-- The metric's per-metric total assets (from latest summary)
+SELECT SUM(total)::int AS total
+FROM vcl_multi_vertical_summary
+WHERE metric_id = $1 AND team LIKE 'ALL:%'
+  AND upload_id IN (
+    SELECT id FROM compliance_uploads
+    WHERE vertical IS NOT NULL
+    ORDER BY id DESC LIMIT 20
+  );
+```
+
+#### Historical Computation — Ratio Method
+
+The `compliance_snapshots` table stores **vertical-level** totals, not per-metric. To estimate this metric's historical non-compliant count for a past month, the handler uses a ratio:
+
+```javascript
+metric_nc_for_month = ROUND(
+    snapshot.non_compliant_for_vertical * (current_metric_nc / current_vertical_total_nc)
+)
+```
+
+In words: "the metric's share of the vertical's current non-compliant load is assumed constant — apply that ratio to historical snapshot non-compliant counts."
+
+> The ratio method is an approximation. It assumes the metric's contribution to the vertical's non-compliance is steady over the last three months. If the metric load shifts dramatically month-to-month, the historical bars will not match the actual past.
+
+The current month is **always** computed from live data (not the ratio):
+
+```javascript
+current_month_nc = number of distinct active hostnames for this metric
+current_compliance_pct = ROUND((total_assets - current_month_nc) / total_assets * 1000) / 10   // 1 decimal
+```
+
+#### Forecast Computation — Resolution Date Bucketing
+
+Forward projections are handled by `computeMetricForecastBurndown`. The algorithm:
+
+1. Partition active devices into `blockers` (no resolution date) and `with_dates`.
+2. Bucket each dated device by its `resolution_date` month (`YYYY-MM`).
+3. **Past-due dates roll into the current month.** A device whose date is March when today is May counts as remediating in May, not March.
+4. Walk forward up to 12 months, decrementing `remaining_non_compliant` by each month's bucket.
+5. Stop early if `remaining_non_compliant <= blockers` — meaning every device with a date is projected to be done and only blockers remain.
+
+The compliance percentage at each forecast point is:
+
+```javascript
+compliance_pct = ROUND((total_assets - remaining_non_compliant) / total_assets * 1000) / 10
+```
+
+#### Correctness Properties of the Forecast
+
+These properties hold for any input (verified by property-based tests in `backend/__tests__/compliance-duplicate-chart-entries.property.test.js` and the forecast spec):
+
+1. **Partition invariant:** `blockers + with_dates == non_compliant`.
+2. **Compliance formula:** `compliance_pct == ROUND((total - nc) / total * 1000) / 10` (or 0 when total is 0).
+3. **Monotonic non-increasing:** each month's `non_compliant` is less than or equal to the previous month's.
+4. **Horizon bound:** at most 12 forecast points; terminates early when only blockers remain.
+5. **Past-due treated as current month:** dates in already-passed months are bucketed into the current month for projection purposes.
+
+**Why it can drift:**
+
+- The ratio method for historical data is an estimate. Verify by hand using the actual upload's Summary sheet for that month if precise historical numbers matter.
+- The fallback `totalAssets = metricNcCount` triggers when no Summary data exists for the metric. This produces a `compliance_pct` of 0 because every "asset" is non-compliant. This is correct for the data we have — the chart cannot show compliance percentages for metrics that have only been observed as failures.
+
+### Per-Vertical Detail and Burndown
+
+**What it shows:** Stats and burndown for a single vertical (e.g., NTS_AEO).
+
+**What feeds it:**
+- Stats: `vcl_multi_vertical_summary` for that vertical, latest upload, with sub-team breakouts.
+- Burndown: `compliance_items` for that vertical, deduplicated by hostname.
+
+**How it is calculated:**
+
+The vertical-level burndown deduplicates per hostname using the **first non-null** resolution date (any one is enough to mark the device In-Progress):
+
+```javascript
+// In the route handler, after fetching compliance_items for the vertical:
+const deviceMap = {};
+for (const row of rows) {
+    if (!deviceMap[row.hostname]) {
+        deviceMap[row.hostname] = { hostname: row.hostname, resolution_date: row.resolution_date };
+    } else if (row.resolution_date && !deviceMap[row.hostname].resolution_date) {
+        // Promote a null entry to In-Progress when any other row has a date
+        deviceMap[row.hostname].resolution_date = row.resolution_date;
+    }
+}
+const devices = Object.values(deviceMap);
+const burndown = computeVerticalBurndown(devices);
+```
+
+`computeVerticalBurndown` returns the same shape as `computeAggregatedBurndown` but scoped to one vertical.
+
+---
+
+## Forecast Algorithms
+
+The dashboard uses three different forecasting approaches depending on the data being projected.
+
+### Linear Regression Forecast (Trend)
+
+**Used by:** Trend chart on the VCL Report and CCP Metrics pages.
+
+**Inputs:** Monthly compliance percentages from `compliance_snapshots` (one decimal place).
+
+**Algorithm:** Least-squares linear regression on the time series.
+
+```javascript
+// X = month index (0, 1, 2, ...), Y = compliance_pct
+slope     = (n * SUM(X*Y) - SUM(X) * SUM(Y)) / (n * SUM(X^2) - SUM(X)^2)
+intercept = (SUM(Y) - slope * SUM(X)) / n
+```
+
+For each future month `i` (1, 2, 3 — three months out):
+
+```javascript
+forecast_pct = ROUND((slope * (n + i - 1) + intercept) * 10) / 10
+forecast_pct = Math.min(100, Math.max(0, forecast_pct))   // clamp to [0, 100]
+```
+
+**Activation:** Forecast appears only when **3 or more** historical months exist. With fewer points, the regression is unreliable, so the dashed line is omitted.
+
+**Why it works for compliance trends:** Compliance is bounded [0, 100] and changes slowly across months. A linear fit captures the directional trajectory ("we're trending up two points per month") accurately enough to inform planning, though it can over-predict near the boundaries (the clamp prevents impossible values).
+
+### Resolution-Date Burndown Forecast
+
+**Used by:** Aggregated burndown, per-vertical burndown, the deprecated team-level forecast in the legacy VCL Report.
+
+**Inputs:** Active non-compliant devices and their `resolution_date` values.
+
+**Algorithm:** Simple monthly bucketing — no math beyond grouping and counting.
+
+```javascript
+buckets = {}                                  // YYYY-MM → count
+for each device with a non-null resolution_date:
+    month = first 7 chars of resolution_date  // 'YYYY-MM-DD' → 'YYYY-MM'
+    buckets[month] += 1
+
+remaining = total_with_dates
+projection = {}
+for each month (sorted ascending):
+    remaining -= buckets[month]
+    projection[month] = { remediated: buckets[month], remaining }
+```
+
+**Projected Clear date:** the last month in `projection` **only if** `blockers === 0`. If any device lacks a date, no projection is shown — there is no honest way to forecast something with no commitment.
+
+**Why this is preferred over regression for burndown:** Resolution dates are explicit human commitments. Linear regression on past remediation rates would project an average pace that ignores what teams have actually committed to. The bucketing approach reports exactly what has been promised and nothing more.
+
+### Per-Metric Forecast (Historical + Projected)
+
+**Used by:** The CCP Metrics per-metric forecast burndown chart.
+
+**Inputs:** Historical snapshots (vertical-level) + current metric devices (per-metric) + the metric's `total_assets` from the Summary sheet.
+
+**Algorithm:** Two separate parts joined at the current month.
+
+**Historical part — Ratio Method:**
+
+```javascript
+// For each historical month from compliance_snapshots:
+metric_share        = current_metric_nc / current_vertical_total_nc
+month.non_compliant = ROUND(snapshot.non_compliant * metric_share)
+month.compliance_pct = ROUND((total_assets - month.non_compliant) / total_assets * 1000) / 10
+```
+
+> The ratio method assumes the metric's share of vertical non-compliance is stable. If a metric was recently introduced or recently fixed at scale, the historical bars will be off. Validate against the source Summary sheet for that month if you need precision.
+
+**Forecast part — Resolution-Date Bucketing:**
+
+Identical to [Resolution-Date Burndown Forecast](#resolution-date-burndown-forecast), with one extra rule: **past-due dates roll into the current month**. A device with `resolution_date = '2026-02-15'` when today is May is bucketed into May, not February. Empirically, past-due dates are commitments that slipped — projecting them as remediating "now" reflects reality (the team is overdue and has to act this month) better than leaving them stuck in the past.
+
+**Termination:** the loop exits as soon as `remaining_non_compliant <= blockers`. Once every dated device is projected to be done, continuing would just show flat blocker count.
+
+---
+
+## Cross-Cutting Correctness Rules
+
+These rules apply across every metric on both pages. Violations indicate a real bug — the dashboard's tests verify these properties hold.
+
+**Rule 1: Rollup-only aggregation across verticals.**
+Every cross-vertical query that touches `vcl_multi_vertical_summary` filters with `WHERE team LIKE 'ALL:%'`. Aggregating both rollup rows and sub-team rows would double-count. (Validated by the `ccp-metrics-view-restructure` spec, Property 1.)
+
+**Rule 2: Latest upload per vertical.**
+Cross-vertical queries select `DISTINCT ON (vertical)` from `compliance_uploads ORDER BY vertical, id DESC` to take only the most recent upload per vertical. Older uploads contribute to `compliance_snapshots` but not to current totals.
+
+**Rule 3: Snapshot deduplication.**
+`compliance_snapshots` is keyed `UNIQUE(snapshot_month, vertical)` and updated via `ON CONFLICT DO UPDATE`. Re-uploading the same month for a vertical overwrites the earlier snapshot. Snapshots are upserted using the upload's `report_date` month, not the current calendar month, so a backfilled upload for March lands in `2026-03` even if it is uploaded in May.
+
+**Rule 4: Status classification on duplicate hostnames.**
+When a hostname has rows in multiple verticals (one active, one resolved), the snapshot logic uses `MIN(status)` inside a CTE — `'active'` lexicographically wins over `'resolved'`, so the device is classified as non-compliant. This guarantees `compliant + non_compliant <= total_devices` for every snapshot row.
+
+**Rule 5: Per-(hostname, metric_id) deduplication.**
+Queries that bucket or count active findings use `DISTINCT ON (hostname, metric_id)` with the canonical `ORDER BY hostname, metric_id, seen_count DESC, upload_id DESC`. A device failing the same metric in two verticals contributes one entry, not two. (Validated by the `compliance-duplicate-failing-metrics` spec, Properties 1–5.)
+
+**Rule 6: Aggregation by `report_date`, not upload ID.**
+Trends, top-recurring, and category-trend queries `GROUP BY report_date` rather than `GROUP BY id`. A multi-vertical day produces multiple `compliance_uploads` rows sharing one `report_date`. (Validated by the `compliance-duplicate-chart-entries` spec, Properties 1–3.)
+
+**Rule 7: Decimal vs whole-number percentages.**
+Two conventions coexist:
+
+| Source | Format | Example |
+|---|---|---|
+| `vcl_multi_vertical_summary.compliance_pct` | Decimal | `0.95` |
+| `compliance_snapshots.compliance_pct` | Whole-number | `95.00` |
+| `/vcl/stats` response `stats.compliance_pct` | Whole-number integer | `95` |
+| `/vcl-multi/stats` response `stats.compliance_pct` | Whole-number integer | `95` |
+| `/vcl-multi/metrics` response `compliance_pct` | Decimal | `0.95` |
+
+The frontend handles both — multiply decimals by 100 and call `toFixed(1)` for the metric-table view, or display the whole number directly for stats bars. Mismatching the formats is a common source of "values look 100x off" bugs.
+
+---
+
+## Verifying Values by Hand
+
+When you suspect a number is wrong, work through this checklist before opening a bug.
+
+**1. Check whether the value comes from `compliance_items` or `vcl_multi_vertical_summary`.**
+
+- `compliance_items` only has non-compliant rows. If a "compliant count" is wrong, the bug is in the Summary sheet path, not item counting.
+- `vcl_multi_vertical_summary` is the source of truth for both compliant and non-compliant totals on the CCP Metrics page.
+
+**2. Check the upload date.**
+
+- Cross-vertical numbers use the **latest upload per vertical**. If you uploaded NTS_AEO yesterday but TSI two weeks ago, the aggregate uses today's NTS_AEO and the two-week-old TSI.
+- The "Last Upload" column in the vertical breakdown shows the `report_date` of each vertical's most recent upload.
+
+**3. Check the snapshot.**
+
+- The trend chart reads from `compliance_snapshots`, not from current `compliance_items`. If you fixed a hostname today, it will not appear in the trend until the next upload writes a new snapshot.
+- Historical months are frozen — only the current month's snapshot updates on re-upload.
+
+**4. Check for ALL: rollup vs sub-team aggregation.**
+
+- If a vertical or cross-vertical total looks roughly 2x too high, you are probably summing rollup AND sub-team rows. Confirm with:
+
+  ```sql
+  SELECT team, COUNT(*) FROM vcl_multi_vertical_summary
+  WHERE upload_id = <latest> AND metric_id = '<metric>'
+  GROUP BY team;
+  ```
+
+  You should see one `ALL: <vertical>` row plus one row per sub-team. Use only the `ALL:` row for cross-vertical totals.
+
+**5. Check for cross-vertical hostname collisions.**
+
+- A hostname appearing in two verticals (e.g., it was migrated between teams) needs the deduplication rules in [Cross-Cutting Correctness Rules](#cross-cutting-correctness-rules) to count once. Confirm with:
+
+  ```sql
+  SELECT hostname, vertical, team, status, seen_count
+  FROM compliance_items
+  WHERE hostname = '<hostname>'
+  ORDER BY hostname, vertical;
+  ```
+
+  If you see two rows with different `team` values, the device is counted under the team from its representative row (highest `seen_count`, then most recent `upload_id`).
+
+**6. Reconcile against the Summary sheet.**
+
+- Open the source xlsx for the upload, navigate to the Summary tab, and find the `ALL: <vertical>` row for the metric in question. The `Total`, `Compliant`, and `Non-Compliant` columns should match `vcl_multi_vertical_summary` exactly (the parser does not transform these numbers — it copies them verbatim).
+
+If after these steps the displayed value still does not match the source data, file an issue with the SQL output from steps 4–5 and the relevant Summary sheet rows attached.
+
+---
+
+## Worked Example — Vulns_Aging vs 7.1.1 Forecast Charts
+
+This example walks the playbook through two side-by-side per-metric forecast burndown charts that look very different despite using the same code path. It is the canonical case study for "the chart looks weird but the data is internally consistent."
+
+### What the charts show
+
+**Vulns_Aging — 17,628 devices.** Every bar is full-height, predominantly orange. The compliance line reads `0.1%` for March, jumps to `27.3%` in April, then back to `0.0%` for May. The total bar height is `17628` on every month.
+
+**7.1.1 — 6,149 non-compliant out of ~66,674 total.** Every bar is mostly blue (compliant) with a thin orange slice at the top. The compliance line stays between `90.8%` and `93.3%`. The total bar height is `66674` on every month.
+
+Both charts are produced by the same endpoint (`GET /api/compliance/vcl-multi/metric/:metricId/forecast-burndown`) and the same helper (`computeMetricForecastBurndown`). The difference is entirely in the input data.
+
+### Walking the playbook
+
+**Step 1 — Where does the value come from?**
+
+Both charts blend two sources: `compliance_items` for active non-compliant devices, and `vcl_multi_vertical_summary` for the metric's `total_assets`. The historical bars also use `compliance_snapshots` (vertical-level totals) reshaped via the ratio method.
+
+The differing input here is `total_assets`, sourced from this query:
+
+```sql
+SELECT SUM(total)::int AS total
+FROM vcl_multi_vertical_summary
+WHERE metric_id = $1 AND team LIKE 'ALL:%'
+  AND upload_id IN (
+      SELECT id FROM compliance_uploads
+      WHERE vertical IS NOT NULL ORDER BY id DESC LIMIT 20
+  );
+```
+
+For `7.1.1` this returns ~66,674. For `Vulns_Aging` it returns 0 or null, and the route handler falls back to `totalAssets = metricNcCount` — the device count from `compliance_items` instead.
+
+**Step 2 — Check the upload date.**
+
+Both metrics are read from the latest 20 uploads, so this is not the cause of the difference. Skip.
+
+**Step 3 — Check the snapshot.**
+
+`compliance_snapshots` is vertical-level only — it does not store per-metric totals. Both metrics use the same snapshot rows scaled by the ratio method:
+
+```javascript
+metricNc = ROUND(snapshot.non_compliant * (currentMetricNc / currentVerticalTotalNc))
+```
+
+For `Vulns_Aging` the ratio is large (most of the vertical's non-compliant load is aging vulnerabilities), so historical `metricNc` values are sizeable. April happened to have a snapshot where the vertical's total was smaller — the ratio method produced a metricNc of roughly `17628 * 0.727 ≈ 12810`, leaving `(17628 - 12810) / 17628 * 100 ≈ 27.3%` compliance for that bar.
+
+That April spike is not a real compliance gain. It is an artifact of the historical snapshot's vertical-level non-compliant count being lower that month, multiplied by the metric's current share.
+
+**Step 4 — ALL: rollup vs sub-team aggregation.**
+
+Run the diagnostic query for each metric:
+
+```sql
+SELECT team, total, compliant, non_compliant
+FROM vcl_multi_vertical_summary
+WHERE metric_id = '7.1.1' AND team LIKE 'ALL:%'
+ORDER BY upload_id DESC LIMIT 5;
+```
+
+For `7.1.1` this returns rows like `('ALL: NTS-AEO', 66674, 60525, 6149)` — a clean, complete rollup.
+
+```sql
+SELECT team, total, compliant, non_compliant
+FROM vcl_multi_vertical_summary
+WHERE metric_id = 'Vulns_Aging' AND team LIKE 'ALL:%'
+ORDER BY upload_id DESC LIMIT 5;
+```
+
+For `Vulns_Aging` this returns **zero rows**. The Summary sheet of the source xlsx does not contain `Vulns_Aging` as a tracked metric. The metric exists only as a detail sheet inside the workbook, never as a Summary row.
+
+**Step 5 — Cross-vertical hostname collisions.**
+
+Confirm the device counts come from `compliance_items`:
+
+```sql
+SELECT COUNT(DISTINCT hostname) FROM compliance_items
+WHERE metric_id = 'Vulns_Aging' AND status = 'active' AND vertical IS NOT NULL;
+-- Returns 17628
+```
+
+This matches the chart's `total_assets` exactly, which is the smoking gun. The chart is showing 17,628 in scope and 17,628 non-compliant — `compliance_pct = 0%` is mathematically correct for the data the chart received.
+
+**Step 6 — Reconcile against the Summary sheet.**
+
+Open any recent xlsx upload for any vertical and inspect the Summary tab. Search for `Vulns_Aging` in the `Metric` column — it is not there. The Summary sheet enumerates the standard metric IDs (`2.3.5`, `5.2.4`, `7.1.1`, etc.) and has no row for the aging vulnerability dashboard.
+
+Now search for `7.1.1` — it appears with rows for both the rollup (`ALL: NTS-AEO`) and each sub-team. The Summary's `Total`, `Compliant`, and `Non-Compliant` columns match `vcl_multi_vertical_summary` exactly.
+
+### Why the charts look the way they do
+
+**Vulns_Aging is a tracked-but-uncategorized detail metric.** The Python parser walks every detail sheet of the xlsx and writes one `compliance_items` row per non-compliant device, using the sheet name as the `metric_id`. `Vulns_Aging` is one such sheet. But because `Vulns_Aging` does not appear in the workbook's Summary sheet, no row is written to `vcl_multi_vertical_summary` — there is no rollup, no compliant count, no total population.
+
+When the per-metric forecast endpoint asks for the metric's `total`, the query returns null. The handler falls back to `totalAssets = metricNcCount`, which is the count of non-compliant devices. The chart's denominator is therefore identical to its numerator, which forces every "current" compliance percentage to 0%. The April 27.3% spike is the historical ratio method projecting a smaller non-compliant count for that month against the same fallback denominator. May returns to 0% because May is the current month and uses the live device count, which always equals the fallback total by construction.
+
+The chart is **internally consistent with the data the database has**. It is not internally consistent with what an executive expects "compliance" to mean for an aging dashboard, because the source xlsx never reported a population total for that detail. The fix is upstream — either the xlsx Summary sheet needs to include a `Vulns_Aging` row with a population total, or the handler needs a special case to mark metrics with no Summary data as "not measurable for compliance percentage" and render the chart differently (e.g., counts only, no percentage line).
+
+**7.1.1 is a fully populated standard metric.** It has a sheet for the failing devices, a `metric_categories` mapping (`Logging & Monitoring`), and a Summary row with `Total`, `Compliant`, and `Non-Compliant` numbers. The route gets a real `totalAssets` value (~66,674), the compliance percentage is `(66674 - 6149) / 66674 ≈ 90.8%`, and the bar visualizes the actual ratio of compliant to non-compliant devices. Historical and forecast bars track real population data, not a fallback.
+
+### What this tells you about the dashboard
+
+The forecast burndown chart is honest about what it knows. When the source data lacks a population total, the chart degrades gracefully to "every device in scope is non-compliant" — which is a literal reading of the rows that exist. It does not fabricate a denominator. The cost is that metrics without Summary entries look catastrophically non-compliant on the chart even when the underlying business reality may be different.
+
+The diagnostic flow above is the canonical procedure: when a chart looks wrong, walk down to the Summary sheet rows and ask whether the metric is even represented as a tracked compliance metric in the source file. If the answer is no, the chart is reflecting an upstream data shape, not a calculation bug.
+
+
+---
+
+## Worked Example — Vulns_Aging vs 7.1.1 Forecast Charts
+
+This example walks the playbook through two side-by-side per-metric forecast burndown charts that look very different despite using the same code path. It is the canonical case study for "the chart looks weird but the data is internally consistent."
+
+### What the charts show
+
+**Vulns_Aging — 17,628 devices.** Every bar is full-height, predominantly orange. The compliance line reads `0.1%` for March, jumps to `27.3%` in April, then back to `0.0%` for May. The total bar height is `17628` on every month.
+
+**7.1.1 — 6,149 non-compliant out of ~66,674 total.** Every bar is mostly blue (compliant) with a thin orange slice at the top. The compliance line stays between `90.8%` and `93.3%`. The total bar height is `66674` on every month.
+
+Both charts are produced by the same endpoint (`GET /api/compliance/vcl-multi/metric/:metricId/forecast-burndown`) and the same helper (`computeMetricForecastBurndown`). The difference is entirely in the input data.
+
+### Walking the playbook
+
+**Step 1 — Where does the value come from?**
+
+Both charts blend two sources: `compliance_items` for active non-compliant devices, and `vcl_multi_vertical_summary` for the metric's `total_assets`. The historical bars also use `compliance_snapshots` (vertical-level totals) reshaped via the ratio method.
+
+The differing input here is `total_assets`, sourced from this query:
+
+```sql
+SELECT SUM(total)::int AS total
+FROM vcl_multi_vertical_summary
+WHERE metric_id = $1 AND team LIKE 'ALL:%'
+  AND upload_id IN (
+      SELECT id FROM compliance_uploads
+      WHERE vertical IS NOT NULL ORDER BY id DESC LIMIT 20
+  );
+```
+
+For `7.1.1` this returns ~66,674. For `Vulns_Aging` it returns 0 or null, and the route handler falls back to `totalAssets = metricNcCount` — the device count from `compliance_items` instead.
+
+**Step 2 — Check the upload date.**
+
+Both metrics are read from the latest 20 uploads, so this is not the cause of the difference. Skip.
+
+**Step 3 — Check the snapshot.**
+
+`compliance_snapshots` is vertical-level only — it does not store per-metric totals. Both metrics use the same snapshot rows scaled by the ratio method:
+
+```javascript
+metricNc = ROUND(snapshot.non_compliant * (currentMetricNc / currentVerticalTotalNc))
+```
+
+For `Vulns_Aging` the ratio is large (most of the vertical's non-compliant load is aging vulnerabilities), so historical `metricNc` values are sizeable. April happened to have a snapshot where the vertical's total non-compliant count was lower — the ratio method produced a `metricNc` of roughly `17628 * 0.727 ≈ 12810`, leaving `(17628 - 12810) / 17628 * 100 ≈ 27.3%` compliance for that bar.
+
+That April spike is not a real compliance gain. It is an artifact of the historical snapshot's vertical-level non-compliant count being lower that month, multiplied by the metric's current share.
+
+**Step 4 — ALL: rollup vs sub-team aggregation.**
+
+Run the diagnostic query for each metric:
+
+```sql
+SELECT team, total, compliant, non_compliant
+FROM vcl_multi_vertical_summary
+WHERE metric_id = '7.1.1' AND team LIKE 'ALL:%'
+ORDER BY upload_id DESC LIMIT 5;
+```
+
+For `7.1.1` this returns rows like `('ALL: NTS-AEO', 66674, 60525, 6149)` — a clean, complete rollup.
+
+```sql
+SELECT team, total, compliant, non_compliant
+FROM vcl_multi_vertical_summary
+WHERE metric_id = 'Vulns_Aging' AND team LIKE 'ALL:%'
+ORDER BY upload_id DESC LIMIT 5;
+```
+
+For `Vulns_Aging` this returns **zero rows**. The Summary sheet of the source xlsx does not contain `Vulns_Aging` as a tracked metric. The metric exists only as a detail sheet inside the workbook, never as a Summary row.
+
+**Step 5 — Cross-vertical hostname collisions.**
+
+Confirm the device counts come from `compliance_items`:
+
+```sql
+SELECT COUNT(DISTINCT hostname) FROM compliance_items
+WHERE metric_id = 'Vulns_Aging' AND status = 'active' AND vertical IS NOT NULL;
+-- Returns 17628
+```
+
+This matches the chart's `total_assets` exactly, which is the smoking gun. The chart is showing 17,628 in scope and 17,628 non-compliant — `compliance_pct = 0%` is mathematically correct for the data the chart received.
+
+**Step 6 — Reconcile against the Summary sheet.**
+
+Open any recent xlsx upload for any vertical and inspect the Summary tab. Search for `Vulns_Aging` in the `Metric` column — it is not there. The Summary sheet enumerates the standard metric IDs (`2.3.4i`, `5.2.4`, `7.1.1`, etc.) and has no row for the aging vulnerability dashboard.
+
+Now search for `7.1.1` — it appears with rows for both the rollup (`ALL: NTS-AEO`) and each sub-team. The Summary's `Total`, `Compliant`, and `Non-Compliant` columns match `vcl_multi_vertical_summary` exactly.
+
+### Why the charts look the way they do
+
+**Vulns_Aging is a tracked-but-uncategorized detail metric.** The Python parser walks every detail sheet of the xlsx and writes one `compliance_items` row per non-compliant device, using the sheet name as the `metric_id`. `Vulns_Aging` is one such sheet. But because `Vulns_Aging` does not appear in the workbook's Summary sheet, no row is written to `vcl_multi_vertical_summary` — there is no rollup, no compliant count, no total population.
+
+When the per-metric forecast endpoint asks for the metric's `total`, the query returns null. The handler falls back to `totalAssets = metricNcCount`, which is the count of non-compliant devices. The chart's denominator is therefore identical to its numerator, which forces every "current" compliance percentage to 0%. The April 27.3% spike is the historical ratio method projecting a smaller non-compliant count for that month against the same fallback denominator. May returns to 0% because May is the current month and uses the live device count, which always equals the fallback total by construction.
+
+The chart is **internally consistent with the data the database has**. It is not internally consistent with what an executive expects "compliance" to mean for an aging dashboard, because the source xlsx never reported a population total for that detail. The fix is upstream — either the xlsx Summary sheet needs to include a `Vulns_Aging` row with a population total, or the handler needs a special case to mark metrics with no Summary data as "not measurable for compliance percentage" and render the chart differently (e.g., counts only, no percentage line).
+
+**7.1.1 is a fully populated standard metric.** It has a sheet for the failing devices, a `metric_categories` mapping (`Logging & Monitoring`), and a Summary row with `Total`, `Compliant`, and `Non-Compliant` numbers. The route gets a real `totalAssets` value (~66,674), the compliance percentage is `(66674 - 6149) / 66674 ≈ 90.8%`, and the bar visualizes the actual ratio of compliant to non-compliant devices. Historical and forecast bars track real population data, not a fallback.
+
+### What this tells you about the dashboard
+
+The forecast burndown chart is honest about what it knows. When the source data lacks a population total, the chart degrades gracefully to "every device in scope is non-compliant" — which is a literal reading of the rows that exist. It does not fabricate a denominator. The cost is that metrics without Summary entries look catastrophically non-compliant on the chart even when the underlying business reality may be different.
+
+The diagnostic flow above is the canonical procedure: when a chart looks wrong, walk down to the Summary sheet rows and ask whether the metric is even represented as a tracked compliance metric in the source file. If the answer is no, the chart is reflecting an upstream data shape, not a calculation bug.

docs/security/security-audit-tracker.md

@@ -1,6 +1,6 @@
 # Security Audit Tracker — STEAM Security Dashboard
 
-**Last scan:** 2026-04-20
+**Last scan:** 2026-06-04
 **Scope:** Full repository — backend routes, middleware, helpers, scripts, frontend components
 **Baseline:** `docs/security-audit-2026-04-01.md` (31 findings), `docs/security-remediation-plan.md` (17 prioritised items)
 
@@ -10,6 +10,7 @@
 
 - [Remediation Status — April 1 Audit](#remediation-status--april-1-audit)
 - [New Findings — April 20 Scan](#new-findings--april-20-scan)
+- [New Findings — June 4 Scan](#new-findings--june-4-scan)
 - [Open Finding Summary](#open-finding-summary)
 - [Positive Security Observations](#positive-security-observations)
 - [Scan Metadata](#scan-metadata)
@@ -54,37 +55,37 @@ Cross-reference of the 31 original findings against the current codebase. Status
 | M-3 | No rate limiting on NVD API proxy | **Open** | No server-side cache or per-user rate limit on `/api/nvd/lookup` |
 | M-4 | Admin self-demotion check uses loose equality | **Fixed** | `users.js` — uses `String(userId) === String(req.user.id)` |
 | M-5 | Missing hostname format validation | **Fixed** | `compliance.js` POST /notes — regex validation `^[a-zA-Z0-9._-]+$` |
-| M-6 | Vendor field validated before trim | **Open** | `ivantiTodoQueue.js:8` — `isValidVendor()` checks length before trim |
-| M-7 | Unsanitized original filename in temp JSON | **Open** | `compliance.js:344` — `req.file.originalname` passed directly |
+| M-6 | Vendor field validated before trim | **Fixed** | `ivantiTodoQueue.js:11-14` — `isValidVendor()` now trims before length check |
+| M-7 | Unsanitized original filename in temp JSON | **Open** | `compliance.js:347` — `req.file.originalname.replace(/[^\w.\-() ]/g, '_')` sanitizes in temp JSON, but line 355 returns raw `req.file.originalname` to client |
 | M-8 | Hardcoded frontend IP in CSP header | **Fixed** | `knowledgeBase.js:302` — reads from `CORS_ORIGINS` env var |
-| M-9 | API error messages forwarded to UI | **Open** | Frontend still uses `alert(err.message)` in several places |
-| M-10 | User data in window.confirm dialogs | **Open** | Frontend still uses `window.confirm` with user-supplied data |
+| M-9 | API error messages forwarded to UI | **Open** | Frontend still uses `alert(err.message)` in App.js, UserManagement.js, KnowledgeBasePage.js, JiraPage.js, and AdminPage.js |
+| M-10 | User data in window.confirm dialogs | **Partial** | App.js replaced with `ConfirmModal`. `JiraPage.js:430` still uses `window.confirm('Delete this Jira ticket record?')` — static string, reduced risk |
 
 ### Low / Info Findings
 
 | ID | Title | Status | Evidence |
 |---|---|---|---|
-| L-1 | Silent ROLLBACK on transaction failure | **Open** | `compliance.js:167` — `.catch(() => {})` still swallows errors |
+| L-1 | Silent ROLLBACK on transaction failure | **Fixed** | `compliance.js` — no `.catch(() => {})` patterns remain; ROLLBACK is followed by `throw err` |
 | L-2 | Fire-and-forget audit logging | **Partial** | `auditLog.js` — now logs to `console.error` on failure, but no alerting |
-| L-3 | Async temp file cleanup with no error handling | **Open** | `compliance.js` — `fs.unlink(path, () => {})` still used |
+| L-3 | Async temp file cleanup with no error handling | **Open** | `compliance.js` — `fs.unlink(path, () => {})` still used in 5 locations |
 | L-4 | IVANTI_SKIP_TLS with no startup warning | **Open** | No startup warning when `IVANTI_SKIP_TLS=true` |
-| L-5 | console.error in production frontend | **Open** | No environment guard on console.error calls |
-| L-6 | localStorage column config lacks structural validation | **Open** | No change observed |
+| L-5 | console.error in production frontend | **Open** | No environment guard on console.error calls — 30+ instances across frontend |
+| L-6 | localStorage column config lacks structural validation | **Open** | `ReportingPage.js:65-80` — parses JSON with try/catch but validates only `Array.isArray(saved)`, not element structure |
 
 ### Remediation Plan Items (not in original 31)
 
 | ID | Title | Status | Evidence |
 |---|---|---|---|
-| RP-1 | Authenticate /uploads static file access | **Open** | `server.js:127` — `express.static('uploads')` still unauthenticated |
+| RP-1 | Authenticate /uploads static file access | **Fixed** | `server.js:127` — `requireAuth()` middleware applied before `express.static('uploads')` |
 | RP-2 | Sanitize Mermaid SVG output with DOMPurify | **Open** | `KnowledgeBaseViewer.js:38` — `innerHTML = svg` without DOMPurify |
-| RP-3 | Strip server file paths from compliance preview response | **Open** | `compliance.js:342` — full `tempFilePath` returned to client |
-| RP-4 | Add SESSION_SECRET to .env.example | **Open** | `.env.example` — no `SESSION_SECRET` entry |
+| RP-3 | Strip server file paths from compliance preview response | **Fixed** | `compliance.js` and `vclMultiVertical.js` — preview returns only the temp filename; commit handler reconstructs full path via `path.join(TEMP_DIR, path.basename(tempFile))` |
+| RP-4 | Add SESSION_SECRET to .env.example | **Fixed** | `.env.example` — `SESSION_SECRET=` with generation comment present |
 
 ---
 
 ## New Findings — April 20 Scan
 
-Findings discovered in this scan that were not present in the April 1 audit.
+Findings discovered in the April 20 scan that were not present in the April 1 audit.
 
 ---
 
@@ -94,8 +95,8 @@ Findings discovered in this scan that were not present in the April 1 audit.
 
 All three `logAudit` calls in the Archer tickets router omit the `username` field:
 
-```js
-logAudit(db, {
+```javascript
+logAudit({
   userId: req.user.id,
   action: 'CREATE_ARCHER_TICKET',
   // username: req.user.username  ← missing
@@ -113,60 +114,19 @@ The `auditLog.js` helper defaults missing username to `'unknown'`, so all Archer
 
 ### N-2 — `migrate-to-1.1.js` Contains Hardcoded Admin Password (Medium)
 
-**File:** `backend/migrate-to-1.1.js:246`
-
-```js
-const passwordHash = await bcrypt.hash('admin123', 10);
-```
-
-While `setup.js` was fixed to generate random passwords (H-8), the migration script still hardcodes `admin123`. If this migration is run on an existing deployment, it resets the admin password to a known value.
-
-**Impact:** Running the migration on a production system resets the admin account to a publicly known password.
-
-**Fix:** Either generate a random password (matching `setup.js` pattern) or skip admin creation if the user already exists.
+**Status:** **Fixed** — file removed from codebase (confirmed 2026-06-04)
 
 ---
 
-### N-3 — Compliance Preview Returns Full Server Filesystem Path (Medium)
+### N-3 — Compliance Preview Returns Full Server Filesystem Path (Medium) — FIXED
 
-**File:** `backend/routes/compliance.js:342`
-
-```js
-tempFile: tempFilePath,
-```
-
-The preview endpoint returns the full server-side path (e.g. `/home/cve-dashboard/backend/uploads/temp/compliance_preview_...json`) to the frontend. The commit endpoint then receives this path back and reads the file. This exposes the server's directory structure to any authenticated user.
-
-**Impact:** Information disclosure — authenticated users learn the server's absolute filesystem layout, which aids further exploitation.
-
-**Fix:** Return only the filename. Reconstruct the full path server-side in the commit handler:
-```js
-tempFile: tempFilename,  // just the basename
-// In commit handler:
-const tempFile = path.join(TEMP_DIR, path.basename(req.body.tempFile));
-```
+**Status:** Fixed — preview now returns only the temp filename (`tempFilename`). The commit handler reconstructs the full path server-side via `path.join(TEMP_DIR, path.basename(tempFile))`. Applied to both `compliance.js` and `vclMultiVertical.js`.
 
 ---
 
-### N-4 — `/uploads` Static Directory Served Without Authentication (High)
+### N-4 — `/uploads` Static Directory Served Without Authentication (High) — FIXED
 
-**File:** `backend/server.js:127`
-
-```js
-app.use('/uploads', express.static('uploads', {
-    dotfiles: 'deny',
-    index: false
-}));
-```
-
-All uploaded files (CVE documents, compliance data, knowledge base articles) are served as static files without any authentication check. Anyone who knows or guesses a file URL can access sensitive vulnerability documentation, compliance reports, and internal knowledge base content.
-
-**Impact:** Unauthenticated access to all uploaded documents. File paths are predictable (CVE ID + vendor + timestamp-filename pattern).
-
-**Fix:** Replace with an authenticated route handler:
-```js
-app.use('/uploads', requireAuth(db), express.static('uploads', { ... }));
-```
+**Status:** Fixed — `requireAuth()` middleware is now applied before `express.static('uploads')` in `server.js`. All file access now requires a valid session cookie.
 
 ---
 
@@ -174,7 +134,7 @@ app.use('/uploads', requireAuth(db), express.static('uploads', { ... }));
 
 **File:** `frontend/src/components/KnowledgeBaseViewer.js:38`
 
-```js
+```javascript
 ref.current.innerHTML = svg;
 ```
 
@@ -183,7 +143,7 @@ Mermaid-generated SVG is injected directly into the DOM via `innerHTML`. While M
 **Impact:** Stored XSS vector if Mermaid's internal sanitization is bypassed. Any user viewing the article would execute the payload.
 
 **Fix:** Sanitize the SVG string before injection:
-```js
+```javascript
 import DOMPurify from 'dompurify';
 ref.current.innerHTML = DOMPurify.sanitize(svg, { USE_PROFILES: { svg: true } });
 ```
@@ -192,15 +152,7 @@ ref.current.innerHTML = DOMPurify.sanitize(svg, { USE_PROFILES: { svg: true } })
 
 ### N-6 — `SESSION_SECRET` Not Documented in `.env.example` (Low)
 
-**File:** `backend/.env.example`
-
-The `SESSION_SECRET` environment variable is required for the server to start (hard-fail added per H-2 fix), but it is not listed in `.env.example`. Fresh deployments will fail with no guidance on what to set.
-
-**Fix:** Add to `.env.example`:
-```
-# Session signing secret — generate with: openssl rand -hex 32
-SESSION_SECRET=
-```
+**Status:** **Fixed** — `.env.example` now includes `SESSION_SECRET=` with generation instructions (confirmed 2026-06-04)
 
 ---
 
@@ -208,7 +160,7 @@ SESSION_SECRET=
 
 **File:** `backend/middleware/auth.js:55-60`
 
-```js
+```javascript
 return res.status(403).json({
     error: 'Insufficient permissions',
     required: allowedGroups,
@@ -219,7 +171,7 @@ return res.status(403).json({
 The 403 response includes both the required groups and the user's current group. This is minor information disclosure — an attacker probing endpoints learns the exact group membership of the compromised account and which groups are needed.
 
 **Fix:** Remove `required` and `current` from the response:
-```js
+```javascript
 return res.status(403).json({ error: 'Insufficient permissions' });
 ```
 
@@ -234,7 +186,7 @@ Security headers include `X-Content-Type-Options`, `X-Frame-Options`, `X-XSS-Pro
 **Impact:** No browser-enforced restriction on script sources. If an XSS vulnerability exists (e.g. N-5), there is no CSP to mitigate it.
 
 **Fix:** Add a baseline CSP header:
-```js
+```javascript
 res.setHeader('Content-Security-Policy',
     "default-src 'self'; script-src 'self'; style-src 'self' 'unsafe-inline'; " +
     "img-src 'self' data:; font-src 'self'; connect-src 'self'");
@@ -252,14 +204,62 @@ The `sessions` table has no automatic cleanup. Expired sessions accumulate indef
 **Impact:** Performance degradation over time as the sessions table grows. Not directly exploitable, but expired session rows increase the surface for timing attacks on session lookups.
 
 **Fix:** Add a cleanup interval on server startup:
-```js
+```javascript
 setInterval(() => {
-    db.run("DELETE FROM sessions WHERE expires_at < datetime('now')");
+    pool.query("DELETE FROM sessions WHERE expires_at < NOW()");
 }, 6 * 60 * 60 * 1000); // every 6 hours
 ```
 
 ---
 
+## New Findings — June 4 Scan
+
+Findings discovered in the June 4, 2026 scan.
+
+---
+
+### N-10 — Feedback Route Uses Incorrect TLS Option Name (Low)
+
+**File:** `backend/routes/feedback.js:92, 221`
+
+```javascript
+const reqOpts = {
+    // ...
+    rejectAuthorized: false,
+};
+```
+
+The option is spelled `rejectAuthorized` instead of the correct `rejectUnauthorized`. This means the option is silently ignored by Node's `https` module — TLS verification remains **enabled** (the secure default), so this is not a vulnerability in itself. However, it indicates the developer intended to disable TLS verification (likely for Charter's SSL inspection proxy), and the code does not achieve its intent. If the GitLab instance uses an internal CA certificate, feedback submissions will fail with a TLS error when the proxy is active.
+
+**Impact:** Feedback submissions may fail behind the SSL inspection proxy due to unintended TLS verification. Not a security vulnerability — TLS remains enforced.
+
+**Fix:** If TLS skip is intentional, use the correct option name and gate it behind an env var:
+```javascript
+rejectUnauthorized: process.env.GITLAB_SKIP_TLS === 'true' ? false : true,
+```
+If TLS skip is not intentional, remove the incorrect option entirely.
+
+---
+
+### N-11 — `window.confirm` Persists in JiraPage.js (Low)
+
+**File:** `frontend/src/components/pages/JiraPage.js:430`
+
+```javascript
+if (!window.confirm('Delete this Jira ticket record?')) return;
+```
+
+The main `App.js` was migrated to use `ConfirmModal` (a themed replacement for `window.confirm`), but `JiraPage.js` still uses the raw browser `confirm()` dialog. While the confirmation string is static (not user-supplied data), this is inconsistent with the security pattern established elsewhere in the codebase.
+
+**Impact:** Low — the string is static so there is no XSS vector. This is a consistency issue rather than a vulnerability.
+
+**Fix:** Replace with the `ConfirmModal` pattern used in `App.js`:
+```javascript
+setPendingConfirm({ message: 'Delete this Jira ticket record?', onConfirm: () => doDelete(id) });
+```
+
+---
+
 ## Open Finding Summary
 
 Prioritised list of all open findings requiring action.
@@ -268,7 +268,7 @@ Prioritised list of all open findings requiring action.
 
 | ID | Severity | Title | Source |
 |---|---|---|---|
-| N-4 | High | `/uploads` static directory served without authentication | New |
+| — | — | (none — all High findings resolved) | — |
 
 ### Medium Priority
 
@@ -276,24 +276,21 @@ Prioritised list of all open findings requiring action.
 |---|---|---|---|
 | M-1 | Medium | No CSRF token protection | April 1 |
 | M-3 | Medium | No rate limiting on NVD API proxy | April 1 |
-| N-1 | Medium | Archer ticket audit logs missing `username` field | New |
-| N-2 | Medium | `migrate-to-1.1.js` contains hardcoded admin password | New |
-| N-3 | Medium | Compliance preview returns full server filesystem path | New |
-| N-5 | Medium | Mermaid SVG rendered via `innerHTML` without sanitization | New |
-| N-8 | Medium | No Content-Security-Policy header on main application | New |
-| M-6 | Medium | Vendor field validated before trim | April 1 |
-| M-7 | Medium | Unsanitized original filename in temp JSON | April 1 |
-| M-9 | Medium | API error messages forwarded to UI | April 1 |
-| M-10 | Medium | User data in `window.confirm` dialogs | April 1 |
+| N-1 | Medium | Archer ticket audit logs missing `username` field | April 20 |
+| N-5 / RP-2 | Medium | Mermaid SVG rendered via `innerHTML` without sanitization | April 20 |
+| N-8 | Medium | No Content-Security-Policy header on main application | April 20 |
+| M-7 | Medium | Unsanitized original filename returned to client in preview response | April 1 |
+| M-9 | Medium | API error messages forwarded to UI via `alert()` | April 1 |
 
 ### Low Priority
 
 | ID | Severity | Title | Source |
 |---|---|---|---|
-| N-6 | Low | `SESSION_SECRET` not documented in `.env.example` | New |
-| N-7 | Low | `requireGroup` error response leaks current user group | New |
-| N-9 | Low | Expired sessions not cleaned up automatically | New |
-| L-1 | Low | Silent ROLLBACK on transaction failure | April 1 |
+| M-10 | Low | User data in `window.confirm` dialogs (partially fixed — JiraPage only) | April 1 |
+| N-7 | Low | `requireGroup` error response leaks current user group | April 20 |
+| N-9 | Low | Expired sessions not cleaned up automatically | April 20 |
+| N-10 | Low | Feedback route uses incorrect TLS option name | June 4 |
+| N-11 | Low | `window.confirm` persists in JiraPage.js | June 4 |
 | L-3 | Low | Async temp file cleanup with no error handling | April 1 |
 | L-4 | Low | IVANTI_SKIP_TLS with no startup warning | April 1 |
 | L-5 | Low | console.error in production frontend | April 1 |
@@ -305,19 +302,23 @@ Prioritised list of all open findings requiring action.
 
 Verified secure patterns that should be preserved:
 
-- **SQL injection prevention** — all queries use parameterized statements throughout the entire codebase
+- **SQL injection prevention** — all queries use parameterized statements throughout the entire codebase (PostgreSQL `$1` placeholders)
 - **Path traversal prevention** — `sanitizePathSegment()` and `isPathWithinUploads()` consistently applied in `server.js`, `compliance.js`, and `knowledgeBase.js`
 - **Python script execution** — `spawn('python3', [SCRIPT, filePath])` with argument arrays — no shell injection
 - **File upload security** — extension allowlist + MIME prefix validation + 10 MB size limit via multer
 - **Password hashing** — bcrypt with cost factor 10 used for all password storage
 - **Session management** — 32-byte random session IDs via `crypto.randomBytes`, httpOnly cookies, 24h expiry
-- **Rate limiting** — login endpoint protected with 20 attempts per 15-minute window
+- **Rate limiting** — login endpoint protected with 20 attempts per 15-minute window; password change limited to 5 per 15 minutes
 - **Audit trail** — comprehensive audit logging on all state-changing operations (with noted exceptions above)
 - **Self-modification prevention** — admin cannot demote or deactivate their own account
 - **Ownership-scoped deletion** — Standard_User can only delete resources they created
 - **Compliance linkage protection** — deletion blocked when tickets are linked to active compliance reports
 - **Temp file path validation** — `isSafeTempPath()` enforces `.json` extension and `uploads/temp/` directory
 - **Static file serving** — `dotfiles: 'deny'` and `index: false` prevent directory listing
+- **Webhook authentication** — GitLab webhook validates `x-gitlab-token` against `GITLAB_WEBHOOK_SECRET` env var
+- **SESSION_SECRET enforcement** — server hard-fails on startup if `SESSION_SECRET` is not set
+- **Input validation coverage** — CVE ID, vendor, hostname, metric_id, EXC number, and workflow_type all validated with regex or enum checks
+- **Error response discipline** — backend routes consistently return `'Internal server error.'` for 500s, avoiding stack trace leaks
 
 ---
 
@@ -325,13 +326,16 @@ Verified secure patterns that should be preserved:
 
 | Field | Value |
 |---|---|
-| Scan date | 2026-04-20 |
+| Scan date | 2026-06-04 |
 | Scan type | Full repository static analysis |
-| Scope | `backend/`, `frontend/src/`, config files |
+| Scope | `backend/server.js`, `backend/routes/`, `backend/middleware/`, `backend/helpers/`, `backend/scripts/`, `backend/migrations/`, `frontend/src/`, `.env.example` |
 | Baseline | `docs/security-audit-2026-04-01.md` |
-| Previous findings | 31 (6 Critical, 9 High, 10 Medium, 6 Low/Info) |
-| Remediated | 20 fully fixed, 2 partially fixed |
-| Still open (from baseline) | 13 |
-| New findings | 9 |
-| Total open | 22 (1 High, 11 Medium, 10 Low) |
+| Previous findings | 31 (6 Critical, 9 High, 10 Medium, 6 Low/Info) + 9 new (April 20) + 4 remediation plan items |
+| Fixed since last scan | 5 (N-2, N-6, M-6, RP-4, L-1) |
+| Downgraded | 1 (M-10: Medium → Low, partially fixed) |
+| Still open (from baseline) | 10 |
+| Still open (from April 20) | 7 |
+| New findings (June 4) | 2 |
+| Total open | 18 (1 High, 8 Medium, 9 Low) |
+| Regressions | 0 |
 | Methodology | Static analysis — code review of all route handlers, middleware, helpers, and frontend components |

frontend/package-lock.json

@@ -20,6 +20,7 @@
         "react-scripts": "5.0.1",
         "recharts": "^3.8.1",
         "rehype-sanitize": "^6.0.0",
+        "remark-gfm": "^4.0.1",
         "web-vitals": "^2.1.4",
         "xlsx": "^0.18.5"
       },
@@ -12716,6 +12717,16 @@
         "tmpl": "1.0.5"
       }
     },
+    "node_modules/markdown-table": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/markdown-table/-/markdown-table-3.0.4.tgz",
+      "integrity": "sha512-wiYz4+JrLyb/DqW2hkFJxP7Vd7JuTDm77fvbM8VfEQdmSMqcImWeeRbHwZjBjIFki/VaMK2BhFi7oUUZeM5bqw==",
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
     "node_modules/marked": {
       "version": "16.4.2",
       "resolved": "https://registry.npmjs.org/marked/-/marked-16.4.2.tgz",
@@ -12737,6 +12748,34 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/mdast-util-find-and-replace": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/mdast-util-find-and-replace/-/mdast-util-find-and-replace-3.0.2.tgz",
+      "integrity": "sha512-Tmd1Vg/m3Xz43afeNxDIhWRtFZgM2VLyaf4vSTYwudTyeuTneoL3qtWMA5jeLyz/O1vDJmmV4QuScFCA2tBPwg==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/mdast": "^4.0.0",
+        "escape-string-regexp": "^5.0.0",
+        "unist-util-is": "^6.0.0",
+        "unist-util-visit-parents": "^6.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/mdast-util-find-and-replace/node_modules/escape-string-regexp": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz",
+      "integrity": "sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/mdast-util-from-markdown": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-2.0.3.tgz",
@@ -12761,6 +12800,107 @@
         "url": "https://opencollective.com/unified"
       }
     },
+    "node_modules/mdast-util-gfm": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/mdast-util-gfm/-/mdast-util-gfm-3.1.0.tgz",
+      "integrity": "sha512-0ulfdQOM3ysHhCJ1p06l0b0VKlhU0wuQs3thxZQagjcjPrlFRqY215uZGHHJan9GEAXd9MbfPjFJz+qMkVR6zQ==",
+      "license": "MIT",
+      "dependencies": {
+        "mdast-util-from-markdown": "^2.0.0",
+        "mdast-util-gfm-autolink-literal": "^2.0.0",
+        "mdast-util-gfm-footnote": "^2.0.0",
+        "mdast-util-gfm-strikethrough": "^2.0.0",
+        "mdast-util-gfm-table": "^2.0.0",
+        "mdast-util-gfm-task-list-item": "^2.0.0",
+        "mdast-util-to-markdown": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/mdast-util-gfm-autolink-literal": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/mdast-util-gfm-autolink-literal/-/mdast-util-gfm-autolink-literal-2.0.1.tgz",
+      "integrity": "sha512-5HVP2MKaP6L+G6YaxPNjuL0BPrq9orG3TsrZ9YXbA3vDw/ACI4MEsnoDpn6ZNm7GnZgtAcONJyPhOP8tNJQavQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/mdast": "^4.0.0",
+        "ccount": "^2.0.0",
+        "devlop": "^1.0.0",
+        "mdast-util-find-and-replace": "^3.0.0",
+        "micromark-util-character": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/mdast-util-gfm-footnote": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mdast-util-gfm-footnote/-/mdast-util-gfm-footnote-2.1.0.tgz",
+      "integrity": "sha512-sqpDWlsHn7Ac9GNZQMeUzPQSMzR6Wv0WKRNvQRg0KqHh02fpTz69Qc1QSseNX29bhz1ROIyNyxExfawVKTm1GQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/mdast": "^4.0.0",
+        "devlop": "^1.1.0",
+        "mdast-util-from-markdown": "^2.0.0",
+        "mdast-util-to-markdown": "^2.0.0",
+        "micromark-util-normalize-identifier": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/mdast-util-gfm-strikethrough": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/mdast-util-gfm-strikethrough/-/mdast-util-gfm-strikethrough-2.0.0.tgz",
+      "integrity": "sha512-mKKb915TF+OC5ptj5bJ7WFRPdYtuHv0yTRxK2tJvi+BDqbkiG7h7u/9SI89nRAYcmap2xHQL9D+QG/6wSrTtXg==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/mdast": "^4.0.0",
+        "mdast-util-from-markdown": "^2.0.0",
+        "mdast-util-to-markdown": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/mdast-util-gfm-table": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/mdast-util-gfm-table/-/mdast-util-gfm-table-2.0.0.tgz",
+      "integrity": "sha512-78UEvebzz/rJIxLvE7ZtDd/vIQ0RHv+3Mh5DR96p7cS7HsBhYIICDBCu8csTNWNO6tBWfqXPWekRuj2FNOGOZg==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/mdast": "^4.0.0",
+        "devlop": "^1.0.0",
+        "markdown-table": "^3.0.0",
+        "mdast-util-from-markdown": "^2.0.0",
+        "mdast-util-to-markdown": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/mdast-util-gfm-task-list-item": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/mdast-util-gfm-task-list-item/-/mdast-util-gfm-task-list-item-2.0.0.tgz",
+      "integrity": "sha512-IrtvNvjxC1o06taBAVJznEnkiHxLFTzgonUdy8hzFVeDun0uTjxxrRGVaNFqkU1wJR3RBPEfsxmU6jDWPofrTQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/mdast": "^4.0.0",
+        "devlop": "^1.0.0",
+        "mdast-util-from-markdown": "^2.0.0",
+        "mdast-util-to-markdown": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
     "node_modules/mdast-util-mdx-expression": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/mdast-util-mdx-expression/-/mdast-util-mdx-expression-2.0.1.tgz",
@@ -13053,6 +13193,127 @@
         "micromark-util-types": "^2.0.0"
       }
     },
+    "node_modules/micromark-extension-gfm": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/micromark-extension-gfm/-/micromark-extension-gfm-3.0.0.tgz",
+      "integrity": "sha512-vsKArQsicm7t0z2GugkCKtZehqUm31oeGBV/KVSorWSy8ZlNAv7ytjFhvaryUiCUJYqs+NoE6AFhpQvBTM6Q4w==",
+      "license": "MIT",
+      "dependencies": {
+        "micromark-extension-gfm-autolink-literal": "^2.0.0",
+        "micromark-extension-gfm-footnote": "^2.0.0",
+        "micromark-extension-gfm-strikethrough": "^2.0.0",
+        "micromark-extension-gfm-table": "^2.0.0",
+        "micromark-extension-gfm-tagfilter": "^2.0.0",
+        "micromark-extension-gfm-task-list-item": "^2.0.0",
+        "micromark-util-combine-extensions": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/micromark-extension-gfm-autolink-literal": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-autolink-literal/-/micromark-extension-gfm-autolink-literal-2.1.0.tgz",
+      "integrity": "sha512-oOg7knzhicgQ3t4QCjCWgTmfNhvQbDDnJeVu9v81r7NltNCVmhPy1fJRX27pISafdjL+SVc4d3l48Gb6pbRypw==",
+      "license": "MIT",
+      "dependencies": {
+        "micromark-util-character": "^2.0.0",
+        "micromark-util-sanitize-uri": "^2.0.0",
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/micromark-extension-gfm-footnote": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-footnote/-/micromark-extension-gfm-footnote-2.1.0.tgz",
+      "integrity": "sha512-/yPhxI1ntnDNsiHtzLKYnE3vf9JZ6cAisqVDauhp4CEHxlb4uoOTxOCJ+9s51bIB8U1N1FJ1RXOKTIlD5B/gqw==",
+      "license": "MIT",
+      "dependencies": {
+        "devlop": "^1.0.0",
+        "micromark-core-commonmark": "^2.0.0",
+        "micromark-factory-space": "^2.0.0",
+        "micromark-util-character": "^2.0.0",
+        "micromark-util-normalize-identifier": "^2.0.0",
+        "micromark-util-sanitize-uri": "^2.0.0",
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/micromark-extension-gfm-strikethrough": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-strikethrough/-/micromark-extension-gfm-strikethrough-2.1.0.tgz",
+      "integrity": "sha512-ADVjpOOkjz1hhkZLlBiYA9cR2Anf8F4HqZUO6e5eDcPQd0Txw5fxLzzxnEkSkfnD0wziSGiv7sYhk/ktvbf1uw==",
+      "license": "MIT",
+      "dependencies": {
+        "devlop": "^1.0.0",
+        "micromark-util-chunked": "^2.0.0",
+        "micromark-util-classify-character": "^2.0.0",
+        "micromark-util-resolve-all": "^2.0.0",
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/micromark-extension-gfm-table": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-table/-/micromark-extension-gfm-table-2.1.1.tgz",
+      "integrity": "sha512-t2OU/dXXioARrC6yWfJ4hqB7rct14e8f7m0cbI5hUmDyyIlwv5vEtooptH8INkbLzOatzKuVbQmAYcbWoyz6Dg==",
+      "license": "MIT",
+      "dependencies": {
+        "devlop": "^1.0.0",
+        "micromark-factory-space": "^2.0.0",
+        "micromark-util-character": "^2.0.0",
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/micromark-extension-gfm-tagfilter": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-tagfilter/-/micromark-extension-gfm-tagfilter-2.0.0.tgz",
+      "integrity": "sha512-xHlTOmuCSotIA8TW1mDIM6X2O1SiX5P9IuDtqGonFhEK0qgRI4yeC6vMxEV2dgyr2TiD+2PQ10o+cOhdVAcwfg==",
+      "license": "MIT",
+      "dependencies": {
+        "micromark-util-types": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/micromark-extension-gfm-task-list-item": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-task-list-item/-/micromark-extension-gfm-task-list-item-2.1.0.tgz",
+      "integrity": "sha512-qIBZhqxqI6fjLDYFTBIa4eivDMnP+OZqsNwmQ3xNLE4Cxwc+zfQEfbs6tzAo2Hjq+bh6q5F+Z8/cksrLFYWQQw==",
+      "license": "MIT",
+      "dependencies": {
+        "devlop": "^1.0.0",
+        "micromark-factory-space": "^2.0.0",
+        "micromark-util-character": "^2.0.0",
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
     "node_modules/micromark-factory-destination": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/micromark-factory-destination/-/micromark-factory-destination-2.0.1.tgz",
@@ -16557,6 +16818,24 @@
         "node": ">= 0.10"
       }
     },
+    "node_modules/remark-gfm": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/remark-gfm/-/remark-gfm-4.0.1.tgz",
+      "integrity": "sha512-1quofZ2RQ9EWdeN34S79+KExV1764+wCUGop5CPL1WGdD0ocPpu91lzPGbwWMECpEpd42kJGQwzRfyov9j4yNg==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/mdast": "^4.0.0",
+        "mdast-util-gfm": "^3.0.0",
+        "micromark-extension-gfm": "^3.0.0",
+        "remark-parse": "^11.0.0",
+        "remark-stringify": "^11.0.0",
+        "unified": "^11.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
     "node_modules/remark-parse": {
       "version": "11.0.0",
       "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-11.0.0.tgz",
@@ -16590,6 +16869,21 @@
         "url": "https://opencollective.com/unified"
       }
     },
+    "node_modules/remark-stringify": {
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/remark-stringify/-/remark-stringify-11.0.0.tgz",
+      "integrity": "sha512-1OSmLd3awB/t8qdoEOMazZkNsfVTeY4fTsgzcQFdXNq8ToTN4ZGwrMnlda4K6smTFKD+GRV6O48i6Z4iKgPPpw==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/mdast": "^4.0.0",
+        "mdast-util-to-markdown": "^2.0.0",
+        "unified": "^11.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
     "node_modules/renderkid": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-3.0.0.tgz",

frontend/package.json

@@ -15,6 +15,7 @@
     "react-scripts": "5.0.1",
     "recharts": "^3.8.1",
     "rehype-sanitize": "^6.0.0",
+    "remark-gfm": "^4.0.1",
     "web-vitals": "^2.1.4",
     "xlsx": "^0.18.5"
   },
@@ -28,7 +29,19 @@
     "extends": [
       "react-app",
       "react-app/jest"
-    ]
+    ],
+    "rules": {
+      "no-unused-vars": [
+        "warn",
+        {
+          "vars": "all",
+          "args": "after-used",
+          "ignoreRestSiblings": true,
+          "varsIgnorePattern": "^_",
+          "argsIgnorePattern": "^_"
+        }
+      ]
+    }
   },
   "browserslist": {
     "production": [

frontend/src/App.js

@@ -18,12 +18,30 @@ import CCPMetricsPage from './components/pages/CCPMetricsPage';
 import JiraPage from './components/pages/JiraPage';
 import AdminPage from './components/pages/AdminPage';
 import ArchiveSummaryBar from './components/pages/ArchiveSummaryBar';
+import ArcherPage from './components/pages/ArcherPage';
+import ArcherTemplatePage from './components/pages/ArcherTemplatePage';
 import FeedbackModal from './components/FeedbackModal';
 import NotificationBell from './components/NotificationBell';
 import './App.css';
 
 const API_BASE = process.env.REACT_APP_API_BASE || 'http://localhost:3001/api';
 
+// Determine if a Jira status represents a "closed/done" state
+function isClosedStatus(status) {
+  if (!status) return false;
+  const lower = status.toLowerCase();
+  return ['closed', 'done', 'resolved', 'complete', 'completed', 'cancelled', 'canceled', "won't do", 'declined'].some(s => lower.includes(s));
+}
+
+function getTicketStatusColor(status) {
+  if (!status) return '#F59E0B';
+  if (isClosedStatus(status)) return '#10B981';
+  const lower = status.toLowerCase();
+  if (['open', 'to do', 'backlog', 'new'].some(s => lower === s)) return '#F59E0B';
+  // Everything else (in progress, approval, prioritizing, etc.) gets blue/purple
+  return '#0EA5E9';
+}
+
 // ============================================
 // INLINE STYLES - NUCLEAR OPTION FOR VISIBILITY
 // ============================================
@@ -164,7 +182,6 @@ const getSeverityDotColor = (severity) => {
     default: return '#0EA5E9';
   }
 };
-const API_HOST = process.env.REACT_APP_API_HOST || 'http://localhost:3001';
 
 const severityLevels = ['All Severities', 'Critical', 'High', 'Medium', 'Low'];
 
@@ -183,7 +200,7 @@ export default function App() {
   const [cveDocuments, setCveDocuments] = useState({});
   const [quickCheckCVE, setQuickCheckCVE] = useState('');
   const [quickCheckResult, setQuickCheckResult] = useState(null);
-  const VALID_PAGES = new Set(['home', 'triage', 'compliance', 'knowledge-base', 'exports', 'jira', 'admin']);
+  const VALID_PAGES = new Set(['home', 'triage', 'compliance', 'knowledge-base', 'exports', 'jira', 'admin', 'archer-templates']);
   const [currentPage, setCurrentPageRaw] = useState(() => {
     try {
       const saved = localStorage.getItem('cve-dashboard-page');
@@ -1072,7 +1089,7 @@ export default function App() {
             <div style={{...STYLES.statCard, border: '2px solid #F59E0B', boxShadow: '0 4px 16px rgba(0, 0, 0, 0.5), 0 0 20px rgba(245, 158, 11, 0.15), inset 0 1px 0 rgba(245, 158, 11, 0.15)'}}>
               <div style={{ position: 'absolute', top: 0, left: 0, right: 0, height: '2px', background: 'linear-gradient(90deg, transparent, #F59E0B, transparent)', boxShadow: '0 0 8px rgba(245, 158, 11, 0.5)' }}></div>
               <div style={{ fontSize: '0.75rem', textTransform: 'uppercase', letterSpacing: '0.1em', color: '#CBD5E1', marginBottom: '0.25rem' }}>Open Tickets</div>
-              <div style={{ fontSize: '1.5rem', fontWeight: '700', fontFamily: 'monospace', color: '#F59E0B', textShadow: '0 0 16px rgba(245, 158, 11, 0.4)' }}>{jiraTickets.filter(t => t.status !== 'Closed').length}</div>
+              <div style={{ fontSize: '1.5rem', fontWeight: '700', fontFamily: 'monospace', color: '#F59E0B', textShadow: '0 0 16px rgba(245, 158, 11, 0.4)' }}>{jiraTickets.filter(t => !isClosedStatus(t.status)).length}</div>
             </div>
             <div style={{...STYLES.statCard, border: '2px solid #EF4444', boxShadow: '0 4px 16px rgba(0, 0, 0, 0.5), 0 0 20px rgba(239, 68, 68, 0.15), inset 0 1px 0 rgba(239, 68, 68, 0.15)'}}>
               <div style={{ position: 'absolute', top: 0, left: 0, right: 0, height: '2px', background: 'linear-gradient(90deg, transparent, #EF4444, transparent)', boxShadow: '0 0 8px rgba(239, 68, 68, 0.5)' }}></div>
@@ -1089,6 +1106,7 @@ export default function App() {
         {currentPage === 'knowledge-base' && <KnowledgeBasePage />}
         {currentPage === 'exports'        && <ExportsPage />}
         {currentPage === 'jira'           && <JiraPage />}
+        {currentPage === 'archer-templates' && <ArcherTemplatePage />}
         {currentPage === 'admin' && isAdmin() && <AdminPage />}
         {currentPage === 'admin' && !isAdmin() && (() => { setCurrentPage('home'); return null; })()}
 
@@ -1475,6 +1493,9 @@ export default function App() {
                       <option value="Open">Open</option>
                       <option value="In Progress">In Progress</option>
                       <option value="Closed">Closed</option>
+                      {ticketForm.status && !['Open', 'In Progress', 'Closed'].includes(ticketForm.status) && (
+                        <option value={ticketForm.status}>{ticketForm.status}</option>
+                      )}
                     </select>
                   </div>
                   <div className="flex gap-3 pt-4">
@@ -1544,6 +1565,9 @@ export default function App() {
                       <option value="Open">Open</option>
                       <option value="In Progress">In Progress</option>
                       <option value="Closed">Closed</option>
+                      {ticketForm.status && !['Open', 'In Progress', 'Closed'].includes(ticketForm.status) && (
+                        <option value={ticketForm.status}>{ticketForm.status}</option>
+                      )}
                     </select>
                   </div>
                   <div className="flex gap-3 pt-4">
@@ -2025,7 +2049,7 @@ export default function App() {
                                         </div>
                                         <div className="flex gap-2">
                                           <a
-                                            href={`${API_HOST}/${doc.file_path}`}
+                                            href={`/${doc.file_path}`}
                                             target="_blank"
                                             rel="noopener noreferrer"
                                             className="px-3 py-1 text-sm text-intel-accent hover:bg-intel-medium rounded transition-all border border-intel-accent/50 font-mono uppercase tracking-wider"
@@ -2096,15 +2120,11 @@ export default function App() {
                                             </a>
                                             {ticket.summary && <span style={{ fontSize: '0.875rem', color: '#E4E8F1', overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap', maxWidth: '20rem' }}>{ticket.summary}</span>}
                                             <span style={
-                                              ticket.status === 'Open' ? STYLES.badgeCritical :
-                                              ticket.status === 'In Progress' ? STYLES.badgeHigh :
-                                              STYLES.badgeLow
+                                              isClosedStatus(ticket.status) ? STYLES.badgeLow :
+                                              getTicketStatusColor(ticket.status) === '#0EA5E9' ? STYLES.badgeHigh :
+                                              STYLES.badgeCritical
                                             }>
-                                              <span style={STYLES.glowDot(
-                                                ticket.status === 'Open' ? '#FF3366' :
-                                                ticket.status === 'In Progress' ? '#FFB800' :
-                                                '#00FF88'
-                                              )}></span>
+                                              <span style={STYLES.glowDot(getTicketStatusColor(ticket.status))}></span>
                                               {ticket.status}
                                             </span>
                                           </div>
@@ -2220,12 +2240,12 @@ export default function App() {
               </div>
               <div className="text-center mb-3">
                 <div style={{ fontSize: '2rem', fontWeight: '700', fontFamily: 'monospace', color: '#F59E0B', textShadow: '0 0 16px rgba(245, 158, 11, 0.4)' }}>
-                  {jiraTickets.filter(t => t.status !== 'Closed').length}
+                  {jiraTickets.filter(t => !isClosedStatus(t.status)).length}
                 </div>
                 <div className="text-xs text-gray-400 uppercase tracking-wider">Active</div>
               </div>
               <div className="space-y-2 max-h-96 overflow-y-auto">
-                {jiraTickets.filter(t => t.status !== 'Closed').slice(0, 10).map(ticket => (
+                {jiraTickets.filter(t => !isClosedStatus(t.status)).slice(0, 10).map(ticket => (
                   <div key={ticket.id} style={{ background: 'linear-gradient(135deg, rgba(30, 41, 59, 0.85) 0%, rgba(51, 65, 85, 0.75) 100%)', border: '1px solid rgba(245, 158, 11, 0.25)', borderRadius: '0.375rem', padding: '0.5rem', boxShadow: '0 2px 6px rgba(0, 0, 0, 0.25), inset 0 1px 0 rgba(255, 255, 255, 0.03)' }}>
                     <div className="flex items-start justify-between gap-2 mb-1">
                       <a
@@ -2254,13 +2274,13 @@ export default function App() {
                     {ticket.summary && <div className="text-xs text-gray-300 mt-1 truncate">{ticket.summary}</div>}
                     <div className="mt-2">
                       <span style={{ ...STYLES.badgeHigh, fontSize: '0.65rem', padding: '0.25rem 0.5rem' }}>
-                        <span style={{...STYLES.glowDot('#F59E0B'), width: '6px', height: '6px'}}></span>
+                        <span style={{...STYLES.glowDot(getTicketStatusColor(ticket.status)), width: '6px', height: '6px'}}></span>
                         {ticket.status}
                       </span>
                     </div>
                   </div>
                 ))}
-                {jiraTickets.filter(t => t.status !== 'Closed').length === 0 && (
+                {jiraTickets.filter(t => !isClosedStatus(t.status)).length === 0 && (
                   <div className="text-center py-8">
                     <CheckCircle className="w-8 h-8 text-intel-success mx-auto mb-2" />
                     <p className="text-sm text-gray-400 italic font-mono">No open tickets</p>
@@ -2270,77 +2290,14 @@ export default function App() {
             </div>
 
             {/* Archer Risk Acceptance Tickets */}
-            <div style={{...STYLES.intelCard, padding: '1.5rem', borderLeft: '3px solid #8B5CF6'}} className="rounded-lg">
-              <div className="flex justify-between items-center mb-4">
-                <h2 style={{ fontSize: '1.125rem', fontWeight: '600', color: '#8B5CF6', display: 'flex', alignItems: 'center', gap: '0.5rem', fontFamily: 'monospace', textTransform: 'uppercase', letterSpacing: '0.1em', textShadow: '0 0 12px rgba(139, 92, 246, 0.4)' }}>
-                  <Shield className="w-5 h-5" />
-                  Archer Risk Tickets
-                </h2>
-                {canWrite() && (
-                  <button
-                    onClick={() => { setAddArcherTicketContext(null); setArcherTicketForm({ exc_number: '', archer_url: '', status: 'Draft', cve_id: '', vendor: '' }); setShowAddArcherTicket(true); }}
-                    className="intel-button intel-button-primary flex items-center gap-1 text-xs px-2 py-1"
-                  >
-                    <Plus className="w-3 h-3" />
-                  </button>
-                )}
-              </div>
-              <div className="text-center mb-3">
-                <div style={{ fontSize: '2rem', fontWeight: '700', fontFamily: 'monospace', color: '#8B5CF6', textShadow: '0 0 16px rgba(139, 92, 246, 0.4)' }}>
-                  {archerTickets.filter(t => t.status !== 'Accepted').length}
-                </div>
-                <div className="text-xs text-gray-400 uppercase tracking-wider">Active</div>
-              </div>
-              <div className="space-y-2 max-h-96 overflow-y-auto">
-                {archerTickets.filter(t => t.status !== 'Accepted').slice(0, 10).map(ticket => (
-                  <div key={ticket.id} style={{ background: 'linear-gradient(135deg, rgba(30, 41, 59, 0.85) 0%, rgba(51, 65, 85, 0.75) 100%)', border: '1px solid rgba(139, 92, 246, 0.25)', borderRadius: '0.375rem', padding: '0.5rem', boxShadow: '0 2px 6px rgba(0, 0, 0, 0.25), inset 0 1px 0 rgba(255, 255, 255, 0.03)' }}>
-                    <div className="flex items-start justify-between gap-2 mb-1">
-                      <a
-                        href={ticket.archer_url || '#'}
-                        target="_blank"
-                        rel="noopener noreferrer"
-                        className="font-mono text-xs font-semibold text-intel-accent hover:text-purple-400 transition-colors"
-                      >
-                        {ticket.exc_number}
-                      </a>
-                      <div className="flex gap-1">
-                        <button
-                          onClick={() => { setReportingExcFilter(ticket.exc_number); setCurrentPage('triage'); }}
-                          title="View findings referencing this ticket"
-                          className="text-gray-400 hover:text-sky-400 transition-colors"
-                        >
-                          <Filter className="w-3 h-3" />
-                        </button>
-                        {canWrite() && (
-                          <button onClick={() => handleEditArcherTicket(ticket)} className="text-gray-400 hover:text-purple-400 transition-colors">
-                            <Edit2 className="w-3 h-3" />
-                          </button>
-                        )}
-                        {canDelete(ticket) && (
-                          <button onClick={() => handleDeleteArcherTicket(ticket)} className="text-gray-400 hover:text-intel-danger transition-colors">
-                            <Trash2 className="w-3 h-3" />
-                          </button>
-                        )}
-                      </div>
-                    </div>
-                    <div className="text-xs text-white font-mono mb-1">{ticket.cve_id}</div>
-                    <div className="text-xs text-gray-400">{ticket.vendor}</div>
-                    <div className="mt-2">
-                      <span style={{ ...STYLES.badgeHigh, fontSize: '0.65rem', padding: '0.25rem 0.5rem', background: 'rgba(139, 92, 246, 0.2)', borderColor: '#8B5CF6' }}>
-                        <span style={{...STYLES.glowDot('#8B5CF6'), width: '6px', height: '6px'}}></span>
-                        {ticket.status}
-                      </span>
-                    </div>
-                  </div>
-                ))}
-                {archerTickets.filter(t => t.status !== 'Accepted').length === 0 && (
-                  <div className="text-center py-8">
-                    <CheckCircle className="w-8 h-8 text-intel-success mx-auto mb-2" />
-                    <p className="text-sm text-gray-400 italic font-mono">No active Archer tickets</p>
-                  </div>
-                )}
-              </div>
-            </div>
+            <ArcherPage
+              archerTickets={archerTickets}
+              onEditTicket={handleEditArcherTicket}
+              onDeleteTicket={handleDeleteArcherTicket}
+              onFilterByExc={(exc) => { setReportingExcFilter(exc); setCurrentPage('triage'); }}
+              onAddTicket={() => { setAddArcherTicketContext(null); setArcherTicketForm({ exc_number: '', archer_url: '', status: 'Draft', cve_id: '', vendor: '' }); setShowAddArcherTicket(true); }}
+              canDeleteTicket={canDelete}
+            />
 
             {/* Ivanti Workflows */}
             <div style={{...STYLES.intelCard, padding: '1.5rem', borderLeft: '3px solid #0D9488'}} className="rounded-lg">

frontend/src/__tests__/compliance-nonmetric-color-resolution.property.test.js

@@ -0,0 +1,71 @@
+/**
+ * Property-Based Test: Color resolution with fallback
+ *
+ * Feature: compliance-nonmetric-filters, Property 4: Color resolution with fallback
+ * **Validates: Requirements 6.2, 6.3**
+ *
+ * For any non-metric category metric_id, the resolved color equals
+ * CATEGORY_COLORS[metricCategoriesConfig[metricId]] when both lookups succeed,
+ * else #94A3B8.
+ */
+import fc from 'fast-check';
+import { deriveNonMetricCategories, CATEGORY_COLORS } from '../components/pages/CompliancePage';
+
+// The color resolution logic extracted for direct testing
+function resolveColor(metricId, categoriesConfig) {
+    const categoryName = categoriesConfig[metricId] || null;
+    return (categoryName && CATEGORY_COLORS[categoryName]) || '#94A3B8';
+}
+
+// Generators
+const metricIdArb = fc.stringMatching(/^[A-Za-z0-9_.]{1,20}$/);
+
+const knownCategories = Object.keys(CATEGORY_COLORS);
+const categoryNameArb = fc.oneof(
+    fc.constantFrom(...knownCategories),
+    fc.string({ minLength: 1, maxLength: 20 }) // may not be in CATEGORY_COLORS
+);
+
+const categoriesConfigArb = fc.dictionary(metricIdArb, categoryNameArb);
+
+describe('Compliance Non-Metric Filter — Property 4: Color resolution with fallback', () => {
+    it('color equals CATEGORY_COLORS[config[metricId]] when both lookups succeed, else #94A3B8', () => {
+        fc.assert(
+            fc.property(metricIdArb, categoriesConfigArb, (metricId, config) => {
+                const result = resolveColor(metricId, config);
+
+                const categoryName = config[metricId];
+                if (categoryName && CATEGORY_COLORS[categoryName]) {
+                    expect(result).toBe(CATEGORY_COLORS[categoryName]);
+                } else {
+                    expect(result).toBe('#94A3B8');
+                }
+            }),
+            { numRuns: 100 }
+        );
+    });
+
+    it('deriveNonMetricCategories produces correct colors for all returned categories', () => {
+        const deviceWithMetricArb = metricIdArb.map(id => ({
+            hostname: 'host-' + id,
+            failing_metrics: [{ metric_id: id, metric_desc: '', category: '' }],
+        }));
+
+        fc.assert(
+            fc.property(
+                fc.array(deviceWithMetricArb, { minLength: 1, maxLength: 15 }),
+                categoriesConfigArb,
+                (devices, config) => {
+                    // Empty summary means all device metric_ids are non-metric
+                    const result = deriveNonMetricCategories(devices, [], config);
+
+                    for (const item of result) {
+                        const expectedColor = resolveColor(item.metricId, config);
+                        expect(item.color).toBe(expectedColor);
+                    }
+                }
+            ),
+            { numRuns: 100 }
+        );
+    });
+});

frontend/src/__tests__/compliance-nonmetric-derivation.property.test.js

@@ -0,0 +1,112 @@
+/**
+ * Property-Based Test: Non-metric category derivation is the set difference with accurate counts
+ *
+ * Feature: compliance-nonmetric-filters, Property 1: Non-metric category derivation
+ * **Validates: Requirements 1.1, 1.2, 2.2, 2.4**
+ *
+ * For any set of devices and any set of summary entries for a team,
+ * deriveNonMetricCategories returns exactly the metric_ids present in at least
+ * one device's failing_metrics array that do not appear in any summary entry's
+ * metric_id — deduplicated, sorted alphabetically by metricId, and each with a
+ * count equal to the number of devices whose failing_metrics contains that metric_id.
+ */
+import fc from 'fast-check';
+import { deriveNonMetricCategories } from '../components/pages/CompliancePage';
+
+// Generators
+const metricIdArb = fc.stringMatching(/^[A-Za-z0-9_.]{1,20}$/);
+
+const failingMetricArb = fc.record({
+    metric_id: metricIdArb,
+    metric_desc: fc.constant(''),
+    category: fc.constant(''),
+});
+
+const deviceArb = fc.record({
+    hostname: fc.string({ minLength: 1, maxLength: 30 }),
+    failing_metrics: fc.array(failingMetricArb, { minLength: 0, maxLength: 8 }),
+});
+
+const summaryEntryArb = fc.record({
+    metric_id: metricIdArb,
+    team: fc.constant('STEAM'),
+    compliance_pct: fc.double({ min: 0, max: 1 }),
+    status: fc.constantFrom('Meets/Exceeds Target', 'Within 15% of Target', 'Below 15% of Target'),
+});
+
+const categoriesConfigArb = fc.dictionary(metricIdArb, fc.constantFrom(
+    'Vulnerability Management', 'Access & MFA', 'Logging & Monitoring',
+    'Asset Data Quality', 'Endpoint Protection', 'Application Security',
+    'Disaster Recovery', 'Decommissioned Assets'
+));
+
+describe('Compliance Non-Metric Derivation — Property 1: Set difference with accurate counts', () => {
+    it('returned metric_ids are exactly the set difference of device metric_ids minus summary metric_ids', () => {
+        fc.assert(
+            fc.property(
+                fc.array(deviceArb, { minLength: 0, maxLength: 20 }),
+                fc.array(summaryEntryArb, { minLength: 0, maxLength: 10 }),
+                categoriesConfigArb,
+                (devices, summaryEntries, config) => {
+                    const result = deriveNonMetricCategories(devices, summaryEntries, config);
+
+                    const summaryIds = new Set(summaryEntries.map(e => e.metric_id));
+                    const deviceMetricIds = new Set();
+                    for (const d of devices) {
+                        for (const m of (d.failing_metrics || [])) {
+                            if (m.metric_id) deviceMetricIds.add(m.metric_id);
+                        }
+                    }
+                    const expectedIds = new Set([...deviceMetricIds].filter(id => !summaryIds.has(id)));
+
+                    const resultIds = new Set(result.map(r => r.metricId));
+                    expect(resultIds).toEqual(expectedIds);
+                }
+            ),
+            { numRuns: 100 }
+        );
+    });
+
+    it('returned list is deduplicated and sorted alphabetically by metricId', () => {
+        fc.assert(
+            fc.property(
+                fc.array(deviceArb, { minLength: 0, maxLength: 20 }),
+                fc.array(summaryEntryArb, { minLength: 0, maxLength: 10 }),
+                categoriesConfigArb,
+                (devices, summaryEntries, config) => {
+                    const result = deriveNonMetricCategories(devices, summaryEntries, config);
+
+                    // Deduplicated
+                    const ids = result.map(r => r.metricId);
+                    expect(ids.length).toBe(new Set(ids).size);
+
+                    // Sorted alphabetically
+                    const sorted = [...ids].sort((a, b) => a.localeCompare(b));
+                    expect(ids).toEqual(sorted);
+                }
+            ),
+            { numRuns: 100 }
+        );
+    });
+
+    it('each count equals the number of devices whose failing_metrics contains that metric_id', () => {
+        fc.assert(
+            fc.property(
+                fc.array(deviceArb, { minLength: 0, maxLength: 20 }),
+                fc.array(summaryEntryArb, { minLength: 0, maxLength: 10 }),
+                categoriesConfigArb,
+                (devices, summaryEntries, config) => {
+                    const result = deriveNonMetricCategories(devices, summaryEntries, config);
+
+                    for (const { metricId, count } of result) {
+                        const expectedCount = devices.filter(d =>
+                            (d.failing_metrics || []).some(m => m.metric_id === metricId)
+                        ).length;
+                        expect(count).toBe(expectedCount);
+                    }
+                }
+            ),
+            { numRuns: 100 }
+        );
+    });
+});

frontend/src/__tests__/compliance-nonmetric-filter-predicate.property.test.js

@@ -0,0 +1,85 @@
+/**
+ * Property-Based Test: Filter predicate correctness
+ *
+ * Feature: compliance-nonmetric-filters, Property 2: Filter predicate correctness
+ * **Validates: Requirements 3.1, 5.2, 5.3, 5.4**
+ *
+ * For any filter state and any set of devices: when null, all devices pass;
+ * when metric, exactly devices with matching metric_id in ids pass;
+ * when nonmetric, exactly devices with matching metric_id pass.
+ */
+import fc from 'fast-check';
+
+// Replicate the filter predicate logic from CompliancePage
+function applyFilter(devices, filterState) {
+    return devices.filter(d => {
+        if (!filterState) return true;
+        if (filterState.type === 'metric') return d.failing_metrics.some(m => filterState.ids.includes(m.metric_id));
+        if (filterState.type === 'nonmetric') return d.failing_metrics.some(m => m.metric_id === filterState.id);
+        return true;
+    });
+}
+
+// Generators
+const metricIdArb = fc.stringMatching(/^[A-Za-z0-9_.]{1,20}$/);
+
+const failingMetricArb = fc.record({
+    metric_id: metricIdArb,
+    metric_desc: fc.constant(''),
+    category: fc.constant(''),
+});
+
+const deviceArb = fc.record({
+    hostname: fc.string({ minLength: 1, maxLength: 30 }),
+    failing_metrics: fc.array(failingMetricArb, { minLength: 0, maxLength: 8 }),
+});
+
+const devicesArb = fc.array(deviceArb, { minLength: 0, maxLength: 20 });
+
+const filterStateArb = fc.oneof(
+    fc.constant(null),
+    fc.array(metricIdArb, { minLength: 1, maxLength: 5 }).map(ids => ({ type: 'metric', ids })),
+    metricIdArb.map(id => ({ type: 'nonmetric', id }))
+);
+
+describe('Compliance Non-Metric Filter — Property 2: Filter predicate correctness', () => {
+    it('when filterState is null, all devices pass', () => {
+        fc.assert(
+            fc.property(devicesArb, (devices) => {
+                const result = applyFilter(devices, null);
+                expect(result.length).toBe(devices.length);
+            }),
+            { numRuns: 100 }
+        );
+    });
+
+    it('when filterState is metric, exactly devices with a matching metric_id pass', () => {
+        fc.assert(
+            fc.property(devicesArb, fc.array(metricIdArb, { minLength: 1, maxLength: 5 }), (devices, ids) => {
+                const filterState = { type: 'metric', ids };
+                const result = applyFilter(devices, filterState);
+
+                const expected = devices.filter(d =>
+                    d.failing_metrics.some(m => ids.includes(m.metric_id))
+                );
+                expect(result).toEqual(expected);
+            }),
+            { numRuns: 100 }
+        );
+    });
+
+    it('when filterState is nonmetric, exactly devices with that metric_id pass', () => {
+        fc.assert(
+            fc.property(devicesArb, metricIdArb, (devices, id) => {
+                const filterState = { type: 'nonmetric', id };
+                const result = applyFilter(devices, filterState);
+
+                const expected = devices.filter(d =>
+                    d.failing_metrics.some(m => m.metric_id === id)
+                );
+                expect(result).toEqual(expected);
+            }),
+            { numRuns: 100 }
+        );
+    });
+});

frontend/src/__tests__/compliance-nonmetric-mutual-exclusivity.property.test.js

@@ -0,0 +1,128 @@
+/**
+ * Property-Based Test: Filter state mutual exclusivity
+ *
+ * Feature: compliance-nonmetric-filters, Property 3: Filter state mutual exclusivity
+ * **Validates: Requirements 3.4, 3.5, 5.1**
+ *
+ * For any prior filter state and any filter action (metric card click, chip click,
+ * or clear), the resulting state is exactly one of: null, { type: 'metric', ids: [...] },
+ * or { type: 'nonmetric', id: string } — never undefined, never both.
+ */
+import fc from 'fast-check';
+
+// Replicate the filter state transition logic from CompliancePage
+function applyFilterAction(currentState, action) {
+    if (action.type === 'clear') {
+        return null;
+    }
+    if (action.type === 'metric_click') {
+        const familyIds = action.ids;
+        // If currently active metric with same ids, toggle off
+        if (currentState?.type === 'metric' &&
+            currentState.ids.length === familyIds.length &&
+            familyIds.every(id => currentState.ids.includes(id))) {
+            return null;
+        }
+        return { type: 'metric', ids: familyIds };
+    }
+    if (action.type === 'chip_click') {
+        const metricId = action.id;
+        // If currently active nonmetric with same id, toggle off
+        if (currentState?.type === 'nonmetric' && currentState.id === metricId) {
+            return null;
+        }
+        return { type: 'nonmetric', id: metricId };
+    }
+    return currentState;
+}
+
+function isValidFilterState(state) {
+    if (state === null) return true;
+    if (state && state.type === 'metric' && Array.isArray(state.ids) && state.ids.length > 0) return true;
+    if (state && state.type === 'nonmetric' && typeof state.id === 'string' && state.id.length > 0) return true;
+    return false;
+}
+
+// Generators
+const metricIdArb = fc.stringMatching(/^[A-Za-z0-9_.]{1,20}$/);
+
+const filterStateArb = fc.oneof(
+    fc.constant(null),
+    fc.array(metricIdArb, { minLength: 1, maxLength: 5 }).map(ids => ({ type: 'metric', ids })),
+    metricIdArb.map(id => ({ type: 'nonmetric', id }))
+);
+
+const filterActionArb = fc.oneof(
+    fc.constant({ type: 'clear' }),
+    fc.array(metricIdArb, { minLength: 1, maxLength: 5 }).map(ids => ({ type: 'metric_click', ids })),
+    metricIdArb.map(id => ({ type: 'chip_click', id }))
+);
+
+describe('Compliance Non-Metric Filter — Property 3: Filter state mutual exclusivity', () => {
+    it('resulting state is always exactly one of null, metric, or nonmetric — never undefined or combined', () => {
+        fc.assert(
+            fc.property(filterStateArb, filterActionArb, (priorState, action) => {
+                const result = applyFilterAction(priorState, action);
+
+                expect(result).not.toBeUndefined();
+                expect(isValidFilterState(result)).toBe(true);
+
+                // Never has both metric and nonmetric properties
+                if (result !== null) {
+                    if (result.type === 'metric') {
+                        expect(result).not.toHaveProperty('id');
+                    }
+                    if (result.type === 'nonmetric') {
+                        expect(result).not.toHaveProperty('ids');
+                    }
+                }
+            }),
+            { numRuns: 100 }
+        );
+    });
+
+    it('clear action always results in null regardless of prior state', () => {
+        fc.assert(
+            fc.property(filterStateArb, (priorState) => {
+                const result = applyFilterAction(priorState, { type: 'clear' });
+                expect(result).toBeNull();
+            }),
+            { numRuns: 100 }
+        );
+    });
+
+    it('metric click replaces any prior state with metric filter or null (toggle off)', () => {
+        fc.assert(
+            fc.property(filterStateArb, fc.array(metricIdArb, { minLength: 1, maxLength: 5 }), (priorState, ids) => {
+                const result = applyFilterAction(priorState, { type: 'metric_click', ids });
+
+                if (result === null) {
+                    // Toggled off — prior must have been metric with same ids
+                    expect(priorState?.type).toBe('metric');
+                } else {
+                    expect(result.type).toBe('metric');
+                    expect(result.ids).toEqual(ids);
+                }
+            }),
+            { numRuns: 100 }
+        );
+    });
+
+    it('chip click replaces any prior state with nonmetric filter or null (toggle off)', () => {
+        fc.assert(
+            fc.property(filterStateArb, metricIdArb, (priorState, id) => {
+                const result = applyFilterAction(priorState, { type: 'chip_click', id });
+
+                if (result === null) {
+                    // Toggled off — prior must have been nonmetric with same id
+                    expect(priorState?.type).toBe('nonmetric');
+                    expect(priorState?.id).toBe(id);
+                } else {
+                    expect(result.type).toBe('nonmetric');
+                    expect(result.id).toBe(id);
+                }
+            }),
+            { numRuns: 100 }
+        );
+    });
+});

frontend/src/__tests__/ivanti-queue-remediation-badge.property.test.js

@@ -0,0 +1,79 @@
+/**
+ * Property-Based Test: Note Count Badge Formatting
+ *
+ * Feature: ivanti-queue-remediation
+ * Property 12: Note count badge formatting
+ *
+ * For any integer count N where N > 0, the badge display SHALL show the string
+ * representation of N when N <= 99, and "99+" when N > 99. For N = 0, no badge
+ * SHALL be displayed.
+ *
+ * **Validates: Requirements 6.1, 6.2**
+ */
+import fc from 'fast-check';
+
+// ---------------------------------------------------------------------------
+// Pure function under test — extracted badge display logic
+// ---------------------------------------------------------------------------
+
+/**
+ * Determines the badge display value for a given note count.
+ * Returns null when no badge should be shown (count = 0).
+ *
+ * @param {number} count - The number of remediation notes
+ * @returns {string|null} The badge text, or null if no badge
+ */
+function formatBadgeCount(count) {
+    if (count <= 0) return null;
+    if (count > 99) return '99+';
+    return String(count);
+}
+
+// ---------------------------------------------------------------------------
+// Property 12: Note count badge formatting
+// ---------------------------------------------------------------------------
+describe('Feature: ivanti-queue-remediation, Property 12: Note count badge formatting', () => {
+    it('displays the exact count for N where 1 <= N <= 99', () => {
+        fc.assert(
+            fc.property(
+                fc.integer({ min: 1, max: 99 }),
+                (count) => {
+                    const badge = formatBadgeCount(count);
+                    expect(badge).toBe(String(count));
+                }
+            ),
+            { numRuns: 100 }
+        );
+    });
+
+    it('displays "99+" for any count exceeding 99', () => {
+        fc.assert(
+            fc.property(
+                fc.integer({ min: 100, max: 100000 }),
+                (count) => {
+                    const badge = formatBadgeCount(count);
+                    expect(badge).toBe('99+');
+                }
+            ),
+            { numRuns: 100 }
+        );
+    });
+
+    it('returns null (no badge) for count = 0', () => {
+        const badge = formatBadgeCount(0);
+        expect(badge).toBeNull();
+    });
+
+    it('returns null (no badge) for negative counts', () => {
+        fc.assert(
+            fc.property(
+                fc.integer({ min: -1000, max: 0 }),
+                (count) => {
+                    const badge = formatBadgeCount(count);
+                    expect(badge).toBeNull();
+                }
+            ),
+            { numRuns: 100 }
+        );
+    });
+});

frontend/src/__tests__/ivanti-queue-remediation-description.property.test.js

@@ -0,0 +1,212 @@
+/**
+ * Property-Based Tests: Ivanti Queue Remediation — Description Generation
+ *
+ * Feature: ivanti-queue-remediation
+ *
+ * Property 10: Description generation appends remediation notes iff notes exist
+ * Property 11: Non-Remediate description unchanged
+ *
+ * **Validates: Requirements 8.1, 8.2, 8.3, 8.4**
+ */
+import fc from 'fast-check';
+import { generateConsolidatedDescription, appendRemediationNotes } from '../utils/jiraConsolidation';
+
+// ---------------------------------------------------------------------------
+// Arbitraries
+// ---------------------------------------------------------------------------
+
+const arbUsername = fc.string({ minLength: 1, maxLength: 30 }).filter(s => s.trim().length > 0);
+
+const arbNoteText = fc.string({ minLength: 1, maxLength: 200 }).filter(s => s.trim().length > 0);
+
+const arbDate = fc.integer({ min: 1577836800000, max: 1924905600000 })
+    .map(ts => new Date(ts).toISOString());
+
+const arbNote = fc.record({
+    id: fc.integer({ min: 1, max: 100000 }),
+    queue_item_id: fc.integer({ min: 1, max: 10000 }),
+    user_id: fc.integer({ min: 1, max: 1000 }),
+    username: arbUsername,
+    note_text: arbNoteText,
+    created_at: arbDate,
+});
+
+const arbQueueItem = fc.record({
+    id: fc.integer({ min: 1, max: 10000 }),
+    finding_id: fc.string({ minLength: 1, maxLength: 20 }),
+    finding_title: fc.string({ minLength: 1, maxLength: 100 }).filter(s => s.trim().length > 0),
+    vendor: fc.constantFrom('Microsoft', 'Cisco', 'Juniper', 'Adobe'),
+    workflow_type: fc.constant('Remediate'),
+    hostname: fc.constantFrom('server01', 'host-a', 'web-prod'),
+    ip_address: fc.constantFrom('10.0.0.1', '192.168.1.5', '172.16.0.10'),
+    cves_json: fc.constant(JSON.stringify(['CVE-2024-1234'])),
+});
+
+const arbNonRemediateItem = fc.record({
+    id: fc.integer({ min: 1, max: 10000 }),
+    finding_id: fc.string({ minLength: 1, maxLength: 20 }),
+    finding_title: fc.string({ minLength: 1, maxLength: 100 }).filter(s => s.trim().length > 0),
+    vendor: fc.constantFrom('Microsoft', 'Cisco', 'Juniper', 'Adobe'),
+    workflow_type: fc.constantFrom('FP', 'Archer', 'CARD', 'GRANITE', 'DECOM'),
+    hostname: fc.constantFrom('server01', 'host-a', 'web-prod'),
+    ip_address: fc.constantFrom('10.0.0.1', '192.168.1.5', '172.16.0.10'),
+    cves_json: fc.constant(JSON.stringify(['CVE-2024-5678'])),
+});
+
+// ---------------------------------------------------------------------------
+// Property 10: Description generation appends remediation notes iff notes exist
+// **Validates: Requirements 8.1, 8.2, 8.3**
+// ---------------------------------------------------------------------------
+describe('Feature: ivanti-queue-remediation, Property 10: Description generation appends remediation notes iff notes exist', () => {
+    it('appends a "Remediation Notes" section when notesMap has at least one note', () => {
+        fc.assert(
+            fc.property(
+                fc.array(arbQueueItem, { minLength: 1, maxLength: 5 })
+                    .map(items => {
+                        const seen = new Set();
+                        return items.filter(i => { if (seen.has(i.id)) return false; seen.add(i.id); return true; });
+                    })
+                    .filter(items => items.length > 0),
+                fc.array(arbNote, { minLength: 1, maxLength: 5 }),
+                (items, notes) => {
+                    const baseDescription = generateConsolidatedDescription(items);
+                    // Map notes to the first item
+                    const notesMap = { [items[0].id]: notes };
+                    const result = appendRemediationNotes(baseDescription, notesMap);
+
+                    // Should contain the remediation notes section
+                    expect(result).toContain('== Remediation Notes ==');
+                    // Should still contain the base description
+                    expect(result).toContain(baseDescription.trim());
+                    // Each note's text should appear
+                    for (const note of notes) {
+                        expect(result).toContain(note.note_text);
+                        expect(result).toContain(note.username);
+                    }
+                }
+            ),
+            { numRuns: 100 }
+        );
+    });
+
+    it('notes are listed in chronological order (oldest first) with [YYYY-MM-DD] prefix', () => {
+        fc.assert(
+            fc.property(
+                arbQueueItem,
+                fc.array(arbNote, { minLength: 2, maxLength: 5 }),
+                (item, notes) => {
+                    const baseDescription = generateConsolidatedDescription([item]);
+                    const notesMap = { [item.id]: notes };
+                    const result = appendRemediationNotes(baseDescription, notesMap);
+
+                    // Extract the remediation notes section
+                    const section = result.split('== Remediation Notes ==')[1];
+                    expect(section).toBeDefined();
+
+                    // Verify each note has the [YYYY-MM-DD] format prefix
+                    for (const note of notes) {
+                        const expectedDate = new Date(note.created_at).toISOString().slice(0, 10);
+                        expect(section).toContain(`[${expectedDate}] ${note.username}:`);
+                    }
+
+                    // Verify chronological order (oldest first)
+                    const sortedNotes = [...notes].sort((a, b) => new Date(a.created_at) - new Date(b.created_at));
+                    let lastIndex = -1;
+                    for (const note of sortedNotes) {
+                        const idx = section.indexOf(note.note_text, lastIndex + 1);
+                        expect(idx).toBeGreaterThan(lastIndex);
+                        lastIndex = idx;
+                    }
+                }
+            ),
+            { numRuns: 100 }
+        );
+    });
+
+    it('does NOT append a section when notesMap is empty', () => {
+        fc.assert(
+            fc.property(
+                fc.array(arbQueueItem, { minLength: 1, maxLength: 3 })
+                    .map(items => {
+                        const seen = new Set();
+                        return items.filter(i => { if (seen.has(i.id)) return false; seen.add(i.id); return true; });
+                    })
+                    .filter(items => items.length > 0),
+                (items) => {
+                    const baseDescription = generateConsolidatedDescription(items);
+                    const result = appendRemediationNotes(baseDescription, {});
+
+                    expect(result).toBe(baseDescription);
+                    expect(result).not.toContain('== Remediation Notes ==');
+                }
+            ),
+            { numRuns: 100 }
+        );
+    });
+
+    it('does NOT append a section when notesMap has items with empty arrays', () => {
+        fc.assert(
+            fc.property(
+                arbQueueItem,
+                (item) => {
+                    const baseDescription = generateConsolidatedDescription([item]);
+                    const notesMap = { [item.id]: [] };
+                    const result = appendRemediationNotes(baseDescription, notesMap);
+
+                    expect(result).toBe(baseDescription);
+                    expect(result).not.toContain('== Remediation Notes ==');
+                }
+            ),
+            { numRuns: 100 }
+        );
+    });
+});
+
+// ---------------------------------------------------------------------------
+// Property 11: Non-Remediate description unchanged
+// **Validates: Requirements 8.4**
+// ---------------------------------------------------------------------------
+describe('Feature: ivanti-queue-remediation, Property 11: Non-Remediate description unchanged', () => {
+    it('output is identical to generateConsolidatedDescription when no notes exist', () => {
+        fc.assert(
+            fc.property(
+                fc.array(arbNonRemediateItem, { minLength: 1, maxLength: 5 })
+                    .map(items => {
+                        const seen = new Set();
+                        return items.filter(i => { if (seen.has(i.id)) return false; seen.add(i.id); return true; });
+                    })
+                    .filter(items => items.length > 0),
+                (items) => {
+                    const baseDescription = generateConsolidatedDescription(items);
+                    // Empty notesMap — simulates non-Remediate items
+                    const result = appendRemediationNotes(baseDescription, {});
+
+                    expect(result).toBe(baseDescription);
+                    expect(result).not.toContain('Remediation Notes');
+                }
+            ),
+            { numRuns: 100 }
+        );
+    });
+
+    it('output is identical when notesMap is null or undefined', () => {
+        fc.assert(
+            fc.property(
+                fc.array(arbNonRemediateItem, { minLength: 1, maxLength: 3 })
+                    .map(items => {
+                        const seen = new Set();
+                        return items.filter(i => { if (seen.has(i.id)) return false; seen.add(i.id); return true; });
+                    })
+                    .filter(items => items.length > 0),
+                fc.oneof(fc.constant(null), fc.constant(undefined)),
+                (items, notesMap) => {
+                    const baseDescription = generateConsolidatedDescription(items);
+                    const result = appendRemediationNotes(baseDescription, notesMap);
+
+                    expect(result).toBe(baseDescription);
+                }
+            ),
+            { numRuns: 50 }
+        );
+    });
+});

frontend/src/__tests__/ivanti-queue-remediation-grouping.property.test.js

@@ -0,0 +1,180 @@
+/**
+ * Property-Based Test: Remediate Queue Grouping
+ *
+ * Feature: ivanti-queue-remediation
+ * Property 2: Remediate items grouped into vendor sections, never Inventory
+ *
+ * For any queue item with workflow_type "Remediate", the groupQueueItems function
+ * SHALL place it in a vendor-grouped section (using the item's vendor field, or
+ * "Unknown" if vendor is empty/null) and SHALL NOT place it in the Inventory section.
+ *
+ * **Validates: Requirements 2.1, 2.2, 2.4**
+ */
+import fc from 'fast-check';
+import { groupQueueItems } from '../utils/queueGrouping';
+
+// ---------------------------------------------------------------------------
+// Arbitraries
+// ---------------------------------------------------------------------------
+
+const arbVendor = fc.oneof(
+    fc.string({ minLength: 1, maxLength: 100 }).filter(s => s.trim().length > 0),
+    fc.constantFrom('Microsoft', 'Cisco', 'Juniper', 'ADTRAN', 'VMware')
+);
+
+const arbEmptyVendor = fc.oneof(
+    fc.constant(''),
+    fc.constant(null),
+    fc.constant(undefined),
+    fc.constant('   ') // whitespace only
+);
+
+const arbRemediateItemWithVendor = fc.record({
+    id: fc.integer({ min: 1, max: 100000 }),
+    workflow_type: fc.constant('Remediate'),
+    vendor: arbVendor,
+    status: fc.constant('pending'),
+    finding_id: fc.string({ minLength: 1, maxLength: 20 }),
+    finding_title: fc.string({ minLength: 1, maxLength: 100 }),
+});
+
+const arbRemediateItemNoVendor = fc.record({
+    id: fc.integer({ min: 1, max: 100000 }),
+    workflow_type: fc.constant('Remediate'),
+    vendor: arbEmptyVendor,
+    status: fc.constant('pending'),
+    finding_id: fc.string({ minLength: 1, maxLength: 20 }),
+    finding_title: fc.string({ minLength: 1, maxLength: 100 }),
+});
+
+const arbInventoryItem = fc.record({
+    id: fc.integer({ min: 100001, max: 200000 }),
+    workflow_type: fc.constantFrom('CARD', 'GRANITE', 'DECOM'),
+    vendor: fc.constant(''),
+    status: fc.constant('pending'),
+    finding_id: fc.string({ minLength: 1, maxLength: 20 }),
+    finding_title: fc.string({ minLength: 1, maxLength: 100 }),
+});
+
+// ---------------------------------------------------------------------------
+// Property 2: Remediate items grouped into vendor sections, never Inventory
+// ---------------------------------------------------------------------------
+describe('Feature: ivanti-queue-remediation, Property 2: Remediate items grouped into vendor sections, never Inventory', () => {
+    it('Remediate items with a vendor are placed in vendor-grouped sections, never Inventory', () => {
+        fc.assert(
+            fc.property(
+                fc.array(arbRemediateItemWithVendor, { minLength: 1, maxLength: 20 })
+                    .map(items => {
+                        // Ensure unique IDs
+                        const seen = new Set();
+                        return items.filter(item => {
+                            if (seen.has(item.id)) return false;
+                            seen.add(item.id);
+                            return true;
+                        });
+                    })
+                    .filter(items => items.length > 0),
+                (items) => {
+                    const sections = groupQueueItems(items);
+
+                    // No Inventory section should exist (Remediate items never go there)
+                    const inventorySection = sections.find(s => s.type === 'inventory');
+                    expect(inventorySection).toBeUndefined();
+
+                    // All items should be in vendor sections
+                    const vendorSections = sections.filter(s => s.type === 'vendor');
+                    const allGroupedItems = vendorSections.flatMap(s => s.items);
+                    expect(allGroupedItems.length).toBe(items.length);
+
+                    // Each item should be in its vendor's section
+                    for (const item of items) {
+                        const expectedVendor = item.vendor?.trim() || 'Unknown';
+                        const section = vendorSections.find(s => s.label === expectedVendor);
+                        expect(section).toBeDefined();
+                        expect(section.items.some(i => i.id === item.id)).toBe(true);
+                    }
+                }
+            ),
+            { numRuns: 100 }
+        );
+    });
+
+    it('Remediate items with empty/null/whitespace-only vendor land in "Unknown" section', () => {
+        fc.assert(
+            fc.property(
+                fc.array(arbRemediateItemNoVendor, { minLength: 1, maxLength: 10 })
+                    .map(items => {
+                        const seen = new Set();
+                        return items.filter(item => {
+                            if (seen.has(item.id)) return false;
+                            seen.add(item.id);
+                            return true;
+                        });
+                    })
+                    .filter(items => items.length > 0),
+                (items) => {
+                    const sections = groupQueueItems(items);
+
+                    // No Inventory section
+                    const inventorySection = sections.find(s => s.type === 'inventory');
+                    expect(inventorySection).toBeUndefined();
+
+                    // All items should be in the "Unknown" vendor section
+                    const unknownSection = sections.find(s => s.label === 'Unknown');
+                    expect(unknownSection).toBeDefined();
+                    expect(unknownSection.items.length).toBe(items.length);
+                }
+            ),
+            { numRuns: 100 }
+        );
+    });
+
+    it('Remediate items are never placed in the Inventory section even when mixed with inventory items', () => {
+        fc.assert(
+            fc.property(
+                fc.array(arbRemediateItemWithVendor, { minLength: 1, maxLength: 10 })
+                    .map(items => {
+                        const seen = new Set();
+                        return items.filter(item => {
+                            if (seen.has(item.id)) return false;
+                            seen.add(item.id);
+                            return true;
+                        });
+                    })
+                    .filter(items => items.length > 0),
+                fc.array(arbInventoryItem, { minLength: 1, maxLength: 5 })
+                    .map(items => {
+                        const seen = new Set();
+                        return items.filter(item => {
+                            if (seen.has(item.id)) return false;
+                            seen.add(item.id);
+                            return true;
+                        });
+                    })
+                    .filter(items => items.length > 0),
+                (remediateItems, inventoryItems) => {
+                    const allItems = [...remediateItems, ...inventoryItems];
+                    const sections = groupQueueItems(allItems);
+
+                    // Inventory section exists (from inventory items)
+                    const inventorySection = sections.find(s => s.type === 'inventory');
+                    expect(inventorySection).toBeDefined();
+
+                    // No Remediate items in the inventory section
+                    const remediateInInventory = inventorySection.items.filter(
+                        i => i.workflow_type === 'Remediate'
+                    );
+                    expect(remediateInInventory.length).toBe(0);
+
+                    // All Remediate items are in vendor sections
+                    const vendorSections = sections.filter(s => s.type === 'vendor');
+                    const allVendorItems = vendorSections.flatMap(s => s.items);
+                    for (const item of remediateItems) {
+                        expect(allVendorItems.some(i => i.id === item.id)).toBe(true);
+                    }
+                }
+            ),
+            { numRuns: 100 }
+        );
+    });
+});

frontend/src/__tests__/queue-grouping-count-accuracy.property.test.js

@@ -0,0 +1,88 @@
+/**
+ * Property-Based Test: Section Header Count Accuracy
+ *
+ * Feature: queue-collapsible-sections, Property 4: Section Header Count Accuracy
+ * **Validates: Requirements 3.1, 3.2**
+ *
+ * For every section in the grouped output, the items array length equals the count
+ * that would be displayed in the header. The sum of all section item counts equals
+ * the total input array length.
+ */
+import fc from 'fast-check';
+
+// Replicate the grouping logic inline (utility file not yet extracted)
+function groupQueueItems(visibleItems) {
+  const INVENTORY_TYPES = new Set(['CARD', 'GRANITE', 'DECOM']);
+  const inventoryItems = [];
+  const vendorMap = new Map();
+  for (const item of visibleItems) {
+    if (INVENTORY_TYPES.has(item.workflow_type)) {
+      inventoryItems.push(item);
+    } else {
+      const vendor = item.vendor?.trim() || 'Unknown';
+      if (!vendorMap.has(vendor)) vendorMap.set(vendor, []);
+      vendorMap.get(vendor).push(item);
+    }
+  }
+  const sections = [];
+  if (inventoryItems.length > 0) {
+    sections.push({ key: 'inventory', label: 'Inventory', type: 'inventory', items: inventoryItems });
+  }
+  const sortedVendors = [...vendorMap.entries()].sort((a, b) => a[0].localeCompare(b[0]));
+  for (const [vendor, items] of sortedVendors) {
+    sections.push({ key: `vendor:${vendor}`, label: vendor, type: 'vendor', items });
+  }
+  return sections;
+}
+
+// Generator for queue items with realistic workflow types and vendor names
+const workflowTypeArb = fc.constantFrom('CARD', 'GRANITE', 'DECOM', 'FP', 'Archer');
+const vendorArb = fc.oneof(
+  fc.constantFrom('Microsoft', 'Adobe', 'Cisco', 'Oracle', 'VMware', 'Apple'),
+  fc.constant(''),
+  fc.constant(null),
+  fc.constant(undefined)
+);
+
+const queueItemArb = fc.record({
+  id: fc.uuid(),
+  workflow_type: workflowTypeArb,
+  vendor: vendorArb,
+  hostname: fc.string({ minLength: 1, maxLength: 20 }),
+  status: fc.constant('pending'),
+});
+
+const queueItemsArb = fc.array(queueItemArb, { minLength: 1, maxLength: 50 });
+
+describe('Queue Grouping — Property 4: Section Header Count Accuracy', () => {
+  it('each section items.length is a positive integer (the displayed count)', () => {
+    fc.assert(
+      fc.property(queueItemsArb, (items) => {
+        const sections = groupQueueItems(items);
+
+        for (const section of sections) {
+          // items.length is the count that would be displayed in the header
+          expect(Number.isInteger(section.items.length)).toBe(true);
+          expect(section.items.length).toBeGreaterThan(0);
+        }
+      }),
+      { numRuns: 200 }
+    );
+  });
+
+  it('sum of all section item counts equals total input array length', () => {
+    fc.assert(
+      fc.property(queueItemsArb, (items) => {
+        const sections = groupQueueItems(items);
+
+        const totalItemsInSections = sections.reduce(
+          (sum, section) => sum + section.items.length,
+          0
+        );
+
+        expect(totalItemsInSections).toBe(items.length);
+      }),
+      { numRuns: 200 }
+    );
+  });
+});

frontend/src/__tests__/queue-grouping-empty-sections.property.test.js

@@ -0,0 +1,111 @@
+/**
+ * Property-Based Test: Empty Section Omission
+ *
+ * Feature: queue-collapsible-sections, Property 3: Empty Section Omission
+ * **Validates: Requirements 1.6, 1.7**
+ *
+ * For any array of queue items (including empty arrays), the grouped output
+ * contains no sections with zero items. If no CARD/GRANITE/DECOM items exist
+ * in the input, no section with type 'inventory' appears in the output.
+ */
+import fc from 'fast-check';
+
+// Inline the grouping logic since the utility file may not exist yet
+function groupQueueItems(visibleItems) {
+  const INVENTORY_TYPES = new Set(['CARD', 'GRANITE', 'DECOM']);
+  const inventoryItems = [];
+  const vendorMap = new Map();
+  for (const item of visibleItems) {
+    if (INVENTORY_TYPES.has(item.workflow_type)) {
+      inventoryItems.push(item);
+    } else {
+      const vendor = item.vendor?.trim() || 'Unknown';
+      if (!vendorMap.has(vendor)) vendorMap.set(vendor, []);
+      vendorMap.get(vendor).push(item);
+    }
+  }
+  const sections = [];
+  if (inventoryItems.length > 0) {
+    sections.push({ key: 'inventory', label: 'Inventory', type: 'inventory', items: inventoryItems });
+  }
+  const sortedVendors = [...vendorMap.entries()].sort((a, b) => a[0].localeCompare(b[0]));
+  for (const [vendor, items] of sortedVendors) {
+    sections.push({ key: `vendor:${vendor}`, label: vendor, type: 'vendor', items });
+  }
+  return sections;
+}
+
+// Generator for queue items with various workflow types and vendors
+const workflowTypeArb = fc.constantFrom('CARD', 'GRANITE', 'DECOM', 'FP', 'Archer');
+const vendorArb = fc.oneof(
+  fc.constant(null),
+  fc.constant(undefined),
+  fc.constant(''),
+  fc.constant('  '),
+  fc.stringMatching(/^[A-Za-z][A-Za-z0-9 ]{0,14}$/)
+);
+
+const queueItemArb = fc.record({
+  id: fc.integer({ min: 1, max: 100000 }),
+  workflow_type: workflowTypeArb,
+  vendor: vendorArb,
+  hostname: fc.stringMatching(/^[a-z]{3,10}$/),
+  status: fc.constant('pending'),
+});
+
+const queueItemsArb = fc.array(queueItemArb, { minLength: 0, maxLength: 50 });
+
+describe('Queue Grouping — Property 3: Empty Section Omission', () => {
+  it('no section in the output has zero items', () => {
+    fc.assert(
+      fc.property(queueItemsArb, (items) => {
+        const sections = groupQueueItems(items);
+        for (const section of sections) {
+          expect(section.items.length).toBeGreaterThan(0);
+        }
+      }),
+      { numRuns: 200 }
+    );
+  });
+
+  it('if no inventory-type items exist, no inventory section appears', () => {
+    // Generate arrays that explicitly exclude inventory types
+    const nonInventoryTypeArb = fc.constantFrom('FP', 'Archer');
+    const nonInventoryItemArb = fc.record({
+      id: fc.integer({ min: 1, max: 100000 }),
+      workflow_type: nonInventoryTypeArb,
+      vendor: vendorArb,
+      hostname: fc.stringMatching(/^[a-z]{3,10}$/),
+      status: fc.constant('pending'),
+    });
+    const nonInventoryItemsArb = fc.array(nonInventoryItemArb, { minLength: 0, maxLength: 50 });
+
+    fc.assert(
+      fc.property(nonInventoryItemsArb, (items) => {
+        const sections = groupQueueItems(items);
+        const inventorySection = sections.find(s => s.type === 'inventory');
+        expect(inventorySection).toBeUndefined();
+      }),
+      { numRuns: 200 }
+    );
+  });
+
+  it('if no CARD/GRANITE/DECOM items exist in a mixed array, no inventory section appears', () => {
+    fc.assert(
+      fc.property(queueItemsArb, (items) => {
+        const INVENTORY_TYPES = new Set(['CARD', 'GRANITE', 'DECOM']);
+        const hasInventoryItems = items.some(item => INVENTORY_TYPES.has(item.workflow_type));
+        const sections = groupQueueItems(items);
+        const inventorySection = sections.find(s => s.type === 'inventory');
+
+        if (!hasInventoryItems) {
+          expect(inventorySection).toBeUndefined();
+        } else {
+          expect(inventorySection).toBeDefined();
+          expect(inventorySection.items.length).toBeGreaterThan(0);
+        }
+      }),
+      { numRuns: 200 }
+    );
+  });
+});

frontend/src/__tests__/queue-grouping-ordering.property.test.js

@@ -0,0 +1,92 @@
+/**
+ * Property-Based Test: Section Ordering
+ *
+ * Feature: queue-collapsible-sections, Property 2: Section Ordering
+ * **Validates: Requirements 1.3, 1.4**
+ *
+ * For any array of queue items, the Inventory section (if present) is always
+ * the first element, and all vendor sections are sorted alphabetically by label.
+ */
+import fc from 'fast-check';
+
+// Inline grouping logic (mirrors the implementation in IvantiTodoQueuePage)
+function groupQueueItems(visibleItems) {
+  const INVENTORY_TYPES = new Set(['CARD', 'GRANITE', 'DECOM']);
+  const inventoryItems = [];
+  const vendorMap = new Map();
+  for (const item of visibleItems) {
+    if (INVENTORY_TYPES.has(item.workflow_type)) {
+      inventoryItems.push(item);
+    } else {
+      const vendor = item.vendor?.trim() || 'Unknown';
+      if (!vendorMap.has(vendor)) vendorMap.set(vendor, []);
+      vendorMap.get(vendor).push(item);
+    }
+  }
+  const sections = [];
+  if (inventoryItems.length > 0) {
+    sections.push({ key: 'inventory', label: 'Inventory', type: 'inventory', items: inventoryItems });
+  }
+  const sortedVendors = [...vendorMap.entries()].sort((a, b) => a[0].localeCompare(b[0]));
+  for (const [vendor, items] of sortedVendors) {
+    sections.push({ key: `vendor:${vendor}`, label: vendor, type: 'vendor', items });
+  }
+  return sections;
+}
+
+// Generator for queue items with random workflow types and vendors
+const workflowTypeArb = fc.constantFrom('CARD', 'GRANITE', 'DECOM', 'FP', 'Archer');
+
+const vendorArb = fc.oneof(
+  fc.constant(null),
+  fc.constant(undefined),
+  fc.constant(''),
+  fc.constant('  '),
+  fc.stringMatching(/^[A-Za-z][A-Za-z0-9 ]{0,14}$/)
+);
+
+const queueItemArb = fc.record({
+  id: fc.integer({ min: 1, max: 100000 }),
+  workflow_type: workflowTypeArb,
+  vendor: vendorArb,
+  hostname: fc.string({ minLength: 1, maxLength: 20 }),
+  status: fc.constant('pending'),
+});
+
+const queueItemsArb = fc.array(queueItemArb, { minLength: 0, maxLength: 50 });
+
+describe('Queue Grouping — Property 2: Section Ordering', () => {
+  it('Inventory section (if present) is always the first element', () => {
+    fc.assert(
+      fc.property(queueItemsArb, (items) => {
+        const sections = groupQueueItems(items);
+
+        const inventoryIndex = sections.findIndex(s => s.type === 'inventory');
+
+        // If inventory section exists, it must be at index 0
+        if (inventoryIndex !== -1) {
+          expect(inventoryIndex).toBe(0);
+        }
+      }),
+      { numRuns: 500 }
+    );
+  });
+
+  it('Vendor sections are sorted alphabetically by label', () => {
+    fc.assert(
+      fc.property(queueItemsArb, (items) => {
+        const sections = groupQueueItems(items);
+
+        const vendorSections = sections.filter(s => s.type === 'vendor');
+
+        // Each consecutive pair of vendor sections must be in alphabetical order
+        for (let i = 1; i < vendorSections.length; i++) {
+          const prev = vendorSections[i - 1].label;
+          const curr = vendorSections[i].label;
+          expect(prev.localeCompare(curr)).toBeLessThanOrEqual(0);
+        }
+      }),
+      { numRuns: 500 }
+    );
+  });
+});

frontend/src/__tests__/queue-grouping.property.test.js

@@ -0,0 +1,135 @@
+/**
+ * Property-Based Test: Grouping Correctness
+ *
+ * Feature: queue-collapsible-sections, Property 1: Grouping Correctness
+ * **Validates: Requirements 1.1, 1.2, 1.5**
+ *
+ * For any array of visible queue items, every item with workflow_type CARD,
+ * GRANITE, or DECOM appears in the Inventory section; every FP/Archer item
+ * appears in the vendor section matching its vendor field (or "Unknown" if
+ * null/empty); no item appears in more than one section; and total items
+ * across all sections equals input length.
+ */
+import fc from 'fast-check';
+import { groupQueueItems } from '../utils/queueGrouping';
+
+// ---------------------------------------------------------------------------
+// Arbitraries
+// ---------------------------------------------------------------------------
+
+const INVENTORY_TYPES = ['CARD', 'GRANITE', 'DECOM'];
+const VENDOR_TYPES = ['FP', 'Archer'];
+const ALL_WORKFLOW_TYPES = [...INVENTORY_TYPES, ...VENDOR_TYPES];
+
+// Generate vendor strings including edge cases: null, undefined, empty, whitespace-only, normal strings
+const vendorArbitrary = fc.oneof(
+  fc.constant(null),
+  fc.constant(undefined),
+  fc.constant(''),
+  fc.constant('   '),
+  fc.stringMatching(/^[A-Za-z][A-Za-z0-9 ]{0,19}$/)
+);
+
+// Generate a single queue item with a random workflow_type and vendor
+const queueItemArbitrary = fc.record({
+  id: fc.integer({ min: 1, max: 100000 }),
+  workflow_type: fc.constantFrom(...ALL_WORKFLOW_TYPES),
+  vendor: vendorArbitrary,
+  status: fc.constant('pending'),
+  hostname: fc.string({ minLength: 1, maxLength: 20 }),
+});
+
+// Generate arrays of queue items (0 to 50 items)
+const queueItemsArbitrary = fc.array(queueItemArbitrary, { minLength: 0, maxLength: 50 });
+
+// ---------------------------------------------------------------------------
+// Property Test
+// ---------------------------------------------------------------------------
+
+describe('Queue Grouping — Property 1: Grouping Correctness', () => {
+  it('every CARD/GRANITE/DECOM item appears in Inventory section', () => {
+    fc.assert(
+      fc.property(queueItemsArbitrary, (items) => {
+        const sections = groupQueueItems(items);
+        const inventorySection = sections.find(s => s.key === 'inventory');
+        const inventoryItems = inventorySection ? inventorySection.items : [];
+
+        const expectedInventoryItems = items.filter(item =>
+          INVENTORY_TYPES.includes(item.workflow_type)
+        );
+
+        // Every inventory-type item must be in the inventory section
+        for (const item of expectedInventoryItems) {
+          expect(inventoryItems).toContain(item);
+        }
+
+        // Inventory section should contain exactly the inventory-type items
+        expect(inventoryItems.length).toBe(expectedInventoryItems.length);
+      }),
+      { numRuns: 200 }
+    );
+  });
+
+  it('every FP/Archer item appears in a vendor section matching its vendor field (or "Unknown")', () => {
+    fc.assert(
+      fc.property(queueItemsArbitrary, (items) => {
+        const sections = groupQueueItems(items);
+
+        const vendorSections = sections.filter(s => s.type === 'vendor');
+        const allVendorItems = vendorSections.flatMap(s => s.items);
+
+        const expectedVendorItems = items.filter(item =>
+          VENDOR_TYPES.includes(item.workflow_type)
+        );
+
+        // Every vendor-type item must appear in a vendor section
+        for (const item of expectedVendorItems) {
+          expect(allVendorItems).toContain(item);
+
+          // Determine expected vendor key
+          const expectedVendor = item.vendor?.trim() || 'Unknown';
+          const expectedKey = `vendor:${expectedVendor}`;
+          const matchingSection = sections.find(s => s.key === expectedKey);
+
+          expect(matchingSection).toBeDefined();
+          expect(matchingSection.items).toContain(item);
+        }
+
+        // Vendor sections should contain exactly the vendor-type items
+        expect(allVendorItems.length).toBe(expectedVendorItems.length);
+      }),
+      { numRuns: 200 }
+    );
+  });
+
+  it('no item appears in more than one section', () => {
+    fc.assert(
+      fc.property(queueItemsArbitrary, (items) => {
+        const sections = groupQueueItems(items);
+
+        // Collect all items across all sections
+        const allSectionItems = sections.flatMap(s => s.items);
+
+        // Use a Set to check for duplicates (by reference)
+        const seen = new Set();
+        for (const item of allSectionItems) {
+          expect(seen.has(item)).toBe(false);
+          seen.add(item);
+        }
+      }),
+      { numRuns: 200 }
+    );
+  });
+
+  it('total items across all sections equals input length', () => {
+    fc.assert(
+      fc.property(queueItemsArbitrary, (items) => {
+        const sections = groupQueueItems(items);
+        const totalInSections = sections.reduce((sum, s) => sum + s.items.length, 0);
+
+        expect(totalInSections).toBe(items.length);
+      }),
+      { numRuns: 200 }
+    );
+  });
+});

frontend/src/__tests__/queue-selection-independence.property.test.js

@@ -0,0 +1,213 @@
+/**
+ * Property-Based Test: Selection Independence from Collapse State
+ *
+ * Feature: queue-collapsible-sections, Property 5: Selection Independence from Collapse State
+ * **Validates: Requirements 4.2, 4.4, 4.5**
+ *
+ * For any combination of selected items and collapse state, the set of selected
+ * item IDs remains unchanged when sections are collapsed or expanded. Select All
+ * always covers all visible items regardless of which sections are collapsed.
+ */
+import fc from 'fast-check';
+
+// --- Pure logic under test (mirrors IvantiTodoQueuePage behavior) ---
+
+/**
+ * Toggle a section's collapse state. Only modifies collapsedSections,
+ * never touches selectedIds.
+ */
+function toggleSection(collapsedSections, sectionKey) {
+  return { ...collapsedSections, [sectionKey]: !collapsedSections[sectionKey] };
+}
+
+/**
+ * Select All — always selects all visible items regardless of collapse state.
+ * The visibleItems array contains ALL pending items, not just those in expanded sections.
+ */
+function selectAll(visibleItems) {
+  return new Set(visibleItems.map(item => item.id));
+}
+
+// --- Generators ---
+
+const WORKFLOW_TYPES = ['CARD', 'GRANITE', 'DECOM', 'FP', 'Archer'];
+const VENDORS = ['Microsoft', 'Adobe', 'Cisco', 'Unknown', 'Oracle', 'VMware'];
+
+const queueItemArbitrary = fc.record({
+  id: fc.integer({ min: 1, max: 100000 }),
+  workflow_type: fc.constantFrom(...WORKFLOW_TYPES),
+  vendor: fc.constantFrom(...VENDORS),
+  status: fc.constant('pending'),
+});
+
+// Generate arrays of queue items with unique IDs
+const queueItemsArbitrary = fc
+  .array(queueItemArbitrary, { minLength: 1, maxLength: 50 })
+  .map(items => {
+    // Ensure unique IDs
+    const seen = new Set();
+    return items.filter(item => {
+      if (seen.has(item.id)) return false;
+      seen.add(item.id);
+      return true;
+    });
+  })
+  .filter(items => items.length > 0);
+
+// Generate a subset of item IDs as the selected set
+const selectedIdsArbitrary = (items) =>
+  fc.subarray(items.map(i => i.id), { minLength: 0 }).map(ids => new Set(ids));
+
+// Generate section keys that would exist for a given set of items
+const sectionKeysForItems = (items) => {
+  const keys = new Set();
+  const INVENTORY_TYPES = new Set(['CARD', 'GRANITE', 'DECOM']);
+  let hasInventory = false;
+  for (const item of items) {
+    if (INVENTORY_TYPES.has(item.workflow_type)) {
+      hasInventory = true;
+    } else {
+      keys.add(`vendor:${item.vendor || 'Unknown'}`);
+    }
+  }
+  if (hasInventory) keys.add('inventory');
+  return [...keys];
+};
+
+// Generate arbitrary collapse state for given section keys
+const collapsedSectionsArbitrary = (sectionKeys) =>
+  fc.record(
+    Object.fromEntries(sectionKeys.map(key => [key, fc.boolean()])),
+    { withDeletedKeys: true }
+  );
+
+// --- Tests ---
+
+describe('Property 5: Selection Independence from Collapse State', () => {
+  it('toggling collapse state does not alter the set of selected item IDs', () => {
+    fc.assert(
+      fc.property(
+        queueItemsArbitrary.chain(items =>
+          fc.tuple(
+            fc.constant(items),
+            selectedIdsArbitrary(items),
+            fc.constant(sectionKeysForItems(items))
+          )
+        ).chain(([items, selectedIds, sectionKeys]) =>
+          fc.tuple(
+            fc.constant(items),
+            fc.constant(selectedIds),
+            sectionKeys.length > 0
+              ? collapsedSectionsArbitrary(sectionKeys)
+              : fc.constant({}),
+            sectionKeys.length > 0
+              ? fc.array(fc.constantFrom(...sectionKeys), { minLength: 1, maxLength: 10 })
+              : fc.constant([])
+          )
+        ),
+        ([items, selectedIds, initialCollapsed, toggleSequence]) => {
+          // Record the original selected IDs
+          const originalSelectedIds = new Set(selectedIds);
+
+          // Apply a sequence of toggleSection calls
+          let currentCollapsed = { ...initialCollapsed };
+          for (const sectionKey of toggleSequence) {
+            currentCollapsed = toggleSection(currentCollapsed, sectionKey);
+          }
+
+          // The selectedIds set must remain completely unchanged
+          // (toggleSection only modifies collapsedSections, never selectedIds)
+          expect(selectedIds).toEqual(originalSelectedIds);
+          expect(selectedIds.size).toBe(originalSelectedIds.size);
+          for (const id of originalSelectedIds) {
+            expect(selectedIds.has(id)).toBe(true);
+          }
+        }
+      ),
+      { numRuns: 200 }
+    );
+  });
+
+  it('Select All always covers all visible items regardless of collapse state', () => {
+    fc.assert(
+      fc.property(
+        queueItemsArbitrary.chain(items =>
+          fc.tuple(
+            fc.constant(items),
+            fc.constant(sectionKeysForItems(items))
+          )
+        ).chain(([items, sectionKeys]) =>
+          fc.tuple(
+            fc.constant(items),
+            sectionKeys.length > 0
+              ? collapsedSectionsArbitrary(sectionKeys)
+              : fc.constant({})
+          )
+        ),
+        ([visibleItems, collapsedSections]) => {
+          // Regardless of which sections are collapsed, selectAll operates
+          // on the full visibleItems array (all pending items)
+          const allSelectedIds = selectAll(visibleItems);
+
+          // Every visible item must be in the selected set
+          for (const item of visibleItems) {
+            expect(allSelectedIds.has(item.id)).toBe(true);
+          }
+
+          // The selected set size must equal the number of visible items
+          expect(allSelectedIds.size).toBe(visibleItems.length);
+
+          // Verify this holds even after toggling all sections to collapsed
+          let fullyCollapsed = { ...collapsedSections };
+          const sectionKeys = Object.keys(collapsedSections);
+          for (const key of sectionKeys) {
+            fullyCollapsed = toggleSection(fullyCollapsed, key);
+          }
+
+          // selectAll still returns all visible items — collapse state is irrelevant
+          const afterCollapseSelectAll = selectAll(visibleItems);
+          expect(afterCollapseSelectAll).toEqual(allSelectedIds);
+          expect(afterCollapseSelectAll.size).toBe(visibleItems.length);
+        }
+      ),
+      { numRuns: 200 }
+    );
+  });
+
+  it('selection count always equals total selected items across all sections regardless of collapse', () => {
+    fc.assert(
+      fc.property(
+        queueItemsArbitrary.chain(items =>
+          fc.tuple(
+            fc.constant(items),
+            selectedIdsArbitrary(items),
+            fc.constant(sectionKeysForItems(items))
+          )
+        ).chain(([items, selectedIds, sectionKeys]) =>
+          fc.tuple(
+            fc.constant(items),
+            fc.constant(selectedIds),
+            sectionKeys.length > 0
+              ? collapsedSectionsArbitrary(sectionKeys)
+              : fc.constant({})
+          )
+        ),
+        ([_items, selectedIds, collapsedSections]) => {
+          // The selection count (selectedIds.size) is independent of collapse state.
+          // Changing collapse state should never change the count.
+          const countBefore = selectedIds.size;
+
+          // Toggle every section
+          let currentCollapsed = { ...collapsedSections };
+          const sectionKeys = Object.keys(collapsedSections);
+          for (const key of sectionKeys) {
+            currentCollapsed = toggleSection(currentCollapsed, key);
+            // After each toggle, selection count must remain the same
+            expect(selectedIds.size).toBe(countBefore);
+          }
+        }
+      ),
+      { numRuns: 200 }
+    );
+  });
+});

frontend/src/components/AtlasBadge.js

@@ -49,6 +49,9 @@ export default function AtlasBadge({ hostId, atlasStatus, onClick }) {
   // No status data — render nothing
   if (!atlasStatus) return null;
 
+  // Host not tracked by Atlas — render nothing (avoids noise from BUs not covered)
+  if (atlasStatus.atlas_known === false) return null;
+
   const hasPlan = atlasStatus.plan_count > 0;
   const style = hasPlan ? successStyle : warningStyle;
   const label = hasPlan ? String(atlasStatus.plan_count) : '0';

frontend/src/components/CardActionModal.js

@@ -0,0 +1,425 @@
+/**
+ * CardActionModal — CARD Asset Action Modal
+ *
+ * Shows the full CARD owner record for an asset and allows
+ * confirm/decline/redirect operations with full context.
+ */
+
+import React, { useState, useEffect } from 'react';
+import { X, Loader, AlertCircle, CheckCircle, ArrowRightLeft, XCircle, ExternalLink } from 'lucide-react';
+
+const API_BASE = process.env.REACT_APP_API_BASE || 'http://localhost:3001/api';
+
+const OVERLAY = {
+  position: 'fixed', inset: 0, background: 'rgba(0,0,0,0.75)', backdropFilter: 'blur(4px)',
+  zIndex: 10200, display: 'flex', alignItems: 'center', justifyContent: 'center',
+};
+const MODAL = {
+  background: 'linear-gradient(135deg, #1E293B, #0F172A)',
+  borderRadius: '1rem', border: '1px solid rgba(124, 58, 237, 0.25)',
+  width: '90vw', maxWidth: '600px', maxHeight: '85vh', overflow: 'auto',
+  padding: '1.5rem', position: 'relative',
+};
+const SECTION = {
+  background: 'rgba(15, 23, 42, 0.6)', border: '1px solid rgba(51, 65, 85, 0.5)',
+  borderRadius: '0.5rem', padding: '0.75rem', marginBottom: '0.75rem',
+};
+const LABEL = { fontSize: '0.6rem', color: '#64748B', textTransform: 'uppercase', letterSpacing: '0.05em', marginBottom: '0.2rem' };
+const VALUE = { fontSize: '0.75rem', color: '#E2E8F0', fontFamily: "'JetBrains Mono', monospace" };
+const TEAM_BADGE = (color) => ({
+  display: 'inline-block', padding: '0.15rem 0.5rem', borderRadius: '0.25rem',
+  fontSize: '0.7rem', fontWeight: '600', fontFamily: 'monospace',
+  background: `${color}15`, border: `1px solid ${color}40`, color,
+});
+const INPUT = {
+  width: '100%', boxSizing: 'border-box', background: 'rgba(15, 23, 42, 0.8)',
+  border: '1px solid rgba(51, 65, 85, 0.6)', borderRadius: '0.375rem',
+  color: '#E2E8F0', padding: '0.5rem 0.75rem', fontSize: '0.75rem',
+  fontFamily: "'JetBrains Mono', monospace", outline: 'none',
+};
+const BTN = {
+  padding: '0.5rem 1.25rem', borderRadius: '0.375rem', border: 'none',
+  fontSize: '0.75rem', fontWeight: '600', cursor: 'pointer', transition: 'all 0.12s',
+};
+
+export default function CardActionModal({ isOpen, onClose, item, initialAction, cardTeams, onSuccess }) {
+  const [ownerData, setOwnerData] = useState(null);
+  const [loading, setLoading] = useState(false);
+  const [error, setError] = useState(null);
+  const [action, setAction] = useState(initialAction || 'confirm');
+  const [teamName, setTeamName] = useState('');
+  const [fromTeam, setFromTeam] = useState('');
+  const [toTeam, setToTeam] = useState('');
+  const [comment, setComment] = useState('');
+  const [executing, setExecuting] = useState(false);
+  const [execError, setExecError] = useState(null);
+
+  // Fetch owner data when modal opens
+  useEffect(() => {
+    if (!isOpen || !item?.ip_address) return;
+
+    setLoading(true);
+    setError(null);
+    setOwnerData(null);
+    setExecError(null);
+
+    fetch(`${API_BASE}/card/owner-lookup/${encodeURIComponent(item.ip_address)}${item.host_id ? '?hostId=' + encodeURIComponent(item.host_id) : ''}`, { credentials: 'include' })
+      .then(r => {
+        if (!r.ok) return r.json().then(d => { throw new Error(d.error || `HTTP ${r.status}`); });
+        return r.json();
+      })
+      .then(data => {
+        setOwnerData(data);
+        // Pre-fill team fields based on owner data
+        if (data.confirmed) {
+          setTeamName(data.confirmed.name || '');
+          setFromTeam(data.confirmed.name || '');
+        } else if (data.unconfirmed) {
+          setTeamName(data.unconfirmed.name || '');
+          setFromTeam(data.unconfirmed.name || '');
+        }
+        setLoading(false);
+      })
+      .catch(err => {
+        setError(err.message);
+        setLoading(false);
+      });
+  }, [isOpen, item]);
+
+  // Reset action when initialAction changes
+  useEffect(() => {
+    if (initialAction) setAction(initialAction);
+  }, [initialAction]);
+
+  const handleExecute = async () => {
+    setExecuting(true);
+    setExecError(null);
+
+    try {
+      let url, body;
+
+      if (action === 'confirm') {
+        url = `${API_BASE}/card/queue/${item.id}/confirm`;
+        body = { teamName: teamName.trim(), assetId: item.ip_address, comment: comment.trim() };
+      } else if (action === 'decline') {
+        url = `${API_BASE}/card/queue/${item.id}/decline`;
+        body = { teamName: teamName.trim(), assetId: item.ip_address, comment: comment.trim() };
+      } else if (action === 'redirect') {
+        url = `${API_BASE}/card/queue/${item.id}/redirect`;
+        body = { fromTeam: fromTeam.trim(), toTeam: toTeam.trim(), assetId: item.ip_address };
+      }
+
+      const res = await fetch(url, {
+        method: 'POST',
+        credentials: 'include',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify(body),
+      });
+
+      const data = await res.json();
+      if (!res.ok) {
+        setExecError(data.error || data.message || `${action} failed.`);
+        setExecuting(false);
+        return;
+      }
+
+      setExecuting(false);
+      if (onSuccess) onSuccess(item.id, action);
+      onClose();
+    } catch (err) {
+      setExecError(err.message || 'Network error.');
+      setExecuting(false);
+    }
+  };
+
+  if (!isOpen) return null;
+
+  const canExecute = () => {
+    if (action === 'confirm' || action === 'decline') return teamName.trim().length > 0;
+    if (action === 'redirect') return fromTeam.trim().length > 0 && toTeam.trim().length > 0;
+    return false;
+  };
+
+  return (
+    <div style={OVERLAY} onClick={onClose}>
+      <div style={MODAL} onClick={e => e.stopPropagation()}>
+        {/* Header */}
+        <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginBottom: '1rem' }}>
+          <div>
+            <h3 style={{ margin: 0, color: '#F8FAFC', fontSize: '0.95rem' }}>CARD Asset Action</h3>
+            {ownerData && (
+              <div style={{ display: 'flex', alignItems: 'center', gap: '0.5rem', marginTop: '0.2rem' }}>
+                <span style={{ fontSize: '0.7rem', color: '#7C3AED', fontFamily: 'monospace' }}>
+                  {ownerData.asset_id}
+                </span>
+                {item?.host_id && (
+                  <button
+                    onClick={() => {
+                      try {
+                        const ta = document.createElement('textarea');
+                        ta.value = String(item.host_id);
+                        ta.style.position = 'fixed';
+                        ta.style.opacity = '0';
+                        document.body.appendChild(ta);
+                        ta.select();
+                        document.execCommand('copy');
+                        document.body.removeChild(ta);
+                      } catch (_) { /* best effort */ }
+                      window.open('https://card.charter.com/ipn-search', '_blank');
+                    }}
+                    title={`Copy Host ID ${item.host_id} and open CARD`}
+                    style={{
+                      display: 'inline-flex', alignItems: 'center', gap: '0.25rem',
+                      padding: '0.15rem 0.45rem',
+                      background: 'rgba(14, 165, 233, 0.12)',
+                      border: '1px solid rgba(14, 165, 233, 0.4)',
+                      borderRadius: '0.25rem',
+                      color: '#7DD3FC',
+                      fontSize: '0.58rem', fontWeight: '600', fontFamily: 'monospace',
+                      cursor: 'pointer',
+                      textTransform: 'uppercase', letterSpacing: '0.04em',
+                      transition: 'all 0.12s',
+                    }}
+                    onMouseEnter={(e) => { e.currentTarget.style.background = 'rgba(14, 165, 233, 0.25)'; }}
+                    onMouseLeave={(e) => { e.currentTarget.style.background = 'rgba(14, 165, 233, 0.12)'; }}
+                  >
+                    <ExternalLink style={{ width: 9, height: 9 }} />
+                    CARD
+                  </button>
+                )}
+              </div>
+            )}
+          </div>
+          <button onClick={onClose} style={{ background: 'none', border: 'none', color: '#64748B', cursor: 'pointer' }}>
+            <X style={{ width: '18px', height: '18px' }} />
+          </button>
+        </div>
+
+        {/* Loading */}
+        {loading && (
+          <div style={{ textAlign: 'center', padding: '2rem' }}>
+            <Loader style={{ width: '20px', height: '20px', color: '#7C3AED', animation: 'spin 1s linear infinite' }} />
+            <div style={{ fontSize: '0.75rem', color: '#64748B', marginTop: '0.5rem' }}>Loading CARD data...</div>
+          </div>
+        )}
+
+        {/* Error loading */}
+        {error && (
+          <div style={{ ...SECTION, borderColor: 'rgba(239, 68, 68, 0.4)' }}>
+            <div style={{ display: 'flex', alignItems: 'center', gap: '0.5rem' }}>
+              <AlertCircle style={{ width: '14px', height: '14px', color: '#EF4444' }} />
+              <span style={{ fontSize: '0.75rem', color: '#FCA5A5' }}>{error}</span>
+            </div>
+          </div>
+        )}
+
+        {/* Owner data display */}
+        {ownerData && (
+          <>
+            {/* Ownership section */}
+            <div style={SECTION}>
+              <div style={LABEL}>Ownership</div>
+              <div style={{ display: 'grid', gap: '0.5rem', marginTop: '0.3rem' }}>
+                <div style={{ display: 'flex', alignItems: 'center', gap: '0.5rem' }}>
+                  <span style={{ fontSize: '0.65rem', color: '#64748B', width: '80px' }}>Confirmed:</span>
+                  {ownerData.confirmed ? (
+                    <span style={TEAM_BADGE('#10B981')}>{ownerData.confirmed.name}</span>
+                  ) : (
+                    <span style={{ fontSize: '0.7rem', color: '#475569' }}>—</span>
+                  )}
+                  {ownerData.confirmed && (
+                    <span style={{ fontSize: '0.6rem', color: '#64748B' }}>
+                      (score: {ownerData.confirmed.score}, {ownerData.confirmed.datasource})
+                    </span>
+                  )}
+                </div>
+                <div style={{ display: 'flex', alignItems: 'center', gap: '0.5rem' }}>
+                  <span style={{ fontSize: '0.65rem', color: '#64748B', width: '80px' }}>Unconfirmed:</span>
+                  {ownerData.unconfirmed ? (
+                    <span style={TEAM_BADGE('#F59E0B')}>{ownerData.unconfirmed.name}</span>
+                  ) : (
+                    <span style={{ fontSize: '0.7rem', color: '#475569' }}>—</span>
+                  )}
+                </div>
+                {ownerData.candidate && ownerData.candidate.length > 0 && (
+                  <div style={{ display: 'flex', alignItems: 'flex-start', gap: '0.5rem' }}>
+                    <span style={{ fontSize: '0.65rem', color: '#64748B', width: '80px', flexShrink: 0 }}>Candidates:</span>
+                    <div style={{ display: 'flex', flexWrap: 'wrap', gap: '0.3rem' }}>
+                      {ownerData.candidate.map((c, i) => (
+                        <span key={i} style={TEAM_BADGE('#94A3B8')}>{c.name} ({c.score})</span>
+                      ))}
+                    </div>
+                  </div>
+                )}
+                {ownerData.declined && ownerData.declined.length > 0 && (
+                  <div style={{ display: 'flex', alignItems: 'flex-start', gap: '0.5rem' }}>
+                    <span style={{ fontSize: '0.65rem', color: '#64748B', width: '80px', flexShrink: 0 }}>Declined:</span>
+                    <div style={{ display: 'flex', flexWrap: 'wrap', gap: '0.3rem' }}>
+                      {ownerData.declined.map((d, i) => (
+                        <span key={i} style={TEAM_BADGE('#EF4444')}>{d.name}</span>
+                      ))}
+                    </div>
+                  </div>
+                )}
+              </div>
+            </div>
+
+            {/* Queue item info */}
+            <div style={SECTION}>
+              <div style={LABEL}>Queue Item</div>
+              <div style={{ display: 'grid', gridTemplateColumns: '1fr 1fr', gap: '0.3rem', marginTop: '0.3rem' }}>
+                <div><span style={{ fontSize: '0.6rem', color: '#64748B' }}>Hostname: </span><span style={VALUE}>{item.hostname || '—'}</span></div>
+                <div><span style={{ fontSize: '0.6rem', color: '#64748B' }}>IP: </span><span style={VALUE}>{item.ip_address || '—'}</span></div>
+                <div><span style={{ fontSize: '0.6rem', color: '#64748B' }}>Finding: </span><span style={VALUE}>{item.finding_id || '—'}</span></div>
+                <div><span style={{ fontSize: '0.6rem', color: '#64748B' }}>CVE: </span><span style={{ ...VALUE, fontSize: '0.65rem' }}>{item.cves_json ? JSON.parse(item.cves_json).slice(0, 2).join(', ') : '—'}</span></div>
+              </div>
+            </div>
+
+            {/* Action section */}
+            <div style={{ ...SECTION, borderColor: 'rgba(124, 58, 237, 0.3)' }}>
+              <div style={LABEL}>Action</div>
+              <div style={{ display: 'flex', gap: '0.5rem', marginTop: '0.4rem', marginBottom: '0.75rem' }}>
+                {['confirm', 'decline', 'redirect'].map(a => (
+                  <button
+                    key={a}
+                    onClick={() => setAction(a)}
+                    style={{
+                      ...BTN,
+                      padding: '0.35rem 0.75rem',
+                      background: action === a ? (a === 'confirm' ? 'rgba(16,185,129,0.15)' : a === 'decline' ? 'rgba(239,68,68,0.15)' : 'rgba(14,165,233,0.15)') : 'transparent',
+                      border: `1px solid ${action === a ? (a === 'confirm' ? '#10B981' : a === 'decline' ? '#EF4444' : '#0EA5E9') : '#334155'}`,
+                      color: action === a ? (a === 'confirm' ? '#10B981' : a === 'decline' ? '#EF4444' : '#0EA5E9') : '#64748B',
+                    }}
+                  >
+                    {a === 'confirm' && <CheckCircle style={{ width: '12px', height: '12px', marginRight: '0.3rem', display: 'inline' }} />}
+                    {a === 'decline' && <XCircle style={{ width: '12px', height: '12px', marginRight: '0.3rem', display: 'inline' }} />}
+                    {a === 'redirect' && <ArrowRightLeft style={{ width: '12px', height: '12px', marginRight: '0.3rem', display: 'inline' }} />}
+                    {a.charAt(0).toUpperCase() + a.slice(1)}
+                  </button>
+                ))}
+              </div>
+
+              {/* Action-specific fields */}
+              {(action === 'confirm' || action === 'decline') && (
+                <div style={{ display: 'flex', flexDirection: 'column', gap: '0.5rem' }}>
+                  <div>
+                    <label style={{ ...LABEL, display: 'block' }}>Team</label>
+                    <select style={INPUT} value={teamName} onChange={e => setTeamName(e.target.value)}>
+                      <option value="">Select team...</option>
+                      {/* Pre-populate with owner teams first */}
+                      {ownerData.confirmed && <option value={ownerData.confirmed.name}>{ownerData.confirmed.name} (confirmed)</option>}
+                      {ownerData.unconfirmed && <option value={ownerData.unconfirmed.name}>{ownerData.unconfirmed.name} (unconfirmed)</option>}
+                      {ownerData.candidate && ownerData.candidate.filter(c => c.name !== 'CARD-UNKNOWN').map(c => (
+                        <option key={c.name} value={c.name}>{c.name} (candidate, score: {c.score})</option>
+                      ))}
+                      <option disabled>───────────</option>
+                      {cardTeams && cardTeams.filter(t => t !== ownerData.confirmed?.name && t !== ownerData.unconfirmed?.name).map(t => (
+                        <option key={t} value={t}>{t}</option>
+                      ))}
+                    </select>
+                  </div>
+                  <div>
+                    <label style={{ ...LABEL, display: 'block' }}>Comment (optional)</label>
+                    <input style={INPUT} value={comment} onChange={e => setComment(e.target.value)} placeholder="Optional comment..." />
+                  </div>
+                </div>
+              )}
+
+              {action === 'redirect' && (
+                <div style={{ display: 'flex', flexDirection: 'column', gap: '0.5rem' }}>
+                  <div>
+                    <label style={{ ...LABEL, display: 'block' }}>From Team</label>
+                    <select style={INPUT} value={fromTeam} onChange={e => setFromTeam(e.target.value)}>
+                      <option value="">Select from team...</option>
+                      {ownerData.confirmed && <option value={ownerData.confirmed.name}>{ownerData.confirmed.name} (confirmed)</option>}
+                      {ownerData.unconfirmed && <option value={ownerData.unconfirmed.name}>{ownerData.unconfirmed.name} (unconfirmed)</option>}
+                      {cardTeams && cardTeams.map(t => (
+                        <option key={t} value={t}>{t}</option>
+                      ))}
+                    </select>
+                  </div>
+                  <div>
+                    <label style={{ ...LABEL, display: 'block' }}>To Team</label>
+                    <select style={INPUT} value={toTeam} onChange={e => setToTeam(e.target.value)}>
+                      <option value="">Select to team...</option>
+                      {cardTeams && cardTeams.map(t => (
+                        <option key={t} value={t}>{t}</option>
+                      ))}
+                    </select>
+                  </div>
+                </div>
+              )}
+            </div>
+
+            {/* Execution error */}
+            {execError && (
+              <div style={{ padding: '0.5rem 0.75rem', background: 'rgba(239, 68, 68, 0.1)', border: '1px solid rgba(239, 68, 68, 0.3)', borderRadius: '0.375rem', marginBottom: '0.75rem' }}>
+                <div style={{ display: 'flex', alignItems: 'center', gap: '0.5rem' }}>
+                  <AlertCircle style={{ width: '13px', height: '13px', color: '#EF4444', flexShrink: 0 }} />
+                  <span style={{ fontSize: '0.7rem', color: '#FCA5A5' }}>
+                    {execError.includes('update_token') ? 'Cannot action via API — this asset has no update token.' : execError}
+                  </span>
+                </div>
+                {execError.includes('update_token') && item?.host_id && (
+                  <div style={{ marginTop: '0.4rem', paddingTop: '0.4rem', borderTop: '1px solid rgba(239, 68, 68, 0.2)' }}>
+                    <span style={{ fontSize: '0.65rem', color: '#94A3B8', display: 'block', marginBottom: '0.3rem' }}>
+                      Action this asset directly in CARD instead:
+                    </span>
+                    <button
+                      onClick={() => {
+                        try {
+                          const ta = document.createElement('textarea');
+                          ta.value = String(item.host_id);
+                          ta.style.position = 'fixed';
+                          ta.style.opacity = '0';
+                          document.body.appendChild(ta);
+                          ta.select();
+                          document.execCommand('copy');
+                          document.body.removeChild(ta);
+                        } catch (_) { /* best effort */ }
+                        window.open('https://card.charter.com/ipn-search', '_blank');
+                      }}
+                      style={{
+                        display: 'inline-flex', alignItems: 'center', gap: '0.35rem',
+                        padding: '0.35rem 0.75rem',
+                        background: 'rgba(14, 165, 233, 0.15)',
+                        border: '1px solid rgba(14, 165, 233, 0.5)',
+                        borderRadius: '0.3rem',
+                        color: '#7DD3FC',
+                        fontSize: '0.7rem', fontWeight: '600', fontFamily: 'monospace',
+                        cursor: 'pointer',
+                        transition: 'all 0.12s',
+                      }}
+                      onMouseEnter={(e) => { e.currentTarget.style.background = 'rgba(14, 165, 233, 0.3)'; }}
+                      onMouseLeave={(e) => { e.currentTarget.style.background = 'rgba(14, 165, 233, 0.15)'; }}
+                    >
+                      <ExternalLink style={{ width: 12, height: 12 }} />
+                      Open in CARD (ID copied)
+                    </button>
+                  </div>
+                )}
+              </div>
+            )}
+
+            {/* Footer */}
+            <div style={{ display: 'flex', justifyContent: 'flex-end', gap: '0.5rem', marginTop: '0.5rem' }}>
+              <button onClick={onClose} style={{ ...BTN, background: '#334155', color: '#E2E8F0' }}>Cancel</button>
+              <button
+                onClick={handleExecute}
+                disabled={!canExecute() || executing}
+                style={{
+                  ...BTN,
+                  background: canExecute() && !executing ? '#7C3AED' : '#1E293B',
+                  color: canExecute() && !executing ? '#fff' : '#475569',
+                  cursor: canExecute() && !executing ? 'pointer' : 'not-allowed',
+                }}
+              >
+                {executing ? 'Executing...' : `Execute ${action.charAt(0).toUpperCase() + action.slice(1)}`}
+              </button>
+            </div>
+          </>
+        )}
+      </div>
+    </div>
+  );
+}

frontend/src/components/CardDetailModal.js

@@ -0,0 +1,419 @@
+/**
+ * CardDetailModal — Full CARD ownership detail view
+ *
+ * Opens from the CARD tooltip "Actions" button on the reporting page.
+ * Shows the full ownership record and allows confirm/decline/redirect
+ * directly against the CARD API (no queue item required).
+ */
+
+import React, { useState, useEffect, useCallback } from 'react';
+import { X, Loader, AlertCircle, CheckCircle, XCircle, ArrowRightLeft, ExternalLink } from 'lucide-react';
+
+// ⚠️ CONVENTION: Prefer using REACT_APP_API_BASE without an absolute URL fallback — other components use relative paths via the env var (e.g. '' default) rather than hardcoding http://localhost:3001/api
+const API_BASE = process.env.REACT_APP_API_BASE || 'http://localhost:3001/api';
+
+const OVERLAY = {
+    position: 'fixed', inset: 0, background: 'rgba(0,0,0,0.75)', backdropFilter: 'blur(4px)',
+    zIndex: 10200, display: 'flex', alignItems: 'center', justifyContent: 'center',
+};
+const MODAL = {
+    background: 'linear-gradient(135deg, #1E293B, #0F172A)',
+    borderRadius: '1rem', border: '1px solid rgba(124, 58, 237, 0.25)',
+    width: '90vw', maxWidth: '580px', maxHeight: '85vh', overflow: 'auto',
+    padding: '1.5rem', position: 'relative',
+};
+const SECTION = {
+    background: 'rgba(15, 23, 42, 0.6)', border: '1px solid rgba(51, 65, 85, 0.5)',
+    borderRadius: '0.5rem', padding: '0.75rem', marginBottom: '0.75rem',
+};
+const LABEL = { fontSize: '0.6rem', color: '#64748B', textTransform: 'uppercase', letterSpacing: '0.05em', marginBottom: '0.2rem' };
+const VALUE = { fontSize: '0.75rem', color: '#E2E8F0', fontFamily: "'JetBrains Mono', monospace" };
+const TEAM_BADGE = (color) => ({
+    display: 'inline-block', padding: '0.15rem 0.5rem', borderRadius: '0.25rem',
+    fontSize: '0.7rem', fontWeight: '600', fontFamily: 'monospace',
+    background: `${color}15`, border: `1px solid ${color}40`, color,
+});
+const INPUT = {
+    width: '100%', boxSizing: 'border-box', background: 'rgba(15, 23, 42, 0.8)',
+    border: '1px solid rgba(51, 65, 85, 0.6)', borderRadius: '0.375rem',
+    color: '#E2E8F0', padding: '0.5rem 0.75rem', fontSize: '0.75rem',
+    fontFamily: "'JetBrains Mono', monospace", outline: 'none',
+};
+const BTN = {
+    padding: '0.5rem 1.25rem', borderRadius: '0.375rem', border: 'none',
+    fontSize: '0.75rem', fontWeight: '600', cursor: 'pointer', transition: 'all 0.12s',
+};
+
+export default function CardDetailModal({ isOpen, onClose, ip, ownerData: initialOwnerData, cardTeams }) {
+    const [ownerData, setOwnerData] = useState(initialOwnerData || null);
+    const [loading, setLoading] = useState(false);
+    const [error, setError] = useState(null);
+    const [action, setAction] = useState('confirm');
+    const [teamName, setTeamName] = useState('');
+    const [fromTeam, setFromTeam] = useState('');
+    const [toTeam, setToTeam] = useState('');
+    const [comment, setComment] = useState('');
+    const [executing, setExecuting] = useState(false);
+    const [execError, setExecError] = useState(null);
+    const [execSuccess, setExecSuccess] = useState(null);
+
+    // Fetch owner data if not provided or refresh on open
+    useEffect(() => {
+        if (!isOpen || !ip) return;
+
+        // If we already have data from the tooltip cache, use it
+        if (initialOwnerData && !initialOwnerData.notFound && !initialOwnerData.error) {
+            setOwnerData(initialOwnerData);
+            // Pre-fill team fields
+            if (initialOwnerData.confirmed) {
+                setTeamName(initialOwnerData.confirmed.name || '');
+                setFromTeam(initialOwnerData.confirmed.name || '');
+            } else if (initialOwnerData.unconfirmed) {
+                setTeamName(initialOwnerData.unconfirmed.name || '');
+                setFromTeam(initialOwnerData.unconfirmed.name || '');
+            }
+            return;
+        }
+
+        // Fetch fresh
+        setLoading(true);
+        setError(null);
+        fetch(`${API_BASE}/card/owner-lookup/${encodeURIComponent(ip)}`, { credentials: 'include' })
+            .then(r => {
+                if (!r.ok) return r.json().then(d => { throw new Error(d.error || `HTTP ${r.status}`); });
+                return r.json();
+            })
+            .then(data => {
+                setOwnerData(data);
+                if (data.confirmed) {
+                    setTeamName(data.confirmed.name || '');
+                    setFromTeam(data.confirmed.name || '');
+                } else if (data.unconfirmed) {
+                    setTeamName(data.unconfirmed.name || '');
+                    setFromTeam(data.unconfirmed.name || '');
+                }
+                setLoading(false);
+            })
+            .catch(err => {
+                setError(err.message);
+                setLoading(false);
+            });
+    }, [isOpen, ip, initialOwnerData]);
+
+    // Reset state on close
+    useEffect(() => {
+        if (!isOpen) {
+            setExecError(null);
+            setExecSuccess(null);
+            setComment('');
+        }
+    }, [isOpen]);
+
+    const handleExecute = useCallback(async () => {
+        if (!ownerData?.asset_id) return;
+        setExecuting(true);
+        setExecError(null);
+        setExecSuccess(null);
+
+        try {
+            let url, body;
+            const assetId = ownerData.asset_id;
+
+            if (action === 'confirm') {
+                url = `${API_BASE}/card/owner/${encodeURIComponent(assetId)}/confirm`;
+                body = { teamName: teamName.trim(), comment: comment.trim() };
+            } else if (action === 'decline') {
+                url = `${API_BASE}/card/owner/${encodeURIComponent(assetId)}/decline`;
+                body = { teamName: teamName.trim(), comment: comment.trim() };
+            } else if (action === 'redirect') {
+                url = `${API_BASE}/card/owner/${encodeURIComponent(assetId)}/redirect`;
+                body = { fromTeam: fromTeam.trim(), toTeam: toTeam.trim() };
+            }
+
+            const res = await fetch(url, {
+                method: 'POST',
+                credentials: 'include',
+                headers: { 'Content-Type': 'application/json' },
+                body: JSON.stringify(body),
+            });
+
+            const data = await res.json();
+            if (!res.ok) {
+                setExecError(data.error || data.message || `${action} failed.`);
+            } else {
+                setExecSuccess(`${action.charAt(0).toUpperCase() + action.slice(1)} successful.`);
+            }
+        } catch (err) {
+            setExecError(err.message || 'Network error.');
+        } finally {
+            setExecuting(false);
+        }
+    }, [ownerData, action, teamName, fromTeam, toTeam, comment]);
+
+    if (!isOpen) return null;
+
+    const canExecute = () => {
+        if (action === 'confirm' || action === 'decline') return teamName.trim().length > 0;
+        if (action === 'redirect') return fromTeam.trim().length > 0 && toTeam.trim().length > 0;
+        return false;
+    };
+
+    return (
+        <div style={OVERLAY} onClick={onClose}>
+            <div style={MODAL} onClick={e => e.stopPropagation()}>
+                {/* Header */}
+                <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginBottom: '1rem' }}>
+                    <div>
+                        <h3 style={{ margin: 0, color: '#F8FAFC', fontSize: '0.95rem' }}>CARD Asset Details</h3>
+                        <div style={{ fontSize: '0.72rem', color: '#0EA5E9', fontFamily: "'JetBrains Mono', monospace", marginTop: '0.2rem' }}>
+                            {ip}
+                        </div>
+                        {ownerData?.asset_id && (
+                            <div style={{ fontSize: '0.65rem', color: '#7C3AED', fontFamily: 'monospace', marginTop: '0.1rem' }}>
+                                {ownerData.asset_id}
+                            </div>
+                        )}
+                    </div>
+                    <button onClick={onClose} style={{ background: 'none', border: 'none', color: '#64748B', cursor: 'pointer' }}>
+                        <X style={{ width: '18px', height: '18px' }} />
+                    </button>
+                </div>
+
+                {/* Loading */}
+                {loading && (
+                    <div style={{ textAlign: 'center', padding: '2rem' }}>
+                        <Loader style={{ width: '20px', height: '20px', color: '#7C3AED', animation: 'spin 1s linear infinite' }} />
+                        <div style={{ fontSize: '0.75rem', color: '#64748B', marginTop: '0.5rem' }}>Loading CARD data...</div>
+                    </div>
+                )}
+
+                {/* Error */}
+                {error && (
+                    <div style={{ ...SECTION, borderColor: 'rgba(239, 68, 68, 0.4)' }}>
+                        <div style={{ display: 'flex', alignItems: 'center', gap: '0.5rem' }}>
+                            <AlertCircle style={{ width: '14px', height: '14px', color: '#EF4444' }} />
+                            <span style={{ fontSize: '0.75rem', color: '#FCA5A5' }}>{error}</span>
+                        </div>
+                    </div>
+                )}
+
+                {/* Owner data */}
+                {ownerData && !loading && (
+                    <>
+                        {/* Ownership section */}
+                        <div style={SECTION}>
+                            <div style={LABEL}>Ownership</div>
+                            <div style={{ display: 'grid', gap: '0.5rem', marginTop: '0.3rem' }}>
+                                <div style={{ display: 'flex', alignItems: 'center', gap: '0.5rem' }}>
+                                    <span style={{ fontSize: '0.65rem', color: '#64748B', width: '80px' }}>Confirmed:</span>
+                                    {ownerData.confirmed ? (
+                                        <>
+                                            <span style={TEAM_BADGE('#10B981')}>{ownerData.confirmed.name}</span>
+                                            <span style={{ fontSize: '0.6rem', color: '#64748B' }}>
+                                                (score: {ownerData.confirmed.score}, {ownerData.confirmed.datasource || 'n/a'})
+                                            </span>
+                                        </>
+                                    ) : (
+                                        <span style={{ ...VALUE, color: '#475569' }}>—</span>
+                                    )}
+                                </div>
+                                <div style={{ display: 'flex', alignItems: 'center', gap: '0.5rem' }}>
+                                    <span style={{ fontSize: '0.65rem', color: '#64748B', width: '80px' }}>Unconfirmed:</span>
+                                    {ownerData.unconfirmed ? (
+                                        <>
+                                            <span style={TEAM_BADGE('#F59E0B')}>{ownerData.unconfirmed.name}</span>
+                                            <span style={{ fontSize: '0.6rem', color: '#64748B' }}>
+                                                (score: {ownerData.unconfirmed.score})
+                                            </span>
+                                        </>
+                                    ) : (
+                                        <span style={{ ...VALUE, color: '#475569' }}>—</span>
+                                    )}
+                                </div>
+                                {ownerData.candidate && ownerData.candidate.length > 0 && (
+                                    <div style={{ display: 'flex', alignItems: 'flex-start', gap: '0.5rem' }}>
+                                        <span style={{ fontSize: '0.65rem', color: '#64748B', width: '80px', flexShrink: 0 }}>Candidates:</span>
+                                        <div style={{ display: 'flex', flexWrap: 'wrap', gap: '0.3rem' }}>
+                                            {ownerData.candidate.map((c, i) => (
+                                                <span key={i} style={TEAM_BADGE('#94A3B8')}>{c.name} ({c.score})</span>
+                                            ))}
+                                        </div>
+                                    </div>
+                                )}
+                                {ownerData.declined && ownerData.declined.length > 0 && (
+                                    <div style={{ display: 'flex', alignItems: 'flex-start', gap: '0.5rem' }}>
+                                        <span style={{ fontSize: '0.65rem', color: '#64748B', width: '80px', flexShrink: 0 }}>Declined:</span>
+                                        <div style={{ display: 'flex', flexWrap: 'wrap', gap: '0.3rem' }}>
+                                            {ownerData.declined.map((d, i) => (
+                                                <span key={i} style={TEAM_BADGE('#EF4444')}>{d.name}</span>
+                                            ))}
+                                        </div>
+                                    </div>
+                                )}
+                            </div>
+                        </div>
+
+                        {/* Action section */}
+                        <div style={{ ...SECTION, borderColor: 'rgba(124, 58, 237, 0.3)' }}>
+                            <div style={LABEL}>Action</div>
+                            <div style={{ display: 'flex', gap: '0.5rem', marginTop: '0.4rem', marginBottom: '0.75rem' }}>
+                                {['confirm', 'decline', 'redirect'].map(a => (
+                                    <button
+                                        key={a}
+                                        onClick={() => setAction(a)}
+                                        style={{
+                                            ...BTN,
+                                            padding: '0.35rem 0.75rem',
+                                            background: action === a ? (a === 'confirm' ? 'rgba(16,185,129,0.15)' : a === 'decline' ? 'rgba(239,68,68,0.15)' : 'rgba(14,165,233,0.15)') : 'transparent',
+                                            border: `1px solid ${action === a ? (a === 'confirm' ? '#10B981' : a === 'decline' ? '#EF4444' : '#0EA5E9') : '#334155'}`,
+                                            color: action === a ? (a === 'confirm' ? '#10B981' : a === 'decline' ? '#EF4444' : '#0EA5E9') : '#64748B',
+                                        }}
+                                    >
+                                        {a === 'confirm' && <CheckCircle style={{ width: '12px', height: '12px', marginRight: '0.3rem', display: 'inline' }} />}
+                                        {a === 'decline' && <XCircle style={{ width: '12px', height: '12px', marginRight: '0.3rem', display: 'inline' }} />}
+                                        {a === 'redirect' && <ArrowRightLeft style={{ width: '12px', height: '12px', marginRight: '0.3rem', display: 'inline' }} />}
+                                        {a.charAt(0).toUpperCase() + a.slice(1)}
+                                    </button>
+                                ))}
+                            </div>
+
+                            {/* Action-specific fields */}
+                            {(action === 'confirm' || action === 'decline') && (
+                                <div style={{ display: 'flex', flexDirection: 'column', gap: '0.5rem' }}>
+                                    <div>
+                                        <label style={{ ...LABEL, display: 'block' }}>Team</label>
+                                        <select style={INPUT} value={teamName} onChange={e => setTeamName(e.target.value)}>
+                                            <option value="">Select team...</option>
+                                            {ownerData.confirmed && <option value={ownerData.confirmed.name}>{ownerData.confirmed.name} (confirmed)</option>}
+                                            {ownerData.unconfirmed && <option value={ownerData.unconfirmed.name}>{ownerData.unconfirmed.name} (unconfirmed)</option>}
+                                            {ownerData.candidate && ownerData.candidate.filter(c => c.name !== 'CARD-UNKNOWN').map(c => (
+                                                <option key={c.name} value={c.name}>{c.name} (candidate, score: {c.score})</option>
+                                            ))}
+                                            <option disabled>───────────</option>
+                                            {cardTeams && cardTeams.filter(t => t !== ownerData.confirmed?.name && t !== ownerData.unconfirmed?.name).map(t => (
+                                                <option key={t} value={t}>{t}</option>
+                                            ))}
+                                        </select>
+                                    </div>
+                                    <div>
+                                        <label style={{ ...LABEL, display: 'block' }}>Comment (optional)</label>
+                                        <input style={INPUT} value={comment} onChange={e => setComment(e.target.value)} placeholder="Optional comment..." />
+                                    </div>
+                                </div>
+                            )}
+
+                            {action === 'redirect' && (
+                                <div style={{ display: 'flex', flexDirection: 'column', gap: '0.5rem' }}>
+                                    <div>
+                                        <label style={{ ...LABEL, display: 'block' }}>From Team</label>
+                                        <select style={INPUT} value={fromTeam} onChange={e => setFromTeam(e.target.value)}>
+                                            <option value="">Select from team...</option>
+                                            {ownerData.confirmed && <option value={ownerData.confirmed.name}>{ownerData.confirmed.name} (confirmed)</option>}
+                                            {ownerData.unconfirmed && <option value={ownerData.unconfirmed.name}>{ownerData.unconfirmed.name} (unconfirmed)</option>}
+                                            {ownerData.candidate && ownerData.candidate.filter(c => c.name !== 'CARD-UNKNOWN').map(c => (
+                                                <option key={c.name} value={c.name}>{c.name} (candidate)</option>
+                                            ))}
+                                            {cardTeams && cardTeams.filter(t => t !== ownerData.confirmed?.name && t !== ownerData.unconfirmed?.name).map(t => (
+                                                <option key={t} value={t}>{t}</option>
+                                            ))}
+                                        </select>
+                                    </div>
+                                    <div>
+                                        <label style={{ ...LABEL, display: 'block' }}>To Team</label>
+                                        <select style={INPUT} value={toTeam} onChange={e => setToTeam(e.target.value)}>
+                                            <option value="">Select to team...</option>
+                                            {ownerData.confirmed && <option value={ownerData.confirmed.name}>{ownerData.confirmed.name} (confirmed)</option>}
+                                            {ownerData.unconfirmed && <option value={ownerData.unconfirmed.name}>{ownerData.unconfirmed.name} (unconfirmed)</option>}
+                                            {ownerData.candidate && ownerData.candidate.filter(c => c.name !== 'CARD-UNKNOWN').map(c => (
+                                                <option key={c.name} value={c.name}>{c.name} (candidate)</option>
+                                            ))}
+                                            {cardTeams && cardTeams.filter(t => t !== ownerData.confirmed?.name && t !== ownerData.unconfirmed?.name).map(t => (
+                                                <option key={t} value={t}>{t}</option>
+                                            ))}
+                                        </select>
+                                    </div>
+                                </div>
+                            )}
+                        </div>
+
+                        {/* Execution error */}
+                        {execError && (
+                            <div style={{ padding: '0.5rem 0.75rem', background: 'rgba(239, 68, 68, 0.1)', border: '1px solid rgba(239, 68, 68, 0.3)', borderRadius: '0.375rem', marginBottom: '0.75rem' }}>
+                                <div style={{ display: 'flex', alignItems: 'center', gap: '0.5rem' }}>
+                                    <AlertCircle style={{ width: '13px', height: '13px', color: '#EF4444', flexShrink: 0 }} />
+                                    <span style={{ fontSize: '0.7rem', color: '#FCA5A5' }}>
+                                        {execError.includes('update_token') ? 'Cannot action via API — this asset has no update token.' : execError}
+                                    </span>
+                                </div>
+                                {execError.includes('update_token') && (
+                                    <div style={{ marginTop: '0.4rem', paddingTop: '0.4rem', borderTop: '1px solid rgba(239, 68, 68, 0.2)' }}>
+                                        <span style={{ fontSize: '0.65rem', color: '#94A3B8', display: 'block', marginBottom: '0.3rem' }}>
+                                            Action this asset directly in CARD instead:
+                                        </span>
+                                        <button
+                                            onClick={() => {
+                                                const hostId = ownerData?.asset_id ? ownerData.asset_id.replace(/-[A-Z]+$/i, '') : ip;
+                                                try {
+                                                    const ta = document.createElement('textarea');
+                                                    ta.value = String(hostId);
+                                                    ta.style.position = 'fixed';
+                                                    ta.style.opacity = '0';
+                                                    document.body.appendChild(ta);
+                                                    ta.select();
+                                                    document.execCommand('copy');
+                                                    document.body.removeChild(ta);
+                                                } catch (_) { /* best effort */ }
+                                                window.open('https://card.charter.com/ipn-search', '_blank');
+                                            }}
+                                            style={{
+                                                display: 'inline-flex', alignItems: 'center', gap: '0.35rem',
+                                                padding: '0.35rem 0.75rem',
+                                                background: 'rgba(14, 165, 233, 0.15)',
+                                                border: '1px solid rgba(14, 165, 233, 0.5)',
+                                                borderRadius: '0.3rem',
+                                                color: '#7DD3FC',
+                                                fontSize: '0.7rem', fontWeight: '600', fontFamily: 'monospace',
+                                                cursor: 'pointer',
+                                                transition: 'all 0.12s',
+                                            }}
+                                            onMouseEnter={(e) => { e.currentTarget.style.background = 'rgba(14, 165, 233, 0.3)'; }}
+                                            onMouseLeave={(e) => { e.currentTarget.style.background = 'rgba(14, 165, 233, 0.15)'; }}
+                                        >
+                                            <ExternalLink style={{ width: 12, height: 12 }} />
+                                            Open in CARD (ID copied)
+                                        </button>
+                                    </div>
+                                )}
+                            </div>
+                        )}
+
+                        {/* Success */}
+                        {execSuccess && (
+                            <div style={{ display: 'flex', alignItems: 'center', gap: '0.5rem', padding: '0.5rem 0.75rem', background: 'rgba(16, 185, 129, 0.1)', border: '1px solid rgba(16, 185, 129, 0.3)', borderRadius: '0.375rem', marginBottom: '0.75rem' }}>
+                                <CheckCircle style={{ width: '13px', height: '13px', color: '#10B981', flexShrink: 0 }} />
+                                <span style={{ fontSize: '0.7rem', color: '#6EE7B7' }}>{execSuccess}</span>
+                            </div>
+                        )}
+
+                        {/* Footer */}
+                        <div style={{ display: 'flex', justifyContent: 'flex-end', gap: '0.5rem', marginTop: '0.5rem' }}>
+                            <button onClick={onClose} style={{ ...BTN, background: '#334155', color: '#E2E8F0' }}>Close</button>
+                            <button
+                                onClick={handleExecute}
+                                disabled={!canExecute() || executing || !!execSuccess}
+                                style={{
+                                    ...BTN,
+                                    background: canExecute() && !executing && !execSuccess ? '#7C3AED' : '#1E293B',
+                                    color: canExecute() && !executing && !execSuccess ? '#fff' : '#475569',
+                                    cursor: canExecute() && !executing && !execSuccess ? 'pointer' : 'not-allowed',
+                                }}
+                            >
+                                {executing ? 'Executing...' : `Execute ${action.charAt(0).toUpperCase() + action.slice(1)}`}
+                            </button>
+                        </div>
+                    </>
+                )}
+            </div>
+        </div>
+    );
+}

frontend/src/components/CardOwnerTooltip.js

@@ -0,0 +1,370 @@
+/**
+ * CardOwnerTooltip — CARD ownership hover tooltip
+ *
+ * Shows CARD asset ownership data (confirmed/unconfirmed/candidate teams)
+ * when hovering over an IP address in the findings table.
+ * Interactive — stays open when you hover into it, includes an Actions button.
+ * Follows the same portal + positioning pattern as CveTooltip.
+ */
+
+import React, { useState, useEffect, useRef, useLayoutEffect, useCallback } from 'react';
+import ReactDOM from 'react-dom';
+import { Loader, AlertCircle, ExternalLink, Copy } from 'lucide-react';
+
+// ⚠️ CONVENTION: Use relative API path fallback, not absolute URL. Should be: process.env.REACT_APP_API_BASE || '/api'
+// Other components in this project use fetch() with relative paths and credentials: 'include'
+const API_BASE = process.env.REACT_APP_API_BASE || 'http://localhost:3001/api';
+
+const TOOLTIP_GAP = 8;
+const ARROW_SIZE = 6;
+const BORDER_COLOR = '#7C3AED'; // purple to match CARD branding
+
+function calcPosition(anchorRect, tooltipHeight, viewportHeight) {
+    const spaceAbove = anchorRect.top;
+    const spaceBelow = viewportHeight - anchorRect.bottom;
+    const needed = tooltipHeight + TOOLTIP_GAP + ARROW_SIZE;
+
+    const placeAbove = spaceAbove >= needed || spaceAbove >= spaceBelow;
+
+    let top;
+    if (placeAbove) {
+        top = anchorRect.top - tooltipHeight - TOOLTIP_GAP - ARROW_SIZE;
+        if (top < 0) top = 0;
+    } else {
+        top = anchorRect.bottom + TOOLTIP_GAP + ARROW_SIZE;
+        if (top + tooltipHeight > viewportHeight) top = viewportHeight - tooltipHeight;
+    }
+
+    const left = anchorRect.left + anchorRect.width / 2;
+
+    return { top, left, placeAbove };
+}
+
+// ---------------------------------------------------------------------------
+// Main exported component
+// ---------------------------------------------------------------------------
+export default function CardOwnerTooltip({ ip, hostId, anchorRect, cache, cardConfigured, onAction, onMouseEnter, onMouseLeave }) {
+    const [data, setData] = useState(null);
+    const [loading, setLoading] = useState(false);
+    const [error, setError] = useState(null);
+
+    useEffect(() => {
+        if (!ip) {
+            setData(null);
+            setLoading(false);
+            setError(null);
+            return;
+        }
+
+        if (!cardConfigured) {
+            setError('CARD not configured');
+            setLoading(false);
+            return;
+        }
+
+        // Check cache
+        if (cache.current.has(ip)) {
+            const cached = cache.current.get(ip);
+            if (cached.error) {
+                setError(cached.error);
+                setData(null);
+            } else {
+                setData(cached);
+                setError(null);
+            }
+            setLoading(false);
+            return;
+        }
+
+        // Fetch — include hostId for fast-path resolution when available
+        const controller = new AbortController();
+        setLoading(true);
+        setData(null);
+        setError(null);
+
+        const hostIdParam = hostId ? `&hostId=${encodeURIComponent(hostId)}` : '';
+        fetch(`${API_BASE}/card/owner-lookup/${encodeURIComponent(ip)}?quick=1${hostIdParam}`, {
+            credentials: 'include',
+            signal: controller.signal,
+        })
+            .then((res) => {
+                if (res.status === 404) {
+                    const result = { notFound: true };
+                    cache.current.set(ip, result);
+                    setData(result);
+                    setLoading(false);
+                    return;
+                }
+                if (res.status === 504) {
+                    // Timeout — don't cache, can be retried
+                    setError('CARD lookup timed out — try again');
+                    setLoading(false);
+                    return;
+                }
+                if (res.status === 502) {
+                    // CARD unreachable — don't cache
+                    setError('CARD unavailable');
+                    setLoading(false);
+                    return;
+                }
+                if (!res.ok) return res.json().then(d => { throw new Error(d.error || `HTTP ${res.status}`); });
+                return res.json();
+            })
+            .then((payload) => {
+                if (!payload) return; // 404 already handled
+                cache.current.set(ip, payload);
+                setData(payload);
+                setLoading(false);
+            })
+            .catch((err) => {
+                if (err.name === 'AbortError') return;
+                cache.current.set(ip, { error: err.message });
+                setError(err.message);
+                setLoading(false);
+            });
+
+        return () => controller.abort();
+    }, [ip, hostId, cache, cardConfigured]);
+
+    if (!ip || !anchorRect) return null;
+    if (!loading && !data && !error) return null;
+
+    return ReactDOM.createPortal(
+        <TooltipBody
+            data={data}
+            loading={loading}
+            error={error}
+            anchorRect={anchorRect}
+            ip={ip}
+            hostId={hostId}
+            onAction={onAction}
+            onMouseEnter={onMouseEnter}
+            onMouseLeave={onMouseLeave}
+        />,
+        document.body,
+    );
+}
+
+// ---------------------------------------------------------------------------
+// TooltipBody — inner component for measurement + rendering
+// ---------------------------------------------------------------------------
+function TooltipBody({ data, loading, error, anchorRect, ip, hostId, onAction, onMouseEnter, onMouseLeave }) {
+    const tooltipRef = useRef(null);
+    const [pos, setPos] = useState({ top: 0, left: 0, placeAbove: true });
+
+    useLayoutEffect(() => {
+        if (!tooltipRef.current || !anchorRect) return;
+        const rect = tooltipRef.current.getBoundingClientRect();
+        const vp = window.innerHeight;
+        setPos(calcPosition(anchorRect, rect.height, vp));
+    }, [anchorRect, data, loading, error]);
+
+    const handleAction = useCallback(() => {
+        if (onAction && ip) {
+            onAction(ip, data);
+        }
+    }, [onAction, ip, data]);
+
+    const tooltipStyle = {
+        position: 'fixed',
+        zIndex: 99999,
+        top: pos.top,
+        left: pos.left,
+        transform: 'translateX(-50%)',
+        maxWidth: 340,
+        minWidth: 220,
+        background: 'linear-gradient(135deg, rgba(30, 41, 59, 0.98), rgba(51, 65, 85, 0.95))',
+        border: `1.5px solid ${BORDER_COLOR}`,
+        borderRadius: '0.5rem',
+        padding: '0.75rem',
+        boxShadow: `0 8px 24px rgba(0, 0, 0, 0.6), 0 0 16px ${BORDER_COLOR}33`,
+        pointerEvents: 'auto',
+        transition: 'opacity 0.15s ease',
+    };
+
+    const arrowStyle = {
+        position: 'absolute',
+        left: '50%',
+        transform: 'translateX(-50%)',
+        width: 0,
+        height: 0,
+        borderLeft: `${ARROW_SIZE}px solid transparent`,
+        borderRight: `${ARROW_SIZE}px solid transparent`,
+        ...(pos.placeAbove
+            ? { bottom: -ARROW_SIZE, borderTop: `${ARROW_SIZE}px solid ${BORDER_COLOR}`, borderBottom: 'none' }
+            : { top: -ARROW_SIZE, borderBottom: `${ARROW_SIZE}px solid ${BORDER_COLOR}`, borderTop: 'none' }),
+    };
+
+    const LABEL = { fontSize: '0.58rem', color: '#64748B', textTransform: 'uppercase', letterSpacing: '0.05em', marginBottom: '0.15rem' };
+    const BADGE = (color) => ({
+        display: 'inline-block', padding: '0.12rem 0.45rem', borderRadius: '0.2rem',
+        fontSize: '0.68rem', fontWeight: '600', fontFamily: "'JetBrains Mono', monospace",
+        background: `${color}18`, border: `1px solid ${color}50`, color,
+    });
+
+    return (
+        <div ref={tooltipRef} style={tooltipStyle} onMouseEnter={onMouseEnter} onMouseLeave={onMouseLeave}>
+            <div style={arrowStyle} />
+
+            {/* Header */}
+            <div style={{ display: 'flex', alignItems: 'center', gap: '0.4rem', marginBottom: '0.5rem' }}>
+                <span style={{ fontSize: '0.6rem', color: '#7C3AED', fontFamily: 'monospace', fontWeight: '700', textTransform: 'uppercase', letterSpacing: '0.08em' }}>
+                    CARD
+                </span>
+                <span style={{ fontSize: '0.72rem', color: '#E2E8F0', fontFamily: "'JetBrains Mono', monospace", fontWeight: '600' }}>
+                    {ip}
+                </span>
+            </div>
+
+            {/* Loading */}
+            {loading && (
+                <div style={{ display: 'flex', alignItems: 'center', justifyContent: 'center', padding: '0.5rem 0' }}>
+                    <Loader style={{ width: 16, height: 16, color: '#7C3AED', animation: 'spin 1s linear infinite' }} />
+                </div>
+            )}
+
+            {/* Error */}
+            {error && !loading && (
+                <div style={{ display: 'flex', alignItems: 'center', gap: '0.4rem' }}>
+                    <AlertCircle style={{ width: 12, height: 12, color: '#EF4444', flexShrink: 0 }} />
+                    <span style={{ fontSize: '0.68rem', color: '#FCA5A5' }}>{error}</span>
+                </div>
+            )}
+
+            {/* Not found */}
+            {data && data.notFound && !loading && (
+                <div style={{ fontSize: '0.7rem', color: '#64748B', fontFamily: 'monospace' }}>
+                    Not found in CARD
+                </div>
+            )}
+
+            {/* Owner data */}
+            {data && !data.notFound && !data.error && !loading && (
+                <div style={{ display: 'flex', flexDirection: 'column', gap: '0.4rem' }}>
+                    {/* Asset ID */}
+                    {data.asset_id && (
+                        <div>
+                            <div style={LABEL}>Asset ID</div>
+                            <div style={{ fontSize: '0.68rem', color: '#A78BFA', fontFamily: "'JetBrains Mono', monospace" }}>
+                                {data.asset_id}
+                            </div>
+                        </div>
+                    )}
+
+                    {/* Confirmed */}
+                    <div>
+                        <div style={LABEL}>Confirmed Owner</div>
+                        {data.confirmed ? (
+                            <div style={{ display: 'flex', alignItems: 'center', gap: '0.4rem' }}>
+                                <span style={BADGE('#10B981')}>{data.confirmed.name}</span>
+                                {data.confirmed.score != null && (
+                                    <span style={{ fontSize: '0.58rem', color: '#64748B' }}>score: {data.confirmed.score}</span>
+                                )}
+                            </div>
+                        ) : (
+                            <span style={{ fontSize: '0.68rem', color: '#475569' }}>—</span>
+                        )}
+                    </div>
+
+                    {/* Unconfirmed */}
+                    {data.unconfirmed && (
+                        <div>
+                            <div style={LABEL}>Unconfirmed</div>
+                            <div style={{ display: 'flex', alignItems: 'center', gap: '0.4rem' }}>
+                                <span style={BADGE('#F59E0B')}>{data.unconfirmed.name}</span>
+                                {data.unconfirmed.score != null && (
+                                    <span style={{ fontSize: '0.58rem', color: '#64748B' }}>score: {data.unconfirmed.score}</span>
+                                )}
+                            </div>
+                        </div>
+                    )}
+
+                    {/* Candidates */}
+                    {data.candidate && data.candidate.length > 0 && (
+                        <div>
+                            <div style={LABEL}>Candidates</div>
+                            <div style={{ display: 'flex', flexWrap: 'wrap', gap: '0.25rem' }}>
+                                {data.candidate.filter(c => c.name !== 'CARD-UNKNOWN').map((c, i) => (
+                                    <span key={i} style={BADGE('#94A3B8')}>{c.name} ({c.score})</span>
+                                ))}
+                            </div>
+                        </div>
+                    )}
+
+                    {/* Declined */}
+                    {data.declined && data.declined.length > 0 && (
+                        <div>
+                            <div style={LABEL}>Declined</div>
+                            <div style={{ display: 'flex', flexWrap: 'wrap', gap: '0.25rem' }}>
+                                {data.declined.map((d, i) => (
+                                    <span key={i} style={BADGE('#EF4444')}>{d.name}</span>
+                                ))}
+                            </div>
+                        </div>
+                    )}
+
+                    {/* Actions button */}
+                    {onAction && (
+                        <div style={{ marginTop: '0.4rem', paddingTop: '0.4rem', borderTop: '1px solid rgba(124, 58, 237, 0.2)', display: 'flex', gap: '0.4rem', flexWrap: 'wrap' }}>
+                            <button
+                                onClick={handleAction}
+                                style={{
+                                    display: 'inline-flex', alignItems: 'center', gap: '0.35rem',
+                                    padding: '0.3rem 0.65rem',
+                                    background: 'rgba(124, 58, 237, 0.12)',
+                                    border: '1px solid rgba(124, 58, 237, 0.4)',
+                                    borderRadius: '0.3rem',
+                                    color: '#A78BFA',
+                                    fontSize: '0.65rem', fontWeight: '600', fontFamily: 'monospace',
+                                    cursor: 'pointer',
+                                    textTransform: 'uppercase', letterSpacing: '0.04em',
+                                    transition: 'all 0.12s',
+                                }}
+                                onMouseEnter={(e) => { e.currentTarget.style.background = 'rgba(124, 58, 237, 0.25)'; e.currentTarget.style.borderColor = 'rgba(124, 58, 237, 0.6)'; }}
+                                onMouseLeave={(e) => { e.currentTarget.style.background = 'rgba(124, 58, 237, 0.12)'; e.currentTarget.style.borderColor = 'rgba(124, 58, 237, 0.4)'; }}
+                            >
+                                <ExternalLink style={{ width: 11, height: 11 }} />
+                                Actions
+                            </button>
+                            {hostId && (
+                                <button
+                                    onClick={() => {
+                                        try {
+                                            const ta = document.createElement('textarea');
+                                            ta.value = String(hostId);
+                                            ta.style.position = 'fixed';
+                                            ta.style.opacity = '0';
+                                            document.body.appendChild(ta);
+                                            ta.select();
+                                            document.execCommand('copy');
+                                            document.body.removeChild(ta);
+                                        } catch (_) { /* best effort */ }
+                                        window.open('https://card.charter.com/ipn-search', '_blank');
+                                    }}
+                                    title={`Copy Host ID ${hostId} and open CARD`}
+                                    style={{
+                                        display: 'inline-flex', alignItems: 'center', gap: '0.35rem',
+                                        padding: '0.3rem 0.65rem',
+                                        background: 'rgba(14, 165, 233, 0.12)',
+                                        border: '1px solid rgba(14, 165, 233, 0.4)',
+                                        borderRadius: '0.3rem',
+                                        color: '#7DD3FC',
+                                        fontSize: '0.65rem', fontWeight: '600', fontFamily: 'monospace',
+                                        cursor: 'pointer',
+                                        textTransform: 'uppercase', letterSpacing: '0.04em',
+                                        transition: 'all 0.12s',
+                                    }}
+                                    onMouseEnter={(e) => { e.currentTarget.style.background = 'rgba(14, 165, 233, 0.25)'; e.currentTarget.style.borderColor = 'rgba(14, 165, 233, 0.6)'; }}
+                                    onMouseLeave={(e) => { e.currentTarget.style.background = 'rgba(14, 165, 233, 0.12)'; e.currentTarget.style.borderColor = 'rgba(14, 165, 233, 0.4)'; }}
+                                >
+                                    <Copy style={{ width: 11, height: 11 }} />
+                                    View in CARD
+                                </button>
+                            )}
+                        </div>
+                    )}
+                </div>
+            )}
+        </div>
+    );
+}

frontend/src/components/ConsolidationModal.js

@@ -0,0 +1,600 @@
+import React, { useState, useEffect, useCallback } from 'react';
+import { X, AlertCircle, Loader, FileText } from 'lucide-react';
+import {
+  generateConsolidatedSummary,
+  generateConsolidatedDescription,
+  extractFirstCve,
+  extractCommonVendor,
+  appendRemediationNotes,
+} from '../utils/jiraConsolidation';
+
+const API_BASE = process.env.REACT_APP_API_BASE || 'http://localhost:3001/api';
+
+// ---------------------------------------------------------------------------
+// Styles — dark theme, monospace fonts, #0EA5E9 accent, gradient backgrounds
+// ---------------------------------------------------------------------------
+const STYLES = {
+  overlay: {
+    position: 'fixed',
+    inset: 0,
+    zIndex: 100,
+    background: 'rgba(10, 14, 39, 0.95)',
+    backdropFilter: 'blur(8px)',
+    display: 'flex',
+    alignItems: 'center',
+    justifyContent: 'center',
+    padding: '1rem',
+  },
+  modal: {
+    position: 'relative',
+    background: 'linear-gradient(135deg, rgba(30, 41, 59, 0.98) 0%, rgba(15, 23, 42, 0.99) 100%)',
+    border: '1px solid rgba(14, 165, 233, 0.25)',
+    borderRadius: '16px',
+    padding: '2rem',
+    width: '90%',
+    maxWidth: '640px',
+    maxHeight: '85vh',
+    overflowY: 'auto',
+    boxShadow: '0 20px 60px rgba(0,0,0,0.7), 0 0 30px rgba(14,165,233,0.08)',
+  },
+  header: {
+    display: 'flex',
+    alignItems: 'flex-start',
+    justifyContent: 'space-between',
+    marginBottom: '1.25rem',
+  },
+  title: {
+    fontFamily: "'JetBrains Mono', monospace",
+    fontSize: '0.9rem',
+    fontWeight: 700,
+    color: '#0EA5E9',
+    textTransform: 'uppercase',
+    letterSpacing: '0.08em',
+  },
+  subtitle: {
+    fontFamily: "'JetBrains Mono', monospace",
+    fontSize: '0.72rem',
+    color: '#94A3B8',
+    marginTop: '0.25rem',
+  },
+  closeBtn: {
+    background: 'transparent',
+    border: 'none',
+    color: '#64748B',
+    cursor: 'pointer',
+    padding: '0.25rem',
+    borderRadius: '4px',
+    display: 'flex',
+    alignItems: 'center',
+    justifyContent: 'center',
+  },
+  section: {
+    marginBottom: '1.25rem',
+  },
+  label: {
+    fontFamily: "'JetBrains Mono', monospace",
+    fontSize: '0.68rem',
+    fontWeight: 600,
+    color: '#7DD3FC',
+    textTransform: 'uppercase',
+    letterSpacing: '0.1em',
+    marginBottom: '0.4rem',
+    display: 'block',
+  },
+  input: {
+    background: 'rgba(15, 23, 42, 0.8)',
+    border: '1px solid rgba(14, 165, 233, 0.2)',
+    borderRadius: '8px',
+    padding: '0.5rem 0.75rem',
+    color: '#F8FAFC',
+    fontSize: '0.82rem',
+    fontFamily: "'JetBrains Mono', monospace",
+    width: '100%',
+    outline: 'none',
+    boxSizing: 'border-box',
+    transition: 'border-color 0.2s',
+  },
+  inputError: {
+    borderColor: 'rgba(239, 68, 68, 0.6)',
+  },
+  textarea: {
+    background: 'rgba(15, 23, 42, 0.8)',
+    border: '1px solid rgba(14, 165, 233, 0.2)',
+    borderRadius: '8px',
+    padding: '0.5rem 0.75rem',
+    color: '#F8FAFC',
+    fontSize: '0.78rem',
+    fontFamily: "'JetBrains Mono', monospace",
+    width: '100%',
+    minHeight: '120px',
+    resize: 'vertical',
+    outline: 'none',
+    boxSizing: 'border-box',
+    transition: 'border-color 0.2s',
+  },
+  readOnlyBadge: {
+    display: 'inline-block',
+    fontFamily: "'JetBrains Mono', monospace",
+    fontSize: '0.7rem',
+    fontWeight: 600,
+    color: '#0EA5E9',
+    background: 'rgba(14, 165, 233, 0.1)',
+    border: '1px solid rgba(14, 165, 233, 0.3)',
+    borderRadius: '4px',
+    padding: '0.25rem 0.6rem',
+  },
+  previewList: {
+    maxHeight: '160px',
+    overflowY: 'auto',
+    border: '1px solid rgba(14, 165, 233, 0.15)',
+    borderRadius: '8px',
+    background: 'rgba(15, 23, 42, 0.6)',
+  },
+  previewItem: {
+    display: 'flex',
+    alignItems: 'center',
+    justifyContent: 'space-between',
+    padding: '0.4rem 0.6rem',
+    borderBottom: '1px solid rgba(255, 255, 255, 0.04)',
+  },
+  previewItemText: {
+    flex: 1,
+    minWidth: 0,
+    overflow: 'hidden',
+  },
+  previewTitle: {
+    fontFamily: "'JetBrains Mono', monospace",
+    fontSize: '0.72rem',
+    color: '#CBD5E1',
+    overflow: 'hidden',
+    textOverflow: 'ellipsis',
+    whiteSpace: 'nowrap',
+  },
+  previewHost: {
+    fontFamily: "'JetBrains Mono', monospace",
+    fontSize: '0.62rem',
+    color: '#64748B',
+    marginTop: '1px',
+  },
+  removeBtn: {
+    background: 'transparent',
+    border: '1px solid rgba(239, 68, 68, 0.3)',
+    borderRadius: '4px',
+    color: '#EF4444',
+    cursor: 'pointer',
+    padding: '0.15rem 0.3rem',
+    marginLeft: '0.5rem',
+    display: 'flex',
+    alignItems: 'center',
+    justifyContent: 'center',
+    flexShrink: 0,
+    transition: 'all 0.2s',
+  },
+  errorMsg: {
+    fontFamily: "'JetBrains Mono', monospace",
+    fontSize: '0.7rem',
+    color: '#EF4444',
+    marginTop: '0.3rem',
+  },
+  warningMsg: {
+    fontFamily: "'JetBrains Mono', monospace",
+    fontSize: '0.7rem',
+    color: '#F59E0B',
+    background: 'rgba(245, 158, 11, 0.08)',
+    border: '1px solid rgba(245, 158, 11, 0.2)',
+    borderRadius: '6px',
+    padding: '0.5rem 0.75rem',
+    marginBottom: '1rem',
+    display: 'flex',
+    alignItems: 'center',
+    gap: '0.4rem',
+  },
+  apiError: {
+    fontFamily: "'JetBrains Mono', monospace",
+    fontSize: '0.72rem',
+    color: '#EF4444',
+    background: 'rgba(239, 68, 68, 0.08)',
+    border: '1px solid rgba(239, 68, 68, 0.25)',
+    borderRadius: '6px',
+    padding: '0.5rem 0.75rem',
+    marginBottom: '1rem',
+    display: 'flex',
+    alignItems: 'center',
+    gap: '0.4rem',
+  },
+  actions: {
+    display: 'flex',
+    gap: '0.75rem',
+    marginTop: '1.5rem',
+  },
+  cancelBtn: {
+    flex: 1,
+    padding: '0.625rem',
+    background: 'transparent',
+    border: '1px solid rgba(100, 116, 139, 0.4)',
+    borderRadius: '0.375rem',
+    color: '#94A3B8',
+    cursor: 'pointer',
+    fontFamily: "'JetBrains Mono', monospace",
+    fontSize: '0.78rem',
+    transition: 'all 0.2s ease',
+  },
+  submitBtn: {
+    flex: 1.5,
+    padding: '0.625rem',
+    background: 'rgba(14, 165, 233, 0.1)',
+    border: '1px solid #0EA5E9',
+    borderRadius: '0.375rem',
+    color: '#0EA5E9',
+    cursor: 'pointer',
+    fontFamily: "'JetBrains Mono', monospace",
+    fontSize: '0.78rem',
+    fontWeight: 600,
+    textTransform: 'uppercase',
+    letterSpacing: '0.05em',
+    transition: 'all 0.2s ease',
+    display: 'flex',
+    alignItems: 'center',
+    justifyContent: 'center',
+    gap: '0.4rem',
+  },
+  submitBtnDisabled: {
+    opacity: 0.4,
+    cursor: 'not-allowed',
+  },
+  charCount: {
+    fontFamily: "'JetBrains Mono', monospace",
+    fontSize: '0.62rem',
+    color: '#64748B',
+    textAlign: 'right',
+    marginTop: '0.2rem',
+  },
+};
+
+/**
+ * ConsolidationModal — Creates a single Jira ticket from multiple selected
+ * Ivanti queue items. Pre-populates summary, description, CVE, and vendor
+ * using aggregation functions.
+ *
+ * Props:
+ *   items     {Array}    — The selected queue items (full objects)
+ *   onClose   {Function} — Close handler
+ *   onSuccess {Function} — Called with created ticket data on success
+ */
+export default function ConsolidationModal({ items, onClose, onSuccess }) {
+  // Internal state — copy of items that can be modified (items removed)
+  const [selectedItems, setSelectedItems] = useState(items);
+
+  // Form fields
+  const [summary, setSummary] = useState('');
+  const [description, setDescription] = useState('');
+  const [cveId, setCveId] = useState('');
+  const [vendor, setVendor] = useState('');
+
+  // Locked source context
+  const sourceContext = 'ivanti_queue';
+
+  // UI state
+  const [summaryError, setSummaryError] = useState(null);
+  const [apiError, setApiError] = useState(null);
+  const [submitting, setSubmitting] = useState(false);
+
+  // ---------------------------------------------------------------------------
+  // Initialize form fields on mount from the original items prop.
+  // Uses items (prop) not selectedItems (state) to avoid re-triggering on removal.
+  // ---------------------------------------------------------------------------
+  useEffect(() => {
+    if (items.length >= 2) {
+      setSummary(generateConsolidatedSummary(items));
+      setCveId(extractFirstCve(items));
+      setVendor(extractCommonVendor(items));
+
+      // Build description, appending remediation notes for Remediate items
+      const baseDescription = generateConsolidatedDescription(items);
+      const remediateItems = items.filter(i => i.workflow_type === 'Remediate');
+      if (remediateItems.length > 0) {
+        Promise.all(
+          remediateItems.map(item =>
+            fetch(`${API_BASE}/ivanti/todo-queue/${item.id}/notes`, { credentials: 'include' })
+              .then(r => r.ok ? r.json() : [])
+              .catch(() => [])
+          )
+        ).then(results => {
+          const notesMap = {};
+          remediateItems.forEach((item, idx) => {
+            if (results[idx] && results[idx].length > 0) {
+              notesMap[item.id] = results[idx];
+            }
+          });
+          setDescription(appendRemediationNotes(baseDescription, notesMap));
+        });
+      } else {
+        setDescription(baseDescription);
+      }
+    }
+  }, [items]);
+
+  // ---------------------------------------------------------------------------
+  // Remove an item from the selection (minimum 2 required)
+  // ---------------------------------------------------------------------------
+  const removeItem = useCallback((itemId) => {
+    setSelectedItems((prev) => prev.filter((i) => i.id !== itemId));
+  }, []);
+
+  // ---------------------------------------------------------------------------
+  // Escape key handler
+  // ---------------------------------------------------------------------------
+  useEffect(() => {
+    const handleKey = (e) => {
+      if (e.key === 'Escape') onClose?.();
+    };
+    document.addEventListener('keydown', handleKey);
+    return () => document.removeEventListener('keydown', handleKey);
+  }, [onClose]);
+
+  // ---------------------------------------------------------------------------
+  // Form validation
+  // ---------------------------------------------------------------------------
+  const canSubmit = selectedItems.length >= 2 && summary.trim().length > 0 && !submitting;
+
+  // ---------------------------------------------------------------------------
+  // Submit handler
+  // ---------------------------------------------------------------------------
+  const handleSubmit = async () => {
+    // Validate summary
+    if (!summary.trim()) {
+      setSummaryError('Summary is required.');
+      return;
+    }
+    if (summary.length > 255) {
+      setSummaryError('Summary must be 255 characters or fewer.');
+      return;
+    }
+    setSummaryError(null);
+    setApiError(null);
+    setSubmitting(true);
+
+    try {
+      // Step 1: Create the Jira ticket
+      const createPayload = {
+        summary: summary.trim(),
+        description,
+        cve_id: cveId.trim() || null,
+        vendor: vendor.trim() || null,
+        source_context: sourceContext,
+      };
+
+      const createRes = await fetch(`${API_BASE}/jira-tickets/create-in-jira`, {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        credentials: 'include',
+        body: JSON.stringify(createPayload),
+      });
+
+      const createData = await createRes.json();
+
+      if (!createRes.ok && createRes.status !== 207) {
+        throw new Error(createData.error || `Failed to create Jira ticket (HTTP ${createRes.status})`);
+      }
+
+      const ticketId = createData.id;
+
+      // Step 2: Link queue items to the ticket via junction endpoint
+      const linkRes = await fetch(`${API_BASE}/jira-tickets/${ticketId}/queue-items`, {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        credentials: 'include',
+        body: JSON.stringify({ queue_item_ids: selectedItems.map((i) => i.id) }),
+      });
+
+      if (!linkRes.ok) {
+        const linkData = await linkRes.json();
+        // Ticket was created but linking failed — partial success
+        console.warn('Junction link failed:', linkData.error || linkRes.status);
+      }
+
+      // Success — close modal and notify parent
+      onSuccess?.(createData);
+    } catch (err) {
+      setApiError(err.message);
+    } finally {
+      setSubmitting(false);
+    }
+  };
+
+  // ---------------------------------------------------------------------------
+  // Render
+  // ---------------------------------------------------------------------------
+  return (
+    <div
+      role="dialog"
+      aria-modal="true"
+      aria-labelledby="consolidation-modal-title"
+      style={STYLES.overlay}
+      onClick={(e) => { if (e.target === e.currentTarget) onClose?.(); }}
+    >
+      <div style={STYLES.modal}>
+        {/* Header */}
+        <div style={STYLES.header}>
+          <div>
+            <div id="consolidation-modal-title" style={STYLES.title}>
+              <FileText style={{ width: '16px', height: '16px', display: 'inline', verticalAlign: 'middle', marginRight: '0.4rem' }} />
+              Create Consolidated Jira Ticket
+            </div>
+            <div style={STYLES.subtitle}>
+              {selectedItems.length} item{selectedItems.length !== 1 ? 's' : ''} selected for consolidation
+            </div>
+          </div>
+          <button
+            onClick={onClose}
+            style={STYLES.closeBtn}
+            title="Close"
+            aria-label="Close modal"
+          >
+            <X style={{ width: '18px', height: '18px' }} />
+          </button>
+        </div>
+
+        {/* Minimum items warning */}
+        {selectedItems.length < 2 && (
+          <div style={STYLES.warningMsg}>
+            <AlertCircle style={{ width: '14px', height: '14px', flexShrink: 0 }} />
+            At least 2 items are required for consolidation. Add more items or close this modal.
+          </div>
+        )}
+
+        {/* API error */}
+        {apiError && (
+          <div style={STYLES.apiError}>
+            <AlertCircle style={{ width: '14px', height: '14px', flexShrink: 0 }} />
+            {apiError}
+          </div>
+        )}
+
+        {/* Selected items preview list */}
+        <div style={STYLES.section}>
+          <label style={STYLES.label}>Selected Items</label>
+          <div style={STYLES.previewList}>
+            {selectedItems.map((item) => (
+              <div key={item.id} style={STYLES.previewItem}>
+                <div style={STYLES.previewItemText}>
+                  <div style={STYLES.previewTitle} title={item.finding_title}>
+                    {item.finding_title || item.finding_id || 'Untitled'}
+                  </div>
+                  <div style={STYLES.previewHost}>
+                    {item.hostname || 'No hostname'}
+                  </div>
+                </div>
+                <button
+                  onClick={() => removeItem(item.id)}
+                  style={STYLES.removeBtn}
+                  title="Remove from selection"
+                  aria-label={`Remove ${item.finding_title || 'item'}`}
+                  disabled={selectedItems.length <= 2}
+                >
+                  <X style={{ width: '12px', height: '12px' }} />
+                </button>
+              </div>
+            ))}
+          </div>
+        </div>
+
+        {/* Summary field (required, max 255 chars) */}
+        <div style={STYLES.section}>
+          <label style={STYLES.label} htmlFor="consolidation-summary">
+            Summary <span style={{ color: '#EF4444' }}>*</span>
+          </label>
+          <input
+            id="consolidation-summary"
+            type="text"
+            value={summary}
+            onChange={(e) => {
+              setSummary(e.target.value);
+              if (summaryError) setSummaryError(null);
+            }}
+            maxLength={255}
+            placeholder="Ticket summary (required)"
+            style={{ ...STYLES.input, ...(summaryError ? STYLES.inputError : {}) }}
+          />
+          <div style={STYLES.charCount}>{summary.length}/255</div>
+          {summaryError && <div style={STYLES.errorMsg}>{summaryError}</div>}
+        </div>
+
+        {/* Description textarea */}
+        <div style={STYLES.section}>
+          <label style={STYLES.label} htmlFor="consolidation-description">
+            Description
+          </label>
+          <textarea
+            id="consolidation-description"
+            value={description}
+            onChange={(e) => setDescription(e.target.value)}
+            placeholder="Aggregated description of selected findings"
+            style={STYLES.textarea}
+          />
+        </div>
+
+        {/* CVE ID (optional) */}
+        <div style={STYLES.section}>
+          <label style={STYLES.label} htmlFor="consolidation-cve">
+            CVE ID <span style={{ color: '#64748B', fontWeight: 400 }}>(optional)</span>
+          </label>
+          <input
+            id="consolidation-cve"
+            type="text"
+            value={cveId}
+            onChange={(e) => setCveId(e.target.value)}
+            placeholder="e.g. CVE-2024-12345"
+            style={STYLES.input}
+          />
+        </div>
+
+        {/* Vendor (optional) */}
+        <div style={STYLES.section}>
+          <label style={STYLES.label} htmlFor="consolidation-vendor">
+            Vendor <span style={{ color: '#64748B', fontWeight: 400 }}>(optional)</span>
+          </label>
+          <input
+            id="consolidation-vendor"
+            type="text"
+            value={vendor}
+            onChange={(e) => setVendor(e.target.value)}
+            placeholder="e.g. Microsoft"
+            style={STYLES.input}
+          />
+        </div>
+
+        {/* Source Context (read-only) */}
+        <div style={STYLES.section}>
+          <label style={STYLES.label}>Source Context</label>
+          <span style={STYLES.readOnlyBadge}>{sourceContext}</span>
+        </div>
+
+        {/* Actions */}
+        <div style={STYLES.actions}>
+          <button
+            onClick={onClose}
+            style={STYLES.cancelBtn}
+            onMouseEnter={(e) => {
+              e.currentTarget.style.borderColor = 'rgba(100,116,139,0.8)';
+              e.currentTarget.style.color = '#CBD5E1';
+            }}
+            onMouseLeave={(e) => {
+              e.currentTarget.style.borderColor = 'rgba(100,116,139,0.4)';
+              e.currentTarget.style.color = '#94A3B8';
+            }}
+          >
+            Cancel
+          </button>
+          <button
+            onClick={handleSubmit}
+            disabled={!canSubmit}
+            style={{
+              ...STYLES.submitBtn,
+              ...(!canSubmit ? STYLES.submitBtnDisabled : {}),
+            }}
+            onMouseEnter={(e) => {
+              if (canSubmit) {
+                e.currentTarget.style.background = 'rgba(14, 165, 233, 0.18)';
+                e.currentTarget.style.boxShadow = '0 0 20px rgba(14, 165, 233, 0.15)';
+              }
+            }}
+            onMouseLeave={(e) => {
+              e.currentTarget.style.background = 'rgba(14, 165, 233, 0.1)';
+              e.currentTarget.style.boxShadow = 'none';
+            }}
+          >
+            {submitting ? (
+              <>
+                <Loader style={{ width: '14px', height: '14px', animation: 'spin 1s linear infinite' }} />
+                Creating…
+              </>
+            ) : (
+              'Create Ticket'
+            )}
+          </button>
+        </div>
+      </div>
+    </div>
+  );
+}

frontend/src/components/DeleteConfirmModal.js

@@ -0,0 +1,271 @@
+// DeleteConfirmModal.js
+// Confirmation dialog for deleting Archer templates.
+// Identifies the template by vendor/platform/model before deletion.
+// On confirm: calls DELETE API, invokes onConfirm callback, closes.
+// On cancel: dismisses dialog, leaves template unchanged.
+
+import React, { useState, useEffect, useRef, useCallback } from 'react';
+import { AlertTriangle, Trash2 } from 'lucide-react';
+
+const API_BASE = process.env.REACT_APP_API_BASE || 'http://localhost:3001/api';
+
+/**
+ * DeleteConfirmModal — confirmation dialog for deleting an Archer template.
+ *
+ * Props:
+ *   template   {object|null}  The template to delete (contains id, vendor, platform, model).
+ *                              When null/undefined, modal is hidden.
+ *   onConfirm  {function}     Callback after successful delete (refresh list).
+ *   onCancel   {function}     Callback to close without deleting.
+ */
+export default function DeleteConfirmModal({ template, onConfirm, onCancel }) {
+  const [deleting, setDeleting] = useState(false);
+  const [error, setError] = useState(null);
+  const cancelRef = useRef(null);
+
+  // Focus cancel button on open and handle Escape key
+  useEffect(() => {
+    if (!template) return;
+
+    const timer = setTimeout(() => cancelRef.current?.focus(), 50);
+
+    const handleKey = (e) => {
+      if (e.key === 'Escape' && !deleting) onCancel?.();
+    };
+    document.addEventListener('keydown', handleKey);
+    return () => {
+      clearTimeout(timer);
+      document.removeEventListener('keydown', handleKey);
+    };
+  }, [template, deleting, onCancel]);
+
+  // Reset state when template changes (new modal open)
+  useEffect(() => {
+    if (template) {
+      setDeleting(false);
+      setError(null);
+    }
+  }, [template]);
+
+  const handleConfirm = useCallback(async () => {
+    if (!template) return;
+    setDeleting(true);
+    setError(null);
+
+    try {
+      const res = await fetch(`${API_BASE}/archer-templates/${template.id}`, {
+        method: 'DELETE',
+        credentials: 'include',
+      });
+
+      if (!res.ok) {
+        const data = await res.json().catch(() => ({}));
+        throw new Error(data.error || `Delete failed (${res.status})`);
+      }
+
+      onConfirm?.();
+    } catch (err) {
+      setError(err.message);
+      setDeleting(false);
+    }
+  }, [template, onConfirm]);
+
+  if (!template) return null;
+
+  return (
+    <div
+      role="dialog"
+      aria-modal="true"
+      aria-labelledby="delete-confirm-title"
+      style={{
+        position: 'fixed',
+        inset: 0,
+        zIndex: 70,
+        background: 'rgba(10, 14, 39, 0.95)',
+        backdropFilter: 'blur(8px)',
+        display: 'flex',
+        alignItems: 'center',
+        justifyContent: 'center',
+        padding: '1rem',
+      }}
+      onClick={(e) => {
+        if (e.target === e.currentTarget && !deleting) onCancel?.();
+      }}
+    >
+      <div style={{
+        background: 'linear-gradient(135deg, rgba(30,41,59,0.98) 0%, rgba(15,23,42,0.99) 100%)',
+        border: '1px solid rgba(239, 68, 68, 0.3)',
+        borderRadius: '0.75rem',
+        boxShadow: '0 20px 60px rgba(0,0,0,0.7), 0 0 30px rgba(239,68,68,0.06)',
+        width: '100%',
+        maxWidth: '440px',
+        padding: '1.75rem 2rem',
+      }}>
+        {/* Header */}
+        <div style={{
+          display: 'flex',
+          alignItems: 'center',
+          gap: '0.625rem',
+          marginBottom: '1rem',
+        }}>
+          <div style={{
+            width: '32px',
+            height: '32px',
+            borderRadius: '0.5rem',
+            background: 'rgba(239, 68, 68, 0.10)',
+            border: '1px solid rgba(239, 68, 68, 0.3)',
+            display: 'flex',
+            alignItems: 'center',
+            justifyContent: 'center',
+            flexShrink: 0,
+          }}>
+            <AlertTriangle style={{ width: '16px', height: '16px', color: '#EF4444' }} />
+          </div>
+          <div
+            id="delete-confirm-title"
+            style={{
+              fontFamily: "'JetBrains Mono', monospace",
+              fontSize: '0.95rem',
+              fontWeight: '700',
+              color: '#EF4444',
+              textTransform: 'uppercase',
+              letterSpacing: '0.08em',
+            }}
+          >
+            Delete Template
+          </div>
+        </div>
+
+        {/* Body */}
+        <div style={{
+          fontSize: '0.82rem',
+          color: '#CBD5E1',
+          lineHeight: '1.6',
+          marginBottom: '1.25rem',
+          fontFamily: "'Outfit', system-ui, sans-serif",
+        }}>
+          <p style={{ margin: '0 0 0.75rem 0' }}>
+            Are you sure you want to delete this template? This action cannot be undone.
+          </p>
+          <div style={{
+            background: 'rgba(239, 68, 68, 0.06)',
+            border: '1px solid rgba(239, 68, 68, 0.15)',
+            borderRadius: '0.5rem',
+            padding: '0.75rem 1rem',
+          }}>
+            <div style={{ display: 'flex', flexDirection: 'column', gap: '0.3rem' }}>
+              <span style={{ color: '#94A3B8', fontSize: '0.72rem', textTransform: 'uppercase', letterSpacing: '0.05em' }}>
+                Vendor
+              </span>
+              <span style={{ color: '#e0e0e0', fontSize: '0.82rem', fontWeight: 600 }}>
+                {template.vendor}
+              </span>
+              <span style={{ color: '#94A3B8', fontSize: '0.72rem', textTransform: 'uppercase', letterSpacing: '0.05em', marginTop: '0.3rem' }}>
+                Platform
+              </span>
+              <span style={{ color: '#e0e0e0', fontSize: '0.82rem', fontWeight: 600 }}>
+                {template.platform}
+              </span>
+              <span style={{ color: '#94A3B8', fontSize: '0.72rem', textTransform: 'uppercase', letterSpacing: '0.05em', marginTop: '0.3rem' }}>
+                Model
+              </span>
+              <span style={{ color: '#e0e0e0', fontSize: '0.82rem', fontWeight: 600 }}>
+                {template.model}
+              </span>
+            </div>
+          </div>
+        </div>
+
+        {/* Error banner */}
+        {error && (
+          <div style={{
+            padding: '0.6rem 0.75rem',
+            borderRadius: '0.375rem',
+            background: 'rgba(239, 68, 68, 0.1)',
+            border: '1px solid rgba(239, 68, 68, 0.25)',
+            color: '#FCA5A5',
+            fontSize: '0.78rem',
+            marginBottom: '1rem',
+            display: 'flex',
+            alignItems: 'center',
+            gap: '0.4rem',
+          }}>
+            <AlertTriangle style={{ width: '12px', height: '12px', flexShrink: 0 }} />
+            {error}
+          </div>
+        )}
+
+        {/* Actions */}
+        <div style={{ display: 'flex', gap: '0.75rem' }}>
+          <button
+            ref={cancelRef}
+            onClick={onCancel}
+            disabled={deleting}
+            style={{
+              flex: 1,
+              padding: '0.625rem',
+              background: 'transparent',
+              border: '1px solid rgba(100,116,139,0.4)',
+              borderRadius: '0.375rem',
+              color: '#94A3B8',
+              cursor: deleting ? 'not-allowed' : 'pointer',
+              fontFamily: "'JetBrains Mono', monospace",
+              fontSize: '0.78rem',
+              opacity: deleting ? 0.5 : 1,
+              transition: 'all 0.2s ease',
+            }}
+            onMouseEnter={e => {
+              if (!deleting) {
+                e.currentTarget.style.borderColor = 'rgba(100,116,139,0.8)';
+                e.currentTarget.style.color = '#CBD5E1';
+              }
+            }}
+            onMouseLeave={e => {
+              e.currentTarget.style.borderColor = 'rgba(100,116,139,0.4)';
+              e.currentTarget.style.color = '#94A3B8';
+            }}
+          >
+            Cancel
+          </button>
+          <button
+            onClick={handleConfirm}
+            disabled={deleting}
+            style={{
+              flex: 1.5,
+              padding: '0.625rem',
+              background: 'rgba(239, 68, 68, 0.10)',
+              border: '1px solid #EF4444',
+              borderRadius: '0.375rem',
+              color: '#EF4444',
+              cursor: deleting ? 'not-allowed' : 'pointer',
+              fontFamily: "'JetBrains Mono', monospace",
+              fontSize: '0.78rem',
+              fontWeight: '600',
+              textTransform: 'uppercase',
+              letterSpacing: '0.05em',
+              transition: 'all 0.2s ease',
+              display: 'flex',
+              alignItems: 'center',
+              justifyContent: 'center',
+              gap: '0.4rem',
+              opacity: deleting ? 0.7 : 1,
+            }}
+            onMouseEnter={e => {
+              if (!deleting) {
+                e.currentTarget.style.background = 'rgba(239, 68, 68, 0.18)';
+                e.currentTarget.style.boxShadow = '0 0 20px rgba(239,68,68,0.15)';
+              }
+            }}
+            onMouseLeave={e => {
+              e.currentTarget.style.background = 'rgba(239, 68, 68, 0.10)';
+              e.currentTarget.style.boxShadow = 'none';
+            }}
+          >
+            <Trash2 style={{ width: '13px', height: '13px' }} />
+            {deleting ? 'Deleting...' : 'Delete Template'}
+          </button>
+        </div>
+      </div>
+    </div>
+  );
+}

frontend/src/components/KnowledgeBaseViewer.js

@@ -1,5 +1,6 @@
 import React, { useState, useEffect, useRef } from 'react';
 import ReactMarkdown from 'react-markdown';
+import remarkGfm from 'remark-gfm';
 import rehypeSanitize from 'rehype-sanitize';
 import mermaid from 'mermaid';
 import { X, Download, Loader, AlertCircle, FileText, File } from 'lucide-react';
@@ -234,6 +235,7 @@ export default function KnowledgeBaseViewer({ article, onClose }) {
             {isMarkdown && (
               <div className="markdown-content">
                 <ReactMarkdown
+                  remarkPlugins={[remarkGfm]}
                   rehypePlugins={[rehypeSanitize]}
                   components={{
                     code({ inline, className, children }) {

frontend/src/components/LoaderModal.js

@@ -0,0 +1,624 @@
+/**
+ * LoaderModal — Granite Team_Device Loader Sheet Generator
+ *
+ * Generates a properly formatted xlsx for upload to SNIP XperLoad.
+ * Supports queue-initiated mode (pre-populated devices) and standalone mode (paste IPs).
+ */
+
+import React, { useState, useEffect, useCallback, useMemo } from 'react';
+import { FileSpreadsheet, Download, X, RefreshCw, Plus, Trash2, AlertCircle, ChevronDown, ChevronRight } from 'lucide-react';
+import {
+  LOADER_COLUMNS,
+  COLUMN_GROUPS,
+  OPERATION_TYPES,
+  getRequiredColumns,
+  getColumnsByGroup,
+} from '../utils/graniteLoaderConfig';
+import { generateLoaderXlsx, generateFilename } from '../utils/graniteLoaderExport';
+import { COLUMN_PICKLISTS } from '../utils/graniteLoaderPicklists';
+import SearchableSelect from './SearchableSelect';
+
+const API_BASE = process.env.REACT_APP_API_BASE || 'http://localhost:3001/api';
+
+// ---------------------------------------------------------------------------
+// Styles
+// ---------------------------------------------------------------------------
+const OVERLAY = {
+  position: 'fixed', inset: 0, background: 'rgba(0,0,0,0.7)', zIndex: 9999,
+  display: 'flex', alignItems: 'center', justifyContent: 'center',
+};
+const MODAL = {
+  background: '#1E293B', borderRadius: '0.75rem', border: '1px solid #334155',
+  width: '90vw', maxWidth: '1100px', maxHeight: '90vh', display: 'flex', flexDirection: 'column',
+  overflow: 'hidden',
+};
+const HEADER = {
+  display: 'flex', alignItems: 'center', justifyContent: 'space-between',
+  padding: '1rem 1.25rem', borderBottom: '1px solid #334155',
+};
+const BODY = { flex: 1, overflow: 'auto', padding: '1.25rem' };
+const FOOTER = {
+  display: 'flex', alignItems: 'center', justifyContent: 'space-between',
+  padding: '1rem 1.25rem', borderTop: '1px solid #334155',
+};
+const INPUT = {
+  background: '#0F172A', border: '1px solid #334155', borderRadius: '0.375rem',
+  color: '#E2E8F0', padding: '0.4rem 0.6rem', fontSize: '0.75rem', width: '100%',
+};
+const BTN = {
+  padding: '0.5rem 1rem', borderRadius: '0.375rem', border: 'none',
+  fontSize: '0.75rem', fontWeight: '600', cursor: 'pointer',
+};
+const BTN_PRIMARY = { ...BTN, background: '#7C3AED', color: '#fff' };
+const BTN_SECONDARY = { ...BTN, background: '#334155', color: '#E2E8F0' };
+const BTN_SUCCESS = { ...BTN, background: '#10B981', color: '#fff' };
+
+export default function LoaderModal({ isOpen, onClose, initialDevices }) {
+  // --- State ---
+  const [operationType, setOperationType] = useState('Change');
+  const [selectedColumns, setSelectedColumns] = useState(new Set());
+  const [devices, setDevices] = useState([]);
+  const [bulkDefaults, setBulkDefaults] = useState({});
+  const [overrides, setOverrides] = useState({});
+  const [editingCell, setEditingCell] = useState(null);
+  const [editValue, setEditValue] = useState('');
+  const [enriching, setEnriching] = useState(false);
+  const [enrichErrors, setEnrichErrors] = useState([]);
+  const [cardConfigured, setCardConfigured] = useState(false);
+  const [pasteInput, setPasteInput] = useState('');
+  const [expandedGroups, setExpandedGroups] = useState(new Set(['Identification', 'Responsible Org']));
+  const [validationWarnings, setValidationWarnings] = useState([]);
+
+  // --- Initialize ---
+  useEffect(() => {
+    if (!isOpen) return;
+    // Check CARD status
+    fetch(`${API_BASE}/card/status`, { credentials: 'include' })
+      .then(r => r.json())
+      .then(d => setCardConfigured(d.configured === true))
+      .catch(() => setCardConfigured(false));
+  }, [isOpen]);
+
+  // Populate devices from initialDevices or reset
+  useEffect(() => {
+    if (!isOpen) return;
+    if (initialDevices && initialDevices.length > 0) {
+      setDevices(initialDevices.map(d => ({
+        IPV4_ADDRESS: d.ip_address || '',
+        EQUIP_NAME: d.hostname || '',
+        _host_id: d.host_id || null,
+      })));
+    } else {
+      setDevices([]);
+    }
+    setOverrides({});
+    setBulkDefaults({});
+    setEnrichErrors([]);
+    setValidationWarnings([]);
+  }, [isOpen, initialDevices]);
+
+  // Auto-select required columns + useful defaults when operation type changes
+  useEffect(() => {
+    const required = getRequiredColumns(operationType);
+    setSelectedColumns(prev => {
+      const next = new Set(prev);
+      required.forEach(id => next.add(id));
+      // Always include these useful columns by default
+      next.add('IPV4_ADDRESS');
+      next.add('EQUIP_NAME');
+      next.add('RESPONSIBLE_TEAM');
+      return next;
+    });
+  }, [operationType]);
+
+  // --- Column selection ---
+  const toggleColumn = useCallback((colId) => {
+    const required = getRequiredColumns(operationType);
+    if (required.includes(colId)) return; // Can't deselect required
+    setSelectedColumns(prev => {
+      const next = new Set(prev);
+      if (next.has(colId)) next.delete(colId);
+      else next.add(colId);
+      return next;
+    });
+  }, [operationType]);
+
+  const toggleGroup = useCallback((group) => {
+    setExpandedGroups(prev => {
+      const next = new Set(prev);
+      if (next.has(group)) next.delete(group);
+      else next.add(group);
+      return next;
+    });
+  }, []);
+
+  // --- Ordered selected columns (canonical order) ---
+  const orderedColumns = useMemo(() => {
+    return LOADER_COLUMNS.filter(col => selectedColumns.has(col.id));
+  }, [selectedColumns]);
+
+  // --- Resolve cell value (override > bulk default > device value > empty) ---
+  const getCellValue = useCallback((rowIdx, colId) => {
+    if (overrides[rowIdx] && overrides[rowIdx][colId] !== undefined) {
+      return overrides[rowIdx][colId];
+    }
+    if (bulkDefaults[colId] !== undefined && bulkDefaults[colId] !== '') {
+      return bulkDefaults[colId];
+    }
+    return devices[rowIdx]?.[colId] || '';
+  }, [overrides, bulkDefaults, devices]);
+
+  // --- Cell editing ---
+  const startEdit = (rowIdx, colId) => {
+    setEditingCell({ rowIdx, colId });
+    setEditValue(getCellValue(rowIdx, colId));
+  };
+
+  const commitEdit = () => {
+    if (!editingCell) return;
+    const { rowIdx, colId } = editingCell;
+    const currentBulk = bulkDefaults[colId] || '';
+    const currentDevice = devices[rowIdx]?.[colId] || '';
+    // Only store override if different from bulk default and device value
+    if (editValue !== currentBulk || currentDevice) {
+      setOverrides(prev => ({
+        ...prev,
+        [rowIdx]: { ...(prev[rowIdx] || {}), [colId]: editValue },
+      }));
+    }
+    setEditingCell(null);
+  };
+
+  const clearOverride = (rowIdx, colId) => {
+    setOverrides(prev => {
+      const next = { ...prev };
+      if (next[rowIdx]) {
+        const row = { ...next[rowIdx] };
+        delete row[colId];
+        if (Object.keys(row).length === 0) delete next[rowIdx];
+        else next[rowIdx] = row;
+      }
+      return next;
+    });
+  };
+
+  // --- Bulk default ---
+  const setBulkDefault = (colId, value) => {
+    setBulkDefaults(prev => ({ ...prev, [colId]: value }));
+  };
+
+  // --- Paste IPs (standalone mode) ---
+  const loadPastedIps = () => {
+    const lines = pasteInput.split(/[\n,]+/).map(s => s.trim()).filter(Boolean);
+    const newDevices = lines.slice(0, 200).map(ip => ({ IPV4_ADDRESS: ip, EQUIP_NAME: '' }));
+    setDevices(newDevices);
+    setOverrides({});
+    setPasteInput('');
+  };
+
+  const addRow = () => {
+    setDevices(prev => [...prev, { IPV4_ADDRESS: '', EQUIP_NAME: '' }]);
+  };
+
+  const removeRow = (idx) => {
+    setDevices(prev => prev.filter((_, i) => i !== idx));
+    setOverrides(prev => {
+      const next = {};
+      Object.entries(prev).forEach(([k, v]) => {
+        const ki = parseInt(k, 10);
+        if (ki < idx) next[ki] = v;
+        else if (ki > idx) next[ki - 1] = v;
+      });
+      return next;
+    });
+  };
+
+  // --- CARD Enrichment ---
+  const enrichFromCard = async () => {
+    const ips = devices.map(d => d.IPV4_ADDRESS).filter(Boolean);
+    const hostIds = devices.filter(d => !d.IPV4_ADDRESS && d._host_id).map(d => d._host_id);
+
+    if (ips.length === 0 && hostIds.length === 0) return;
+
+    setEnriching(true);
+    setEnrichErrors([]);
+
+    try {
+      const body = {};
+      if (ips.length > 0) body.ips = ips;
+      if (hostIds.length > 0) body.host_ids = hostIds;
+
+      const resp = await fetch(`${API_BASE}/card/enrich-batch`, {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        credentials: 'include',
+        body: JSON.stringify(body),
+      });
+
+      if (!resp.ok) {
+        const err = await resp.json().catch(() => ({}));
+        setEnrichErrors([{ ip: 'all', error: err.error || `HTTP ${resp.status}` }]);
+        setEnriching(false);
+        return;
+      }
+
+      const data = await resp.json();
+      const errors = [];
+
+      // Map results back to devices
+      setDevices(prev => prev.map((device, idx) => {
+        // Try matching by IP first
+        let result = data.results ? data.results.find(r => r.ip === device.IPV4_ADDRESS) : null;
+
+        // If no IP match, try matching by host_id
+        if (!result && device._host_id && data.host_id_results) {
+          result = data.host_id_results.find(r => String(r.host_id) === String(device._host_id));
+        }
+
+        if (!result || !result.found) {
+          if (result) errors.push({ ip: device.IPV4_ADDRESS || `hostId:${device._host_id}`, error: result.error || 'Not found' });
+          return device;
+        }
+
+        // Only populate fields that aren't already overridden by the user
+        const updated = { ...device };
+        const rowOverrides = overrides[idx] || {};
+
+        // Populate IP from host_id result if device didn't have one
+        if (result.ip && !device.IPV4_ADDRESS) {
+          updated.IPV4_ADDRESS = result.ip;
+        }
+        if (result.equip_inst_id && !rowOverrides.EQUIP_INST_ID && !device.EQUIP_INST_ID) {
+          updated.EQUIP_INST_ID = result.equip_inst_id;
+        }
+        if (result.hostname && !rowOverrides.EQUIP_NAME && !device.EQUIP_NAME) {
+          updated.EQUIP_NAME = result.hostname;
+        }
+        if (result.site_name && !rowOverrides.SITE_NAME && !device.SITE_NAME) {
+          updated.SITE_NAME = result.site_name;
+        }
+        if (result.mgmt_ip_asn && !rowOverrides.MGMT_IP_ASN && !device.MGMT_IP_ASN) {
+          updated.MGMT_IP_ASN = result.mgmt_ip_asn;
+        }
+        if (result.responsible_team && !rowOverrides.RESPONSIBLE_TEAM && !device.RESPONSIBLE_TEAM) {
+          updated.RESPONSIBLE_TEAM = result.responsible_team;
+        }
+        if (result.equip_status && !rowOverrides.EQUIP_STATUS && !device.EQUIP_STATUS) {
+          updated.EQUIP_STATUS = result.equip_status;
+        }
+
+        return updated;
+      }));
+
+      setEnrichErrors(errors);
+    } catch (err) {
+      setEnrichErrors([{ ip: 'all', error: err.message }]);
+    }
+
+    setEnriching(false);
+  };
+
+  // --- Validation ---
+  const validate = () => {
+    const required = getRequiredColumns(operationType);
+    const warnings = [];
+
+    devices.forEach((_, rowIdx) => {
+      required.forEach(colId => {
+        if (colId === 'DELETE') return; // Auto-filled
+        const val = getCellValue(rowIdx, colId);
+        if (!val) {
+          warnings.push({ rowIdx, colId });
+        }
+      });
+    });
+
+    setValidationWarnings(warnings);
+    return warnings;
+  };
+
+  // --- Download ---
+  const handleDownload = () => {
+    const warnings = validate();
+
+    // Build final rows
+    const finalRows = devices.map((_, rowIdx) => {
+      const row = {};
+      orderedColumns.forEach(col => {
+        row[col.id] = getCellValue(rowIdx, col.id);
+      });
+      return row;
+    });
+
+    // Determine team name for filename (from bulk default or first row)
+    const teamName = bulkDefaults.RESPONSIBLE_TEAM || finalRows[0]?.RESPONSIBLE_TEAM || '';
+
+    const blob = generateLoaderXlsx({
+      operationType,
+      columnIds: orderedColumns.map(c => c.id),
+      rows: finalRows,
+    });
+
+    const filename = generateFilename(operationType, teamName);
+    const url = URL.createObjectURL(blob);
+    const a = document.createElement('a');
+    a.href = url;
+    a.download = filename;
+    document.body.appendChild(a);
+    a.click();
+    document.body.removeChild(a);
+    URL.revokeObjectURL(url);
+
+    // Keep warnings visible but don't block download
+    if (warnings.length > 0) {
+      // Warnings already displayed in UI
+    }
+  };
+
+  // --- Render ---
+  if (!isOpen) return null;
+
+  const requiredCols = getRequiredColumns(operationType);
+  const isStandalone = !initialDevices || initialDevices.length === 0;
+  const missingCount = validationWarnings.length;
+  const isCellWarning = (rowIdx, colId) => validationWarnings.some(w => w.rowIdx === rowIdx && w.colId === colId);
+  const isOverridden = (rowIdx, colId) => overrides[rowIdx] && overrides[rowIdx][colId] !== undefined;
+
+  return (
+    <div style={OVERLAY} onClick={onClose}>
+      <div style={MODAL} onClick={e => e.stopPropagation()}>
+        {/* Header */}
+        <div style={HEADER}>
+          <div style={{ display: 'flex', alignItems: 'center', gap: '0.5rem' }}>
+            <FileSpreadsheet style={{ width: '18px', height: '18px', color: '#7C3AED' }} />
+            <span style={{ fontSize: '0.9rem', fontWeight: '700', color: '#E2E8F0' }}>Generate Granite Loader Sheet</span>
+            <span style={{ fontSize: '0.7rem', color: '#64748B' }}>({devices.length} devices)</span>
+          </div>
+          <button onClick={onClose} style={{ background: 'none', border: 'none', color: '#64748B', cursor: 'pointer' }}>
+            <X style={{ width: '18px', height: '18px' }} />
+          </button>
+        </div>
+
+        {/* Body */}
+        <div style={BODY}>
+          {/* Top controls row */}
+          <div style={{ display: 'flex', gap: '1rem', alignItems: 'flex-end', marginBottom: '1rem', flexWrap: 'wrap' }}>
+            <div>
+              <label style={{ fontSize: '0.65rem', color: '#94A3B8', display: 'block', marginBottom: '0.2rem' }}>Operation</label>
+              <select style={{ ...INPUT, width: '140px', cursor: 'pointer' }} value={operationType} onChange={e => setOperationType(e.target.value)}>
+                {OPERATION_TYPES.map(op => <option key={op} value={op}>{op}</option>)}
+              </select>
+            </div>
+
+            {cardConfigured && (
+              <button style={{ ...BTN_SECONDARY, display: 'flex', alignItems: 'center', gap: '0.3rem' }} onClick={enrichFromCard} disabled={enriching || devices.length === 0}>
+                <RefreshCw style={{ width: '12px', height: '12px', animation: enriching ? 'spin 1s linear infinite' : 'none' }} />
+                {enriching ? 'Enriching...' : 'Enrich from CARD'}
+              </button>
+            )}
+          </div>
+
+          {/* Standalone: paste IPs */}
+          {isStandalone && devices.length === 0 && (
+            <div style={{ marginBottom: '1rem', padding: '1rem', background: '#0F172A', borderRadius: '0.5rem', border: '1px solid #334155' }}>
+              <label style={{ fontSize: '0.7rem', color: '#94A3B8', display: 'block', marginBottom: '0.3rem' }}>Paste IP addresses (one per line or comma-separated)</label>
+              <textarea
+                style={{ ...INPUT, height: '80px', resize: 'vertical', fontFamily: 'monospace' }}
+                value={pasteInput}
+                onChange={e => setPasteInput(e.target.value)}
+                placeholder="10.240.78.110&#10;10.240.78.111&#10;172.16.5.20"
+              />
+              <div style={{ marginTop: '0.5rem', display: 'flex', gap: '0.5rem' }}>
+                <button style={BTN_PRIMARY} onClick={loadPastedIps} disabled={!pasteInput.trim()}>Load IPs</button>
+              </div>
+            </div>
+          )}
+
+          {/* Enrich errors */}
+          {enrichErrors.length > 0 && (
+            <div style={{ marginBottom: '0.75rem', padding: '0.5rem 0.75rem', background: 'rgba(239, 68, 68, 0.1)', border: '1px solid rgba(239, 68, 68, 0.3)', borderRadius: '0.375rem' }}>
+              <div style={{ fontSize: '0.7rem', color: '#EF4444', display: 'flex', alignItems: 'center', gap: '0.3rem' }}>
+                <AlertCircle style={{ width: '12px', height: '12px' }} />
+                {enrichErrors.length === 1 && enrichErrors[0].ip === 'all'
+                  ? enrichErrors[0].error
+                  : `${enrichErrors.length} device(s) not found in CARD`}
+              </div>
+            </div>
+          )}
+
+          {/* Column selection */}
+          <div style={{ marginBottom: '1rem', padding: '0.75rem', background: '#0F172A', borderRadius: '0.5rem', border: '1px solid #334155' }}>
+            <div style={{ fontSize: '0.7rem', color: '#94A3B8', marginBottom: '0.5rem', fontWeight: '600' }}>Columns</div>
+            {COLUMN_GROUPS.map(group => {
+              const cols = getColumnsByGroup(group);
+              const selectedInGroup = cols.filter(c => selectedColumns.has(c.id)).length;
+              const expanded = expandedGroups.has(group);
+              return (
+                <div key={group} style={{ marginBottom: '0.25rem' }}>
+                  <div
+                    style={{ display: 'flex', alignItems: 'center', gap: '0.3rem', cursor: 'pointer', padding: '0.2rem 0', userSelect: 'none' }}
+                    onClick={() => toggleGroup(group)}
+                  >
+                    {expanded ? <ChevronDown style={{ width: '12px', height: '12px', color: '#64748B' }} /> : <ChevronRight style={{ width: '12px', height: '12px', color: '#64748B' }} />}
+                    <span style={{ fontSize: '0.7rem', color: '#E2E8F0' }}>{group}</span>
+                    <span style={{ fontSize: '0.6rem', color: '#64748B' }}>({selectedInGroup} selected)</span>
+                  </div>
+                  {expanded && (
+                    <div style={{ display: 'flex', flexWrap: 'wrap', gap: '0.3rem', paddingLeft: '1.2rem', marginTop: '0.2rem' }}>
+                      {cols.map(col => {
+                        const isRequired = requiredCols.includes(col.id);
+                        const isChecked = selectedColumns.has(col.id);
+                        return (
+                          <label key={col.id} style={{ display: 'flex', alignItems: 'center', gap: '0.2rem', fontSize: '0.65rem', color: isRequired ? '#A78BFA' : '#94A3B8', cursor: isRequired ? 'default' : 'pointer' }}>
+                            <input
+                              type="checkbox"
+                              checked={isChecked}
+                              onChange={() => toggleColumn(col.id)}
+                              disabled={isRequired}
+                              style={{ accentColor: '#7C3AED' }}
+                            />
+                            {col.label.length > 30 ? col.id : col.label}
+                            {isRequired && <span style={{ fontSize: '0.55rem', color: '#7C3AED' }}>*</span>}
+                          </label>
+                        );
+                      })}
+                    </div>
+                  )}
+                </div>
+              );
+            })}
+          </div>
+
+          {/* Bulk defaults */}
+          {orderedColumns.length > 0 && devices.length > 0 && (
+            <div style={{ marginBottom: '1rem', padding: '0.75rem', background: '#0F172A', borderRadius: '0.5rem', border: '1px solid #334155' }}>
+              <div style={{ fontSize: '0.7rem', color: '#94A3B8', marginBottom: '0.5rem', fontWeight: '600' }}>Bulk Defaults (applies to all rows)</div>
+              <div style={{ display: 'grid', gridTemplateColumns: 'repeat(auto-fill, minmax(220px, 1fr))', gap: '0.5rem' }}>
+                {orderedColumns.filter(c => c.id !== 'DELETE').map(col => (
+                  <div key={col.id}>
+                    <label style={{ fontSize: '0.6rem', color: '#64748B', display: 'block', marginBottom: '0.15rem' }}>
+                      {col.id}
+                    </label>
+                    {COLUMN_PICKLISTS[col.id] ? (
+                      <SearchableSelect
+                        value={bulkDefaults[col.id] || ''}
+                        options={COLUMN_PICKLISTS[col.id]}
+                        onChange={(val) => setBulkDefault(col.id, val)}
+                        placeholder={`Default for all rows`}
+                        autoFocus={false}
+                      />
+                    ) : (
+                      <input
+                        style={INPUT}
+                        value={bulkDefaults[col.id] || ''}
+                        onChange={e => setBulkDefault(col.id, e.target.value)}
+                        placeholder={`Default for all rows`}
+                      />
+                    )}
+                  </div>
+                ))}
+              </div>
+            </div>
+          )}
+
+          {/* Preview table */}
+          {devices.length > 0 && orderedColumns.length > 0 && (
+            <div style={{ border: '1px solid #334155', borderRadius: '0.5rem', overflow: 'auto', maxHeight: '300px' }}>
+              <table style={{ width: '100%', borderCollapse: 'collapse', fontSize: '0.7rem' }}>
+                <thead>
+                  <tr style={{ position: 'sticky', top: 0, background: '#0F172A', zIndex: 1 }}>
+                    <th style={{ padding: '0.4rem', borderBottom: '1px solid #334155', color: '#64748B', textAlign: 'center', width: '30px' }}>#</th>
+                    {orderedColumns.map(col => (
+                      <th key={col.id} style={{ padding: '0.4rem 0.5rem', borderBottom: '1px solid #334155', color: '#94A3B8', textAlign: 'left', whiteSpace: 'nowrap' }}>
+                        {col.id}
+                      </th>
+                    ))}
+                    <th style={{ padding: '0.4rem', borderBottom: '1px solid #334155', width: '30px' }}></th>
+                  </tr>
+                </thead>
+                <tbody>
+                  {devices.map((_, rowIdx) => (
+                    <tr key={rowIdx} style={{ borderBottom: '1px solid rgba(51, 65, 85, 0.5)' }}>
+                      <td style={{ padding: '0.3rem', textAlign: 'center', color: '#475569', fontSize: '0.6rem' }}>{rowIdx + 1}</td>
+                      {orderedColumns.map(col => {
+                        const value = getCellValue(rowIdx, col.id);
+                        const isEditing = editingCell?.rowIdx === rowIdx && editingCell?.colId === col.id;
+                        const hasOverride = isOverridden(rowIdx, col.id);
+                        const hasWarning = isCellWarning(rowIdx, col.id);
+
+                        return (
+                          <td
+                            key={col.id}
+                            style={{
+                              padding: '0.2rem 0.4rem',
+                              position: 'relative',
+                              background: hasWarning ? 'rgba(239, 68, 68, 0.08)' : 'transparent',
+                              cursor: 'pointer',
+                              minWidth: '100px',
+                            }}
+                            onClick={() => !isEditing && startEdit(rowIdx, col.id)}
+                          >
+                            {isEditing ? (
+                              COLUMN_PICKLISTS[col.id] ? (
+                                <SearchableSelect
+                                  value={editValue}
+                                  options={COLUMN_PICKLISTS[col.id]}
+                                  onChange={(val) => {
+                                    setOverrides(prev => ({
+                                      ...prev,
+                                      [rowIdx]: { ...(prev[rowIdx] || {}), [col.id]: val },
+                                    }));
+                                    setEditingCell(null);
+                                  }}
+                                  onClose={() => setEditingCell(null)}
+                                  autoFocus
+                                />
+                              ) : (
+                                <input
+                                  style={{ ...INPUT, padding: '0.2rem 0.4rem', fontSize: '0.7rem' }}
+                                  value={editValue}
+                                  onChange={e => setEditValue(e.target.value)}
+                                  onBlur={commitEdit}
+                                  onKeyDown={e => { if (e.key === 'Enter') commitEdit(); if (e.key === 'Escape') setEditingCell(null); }}
+                                  autoFocus
+                                />
+                              )
+                            ) : (
+                              <div style={{ display: 'flex', alignItems: 'center', gap: '0.2rem' }}>
+                                {hasOverride && <span style={{ color: '#F59E0B', fontSize: '0.5rem' }}>●</span>}
+                                <span style={{ color: value ? '#E2E8F0' : '#475569' }}>{value || '—'}</span>
+                                {hasOverride && (
+                                  <button
+                                    onClick={e => { e.stopPropagation(); clearOverride(rowIdx, col.id); }}
+                                    style={{ background: 'none', border: 'none', color: '#64748B', cursor: 'pointer', fontSize: '0.55rem', padding: '0 0.2rem' }}
+                                    title="Revert to bulk default"
+                                  >↻</button>
+                                )}
+                              </div>
+                            )}
+                          </td>
+                        );
+                      })}
+                      <td style={{ padding: '0.2rem', textAlign: 'center' }}>
+                        <button onClick={() => removeRow(rowIdx)} style={{ background: 'none', border: 'none', color: '#64748B', cursor: 'pointer' }}>
+                          <Trash2 style={{ width: '11px', height: '11px' }} />
+                        </button>
+                      </td>
+                    </tr>
+                  ))}
+                </tbody>
+              </table>
+            </div>
+          )}
+
+          {/* Add row button */}
+          {devices.length > 0 && (
+            <button style={{ ...BTN_SECONDARY, marginTop: '0.5rem', display: 'flex', alignItems: 'center', gap: '0.3rem', fontSize: '0.65rem' }} onClick={addRow}>
+              <Plus style={{ width: '11px', height: '11px' }} /> Add Row
+            </button>
+          )}
+        </div>
+
+        {/* Footer */}
+        <div style={FOOTER}>
+          <div style={{ fontSize: '0.7rem', color: '#64748B' }}>
+            {missingCount > 0 && (
+              <span style={{ color: '#F59E0B' }}>⚠ {missingCount} missing required field{missingCount > 1 ? 's' : ''}</span>
+            )}
+          </div>
+          <div style={{ display: 'flex', gap: '0.5rem' }}>
+            <button style={BTN_SECONDARY} onClick={onClose}>Cancel</button>
+            <button
+              style={{ ...BTN_SUCCESS, display: 'flex', alignItems: 'center', gap: '0.3rem' }}
+              onClick={handleDownload}
+              disabled={devices.length === 0 || orderedColumns.length === 0}
+            >
+              <Download style={{ width: '13px', height: '13px' }} />
+              Download Loader Sheet
+            </button>
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+}

frontend/src/components/NavDrawer.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { X, Home, BarChart2, BookOpen, Download, ShieldCheck, Settings, Ticket, Building2 } from 'lucide-react';
+import { X, Home, BarChart2, BookOpen, Download, ShieldCheck, Settings, Ticket, Building2, Layers } from 'lucide-react';
 import { useAuth } from '../contexts/AuthContext';
 
 const NAV_ITEMS = [
@@ -10,6 +10,7 @@ const NAV_ITEMS = [
   { id: 'knowledge-base', label: 'Knowledge Base', icon: BookOpen,    color: '#10B981', description: 'Articles & documentation'   },
   { id: 'exports',        label: 'Exports',        icon: Download,    color: '#8B5CF6', description: 'Export data & reports'      },
   { id: 'jira',           label: 'Jira Tickets',   icon: Ticket,      color: '#6366F1', description: 'Jira issue tracking & sync' },
+  { id: 'archer-templates', label: 'Template Mgr', icon: Layers,    color: '#F472B6', description: 'Archer template library'   },
 ];
 
 const ADMIN_ITEM = { id: 'admin', label: 'Admin Panel', icon: Settings, color: '#EF4444', description: 'User management & audit' };

frontend/src/components/RedirectModal.js

@@ -4,10 +4,12 @@ import { CornerUpRight, X, Loader, AlertCircle } from 'lucide-react';
 const API_BASE = process.env.REACT_APP_API_BASE || 'http://localhost:3001/api';
 
 const WORKFLOW_OPTIONS = [
-  { key: 'FP',      label: 'FP',      col: '#F59E0B', rgb: '245,158,11' },
-  { key: 'Archer',  label: 'Archer',  col: '#0EA5E9', rgb: '14,165,233' },
-  { key: 'CARD',    label: 'CARD',    col: '#10B981', rgb: '16,185,129' },
-  { key: 'GRANITE', label: 'GRANITE', col: '#A1887F', rgb: '161,136,127' },
+  { key: 'FP',        label: 'FP',        col: '#F59E0B', rgb: '245,158,11' },
+  { key: 'Archer',    label: 'Archer',    col: '#0EA5E9', rgb: '14,165,233' },
+  { key: 'CARD',      label: 'CARD',      col: '#10B981', rgb: '16,185,129' },
+  { key: 'GRANITE',   label: 'GRANITE',   col: '#A1887F', rgb: '161,136,127' },
+  { key: 'DECOM',     label: 'DECOM',     col: '#EF4444', rgb: '239,68,68' },
+  { key: 'Remediate', label: 'Remediate', col: '#A855F7', rgb: '168,85,247' },
 ];
 
 export default function RedirectModal({ item, onClose, onRedirect }) {
@@ -16,7 +18,7 @@ export default function RedirectModal({ item, onClose, onRedirect }) {
   const [loading, setLoading] = useState(false);
   const [error, setError] = useState('');
 
-  const needsVendor = workflowType === 'FP' || workflowType === 'Archer';
+  const needsVendor = workflowType === 'FP' || workflowType === 'Archer' || workflowType === 'Remediate';
   const canSubmit = !loading && (!needsVendor || vendor.trim().length > 0);
 
   const handleSubmit = async () => {

frontend/src/components/RemediationModal.js

@@ -0,0 +1,362 @@
+import React, { useState, useEffect, useCallback } from 'react';
+import { X, Loader, AlertCircle, Send, RefreshCw } from 'lucide-react';
+
+const API_BASE = process.env.REACT_APP_API_BASE || 'http://localhost:3001/api';
+
+// ---------------------------------------------------------------------------
+// Styles — matches dark theme tactical intelligence aesthetic
+// ---------------------------------------------------------------------------
+const STYLES = {
+  overlay: {
+    position: 'fixed',
+    inset: 0,
+    zIndex: 100,
+    display: 'flex',
+    alignItems: 'center',
+    justifyContent: 'center',
+  },
+  backdrop: {
+    position: 'fixed',
+    inset: 0,
+    background: 'rgba(0,0,0,0.7)',
+    backdropFilter: 'blur(4px)',
+  },
+  content: {
+    position: 'relative',
+    background: 'linear-gradient(135deg, #1E293B, #0F172A)',
+    border: '1px solid rgba(14, 165, 233, 0.25)',
+    borderRadius: '16px',
+    padding: '2rem',
+    width: '90%',
+    maxWidth: '560px',
+    maxHeight: '85vh',
+    overflowY: 'auto',
+    zIndex: 101,
+  },
+  header: {
+    display: 'flex',
+    alignItems: 'flex-start',
+    justifyContent: 'space-between',
+    marginBottom: '1.25rem',
+  },
+  title: {
+    fontFamily: 'monospace',
+    fontSize: '0.8rem',
+    fontWeight: 700,
+    color: '#A855F7',
+    textTransform: 'uppercase',
+    letterSpacing: '0.1em',
+  },
+  subtitle: {
+    fontFamily: 'monospace',
+    fontSize: '0.7rem',
+    color: '#94A3B8',
+    marginTop: '0.35rem',
+    overflow: 'hidden',
+    textOverflow: 'ellipsis',
+    whiteSpace: 'nowrap',
+    maxWidth: '400px',
+  },
+  closeBtn: {
+    background: 'none',
+    border: 'none',
+    color: '#64748B',
+    cursor: 'pointer',
+    padding: '0.25rem',
+    borderRadius: '4px',
+    display: 'flex',
+    alignItems: 'center',
+    justifyContent: 'center',
+  },
+  textarea: {
+    width: '100%',
+    boxSizing: 'border-box',
+    minHeight: '100px',
+    background: 'rgba(15, 23, 42, 0.8)',
+    border: '1px solid rgba(14, 165, 233, 0.2)',
+    borderRadius: '8px',
+    padding: '0.75rem',
+    color: '#F8FAFC',
+    fontSize: '0.85rem',
+    fontFamily: 'monospace',
+    resize: 'vertical',
+    outline: 'none',
+  },
+  charCounter: {
+    fontFamily: 'monospace',
+    fontSize: '0.6rem',
+    color: '#64748B',
+    textAlign: 'right',
+    marginTop: '0.25rem',
+  },
+  submitBtn: {
+    padding: '0.5rem 1rem',
+    borderRadius: '8px',
+    border: '1px solid rgba(168, 85, 247, 0.4)',
+    background: 'rgba(168, 85, 247, 0.15)',
+    color: '#C084FC',
+    cursor: 'pointer',
+    fontSize: '0.8rem',
+    fontWeight: 600,
+    display: 'inline-flex',
+    alignItems: 'center',
+    gap: '0.4rem',
+    transition: 'all 0.2s',
+  },
+  submitBtnDisabled: {
+    opacity: 0.4,
+    cursor: 'not-allowed',
+  },
+  noteItem: {
+    padding: '0.75rem',
+    marginBottom: '0.5rem',
+    background: 'rgba(14, 165, 233, 0.04)',
+    border: '1px solid rgba(14, 165, 233, 0.1)',
+    borderRadius: '8px',
+  },
+  noteMeta: {
+    fontFamily: 'monospace',
+    fontSize: '0.6rem',
+    color: '#64748B',
+    marginBottom: '0.35rem',
+    display: 'flex',
+    gap: '0.5rem',
+  },
+  noteText: {
+    fontFamily: 'monospace',
+    fontSize: '0.75rem',
+    color: '#CBD5E1',
+    lineHeight: 1.5,
+    whiteSpace: 'pre-wrap',
+    wordBreak: 'break-word',
+  },
+  error: {
+    display: 'flex',
+    alignItems: 'center',
+    gap: '0.5rem',
+    padding: '0.5rem 0.75rem',
+    background: 'rgba(239, 68, 68, 0.08)',
+    border: '1px solid rgba(239, 68, 68, 0.2)',
+    borderRadius: '0.5rem',
+    marginBottom: '0.75rem',
+  },
+  errorText: {
+    fontFamily: 'monospace',
+    fontSize: '0.7rem',
+    color: '#FCA5A5',
+  },
+  emptyState: {
+    textAlign: 'center',
+    padding: '1.5rem 0',
+    fontFamily: 'monospace',
+    fontSize: '0.7rem',
+    color: '#475569',
+  },
+  divider: {
+    height: '1px',
+    background: 'rgba(14, 165, 233, 0.1)',
+    margin: '1rem 0',
+  },
+  retryBtn: {
+    padding: '0.4rem 0.75rem',
+    borderRadius: '6px',
+    border: '1px solid rgba(14, 165, 233, 0.3)',
+    background: 'rgba(14, 165, 233, 0.1)',
+    color: '#7DD3FC',
+    cursor: 'pointer',
+    fontSize: '0.7rem',
+    fontWeight: 600,
+    display: 'inline-flex',
+    alignItems: 'center',
+    gap: '0.3rem',
+    marginTop: '0.5rem',
+  },
+};
+
+// ---------------------------------------------------------------------------
+// RemediationModal — add and view remediation notes for a queue item
+// ---------------------------------------------------------------------------
+export default function RemediationModal({ item, onClose, onNoteAdded }) {
+  const [notes, setNotes] = useState([]);
+  const [newNoteText, setNewNoteText] = useState('');
+  const [loading, setLoading] = useState(true);
+  const [saving, setSaving] = useState(false);
+  const [error, setError] = useState(null);
+  const [fetchError, setFetchError] = useState(null);
+
+  // ---------------------------------------------------------------------------
+  // Fetch existing notes on mount
+  // ---------------------------------------------------------------------------
+  const fetchNotes = useCallback(async () => {
+    setLoading(true);
+    setFetchError(null);
+    try {
+      const res = await fetch(`${API_BASE}/ivanti/todo-queue/${item.id}/notes`, {
+        credentials: 'include',
+      });
+      if (!res.ok) {
+        const data = await res.json().catch(() => ({}));
+        throw new Error(data.error || `HTTP ${res.status}`);
+      }
+      const data = await res.json();
+      setNotes(data);
+    } catch (e) {
+      setFetchError(e.message || 'Failed to load notes.');
+    } finally {
+      setLoading(false);
+    }
+  }, [item.id]);
+
+  useEffect(() => {
+    fetchNotes();
+  }, [fetchNotes]);
+
+  // ---------------------------------------------------------------------------
+  // Submit new note
+  // ---------------------------------------------------------------------------
+  const handleSubmit = useCallback(async () => {
+    if (!newNoteText.trim() || saving) return;
+
+    setSaving(true);
+    setError(null);
+    try {
+      const res = await fetch(`${API_BASE}/ivanti/todo-queue/${item.id}/notes`, {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        credentials: 'include',
+        body: JSON.stringify({ note_text: newNoteText }),
+      });
+      const data = await res.json();
+      if (!res.ok) {
+        throw new Error(data.error || `HTTP ${res.status}`);
+      }
+      // Prepend new note to list (most recent first)
+      setNotes((prev) => [data, ...prev]);
+      setNewNoteText('');
+      if (onNoteAdded) onNoteAdded();
+    } catch (e) {
+      setError(e.message || 'Failed to save note.');
+    } finally {
+      setSaving(false);
+    }
+  }, [newNoteText, saving, item.id, onNoteAdded]);
+
+  // ---------------------------------------------------------------------------
+  // Format date as YYYY-MM-DD
+  // ---------------------------------------------------------------------------
+  const formatDate = (dateStr) => {
+    try {
+      const d = new Date(dateStr);
+      return d.toISOString().slice(0, 10);
+    } catch {
+      return '—';
+    }
+  };
+
+  const canSubmit = newNoteText.trim().length > 0 && !saving;
+  const remaining = 5000 - newNoteText.length;
+
+  return (
+    <div style={STYLES.overlay}>
+      <div style={STYLES.backdrop} onClick={onClose} />
+      <div style={STYLES.content}>
+        {/* Header */}
+        <div style={STYLES.header}>
+          <div>
+            <div style={STYLES.title}>Remediation Notes</div>
+            <div style={STYLES.subtitle} title={item.finding_title || item.finding_id}>
+              {item.finding_title || item.finding_id}
+            </div>
+            <div style={{ ...STYLES.subtitle, fontSize: '0.6rem', color: '#64748B' }}>
+              ID: {item.finding_id}
+            </div>
+          </div>
+          <button onClick={onClose} style={STYLES.closeBtn} aria-label="Close modal">
+            <X style={{ width: '18px', height: '18px' }} />
+          </button>
+        </div>
+
+        {/* New note input */}
+        <div style={{ marginBottom: '1rem' }}>
+          <textarea
+            value={newNoteText}
+            onChange={(e) => setNewNoteText(e.target.value)}
+            maxLength={5000}
+            placeholder="Describe what remediation steps were taken…"
+            style={STYLES.textarea}
+            disabled={saving}
+          />
+          <div style={STYLES.charCounter}>
+            {remaining} characters remaining
+          </div>
+        </div>
+
+        {/* Error message */}
+        {error && (
+          <div style={STYLES.error}>
+            <AlertCircle style={{ width: '14px', height: '14px', color: '#EF4444', flexShrink: 0 }} />
+            <span style={STYLES.errorText}>{error}</span>
+          </div>
+        )}
+
+        {/* Submit button */}
+        <div style={{ marginBottom: '1rem' }}>
+          <button
+            onClick={handleSubmit}
+            disabled={!canSubmit}
+            style={{
+              ...STYLES.submitBtn,
+              ...(canSubmit ? {} : STYLES.submitBtnDisabled),
+            }}
+          >
+            <Send style={{ width: '14px', height: '14px' }} />
+            {saving ? 'Saving...' : 'Add Note'}
+          </button>
+        </div>
+
+        <div style={STYLES.divider} />
+
+        {/* Notes list */}
+        {loading && (
+          <div style={{ textAlign: 'center', padding: '1.5rem 0' }}>
+            <Loader style={{ width: '20px', height: '20px', color: '#0EA5E9', animation: 'spin 1s linear infinite', margin: '0 auto' }} />
+            <div style={{ fontFamily: 'monospace', fontSize: '0.7rem', color: '#475569', marginTop: '0.5rem' }}>
+              Loading notes...
+            </div>
+          </div>
+        )}
+
+        {fetchError && !loading && (
+          <div style={STYLES.error}>
+            <AlertCircle style={{ width: '14px', height: '14px', color: '#EF4444', flexShrink: 0 }} />
+            <span style={STYLES.errorText}>{fetchError}</span>
+            <button onClick={fetchNotes} style={STYLES.retryBtn}>
+              <RefreshCw style={{ width: '12px', height: '12px' }} />
+              Retry
+            </button>
+          </div>
+        )}
+
+        {!loading && !fetchError && notes.length === 0 && (
+          <div style={STYLES.emptyState}>
+            No remediation notes yet.
+          </div>
+        )}
+
+        {!loading && !fetchError && notes.length > 0 && (
+          <div>
+            {notes.map((note) => (
+              <div key={note.id} style={STYLES.noteItem}>
+                <div style={STYLES.noteMeta}>
+                  <span style={{ color: '#A855F7', fontWeight: 600 }}>{note.username}</span>
+                  <span>{formatDate(note.created_at)}</span>
+                </div>
+                <div style={STYLES.noteText}>{note.note_text}</div>
+              </div>
+            ))}
+          </div>
+        )}
+      </div>
+    </div>
+  );
+}

frontend/src/components/SearchableSelect.js

@@ -0,0 +1,157 @@
+/**
+ * SearchableSelect — Inline searchable dropdown for the Granite Loader Sheet.
+ *
+ * Supports:
+ * - Static options (small lists like EQUIP_STATUS)
+ * - Large searchable lists (RESPONSIBLE_TEAM, SITE_NAME, EQUIP_TEMPLATE)
+ * - Keyboard navigation (arrow keys, enter, escape)
+ * - Typeahead filtering
+ * - Portal-free (renders inline to avoid z-index issues in table cells)
+ */
+
+import React, { useState, useRef, useEffect, useCallback } from 'react';
+
+const DROPDOWN_STYLE = {
+  position: 'absolute',
+  top: '100%',
+  left: 0,
+  right: 0,
+  zIndex: 100,
+  background: '#0F172A',
+  border: '1px solid #7C3AED',
+  borderRadius: '0 0 0.375rem 0.375rem',
+  maxHeight: '180px',
+  overflowY: 'auto',
+  boxShadow: '0 8px 24px rgba(0, 0, 0, 0.5)',
+};
+
+const OPTION_STYLE = {
+  padding: '0.3rem 0.6rem',
+  fontSize: '0.7rem',
+  color: '#E2E8F0',
+  cursor: 'pointer',
+  fontFamily: "'JetBrains Mono', monospace",
+};
+
+const OPTION_HIGHLIGHT = {
+  ...OPTION_STYLE,
+  background: 'rgba(124, 58, 237, 0.2)',
+};
+
+export default function SearchableSelect({ value, options, onChange, onClose, placeholder, autoFocus }) {
+  const [filter, setFilter] = useState(value || '');
+  const [highlightIdx, setHighlightIdx] = useState(-1);
+  const [isOpen, setIsOpen] = useState(false);
+  const inputRef = useRef(null);
+  const listRef = useRef(null);
+
+  useEffect(() => {
+    if (autoFocus && inputRef.current) {
+      inputRef.current.focus();
+      inputRef.current.select();
+      setIsOpen(true);
+    }
+  }, [autoFocus]);
+
+  const filtered = useCallback(() => {
+    if (!filter.trim()) return options.slice(0, 50);
+    const lower = filter.toLowerCase();
+    return options.filter(o => o.toLowerCase().includes(lower)).slice(0, 50);
+  }, [filter, options]);
+
+  const filteredOptions = filtered();
+
+  // Scroll highlighted item into view
+  useEffect(() => {
+    if (highlightIdx >= 0 && listRef.current) {
+      const el = listRef.current.children[highlightIdx];
+      if (el) el.scrollIntoView({ block: 'nearest' });
+    }
+  }, [highlightIdx]);
+
+  const handleKeyDown = (e) => {
+    if (e.key === 'ArrowDown') {
+      e.preventDefault();
+      setHighlightIdx(prev => Math.min(prev + 1, filteredOptions.length - 1));
+    } else if (e.key === 'ArrowUp') {
+      e.preventDefault();
+      setHighlightIdx(prev => Math.max(prev - 1, 0));
+    } else if (e.key === 'Enter') {
+      e.preventDefault();
+      if (highlightIdx >= 0 && filteredOptions[highlightIdx]) {
+        onChange(filteredOptions[highlightIdx]);
+        setFilter(filteredOptions[highlightIdx]);
+      } else if (filter.trim()) {
+        onChange(filter.trim());
+      }
+      setIsOpen(false);
+      if (onClose) onClose();
+    } else if (e.key === 'Escape') {
+      setIsOpen(false);
+      if (onClose) onClose();
+    } else if (e.key === 'Tab') {
+      if (highlightIdx >= 0 && filteredOptions[highlightIdx]) {
+        onChange(filteredOptions[highlightIdx]);
+        setFilter(filteredOptions[highlightIdx]);
+      } else if (filter.trim()) {
+        onChange(filter.trim());
+      }
+      setIsOpen(false);
+      if (onClose) onClose();
+    }
+  };
+
+  const handleSelect = (opt) => {
+    onChange(opt);
+    setFilter(opt);
+    setIsOpen(false);
+    if (onClose) onClose();
+  };
+
+  return (
+    <div style={{ position: 'relative' }}>
+      <input
+        ref={inputRef}
+        style={{
+          background: '#0F172A', border: isOpen ? '1px solid #7C3AED' : '1px solid #334155', borderRadius: isOpen ? '0.375rem 0.375rem 0 0' : '0.375rem',
+          color: '#E2E8F0', padding: '0.3rem 0.5rem', fontSize: '0.7rem', width: '100%',
+          fontFamily: "'JetBrains Mono', monospace", outline: 'none', boxSizing: 'border-box',
+        }}
+        value={filter}
+        onChange={e => { setFilter(e.target.value); setHighlightIdx(-1); setIsOpen(true); }}
+        onFocus={() => setIsOpen(true)}
+        onKeyDown={handleKeyDown}
+        onBlur={() => {
+          // Delay close so click on option can fire
+          setTimeout(() => {
+            setIsOpen(false);
+            if (filter.trim() && filter.trim() !== value) {
+              onChange(filter.trim());
+            }
+            if (onClose) onClose();
+          }, 150);
+        }}
+        placeholder={placeholder || 'Search...'}
+      />
+      {isOpen && filteredOptions.length > 0 && (
+        <div ref={listRef} style={DROPDOWN_STYLE}>
+          {filteredOptions.map((opt, i) => (
+            <div
+              key={opt}
+              style={i === highlightIdx ? OPTION_HIGHLIGHT : OPTION_STYLE}
+              onMouseEnter={() => setHighlightIdx(i)}
+              onMouseDown={(e) => { e.preventDefault(); handleSelect(opt); }}
+            >
+              {opt}
+            </div>
+          ))}
+          {filteredOptions.length === 50 && (
+            <div style={{ ...OPTION_STYLE, color: '#64748B', fontStyle: 'italic' }}>
+              Type to filter more...
+            </div>
+          )}
+        </div>
+      )}
+    </div>
+  );
+}

frontend/src/components/TemplateFormModal.js

@@ -0,0 +1,522 @@
+// TemplateFormModal.js
+// Modal for creating, editing, and cloning Archer Risk Acceptance templates.
+// Supports three modes:
+//   - create: all fields empty
+//   - edit: pre-populated from existing template
+//   - clone: sections pre-populated from source, hierarchy fields empty
+
+import React, { useState, useEffect, useRef } from 'react';
+import { X, Save, AlertCircle, Loader } from 'lucide-react';
+
+const API_BASE = process.env.REACT_APP_API_BASE || 'http://localhost:3001/api'; // ⚠️ CONVENTION: Prefer relative API paths (e.g. '/api') over absolute URL fallback
+
+// ---------------------------------------------------------------------------
+// Section definitions — ordered as static first, then semi-static
+// ---------------------------------------------------------------------------
+const SECTIONS = [
+  { key: 'environment_overview', label: 'Environment Overview' },
+  { key: 'segmentation', label: 'Segmentation' },
+  { key: 'mitigating_controls', label: 'Mitigating Controls' },
+  { key: 'additional_info', label: 'Additional Info/Background' },
+  { key: 'charter_network_banner', label: 'Charter Network Banner' },
+  { key: 'data_classification', label: 'Data Classification' },
+  { key: 'charter_network', label: 'Charter Network' },
+  { key: 'additional_access_list', label: 'Additional Access List' },
+];
+
+// ---------------------------------------------------------------------------
+// Styles
+// ---------------------------------------------------------------------------
+const STYLES = {
+  backdrop: {
+    position: 'fixed',
+    inset: 0,
+    zIndex: 70,
+    background: 'rgba(10, 14, 39, 0.95)',
+    backdropFilter: 'blur(8px)',
+    display: 'flex',
+    alignItems: 'flex-start',
+    justifyContent: 'center',
+    padding: '2rem 1rem',
+    overflowY: 'auto',
+  },
+  modal: {
+    background: 'linear-gradient(135deg, rgba(30,41,59,0.98) 0%, rgba(15,23,42,0.99) 100%)',
+    border: '1px solid rgba(0, 212, 255, 0.2)',
+    borderRadius: '12px',
+    boxShadow: '0 20px 60px rgba(0,0,0,0.7), 0 0 30px rgba(0,212,255,0.08)',
+    width: '100%',
+    maxWidth: '700px',
+    padding: '1.75rem 2rem',
+    marginTop: '1rem',
+    marginBottom: '2rem',
+  },
+  header: {
+    display: 'flex',
+    alignItems: 'center',
+    justifyContent: 'space-between',
+    marginBottom: '1.25rem',
+  },
+  title: {
+    fontFamily: 'monospace',
+    fontSize: '0.8rem',
+    fontWeight: 700,
+    color: '#00d4ff',
+    textTransform: 'uppercase',
+    letterSpacing: '0.12em',
+  },
+  closeBtn: {
+    background: 'transparent',
+    border: 'none',
+    color: '#64748B',
+    cursor: 'pointer',
+    padding: '0.25rem',
+    borderRadius: '4px',
+    display: 'flex',
+    alignItems: 'center',
+    justifyContent: 'center',
+  },
+  fieldGroup: {
+    marginBottom: '1rem',
+  },
+  label: {
+    display: 'block',
+    fontSize: '0.75rem',
+    fontWeight: 600,
+    color: '#94A3B8',
+    marginBottom: '0.3rem',
+    textTransform: 'uppercase',
+    letterSpacing: '0.05em',
+  },
+  input: {
+    width: '100%',
+    padding: '0.55rem 0.75rem',
+    borderRadius: '6px',
+    border: '1px solid rgba(0, 212, 255, 0.2)',
+    background: 'rgba(15, 23, 42, 0.8)',
+    color: '#e0e0e0',
+    fontSize: '0.85rem',
+    fontFamily: 'inherit',
+    outline: 'none',
+    transition: 'border-color 0.2s',
+    boxSizing: 'border-box',
+  },
+  inputError: {
+    borderColor: '#ef4444',
+  },
+  textarea: {
+    width: '100%',
+    padding: '0.55rem 0.75rem',
+    borderRadius: '6px',
+    border: '1px solid rgba(0, 212, 255, 0.15)',
+    background: 'rgba(15, 23, 42, 0.8)',
+    color: '#e0e0e0',
+    fontSize: '0.82rem',
+    fontFamily: 'inherit',
+    outline: 'none',
+    resize: 'vertical',
+    minHeight: '80px',
+    transition: 'border-color 0.2s',
+    boxSizing: 'border-box',
+  },
+  errorText: {
+    fontSize: '0.72rem',
+    color: '#ef4444',
+    marginTop: '0.2rem',
+  },
+  errorBanner: {
+    padding: '0.65rem 0.85rem',
+    borderRadius: '8px',
+    background: 'rgba(239, 68, 68, 0.1)',
+    border: '1px solid rgba(239, 68, 68, 0.25)',
+    color: '#FCA5A5',
+    fontSize: '0.8rem',
+    display: 'flex',
+    alignItems: 'center',
+    gap: '0.5rem',
+    marginBottom: '1rem',
+  },
+  sectionDivider: {
+    margin: '1.25rem 0 0.75rem',
+    padding: '0.4rem 0',
+    borderTop: '1px solid rgba(0, 212, 255, 0.08)',
+    fontSize: '0.7rem',
+    fontWeight: 700,
+    color: '#00d4ff',
+    textTransform: 'uppercase',
+    letterSpacing: '0.12em',
+  },
+  footer: {
+    display: 'flex',
+    alignItems: 'center',
+    justifyContent: 'flex-end',
+    gap: '0.75rem',
+    marginTop: '1.5rem',
+    paddingTop: '1rem',
+    borderTop: '1px solid rgba(0, 212, 255, 0.08)',
+  },
+  cancelBtn: {
+    padding: '0.55rem 1.1rem',
+    borderRadius: '6px',
+    border: '1px solid rgba(100,116,139,0.4)',
+    background: 'transparent',
+    color: '#94A3B8',
+    cursor: 'pointer',
+    fontSize: '0.8rem',
+    fontWeight: 600,
+    transition: 'all 0.2s',
+  },
+  submitBtn: {
+    padding: '0.55rem 1.25rem',
+    borderRadius: '6px',
+    border: '1px solid rgba(0, 212, 255, 0.4)',
+    background: 'rgba(0, 212, 255, 0.12)',
+    color: '#7DD3FC',
+    cursor: 'pointer',
+    fontSize: '0.8rem',
+    fontWeight: 600,
+    display: 'inline-flex',
+    alignItems: 'center',
+    gap: '0.4rem',
+    transition: 'all 0.2s',
+  },
+  submitBtnDisabled: {
+    opacity: 0.5,
+    cursor: 'not-allowed',
+  },
+  charCount: {
+    fontSize: '0.65rem',
+    color: '#475569',
+    textAlign: 'right',
+    marginTop: '0.15rem',
+  },
+};
+
+// ---------------------------------------------------------------------------
+// Component
+// ---------------------------------------------------------------------------
+
+/**
+ * TemplateFormModal
+ *
+ * Props:
+ *   mode       {'create'|'edit'|'clone'}  Determines form behavior
+ *   template   {object|null}              Source template (for edit/clone)
+ *   onClose    {function}                 Callback to close the modal
+ *   onSuccess  {function}                 Callback after successful save (refreshes list)
+ */
+export default function TemplateFormModal({ mode = 'create', template = null, onClose, onSuccess }) {
+  // Form state
+  const [vendor, setVendor] = useState('');
+  const [platform, setPlatform] = useState('');
+  const [model, setModel] = useState('');
+  const [sections, setSections] = useState(() => {
+    const initial = {};
+    for (const s of SECTIONS) {
+      initial[s.key] = '';
+    }
+    return initial;
+  });
+
+  // Validation and submission state
+  const [fieldErrors, setFieldErrors] = useState({});
+  const [apiError, setApiError] = useState(null);
+  const [submitting, setSubmitting] = useState(false);
+
+  const vendorRef = useRef(null);
+
+  // -------------------------------------------------------------------------
+  // Initialize form based on mode
+  // -------------------------------------------------------------------------
+  useEffect(() => {
+    if (mode === 'edit' && template) {
+      setVendor(template.vendor || '');
+      setPlatform(template.platform || '');
+      setModel(template.model || '');
+      const sectionValues = {};
+      for (const s of SECTIONS) {
+        sectionValues[s.key] = template[s.key] || '';
+      }
+      setSections(sectionValues);
+    } else if (mode === 'clone' && template) {
+      // Clone: copy sections, leave hierarchy empty
+      setVendor('');
+      setPlatform('');
+      setModel('');
+      const sectionValues = {};
+      for (const s of SECTIONS) {
+        sectionValues[s.key] = template[s.key] || '';
+      }
+      setSections(sectionValues);
+    }
+    // create mode: all fields already empty (initial state)
+  }, [mode, template]);
+
+  // Focus the vendor input on mount
+  useEffect(() => {
+    const timer = setTimeout(() => vendorRef.current?.focus(), 80);
+    return () => clearTimeout(timer);
+  }, []);
+
+  // Handle Escape key
+  useEffect(() => {
+    const handleKey = (e) => {
+      if (e.key === 'Escape') onClose?.();
+    };
+    document.addEventListener('keydown', handleKey);
+    return () => document.removeEventListener('keydown', handleKey);
+  }, [onClose]);
+
+  // -------------------------------------------------------------------------
+  // Validation
+  // -------------------------------------------------------------------------
+  function validate() {
+    const errors = {};
+    if (!vendor.trim()) errors.vendor = 'Vendor is required';
+    else if (vendor.trim().length > 100) errors.vendor = 'Vendor must be 100 characters or fewer';
+
+    if (!platform.trim()) errors.platform = 'Platform is required';
+    else if (platform.trim().length > 100) errors.platform = 'Platform must be 100 characters or fewer';
+
+    if (!model.trim()) errors.model = 'Model is required';
+    else if (model.trim().length > 100) errors.model = 'Model must be 100 characters or fewer';
+
+    setFieldErrors(errors);
+    return Object.keys(errors).length === 0;
+  }
+
+  // -------------------------------------------------------------------------
+  // Submit
+  // -------------------------------------------------------------------------
+  async function handleSubmit(e) {
+    e.preventDefault();
+    setApiError(null);
+
+    if (!validate()) return;
+
+    setSubmitting(true);
+
+    try {
+      const body = {
+        vendor: vendor.trim(),
+        platform: platform.trim(),
+        model: model.trim(),
+      };
+
+      // Include section fields
+      for (const s of SECTIONS) {
+        body[s.key] = sections[s.key];
+      }
+
+      let url;
+      let method;
+
+      if (mode === 'edit' && template) {
+        // PUT to update
+        url = `${API_BASE}/archer-templates/${template.id}`;
+        method = 'PUT';
+      } else if (mode === 'clone' && template) {
+        // POST to clone endpoint
+        url = `${API_BASE}/archer-templates/${template.id}/clone`;
+        method = 'POST';
+        // Clone endpoint only needs vendor, platform, model
+        delete body.environment_overview;
+        delete body.segmentation;
+        delete body.mitigating_controls;
+        delete body.additional_info;
+        delete body.charter_network_banner;
+        delete body.data_classification;
+        delete body.charter_network;
+        delete body.additional_access_list;
+      } else {
+        // POST to create
+        url = `${API_BASE}/archer-templates`;
+        method = 'POST';
+      }
+
+      const res = await fetch(url, {
+        method,
+        credentials: 'include',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify(body),
+      });
+
+      if (!res.ok) {
+        const data = await res.json().catch(() => ({}));
+        if (res.status === 409) {
+          setApiError(data.error || 'A template with this vendor/platform/model combination already exists');
+        } else {
+          setApiError(data.error || `Request failed (${res.status})`);
+        }
+        return;
+      }
+
+      // Success — close and refresh
+      onSuccess?.();
+      onClose?.();
+    } catch (err) {
+      setApiError(err.message || 'Network error — please try again');
+    } finally {
+      setSubmitting(false);
+    }
+  }
+
+  // -------------------------------------------------------------------------
+  // Section change handler
+  // -------------------------------------------------------------------------
+  function handleSectionChange(key, value) {
+    setSections(prev => ({ ...prev, [key]: value }));
+  }
+
+  // -------------------------------------------------------------------------
+  // Title based on mode
+  // -------------------------------------------------------------------------
+  const titles = {
+    create: 'Create Template',
+    edit: 'Edit Template',
+    clone: 'Clone Template',
+  };
+
+  // -------------------------------------------------------------------------
+  // Render
+  // -------------------------------------------------------------------------
+  return (
+    <div
+      role="dialog"
+      aria-modal="true"
+      aria-labelledby="template-form-modal-title"
+      style={STYLES.backdrop}
+    >
+      <div style={STYLES.modal}>
+        {/* Header */}
+        <div style={STYLES.header}>
+          <span id="template-form-modal-title" style={STYLES.title}>
+            {titles[mode] || 'Template'}
+          </span>
+          <button
+            style={STYLES.closeBtn}
+            onClick={onClose}
+            title="Close"
+            aria-label="Close modal"
+          >
+            <X size={18} />
+          </button>
+        </div>
+
+        {/* API error banner */}
+        {apiError && (
+          <div style={STYLES.errorBanner}>
+            <AlertCircle size={14} />
+            {apiError}
+          </div>
+        )}
+
+        <form onSubmit={handleSubmit} noValidate>
+          {/* Hierarchy fields */}
+          <div style={{ display: 'grid', gridTemplateColumns: '1fr 1fr 1fr', gap: '0.75rem' }}>
+            {/* Vendor */}
+            <div style={STYLES.fieldGroup}>
+              <label style={STYLES.label} htmlFor="tmpl-vendor">Vendor *</label>
+              <input
+                ref={vendorRef}
+                id="tmpl-vendor"
+                type="text"
+                maxLength={100}
+                value={vendor}
+                onChange={(e) => {
+                  setVendor(e.target.value);
+                  if (fieldErrors.vendor) setFieldErrors(prev => ({ ...prev, vendor: undefined }));
+                }}
+                style={{ ...STYLES.input, ...(fieldErrors.vendor ? STYLES.inputError : {}) }}
+                placeholder="e.g. Harmonic"
+              />
+              {fieldErrors.vendor && <div style={STYLES.errorText}>{fieldErrors.vendor}</div>}
+            </div>
+
+            {/* Platform */}
+            <div style={STYLES.fieldGroup}>
+              <label style={STYLES.label} htmlFor="tmpl-platform">Platform *</label>
+              <input
+                id="tmpl-platform"
+                type="text"
+                maxLength={100}
+                value={platform}
+                onChange={(e) => {
+                  setPlatform(e.target.value);
+                  if (fieldErrors.platform) setFieldErrors(prev => ({ ...prev, platform: undefined }));
+                }}
+                style={{ ...STYLES.input, ...(fieldErrors.platform ? STYLES.inputError : {}) }}
+                placeholder="e.g. vCMTS"
+              />
+              {fieldErrors.platform && <div style={STYLES.errorText}>{fieldErrors.platform}</div>}
+            </div>
+
+            {/* Model */}
+            <div style={STYLES.fieldGroup}>
+              <label style={STYLES.label} htmlFor="tmpl-model">Model *</label>
+              <input
+                id="tmpl-model"
+                type="text"
+                maxLength={100}
+                value={model}
+                onChange={(e) => {
+                  setModel(e.target.value);
+                  if (fieldErrors.model) setFieldErrors(prev => ({ ...prev, model: undefined }));
+                }}
+                style={{ ...STYLES.input, ...(fieldErrors.model ? STYLES.inputError : {}) }}
+                placeholder="e.g. 3.29.1"
+              />
+              {fieldErrors.model && <div style={STYLES.errorText}>{fieldErrors.model}</div>}
+            </div>
+          </div>
+
+          {/* Section textareas */}
+          <div style={STYLES.sectionDivider}>Template Sections</div>
+
+          {SECTIONS.map((section) => (
+            <div key={section.key} style={STYLES.fieldGroup}>
+              <label style={STYLES.label} htmlFor={`tmpl-${section.key}`}>
+                {section.label}
+              </label>
+              <textarea
+                id={`tmpl-${section.key}`}
+                value={sections[section.key]}
+                onChange={(e) => handleSectionChange(section.key, e.target.value)}
+                maxLength={10000}
+                style={STYLES.textarea}
+                placeholder={`Enter ${section.label.toLowerCase()} content...`}
+              />
+              {sections[section.key].length > 9500 && (
+                <div style={STYLES.charCount}>
+                  {sections[section.key].length}/10,000
+                </div>
+              )}
+            </div>
+          ))}
+
+          {/* Footer actions */}
+          <div style={STYLES.footer}>
+            <button
+              type="button"
+              style={STYLES.cancelBtn}
+              onClick={onClose}
+            >
+              Cancel
+            </button>
+            <button
+              type="submit"
+              disabled={submitting}
+              style={{
+                ...STYLES.submitBtn,
+                ...(submitting ? STYLES.submitBtnDisabled : {}),
+              }}
+            >
+              {submitting ? <Loader size={13} /> : <Save size={13} />}
+              {submitting ? 'Saving...' : (mode === 'edit' ? 'Update Template' : 'Save Template')}
+            </button>
+          </div>
+        </form>
+      </div>
+    </div>
+  );
+}

frontend/src/components/TemplateSelector.js

@@ -0,0 +1,621 @@
+import React, { useState, useEffect, useRef, useCallback } from 'react';
+import { Search, ChevronDown, Loader, FileText, Clipboard, Check, Copy } from 'lucide-react';
+
+const API_BASE = process.env.REACT_APP_API_BASE || 'http://localhost:3001/api';
+
+// ---------------------------------------------------------------------------
+// Section field mapping — ordered: static first, then semi-static
+// ---------------------------------------------------------------------------
+const SECTIONS = [
+  // Static sections
+  { key: 'environment_overview', label: 'Environment Overview' },
+  { key: 'segmentation', label: 'Segmentation' },
+  { key: 'mitigating_controls', label: 'Mitigating Controls' },
+  // Semi-static sections
+  { key: 'additional_info', label: 'Additional Info/Background' },
+  { key: 'charter_network_banner', label: 'Charter Network Banner' },
+  { key: 'data_classification', label: 'Data Classification' },
+  { key: 'charter_network', label: 'Charter Network' },
+  { key: 'additional_access_list', label: 'Additional Access List' },
+];
+
+// ---------------------------------------------------------------------------
+// Styles — dark theme tactical intelligence aesthetic
+// ---------------------------------------------------------------------------
+const STYLES = {
+  container: {
+    position: 'relative',
+    width: '100%',
+  },
+  label: {
+    fontFamily: "'JetBrains Mono', monospace",
+    fontSize: '0.7rem',
+    fontWeight: 700,
+    color: '#00d4ff',
+    textTransform: 'uppercase',
+    letterSpacing: '0.12em',
+    marginBottom: '0.5rem',
+    display: 'flex',
+    alignItems: 'center',
+    gap: '0.4rem',
+  },
+  searchWrapper: {
+    position: 'relative',
+    display: 'flex',
+    alignItems: 'center',
+  },
+  searchIcon: {
+    position: 'absolute',
+    left: '0.75rem',
+    color: '#64748b',
+    pointerEvents: 'none',
+  },
+  input: {
+    width: '100%',
+    padding: '0.625rem 2.25rem 0.625rem 2.25rem',
+    background: 'rgba(15, 23, 42, 0.9)',
+    border: '1px solid rgba(0, 212, 255, 0.2)',
+    borderRadius: '8px',
+    color: '#e0e0e0',
+    fontSize: '0.82rem',
+    fontFamily: "'Outfit', system-ui, sans-serif",
+    outline: 'none',
+    transition: 'border-color 0.2s, box-shadow 0.2s',
+  },
+  inputFocused: {
+    borderColor: 'rgba(0, 212, 255, 0.5)',
+    boxShadow: '0 0 12px rgba(0, 212, 255, 0.1)',
+  },
+  chevron: {
+    position: 'absolute',
+    right: '0.75rem',
+    color: '#64748b',
+    cursor: 'pointer',
+    transition: 'transform 0.2s',
+  },
+  chevronOpen: {
+    transform: 'rotate(180deg)',
+  },
+  dropdown: {
+    position: 'absolute',
+    top: '100%',
+    left: 0,
+    right: 0,
+    marginTop: '4px',
+    background: 'linear-gradient(135deg, rgba(22, 33, 62, 0.98), rgba(15, 23, 42, 0.99))',
+    border: '1px solid rgba(0, 212, 255, 0.2)',
+    borderRadius: '8px',
+    maxHeight: '240px',
+    overflowY: 'auto',
+    zIndex: 50,
+    boxShadow: '0 12px 40px rgba(0, 0, 0, 0.6)',
+  },
+  dropdownItem: {
+    padding: '0.6rem 0.875rem',
+    color: '#e0e0e0',
+    fontSize: '0.8rem',
+    fontFamily: "'Outfit', system-ui, sans-serif",
+    cursor: 'pointer',
+    transition: 'background 0.15s',
+    borderBottom: '1px solid rgba(100, 116, 139, 0.1)',
+    display: 'flex',
+    alignItems: 'center',
+    gap: '0.5rem',
+  },
+  dropdownItemHover: {
+    background: 'rgba(0, 212, 255, 0.08)',
+  },
+  dropdownItemSelected: {
+    background: 'rgba(0, 212, 255, 0.12)',
+    color: '#00d4ff',
+  },
+  loadingState: {
+    padding: '1rem',
+    display: 'flex',
+    alignItems: 'center',
+    justifyContent: 'center',
+    gap: '0.5rem',
+    color: '#64748b',
+    fontSize: '0.8rem',
+    fontFamily: "'Outfit', system-ui, sans-serif",
+  },
+  emptyState: {
+    padding: '1rem',
+    textAlign: 'center',
+    color: '#64748b',
+    fontSize: '0.8rem',
+    fontStyle: 'italic',
+    fontFamily: "'Outfit', system-ui, sans-serif",
+  },
+  selectedDisplay: {
+    marginTop: '0.5rem',
+    padding: '0.5rem 0.75rem',
+    background: 'rgba(0, 212, 255, 0.06)',
+    border: '1px solid rgba(0, 212, 255, 0.15)',
+    borderRadius: '6px',
+    color: '#00d4ff',
+    fontSize: '0.78rem',
+    fontFamily: "'JetBrains Mono', monospace",
+    display: 'flex',
+    alignItems: 'center',
+    gap: '0.4rem',
+  },
+  // Section panel styles
+  sectionPanel: {
+    marginTop: '1rem',
+    background: 'linear-gradient(135deg, rgba(22, 33, 62, 0.6), rgba(15, 23, 42, 0.8))',
+    border: '1px solid rgba(0, 212, 255, 0.15)',
+    borderRadius: '10px',
+    padding: '1rem',
+  },
+  sectionPanelHeader: {
+    display: 'flex',
+    alignItems: 'center',
+    justifyContent: 'space-between',
+    marginBottom: '0.75rem',
+    paddingBottom: '0.5rem',
+    borderBottom: '1px solid rgba(100, 116, 139, 0.2)',
+  },
+  sectionPanelTitle: {
+    fontFamily: "'JetBrains Mono', monospace",
+    fontSize: '0.7rem',
+    fontWeight: 700,
+    color: '#00d4ff',
+    textTransform: 'uppercase',
+    letterSpacing: '0.1em',
+  },
+  copyAllButton: {
+    display: 'flex',
+    alignItems: 'center',
+    gap: '0.35rem',
+    padding: '0.35rem 0.65rem',
+    background: 'rgba(0, 212, 255, 0.1)',
+    border: '1px solid rgba(0, 212, 255, 0.3)',
+    borderRadius: '6px',
+    color: '#00d4ff',
+    fontSize: '0.72rem',
+    fontFamily: "'JetBrains Mono', monospace",
+    fontWeight: 600,
+    cursor: 'pointer',
+    transition: 'background 0.2s, border-color 0.2s',
+  },
+  copyAllButtonHover: {
+    background: 'rgba(0, 212, 255, 0.18)',
+    borderColor: 'rgba(0, 212, 255, 0.5)',
+  },
+  copyAllButtonCopied: {
+    background: 'rgba(34, 197, 94, 0.15)',
+    borderColor: 'rgba(34, 197, 94, 0.4)',
+    color: '#22c55e',
+  },
+  sectionBlock: {
+    marginBottom: '0.75rem',
+    padding: '0.6rem 0.75rem',
+    background: 'rgba(15, 23, 42, 0.5)',
+    border: '1px solid rgba(100, 116, 139, 0.15)',
+    borderRadius: '6px',
+  },
+  sectionBlockHeader: {
+    display: 'flex',
+    alignItems: 'center',
+    justifyContent: 'space-between',
+    marginBottom: '0.35rem',
+  },
+  sectionLabel: {
+    fontFamily: "'Outfit', system-ui, sans-serif",
+    fontSize: '0.75rem',
+    fontWeight: 600,
+    color: '#94a3b8',
+    letterSpacing: '0.02em',
+  },
+  sectionContent: {
+    fontFamily: "'Outfit', system-ui, sans-serif",
+    fontSize: '0.78rem',
+    color: '#e0e0e0',
+    lineHeight: 1.5,
+    whiteSpace: 'pre-wrap',
+    wordBreak: 'break-word',
+    maxHeight: '120px',
+    overflowY: 'auto',
+  },
+  sectionEmpty: {
+    fontFamily: "'Outfit', system-ui, sans-serif",
+    fontSize: '0.78rem',
+    color: '#64748b',
+    fontStyle: 'italic',
+  },
+  copyButton: {
+    display: 'flex',
+    alignItems: 'center',
+    gap: '0.25rem',
+    padding: '0.25rem 0.5rem',
+    background: 'rgba(100, 116, 139, 0.15)',
+    border: '1px solid rgba(100, 116, 139, 0.25)',
+    borderRadius: '4px',
+    color: '#94a3b8',
+    fontSize: '0.68rem',
+    fontFamily: "'JetBrains Mono', monospace",
+    cursor: 'pointer',
+    transition: 'background 0.2s, color 0.2s, border-color 0.2s',
+  },
+  copyButtonHover: {
+    background: 'rgba(0, 212, 255, 0.1)',
+    borderColor: 'rgba(0, 212, 255, 0.3)',
+    color: '#00d4ff',
+  },
+  copyButtonCopied: {
+    background: 'rgba(34, 197, 94, 0.12)',
+    borderColor: 'rgba(34, 197, 94, 0.3)',
+    color: '#22c55e',
+  },
+  copyButtonDisabled: {
+    opacity: 0.4,
+    cursor: 'not-allowed',
+  },
+};
+
+/**
+ * TemplateSelector — searchable dropdown for selecting Archer templates.
+ *
+ * Props:
+ *   onSelect {function} — optional callback invoked with the full template object when a selection is made
+ */
+export default function TemplateSelector({ onSelect }) {
+  const [templates, setTemplates] = useState([]);
+  const [loading, setLoading] = useState(true);
+  const [error, setError] = useState(null);
+  const [searchText, setSearchText] = useState('');
+  const [isOpen, setIsOpen] = useState(false);
+  const [selectedTemplate, setSelectedTemplate] = useState(null);
+  const [hoveredIndex, setHoveredIndex] = useState(-1);
+  const [inputFocused, setInputFocused] = useState(false);
+
+  // Copy state: per-section copied confirmation + copy all
+  const [copiedSections, setCopiedSections] = useState({});
+  const [copyAllCopied, setCopyAllCopied] = useState(false);
+  const [copyAllHovered, setCopyAllHovered] = useState(false);
+  const [hoveredCopyButton, setHoveredCopyButton] = useState(null);
+
+  const containerRef = useRef(null);
+  const inputRef = useRef(null);
+
+  // Fetch all templates on mount
+  useEffect(() => {
+    let cancelled = false;
+    async function fetchTemplates() {
+      try {
+        setLoading(true);
+        setError(null);
+        const res = await fetch(`${API_BASE}/archer-templates`, {
+          credentials: 'include',
+        });
+        if (!res.ok) {
+          throw new Error(`Failed to fetch templates (${res.status})`);
+        }
+        const data = await res.json();
+        if (!cancelled) {
+          setTemplates(data);
+        }
+      } catch (err) {
+        if (!cancelled) {
+          setError(err.message);
+        }
+      } finally {
+        if (!cancelled) {
+          setLoading(false);
+        }
+      }
+    }
+    fetchTemplates();
+    return () => { cancelled = true; };
+  }, []);
+
+  // Close dropdown when clicking outside
+  useEffect(() => {
+    function handleClickOutside(e) {
+      if (containerRef.current && !containerRef.current.contains(e.target)) {
+        setIsOpen(false);
+      }
+    }
+    document.addEventListener('mousedown', handleClickOutside);
+    return () => document.removeEventListener('mousedown', handleClickOutside);
+  }, []);
+
+  // Client-side filter — case-insensitive substring match on vendor, platform, or model
+  const filteredTemplates = useCallback(() => {
+    if (!searchText.trim()) return templates;
+    const query = searchText.toLowerCase().trim();
+    return templates.filter(t =>
+      t.vendor.toLowerCase().includes(query) ||
+      t.platform.toLowerCase().includes(query) ||
+      t.model.toLowerCase().includes(query)
+    );
+  }, [templates, searchText])();
+
+  // Handle template selection
+  const handleSelect = (template) => {
+    setSelectedTemplate(template);
+    setSearchText(`${template.vendor} / ${template.platform} / ${template.model}`);
+    setIsOpen(false);
+    setCopiedSections({});
+    setCopyAllCopied(false);
+    if (onSelect) {
+      onSelect(template);
+    }
+  };
+
+  // Handle input change
+  const handleInputChange = (e) => {
+    setSearchText(e.target.value);
+    setSelectedTemplate(null);
+    setIsOpen(true);
+    setHoveredIndex(-1);
+  };
+
+  // Handle input focus
+  const handleInputFocus = () => {
+    setInputFocused(true);
+    setIsOpen(true);
+  };
+
+  // Handle input blur
+  const handleInputBlur = () => {
+    setInputFocused(false);
+  };
+
+  // Keyboard navigation
+  const handleKeyDown = (e) => {
+    if (!isOpen) {
+      if (e.key === 'ArrowDown' || e.key === 'Enter') {
+        setIsOpen(true);
+        e.preventDefault();
+      }
+      return;
+    }
+
+    switch (e.key) {
+      case 'ArrowDown':
+        e.preventDefault();
+        setHoveredIndex(prev =>
+          prev < filteredTemplates.length - 1 ? prev + 1 : 0
+        );
+        break;
+      case 'ArrowUp':
+        e.preventDefault();
+        setHoveredIndex(prev =>
+          prev > 0 ? prev - 1 : filteredTemplates.length - 1
+        );
+        break;
+      case 'Enter':
+        e.preventDefault();
+        if (hoveredIndex >= 0 && hoveredIndex < filteredTemplates.length) {
+          handleSelect(filteredTemplates[hoveredIndex]);
+        }
+        break;
+      case 'Escape':
+        setIsOpen(false);
+        inputRef.current?.blur();
+        break;
+      default:
+        break;
+    }
+  };
+
+  // Copy a single section to clipboard
+  const handleCopySection = async (sectionKey, content) => {
+    if (!content) return;
+    try {
+      await navigator.clipboard.writeText(content);
+      setCopiedSections(prev => ({ ...prev, [sectionKey]: true }));
+      setTimeout(() => {
+        setCopiedSections(prev => ({ ...prev, [sectionKey]: false }));
+      }, 2000);
+    } catch (_err) {
+      // Clipboard API failed — silently ignore
+    }
+  };
+
+  // Copy All: concatenate non-empty sections with headers
+  const handleCopyAll = async () => {
+    if (!selectedTemplate) return;
+    const parts = [];
+    for (const section of SECTIONS) {
+      const content = selectedTemplate[section.key];
+      if (content && content.trim()) {
+        parts.push(`${section.label}\n${content}`);
+      }
+    }
+    const combined = parts.join('\n\n');
+    try {
+      await navigator.clipboard.writeText(combined);
+      setCopyAllCopied(true);
+      setTimeout(() => {
+        setCopyAllCopied(false);
+      }, 2000);
+    } catch (_err) {
+      // Clipboard API failed — silently ignore
+    }
+  };
+
+  // Check if there are any non-empty sections
+  const hasNonEmptySections = selectedTemplate && SECTIONS.some(s => {
+    const val = selectedTemplate[s.key];
+    return val && val.trim();
+  });
+
+  return (
+    <div style={STYLES.container} ref={containerRef}>
+      {/* Label */}
+      <div style={STYLES.label}>
+        <FileText size={12} />
+        Template Selector
+      </div>
+
+      {/* Search input with dropdown */}
+      <div style={STYLES.searchWrapper}>
+        <Search size={14} style={STYLES.searchIcon} />
+        <input
+          ref={inputRef}
+          type="text"
+          placeholder={loading ? 'Loading templates...' : 'Search by vendor, platform, or model...'}
+          value={searchText}
+          onChange={handleInputChange}
+          onFocus={handleInputFocus}
+          onBlur={handleInputBlur}
+          onKeyDown={handleKeyDown}
+          disabled={loading}
+          style={{
+            ...STYLES.input,
+            ...(inputFocused ? STYLES.inputFocused : {}),
+            opacity: loading ? 0.6 : 1,
+          }}
+          aria-label="Search templates"
+          aria-expanded={isOpen}
+          aria-haspopup="listbox"
+          role="combobox"
+          aria-autocomplete="list"
+        />
+        <ChevronDown
+          size={14}
+          style={{
+            ...STYLES.chevron,
+            ...(isOpen ? STYLES.chevronOpen : {}),
+          }}
+          onClick={() => {
+            setIsOpen(!isOpen);
+            inputRef.current?.focus();
+          }}
+        />
+      </div>
+
+      {/* Dropdown list */}
+      {isOpen && (
+        <div style={STYLES.dropdown} role="listbox" aria-label="Template list">
+          {loading ? (
+            <div style={STYLES.loadingState}>
+              <Loader size={14} style={{ animation: 'spin 1s linear infinite' }} />
+              Loading templates...
+            </div>
+          ) : error ? (
+            <div style={{ ...STYLES.emptyState, color: '#ef4444' }}>
+              {error}
+            </div>
+          ) : filteredTemplates.length === 0 ? (
+            <div style={STYLES.emptyState}>
+              {searchText.trim()
+                ? 'No templates match your search'
+                : 'No templates available'}
+            </div>
+          ) : (
+            filteredTemplates.map((template, index) => {
+              const isSelected = selectedTemplate?.id === template.id;
+              const isHovered = hoveredIndex === index;
+              return (
+                <div
+                  key={template.id}
+                  role="option"
+                  aria-selected={isSelected}
+                  style={{
+                    ...STYLES.dropdownItem,
+                    ...(isHovered ? STYLES.dropdownItemHover : {}),
+                    ...(isSelected ? STYLES.dropdownItemSelected : {}),
+                  }}
+                  onMouseEnter={() => setHoveredIndex(index)}
+                  onMouseLeave={() => setHoveredIndex(-1)}
+                  onMouseDown={(e) => {
+                    e.preventDefault(); // Prevent input blur before click registers
+                    handleSelect(template);
+                  }}
+                >
+                  <FileText size={12} style={{ opacity: 0.5, flexShrink: 0 }} />
+                  {template.vendor} / {template.platform} / {template.model}
+                </div>
+              );
+            })
+          )}
+        </div>
+      )}
+
+      {/* Section display panel — shown when a template is selected */}
+      {selectedTemplate && (
+        <div style={STYLES.sectionPanel}>
+          {/* Panel header with Copy All button */}
+          <div style={STYLES.sectionPanelHeader}>
+            <span style={STYLES.sectionPanelTitle}>Template Sections</span>
+            {hasNonEmptySections && (
+              <button
+                onClick={handleCopyAll}
+                onMouseEnter={() => setCopyAllHovered(true)}
+                onMouseLeave={() => setCopyAllHovered(false)}
+                style={{
+                  ...STYLES.copyAllButton,
+                  ...(copyAllCopied ? STYLES.copyAllButtonCopied : {}),
+                  ...(!copyAllCopied && copyAllHovered ? STYLES.copyAllButtonHover : {}),
+                }}
+                aria-label="Copy all sections"
+              >
+                {copyAllCopied ? (
+                  <>
+                    <Check size={11} />
+                    Copied!
+                  </>
+                ) : (
+                  <>
+                    <Copy size={11} />
+                    Copy All
+                  </>
+                )}
+              </button>
+            )}
+          </div>
+
+          {/* Section blocks */}
+          {SECTIONS.map((section) => {
+            const content = selectedTemplate[section.key];
+            const isEmpty = !content || !content.trim();
+            const isCopied = copiedSections[section.key];
+            const isButtonHovered = hoveredCopyButton === section.key;
+
+            return (
+              <div key={section.key} style={STYLES.sectionBlock}>
+                <div style={STYLES.sectionBlockHeader}>
+                  <span style={STYLES.sectionLabel}>{section.label}</span>
+                  <button
+                    onClick={() => handleCopySection(section.key, content)}
+                    disabled={isEmpty}
+                    onMouseEnter={() => setHoveredCopyButton(section.key)}
+                    onMouseLeave={() => setHoveredCopyButton(null)}
+                    style={{
+                      ...STYLES.copyButton,
+                      ...(isEmpty ? STYLES.copyButtonDisabled : {}),
+                      ...(isCopied ? STYLES.copyButtonCopied : {}),
+                      ...(!isEmpty && !isCopied && isButtonHovered ? STYLES.copyButtonHover : {}),
+                    }}
+                    aria-label={`Copy ${section.label}`}
+                  >
+                    {isCopied ? (
+                      <>
+                        <Check size={10} />
+                        Copied!
+                      </>
+                    ) : (
+                      <>
+                        <Clipboard size={10} />
+                        Copy
+                      </>
+                    )}
+                  </button>
+                </div>
+                {isEmpty ? (
+                  <div style={STYLES.sectionEmpty}>No content stored</div>
+                ) : (
+                  <div style={STYLES.sectionContent}>{content}</div>
+                )}
+              </div>
+            );
+          })}
+        </div>
+      )}
+    </div>
+  );
+}

frontend/src/components/UserManagement.js

@@ -181,7 +181,9 @@ export default function UserManagement({ onClose }) {
         email: '',
         password: '',
         group: 'Read_Only',
-        bu_teams: ''
+        bu_teams: '',
+        ivanti_first_name: '',
+        ivanti_last_name: ''
     });
     const [formError, setFormError] = useState('');
     const [formSuccess, setFormSuccess] = useState('');
@@ -241,7 +243,7 @@ export default function UserManagement({ onClose }) {
             setTimeout(() => {
                 setShowAddUser(false);
                 setEditingUser(null);
-                setFormData({ username: '', email: '', password: '', group: 'Read_Only', bu_teams: '' });
+                setFormData({ username: '', email: '', password: '', group: 'Read_Only', bu_teams: '', ivanti_first_name: '', ivanti_last_name: '' });
                 setFormSuccess('');
             }, 1500);
         } catch (err) {
@@ -280,7 +282,9 @@ export default function UserManagement({ onClose }) {
             email: user.email,
             password: '',
             group: user.group,
-            bu_teams: user.bu_teams || ''
+            bu_teams: user.bu_teams || '',
+            ivanti_first_name: user.ivanti_first_name || '',
+            ivanti_last_name: user.ivanti_last_name || ''
         });
         setShowAddUser(true);
         setFormError('');
@@ -363,7 +367,7 @@ export default function UserManagement({ onClose }) {
                             onClick={() => {
                                 setShowAddUser(true);
                                 setEditingUser(null);
-                                setFormData({ username: '', email: '', password: '', group: 'Read_Only', bu_teams: '' });
+                                setFormData({ username: '', email: '', password: '', group: 'Read_Only', bu_teams: '', ivanti_first_name: '', ivanti_last_name: '' });
                                 setFormError('');
                                 setFormSuccess('');
                             }}
@@ -528,6 +532,32 @@ export default function UserManagement({ onClose }) {
                                     </p>
                                 </div>
 
+                                {/* Ivanti Identity */}
+                                <div>
+                                    <label style={{ display: 'block', fontSize: '0.75rem', color: '#94A3B8', marginBottom: '0.375rem', fontWeight: '600' }}>
+                                        Ivanti Identity
+                                    </label>
+                                    <div style={{ display: 'flex', gap: '0.5rem' }}>
+                                        <input
+                                            type="text"
+                                            style={{ ...styles.input, flex: 1 }}
+                                            value={formData.ivanti_first_name || ''}
+                                            onChange={e => setFormData({ ...formData, ivanti_first_name: e.target.value })}
+                                            placeholder="First name in Ivanti"
+                                        />
+                                        <input
+                                            type="text"
+                                            style={{ ...styles.input, flex: 1 }}
+                                            value={formData.ivanti_last_name || ''}
+                                            onChange={e => setFormData({ ...formData, ivanti_last_name: e.target.value })}
+                                            placeholder="Last name in Ivanti"
+                                        />
+                                    </div>
+                                    <p style={{ fontSize: '0.65rem', color: '#64748B', marginTop: '0.375rem' }}>
+                                        Used to filter FP workflows — must match the name in Ivanti exactly.
+                                    </p>
+                                </div>
+
                                 <div style={{ display: 'flex', gap: '0.75rem', paddingTop: '1rem' }}>
                                     <button type="submit" style={styles.primaryBtn}
                                         onMouseEnter={e => {

frontend/src/components/pages/AnomalyBanner.js

@@ -2,9 +2,11 @@
 // Warning banner for the Vulnerability Triage page.
 // Fetches the latest sync anomaly summary and displays a dismissible
 // amber banner when a significant count change is detected.
+// Clicking the "BU reassignment" row expands a detail view showing
+// which specific findings moved and from/to which team.
 
-import React, { useState, useEffect } from 'react';
-import { AlertTriangle, X, ChevronDown, ChevronUp } from 'lucide-react';
+import React, { useState, useEffect, useCallback } from 'react';
+import { AlertTriangle, X, ChevronDown, ChevronUp, ArrowRight, Loader } from 'lucide-react';
 
 const API_BASE = process.env.REACT_APP_API_BASE || 'http://localhost:3001/api';
 
@@ -92,6 +94,69 @@ const DETAIL_COUNT = {
     color: '#FCD34D',
 };
 
+const BU_DETAIL_SECTION = {
+    marginTop: '0.5rem',
+    padding: '0.5rem 0.625rem',
+    background: 'rgba(251, 146, 60, 0.08)',
+    border: '1px solid rgba(251, 146, 60, 0.15)',
+    borderRadius: '0.375rem',
+    maxHeight: '200px',
+    overflowY: 'auto',
+};
+
+const BU_DETAIL_ROW = {
+    display: 'flex',
+    alignItems: 'center',
+    gap: '0.4rem',
+    padding: '0.25rem 0',
+    fontSize: '0.6rem',
+    color: '#CBD5E1',
+    borderBottom: '1px solid rgba(255,255,255,0.04)',
+};
+
+const BU_DETAIL_HOST = {
+    fontWeight: '600',
+    color: '#E2E8F0',
+    minWidth: '80px',
+    maxWidth: '140px',
+    overflow: 'hidden',
+    textOverflow: 'ellipsis',
+    whiteSpace: 'nowrap',
+};
+
+const BU_DETAIL_TEAM = {
+    fontFamily: "'JetBrains Mono', monospace",
+    fontSize: '0.58rem',
+    padding: '0.1rem 0.35rem',
+    borderRadius: '0.2rem',
+    whiteSpace: 'nowrap',
+};
+
+const BU_FROM_STYLE = {
+    ...BU_DETAIL_TEAM,
+    background: 'rgba(239, 68, 68, 0.15)',
+    color: '#FCA5A5',
+};
+
+const BU_TO_STYLE = {
+    ...BU_DETAIL_TEAM,
+    background: 'rgba(251, 146, 60, 0.15)',
+    color: '#FDBA74',
+};
+
+const BU_ARROW_STYLE = {
+    width: '10px',
+    height: '10px',
+    color: '#64748B',
+    flexShrink: 0,
+};
+
+const BU_CLICKABLE_ROW = {
+    cursor: 'pointer',
+    borderRadius: '0.2rem',
+    transition: 'background 0.15s',
+};
+
 // ---------------------------------------------------------------------------
 // Classification labels for display
 // ---------------------------------------------------------------------------
@@ -128,6 +193,19 @@ function buildSummaryText(anomaly) {
     return `${count} findings archived — ${breakdown}`;
 }
 
+// ---------------------------------------------------------------------------
+// Shorten BU names for compact display (e.g. NTS-AEO-STEAM → STEAM)
+// ---------------------------------------------------------------------------
+function shortenBU(bu) {
+    if (!bu) return '?';
+    // Strip common prefixes for compact display
+    return bu
+        .replace(/^NTS-AEO-/, '')
+        .replace(/^SDIT-CSD-ITLS-/, '')
+        .replace(/^SDIT-CSD-/, '')
+        .replace(/^NTS-/, '');
+}
+
 // ---------------------------------------------------------------------------
 // Main component
 // ---------------------------------------------------------------------------
@@ -136,6 +214,9 @@ export default function AnomalyBanner() {
     const [loading, setLoading]     = useState(true);
     const [dismissed, setDismissed] = useState(false);
     const [expanded, setExpanded]   = useState(false);
+    const [buChanges, setBuChanges] = useState(null);
+    const [buLoading, setBuLoading] = useState(false);
+    const [buExpanded, setBuExpanded] = useState(false);
 
     useEffect(() => {
         let cancelled = false;
@@ -156,6 +237,42 @@ export default function AnomalyBanner() {
         return () => { cancelled = true; };
     }, []);
 
+    // Fetch BU change details when user expands the reassignment section
+    const loadBuChanges = useCallback(async () => {
+        if (buChanges !== null) {
+            // Already loaded — just toggle visibility
+            setBuExpanded(e => !e);
+            return;
+        }
+        setBuLoading(true);
+        setBuExpanded(true);
+        try {
+            // Fetch BU change records relevant to this anomaly.
+            // Use a generous 60-minute window before sync_timestamp since the drift
+            // checker runs well before the anomaly summary is recorded.
+            const since = anomaly?.sync_timestamp || '';
+            let url;
+            if (since) {
+                const sinceDate = new Date(since);
+                sinceDate.setMinutes(sinceDate.getMinutes() - 60);
+                url = `${API_BASE}/ivanti/findings/bu-changes?since=${encodeURIComponent(sinceDate.toISOString())}`;
+            } else {
+                url = `${API_BASE}/ivanti/findings/bu-changes?limit=50`;
+            }
+            const res = await fetch(url, { credentials: 'include' });
+            if (res.ok) {
+                const data = await res.json();
+                setBuChanges(data.changes || []);
+            } else {
+                setBuChanges([]);
+            }
+        } catch {
+            setBuChanges([]);
+        } finally {
+            setBuLoading(false);
+        }
+    }, [anomaly, buChanges]);
+
     // Render nothing while loading, if dismissed, or if anomaly is not significant
     if (loading || dismissed || !anomaly || !anomaly.is_significant) {
         return null;
@@ -198,6 +315,45 @@ export default function AnomalyBanner() {
                     {Object.entries(CLASSIFICATION_LABELS).map(([key, label]) => {
                         const val = classification[key] || 0;
                         if (val === 0) return null;
+                        // BU reassignment row is clickable to show from/to details
+                        if (key === 'bu_reassignment') {
+                            return (
+                                <div key={key}>
+                                    <div
+                                        style={{ ...DETAIL_ROW, ...BU_CLICKABLE_ROW }}
+                                        onClick={loadBuChanges}
+                                        title="Click to see which findings moved and where"
+                                    >
+                                        <span style={{ display: 'flex', alignItems: 'center', gap: '0.3rem' }}>
+                                            {label}
+                                            {buLoading && <Loader style={{ width: '10px', height: '10px', animation: 'spin 1s linear infinite' }} />}
+                                            {!buLoading && (buExpanded
+                                                ? <ChevronUp style={{ width: '10px', height: '10px', opacity: 0.5 }} />
+                                                : <ChevronDown style={{ width: '10px', height: '10px', opacity: 0.5 }} />
+                                            )}
+                                        </span>
+                                        <span style={DETAIL_COUNT}>{val}</span>
+                                    </div>
+                                    {buExpanded && buChanges !== null && buChanges.length > 0 && (
+                                        <div style={BU_DETAIL_SECTION}>
+                                            {buChanges.map((change, idx) => (
+                                                <div key={change.id || idx} style={BU_DETAIL_ROW} title={change.finding_title || ''}>
+                                                    <span style={BU_DETAIL_HOST}>{change.host_name || change.finding_id}</span>
+                                                    <span style={BU_FROM_STYLE}>{shortenBU(change.previous_bu)}</span>
+                                                    <ArrowRight style={BU_ARROW_STYLE} />
+                                                    <span style={BU_TO_STYLE}>{shortenBU(change.new_bu)}</span>
+                                                </div>
+                                            ))}
+                                        </div>
+                                    )}
+                                    {buExpanded && buChanges !== null && buChanges.length === 0 && (
+                                        <div style={{ ...BU_DETAIL_SECTION, color: '#64748B', fontSize: '0.6rem', textAlign: 'center', padding: '0.5rem' }}>
+                                            No detailed BU change records found for this sync
+                                        </div>
+                                    )}
+                                </div>
+                            );
+                        }
                         return (
                             <div key={key} style={DETAIL_ROW}>
                                 <span>{label}</span>

frontend/src/components/pages/ArcherPage.js

@@ -0,0 +1,430 @@
+import React, { useState } from 'react';
+import { Plus, X, Loader, Shield, Filter, Edit2, Trash2, CheckCircle } from 'lucide-react';
+import { useAuth } from '../../contexts/AuthContext';
+
+const API_BASE = process.env.REACT_APP_API_BASE || 'http://localhost:3001/api';
+
+// ---------------------------------------------------------------------------
+// Styles — matches tactical intelligence aesthetic
+// ---------------------------------------------------------------------------
+const STYLES = {
+  modal: {
+    position: 'fixed',
+    inset: 0,
+    zIndex: 100,
+    display: 'flex',
+    alignItems: 'center',
+    justifyContent: 'center',
+  },
+  modalBackdrop: {
+    position: 'fixed',
+    inset: 0,
+    background: 'rgba(0,0,0,0.7)',
+    backdropFilter: 'blur(4px)',
+  },
+  modalContent: {
+    position: 'relative',
+    background: 'linear-gradient(135deg, #1E293B, #0F172A)',
+    border: '1px solid rgba(139, 92, 246, 0.25)',
+    borderRadius: '16px',
+    padding: '2rem',
+    width: '90%',
+    maxWidth: '520px',
+    maxHeight: '85vh',
+    overflowY: 'auto',
+    zIndex: 101,
+  },
+  input: {
+    background: 'rgba(15, 23, 42, 0.8)',
+    border: '1px solid rgba(14, 165, 233, 0.2)',
+    borderRadius: '8px',
+    padding: '0.5rem 0.75rem',
+    color: '#F8FAFC',
+    fontSize: '0.85rem',
+    width: '100%',
+    outline: 'none',
+  },
+  btn: {
+    padding: '0.5rem 1rem',
+    borderRadius: '8px',
+    border: '1px solid rgba(139, 92, 246, 0.3)',
+    background: 'rgba(139, 92, 246, 0.1)',
+    color: '#C4B5FD',
+    cursor: 'pointer',
+    fontSize: '0.8rem',
+    fontWeight: 600,
+    display: 'inline-flex',
+    alignItems: 'center',
+    gap: '0.4rem',
+    transition: 'all 0.2s',
+  },
+  btnSuccess: {
+    border: '1px solid rgba(16, 185, 129, 0.3)',
+    background: 'rgba(16, 185, 129, 0.1)',
+    color: '#6EE7B7',
+  },
+  intelCard: {
+    background: 'linear-gradient(135deg, rgba(30, 41, 59, 0.95) 0%, rgba(51, 65, 85, 0.9) 100%)',
+    border: '1px solid rgba(14, 165, 233, 0.15)',
+    borderRadius: '0.75rem',
+    padding: '1.5rem',
+    boxShadow: '0 4px 16px rgba(0, 0, 0, 0.4), inset 0 1px 0 rgba(255, 255, 255, 0.03)',
+  },
+  ticketCard: {
+    background: 'linear-gradient(135deg, rgba(30, 41, 59, 0.85) 0%, rgba(51, 65, 85, 0.75) 100%)',
+    border: '1px solid rgba(139, 92, 246, 0.25)',
+    borderRadius: '0.375rem',
+    padding: '0.5rem',
+    boxShadow: '0 2px 6px rgba(0, 0, 0, 0.25), inset 0 1px 0 rgba(255, 255, 255, 0.03)',
+  },
+  badgeHigh: {
+    display: 'inline-flex',
+    alignItems: 'center',
+    gap: '0.375rem',
+    padding: '0.25rem 0.75rem',
+    borderRadius: '9999px',
+    fontSize: '0.7rem',
+    fontWeight: '600',
+    letterSpacing: '0.05em',
+    textTransform: 'uppercase',
+    border: '1px solid #F59E0B',
+    background: 'rgba(245, 158, 11, 0.15)',
+    color: '#F59E0B',
+  },
+  glowDot: (color) => ({
+    width: '8px',
+    height: '8px',
+    borderRadius: '50%',
+    background: color,
+    boxShadow: `0 0 6px ${color}, 0 0 12px ${color}`,
+  }),
+};
+
+// ---------------------------------------------------------------------------
+// ArcherPage — Archer Risk Tickets panel with "Create Jira Ticket" action
+// ---------------------------------------------------------------------------
+export default function ArcherPage({
+  archerTickets = [],
+  onEditTicket,
+  onDeleteTicket,
+  onFilterByExc,
+  onAddTicket,
+  canDeleteTicket,
+}) {
+  const { canWrite } = useAuth();
+
+  // Create Jira Ticket modal state
+  const [showCreateJiraModal, setShowCreateJiraModal] = useState(false);
+  const [createJiraForm, setCreateJiraForm] = useState({
+    summary: '',
+    cve_id: '',
+    vendor: '',
+    source_context: 'archer',
+    description: '',
+    project_key: '',
+    issue_type: '',
+  });
+  const [createJiraSaving, setCreateJiraSaving] = useState(false);
+  const [createJiraError, setCreateJiraError] = useState(null);
+  const [summaryError, setSummaryError] = useState(null);
+  const [createJiraSuccess, setCreateJiraSuccess] = useState(null);
+
+  // Open the Create Jira Ticket modal pre-populated with Archer ticket data
+  const openCreateJiraModal = (ticket) => {
+    // Build description with available Archer ticket information
+    const descParts = [];
+    descParts.push(`Archer risk acceptance ticket: ${ticket.exc_number || 'N/A'}`);
+    if (ticket.cve_id) descParts.push(`CVE: ${ticket.cve_id}`);
+    if (ticket.vendor) descParts.push(`Vendor: ${ticket.vendor}`);
+    if (ticket.status) descParts.push(`Status: ${ticket.status}`);
+    if (ticket.archer_url) descParts.push(`Archer URL: ${ticket.archer_url}`);
+    const description = descParts.join('\n');
+
+    setCreateJiraForm({
+      summary: ticket.exc_number || '',
+      cve_id: ticket.cve_id || '',
+      vendor: ticket.vendor || '',
+      source_context: 'archer',
+      description,
+      project_key: '',
+      issue_type: '',
+    });
+    setCreateJiraError(null);
+    setSummaryError(null);
+    setCreateJiraSuccess(null);
+    setShowCreateJiraModal(true);
+  };
+
+  // Submit the Create Jira Ticket form
+  const handleCreateJira = async () => {
+    setSummaryError(null);
+    const trimmedSummary = (createJiraForm.summary || '').trim();
+    if (!trimmedSummary) {
+      setSummaryError('Summary is required.');
+      return;
+    }
+    if (trimmedSummary.length > 255) {
+      setSummaryError('Summary must be 255 characters or fewer.');
+      return;
+    }
+
+    setCreateJiraError(null);
+    setCreateJiraSaving(true);
+    try {
+      const payload = {
+        summary: trimmedSummary,
+        source_context: 'archer',
+      };
+      if (createJiraForm.cve_id && createJiraForm.cve_id.trim()) {
+        payload.cve_id = createJiraForm.cve_id.trim();
+      }
+      if (createJiraForm.vendor && createJiraForm.vendor.trim()) {
+        payload.vendor = createJiraForm.vendor.trim();
+      }
+      if (createJiraForm.description && createJiraForm.description.trim()) {
+        payload.description = createJiraForm.description.trim();
+      }
+      if (createJiraForm.project_key && createJiraForm.project_key.trim()) {
+        payload.project_key = createJiraForm.project_key.trim();
+      }
+      if (createJiraForm.issue_type && createJiraForm.issue_type.trim()) {
+        payload.issue_type = createJiraForm.issue_type.trim();
+      }
+
+      const res = await fetch(`${API_BASE}/jira-tickets/create-in-jira`, {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        credentials: 'include',
+        body: JSON.stringify(payload),
+      });
+      const data = await res.json();
+      if (!res.ok && res.status !== 207) {
+        throw new Error(data.error || `HTTP ${res.status}`);
+      }
+      setCreateJiraSuccess(`Jira ticket ${data.ticket_key} created successfully.`);
+      // Reset form after short delay so user sees success
+      setTimeout(() => {
+        setShowCreateJiraModal(false);
+        setCreateJiraSuccess(null);
+        setCreateJiraForm({ summary: '', cve_id: '', vendor: '', source_context: 'archer', description: '', project_key: '', issue_type: '' });
+      }, 1500);
+    } catch (err) {
+      setCreateJiraError(err.message);
+    } finally {
+      setCreateJiraSaving(false);
+    }
+  };
+
+  const activeTickets = archerTickets.filter(t => t.status !== 'Accepted');
+
+  return (
+    <>
+      {/* Archer Risk Acceptance Tickets Card */}
+      <div style={{ ...STYLES.intelCard, borderLeft: '3px solid #8B5CF6' }} className="rounded-lg">
+        <div className="flex justify-between items-center mb-4">
+          <h2 style={{ fontSize: '1.125rem', fontWeight: '600', color: '#8B5CF6', display: 'flex', alignItems: 'center', gap: '0.5rem', fontFamily: 'monospace', textTransform: 'uppercase', letterSpacing: '0.1em', textShadow: '0 0 12px rgba(139, 92, 246, 0.4)' }}>
+            <Shield className="w-5 h-5" />
+            Archer Risk Tickets
+          </h2>
+          {canWrite() && onAddTicket && (
+            <button
+              onClick={onAddTicket}
+              className="intel-button intel-button-primary flex items-center gap-1 text-xs px-2 py-1"
+            >
+              <Plus className="w-3 h-3" />
+            </button>
+          )}
+        </div>
+        <div className="text-center mb-3">
+          <div style={{ fontSize: '2rem', fontWeight: '700', fontFamily: 'monospace', color: '#8B5CF6', textShadow: '0 0 16px rgba(139, 92, 246, 0.4)' }}>
+            {activeTickets.length}
+          </div>
+          <div className="text-xs text-gray-400 uppercase tracking-wider">Active</div>
+        </div>
+        <div className="space-y-2 max-h-96 overflow-y-auto">
+          {activeTickets.slice(0, 10).map(ticket => (
+            <div key={ticket.id} style={STYLES.ticketCard}>
+              <div className="flex items-start justify-between gap-2 mb-1">
+                <a
+                  href={ticket.archer_url || '#'}
+                  target="_blank"
+                  rel="noopener noreferrer"
+                  className="font-mono text-xs font-semibold text-intel-accent hover:text-purple-400 transition-colors"
+                >
+                  {ticket.exc_number}
+                </a>
+                <div className="flex gap-1">
+                  {onFilterByExc && (
+                    <button
+                      onClick={() => onFilterByExc(ticket.exc_number)}
+                      title="View findings referencing this ticket"
+                      className="text-gray-400 hover:text-sky-400 transition-colors"
+                    >
+                      <Filter className="w-3 h-3" />
+                    </button>
+                  )}
+                  {canWrite() && (
+                    <button
+                      onClick={() => openCreateJiraModal(ticket)}
+                      title="Create Jira Ticket"
+                      className="text-gray-400 hover:text-green-400 transition-colors"
+                    >
+                      <Plus className="w-3 h-3" />
+                    </button>
+                  )}
+                  {canWrite() && onEditTicket && (
+                    <button onClick={() => onEditTicket(ticket)} className="text-gray-400 hover:text-purple-400 transition-colors">
+                      <Edit2 className="w-3 h-3" />
+                    </button>
+                  )}
+                  {canDeleteTicket && canDeleteTicket(ticket) && onDeleteTicket && (
+                    <button onClick={() => onDeleteTicket(ticket)} className="text-gray-400 hover:text-intel-danger transition-colors">
+                      <Trash2 className="w-3 h-3" />
+                    </button>
+                  )}
+                </div>
+              </div>
+              <div className="text-xs text-white font-mono mb-1">{ticket.cve_id}</div>
+              <div className="text-xs text-gray-400">{ticket.vendor}</div>
+              <div className="mt-2">
+                <span style={{ ...STYLES.badgeHigh, fontSize: '0.65rem', padding: '0.25rem 0.5rem', background: 'rgba(139, 92, 246, 0.2)', borderColor: '#8B5CF6' }}>
+                  <span style={{ ...STYLES.glowDot('#8B5CF6'), width: '6px', height: '6px' }}></span>
+                  {ticket.status}
+                </span>
+              </div>
+            </div>
+          ))}
+          {activeTickets.length === 0 && (
+            <div className="text-center py-8">
+              <CheckCircle className="w-8 h-8 text-intel-success mx-auto mb-2" />
+              <p className="text-sm text-gray-400 italic font-mono">No active Archer tickets</p>
+            </div>
+          )}
+        </div>
+      </div>
+
+      {/* Create Jira Ticket Modal */}
+      {showCreateJiraModal && (
+        <div style={STYLES.modal}>
+          <div style={STYLES.modalBackdrop} onClick={() => setShowCreateJiraModal(false)} />
+          <div style={STYLES.modalContent}>
+            <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginBottom: '1.25rem' }}>
+              <h3 style={{ margin: 0, color: '#F8FAFC', fontSize: '1rem', fontFamily: 'monospace' }}>Create Jira Ticket from Archer</h3>
+              <button onClick={() => setShowCreateJiraModal(false)} style={{ background: 'none', border: 'none', color: '#94A3B8', cursor: 'pointer' }}>
+                <X size={18} />
+              </button>
+            </div>
+            <p style={{ fontSize: '0.8rem', color: '#94A3B8', marginTop: 0, marginBottom: '1rem' }}>
+              Creates a Jira issue linked to this Archer risk ticket.
+            </p>
+
+            {createJiraSuccess && (
+              <div style={{ color: '#6EE7B7', fontSize: '0.85rem', marginBottom: '0.75rem', padding: '0.5rem', background: 'rgba(16, 185, 129, 0.1)', border: '1px solid rgba(16, 185, 129, 0.3)', borderRadius: '8px' }}>
+                {createJiraSuccess}
+              </div>
+            )}
+            {createJiraError && (
+              <div style={{ color: '#FCA5A5', fontSize: '0.85rem', marginBottom: '0.75rem', padding: '0.5rem', background: 'rgba(239, 68, 68, 0.1)', border: '1px solid rgba(239, 68, 68, 0.3)', borderRadius: '8px' }}>
+                {createJiraError}
+              </div>
+            )}
+
+            <div style={{ display: 'flex', flexDirection: 'column', gap: '0.75rem' }}>
+              {/* Summary — required, pre-populated with exc_number */}
+              <div>
+                <label style={{ fontSize: '0.75rem', color: '#94A3B8', display: 'block', marginBottom: '0.25rem' }}>
+                  Summary <span style={{ color: '#F59E0B' }}>*</span>
+                </label>
+                <input
+                  style={{ ...STYLES.input, ...(summaryError ? { borderColor: 'rgba(239, 68, 68, 0.6)' } : {}) }}
+                  placeholder="Issue summary (max 255 chars)"
+                  value={createJiraForm.summary}
+                  onChange={e => { setCreateJiraForm(f => ({ ...f, summary: e.target.value })); if (summaryError) setSummaryError(null); }}
+                  maxLength={255}
+                />
+                {summaryError && <div style={{ color: '#FCA5A5', fontSize: '0.75rem', marginTop: '0.25rem' }}>{summaryError}</div>}
+              </div>
+
+              {/* Source Context — locked to archer */}
+              <div>
+                <label style={{ fontSize: '0.75rem', color: '#94A3B8', display: 'block', marginBottom: '0.25rem' }}>Source Context</label>
+                <select
+                  style={{ ...STYLES.input, cursor: 'not-allowed', opacity: 0.7 }}
+                  value={createJiraForm.source_context}
+                  disabled
+                >
+                  <option value="archer">Archer Request</option>
+                </select>
+              </div>
+
+              {/* CVE ID — optional, pre-populated from Archer ticket */}
+              <div>
+                <label style={{ fontSize: '0.75rem', color: '#94A3B8', display: 'block', marginBottom: '0.25rem' }}>CVE ID (optional)</label>
+                <input
+                  style={STYLES.input}
+                  placeholder="e.g. CVE-2024-12345"
+                  value={createJiraForm.cve_id}
+                  onChange={e => setCreateJiraForm(f => ({ ...f, cve_id: e.target.value }))}
+                />
+              </div>
+
+              {/* Vendor — optional, pre-populated from Archer ticket */}
+              <div>
+                <label style={{ fontSize: '0.75rem', color: '#94A3B8', display: 'block', marginBottom: '0.25rem' }}>Vendor (optional)</label>
+                <input
+                  style={STYLES.input}
+                  placeholder="e.g. Microsoft"
+                  value={createJiraForm.vendor}
+                  onChange={e => setCreateJiraForm(f => ({ ...f, vendor: e.target.value }))}
+                />
+              </div>
+
+              {/* Description — optional */}
+              <div>
+                <label style={{ fontSize: '0.75rem', color: '#94A3B8', display: 'block', marginBottom: '0.25rem' }}>Description (optional)</label>
+                <textarea
+                  style={{ ...STYLES.input, minHeight: '80px', resize: 'vertical' }}
+                  placeholder="Detailed description..."
+                  value={createJiraForm.description}
+                  onChange={e => setCreateJiraForm(f => ({ ...f, description: e.target.value }))}
+                />
+              </div>
+
+              {/* Project Key and Issue Type */}
+              <div style={{ display: 'grid', gridTemplateColumns: '1fr 1fr', gap: '0.75rem' }}>
+                <div>
+                  <label style={{ fontSize: '0.75rem', color: '#94A3B8', display: 'block', marginBottom: '0.25rem' }}>Project Key (optional)</label>
+                  <input
+                    style={STYLES.input}
+                    placeholder="Uses .env default"
+                    value={createJiraForm.project_key}
+                    onChange={e => setCreateJiraForm(f => ({ ...f, project_key: e.target.value.toUpperCase() }))}
+                  />
+                </div>
+                <div>
+                  <label style={{ fontSize: '0.75rem', color: '#94A3B8', display: 'block', marginBottom: '0.25rem' }}>Issue Type (optional)</label>
+                  <input
+                    style={STYLES.input}
+                    placeholder="Task"
+                    value={createJiraForm.issue_type}
+                    onChange={e => setCreateJiraForm(f => ({ ...f, issue_type: e.target.value }))}
+                  />
+                </div>
+              </div>
+
+              {/* Submit button */}
+              <button
+                style={{ ...STYLES.btn, ...STYLES.btnSuccess, justifyContent: 'center', marginTop: '0.5rem', width: '100%' }}
+                onClick={handleCreateJira}
+                disabled={createJiraSaving}
+              >
+                {createJiraSaving ? <Loader size={14} className="animate-spin" /> : <Plus size={14} />}
+                Create Jira Ticket
+              </button>
+            </div>
+          </div>
+        </div>
+      )}
+    </>
+  );
+}

frontend/src/components/pages/ArcherTemplatePage.js

@@ -0,0 +1,569 @@
+// ArcherTemplatePage.js
+// Full-page Template Manager — browse, create, edit, clone, and delete
+// Archer Risk Acceptance templates organized by Vendor > Platform > Model.
+// Write operations require editor/admin role (Standard_User or Admin group).
+
+import React, { useState, useEffect, useCallback } from 'react';
+import {
+  FileText, Plus, Edit, Copy, Trash2, ChevronDown, ChevronRight,
+  Loader, AlertCircle, RefreshCw, Eye, EyeOff, Clipboard, Check,
+} from 'lucide-react';
+import { useAuth } from '../../contexts/AuthContext';
+import TemplateFormModal from '../TemplateFormModal';
+import DeleteConfirmModal from '../DeleteConfirmModal';
+
+const API_BASE = process.env.REACT_APP_API_BASE || 'http://localhost:3001/api';
+
+// Section field mapping — ordered: static first, then semi-static
+const SECTIONS = [
+  { key: 'environment_overview', label: 'Environment Overview' },
+  { key: 'segmentation', label: 'Segmentation' },
+  { key: 'mitigating_controls', label: 'Mitigating Controls' },
+  { key: 'additional_info', label: 'Additional Info/Background' },
+  { key: 'charter_network_banner', label: 'Charter Network Banner' },
+  { key: 'data_classification', label: 'Data Classification' },
+  { key: 'charter_network', label: 'Charter Network' },
+  { key: 'additional_access_list', label: 'Additional Access List' },
+];
+
+// ---------------------------------------------------------------------------
+// Styles — dark theme tactical intelligence aesthetic
+// ---------------------------------------------------------------------------
+const STYLES = {
+  page: {
+    minHeight: '60vh',
+  },
+  card: {
+    background: 'linear-gradient(135deg, rgba(30, 41, 59, 0.95), rgba(15, 23, 42, 0.98))',
+    border: '1px solid rgba(0, 212, 255, 0.15)',
+    borderRadius: '12px',
+    padding: '1.5rem',
+    marginBottom: '1rem',
+  },
+  header: {
+    fontFamily: 'monospace',
+    fontSize: '0.7rem',
+    fontWeight: 700,
+    color: '#00d4ff',
+    textTransform: 'uppercase',
+    letterSpacing: '0.15em',
+    marginBottom: '1rem',
+  },
+  toolbar: {
+    display: 'flex',
+    alignItems: 'center',
+    justifyContent: 'space-between',
+    marginBottom: '1rem',
+    flexWrap: 'wrap',
+    gap: '0.5rem',
+  },
+  btn: {
+    padding: '0.5rem 1rem',
+    borderRadius: '8px',
+    border: '1px solid rgba(0, 212, 255, 0.3)',
+    background: 'rgba(0, 212, 255, 0.1)',
+    color: '#7DD3FC',
+    cursor: 'pointer',
+    fontSize: '0.8rem',
+    fontWeight: 600,
+    display: 'inline-flex',
+    alignItems: 'center',
+    gap: '0.4rem',
+    transition: 'all 0.2s',
+  },
+  btnDanger: {
+    padding: '0.4rem 0.75rem',
+    borderRadius: '6px',
+    border: '1px solid rgba(239, 68, 68, 0.3)',
+    background: 'rgba(239, 68, 68, 0.1)',
+    color: '#FCA5A5',
+    cursor: 'pointer',
+    fontSize: '0.75rem',
+    fontWeight: 600,
+    display: 'inline-flex',
+    alignItems: 'center',
+    gap: '0.3rem',
+    transition: 'all 0.2s',
+  },
+  btnSmall: {
+    padding: '0.35rem 0.65rem',
+    borderRadius: '6px',
+    border: '1px solid rgba(0, 212, 255, 0.25)',
+    background: 'rgba(0, 212, 255, 0.08)',
+    color: '#7DD3FC',
+    cursor: 'pointer',
+    fontSize: '0.75rem',
+    fontWeight: 600,
+    display: 'inline-flex',
+    alignItems: 'center',
+    gap: '0.3rem',
+    transition: 'all 0.2s',
+  },
+  vendorGroup: {
+    marginBottom: '0.75rem',
+  },
+  vendorHeader: {
+    display: 'flex',
+    alignItems: 'center',
+    gap: '0.5rem',
+    padding: '0.6rem 0.75rem',
+    background: 'rgba(0, 212, 255, 0.05)',
+    border: '1px solid rgba(0, 212, 255, 0.12)',
+    borderRadius: '8px',
+    cursor: 'pointer',
+    transition: 'all 0.15s',
+  },
+  vendorLabel: {
+    fontSize: '0.85rem',
+    fontWeight: 700,
+    color: '#e0e0e0',
+  },
+  vendorCount: {
+    fontSize: '0.7rem',
+    color: '#64748B',
+    marginLeft: 'auto',
+  },
+  platformSubgroup: {
+    marginLeft: '1.25rem',
+    marginTop: '0.5rem',
+    paddingLeft: '0.75rem',
+    borderLeft: '2px solid rgba(0, 212, 255, 0.1)',
+  },
+  platformLabel: {
+    fontSize: '0.78rem',
+    fontWeight: 600,
+    color: '#94A3B8',
+    marginBottom: '0.35rem',
+    textTransform: 'uppercase',
+    letterSpacing: '0.05em',
+  },
+  templateRow: {
+    display: 'flex',
+    alignItems: 'center',
+    justifyContent: 'space-between',
+    padding: '0.45rem 0.6rem',
+    borderRadius: '6px',
+    marginBottom: '0.25rem',
+    transition: 'background 0.15s',
+  },
+  templateModel: {
+    fontSize: '0.82rem',
+    color: '#e0e0e0',
+    fontWeight: 500,
+  },
+  templateActions: {
+    display: 'flex',
+    alignItems: 'center',
+    gap: '0.35rem',
+  },
+  emptyState: {
+    textAlign: 'center',
+    padding: '3rem 1rem',
+    color: '#64748B',
+    fontSize: '0.9rem',
+  },
+  errorBanner: {
+    padding: '0.75rem 1rem',
+    borderRadius: '8px',
+    background: 'rgba(239, 68, 68, 0.1)',
+    border: '1px solid rgba(239, 68, 68, 0.25)',
+    color: '#FCA5A5',
+    fontSize: '0.82rem',
+    display: 'flex',
+    alignItems: 'center',
+    gap: '0.5rem',
+    marginBottom: '1rem',
+  },
+  loadingState: {
+    textAlign: 'center',
+    padding: '3rem 1rem',
+    color: '#64748B',
+    fontSize: '0.85rem',
+    display: 'flex',
+    flexDirection: 'column',
+    alignItems: 'center',
+    gap: '0.75rem',
+  },
+};
+
+// ---------------------------------------------------------------------------
+// Helpers
+// ---------------------------------------------------------------------------
+
+/**
+ * Group templates by vendor, then by platform within each vendor.
+ * Returns: [ { vendor, platforms: [ { platform, templates: [...] } ] } ]
+ */
+function groupTemplates(templates) {
+  const vendorMap = {};
+  for (const t of templates) {
+    if (!vendorMap[t.vendor]) vendorMap[t.vendor] = {};
+    if (!vendorMap[t.vendor][t.platform]) vendorMap[t.vendor][t.platform] = [];
+    vendorMap[t.vendor][t.platform].push(t);
+  }
+
+  const vendors = Object.keys(vendorMap).sort((a, b) =>
+    a.localeCompare(b, undefined, { sensitivity: 'base' })
+  );
+
+  return vendors.map(vendor => {
+    const platforms = Object.keys(vendorMap[vendor]).sort((a, b) =>
+      a.localeCompare(b, undefined, { sensitivity: 'base' })
+    );
+    return {
+      vendor,
+      platforms: platforms.map(platform => ({
+        platform,
+        templates: vendorMap[vendor][platform].sort((a, b) =>
+          a.model.localeCompare(b.model, undefined, { sensitivity: 'base' })
+        ),
+      })),
+    };
+  });
+}
+
+// ---------------------------------------------------------------------------
+// ArcherTemplatePage
+// ---------------------------------------------------------------------------
+export default function ArcherTemplatePage() {
+  const { canWrite } = useAuth();
+  const [templates, setTemplates] = useState([]);
+  const [loading, setLoading] = useState(true);
+  const [error, setError] = useState(null);
+  const [expandedVendors, setExpandedVendors] = useState({});
+
+  // Modal state for create/edit/clone
+  const [modalState, setModalState] = useState({ open: false, mode: 'create', template: null });
+  const [deleteTarget, setDeleteTarget] = useState(null);
+  // View panel state — which template ID is expanded for viewing
+  const [viewExpandedId, setViewExpandedId] = useState(null);
+  // Copy state for view panel
+  const [copiedSections, setCopiedSections] = useState({});
+  const [copyAllCopied, setCopyAllCopied] = useState(false);
+
+  // -------------------------------------------------------------------------
+  // Fetch templates
+  // -------------------------------------------------------------------------
+  const fetchTemplates = useCallback(async () => {
+    setLoading(true);
+    setError(null);
+    try {
+      const res = await fetch(`${API_BASE}/archer-templates`, {
+        credentials: 'include',
+      });
+      if (!res.ok) {
+        const data = await res.json().catch(() => ({}));
+        throw new Error(data.error || `Failed to fetch templates (${res.status})`);
+      }
+      const data = await res.json();
+      setTemplates(data);
+      // Expand all vendors by default on initial load
+      const expanded = {};
+      const grouped = groupTemplates(data);
+      for (const g of grouped) {
+        expanded[g.vendor] = true;
+      }
+      setExpandedVendors(expanded);
+    } catch (err) {
+      setError(err.message);
+    } finally {
+      setLoading(false);
+    }
+  }, []);
+
+  useEffect(() => {
+    fetchTemplates();
+  }, [fetchTemplates]);
+
+  // -------------------------------------------------------------------------
+  // Vendor toggle
+  // -------------------------------------------------------------------------
+  const toggleVendor = (vendor) => {
+    setExpandedVendors(prev => ({ ...prev, [vendor]: !prev[vendor] }));
+  };
+
+  // -------------------------------------------------------------------------
+  // View panel toggle and copy handlers
+  // -------------------------------------------------------------------------
+  const toggleView = (templateId) => {
+    setViewExpandedId(prev => prev === templateId ? null : templateId);
+    setCopiedSections({});
+    setCopyAllCopied(false);
+  };
+
+  const handleCopySection = async (sectionKey, content) => {
+    if (!content) return;
+    try {
+      await navigator.clipboard.writeText(content);
+      setCopiedSections(prev => ({ ...prev, [sectionKey]: true }));
+      setTimeout(() => {
+        setCopiedSections(prev => ({ ...prev, [sectionKey]: false }));
+      }, 2000);
+    } catch (_err) { /* clipboard failed */ }
+  };
+
+  const handleCopyAll = async (template) => {
+    const parts = [];
+    for (const section of SECTIONS) {
+      const content = template[section.key];
+      if (content && content.trim()) {
+        parts.push(`${section.label}\n${content}`);
+      }
+    }
+    try {
+      await navigator.clipboard.writeText(parts.join('\n\n'));
+      setCopyAllCopied(true);
+      setTimeout(() => setCopyAllCopied(false), 2000);
+    } catch (_err) { /* clipboard failed */ }
+  };
+
+  // -------------------------------------------------------------------------
+  // Grouped data
+  // -------------------------------------------------------------------------
+  const grouped = groupTemplates(templates);
+  const totalCount = templates.length;
+
+  // -------------------------------------------------------------------------
+  // Render
+  // -------------------------------------------------------------------------
+  return (
+    <div style={STYLES.page}>
+      <div style={STYLES.card}>
+        {/* Header */}
+        <div style={STYLES.header}>
+          <FileText size={12} style={{ display: 'inline', verticalAlign: 'middle', marginRight: '0.4rem' }} />
+          Archer Template Library
+        </div>
+
+        {/* Toolbar */}
+        <div style={STYLES.toolbar}>
+          <div style={{ display: 'flex', alignItems: 'center', gap: '0.5rem' }}>
+            <span style={{ color: '#94A3B8', fontSize: '0.8rem' }}>
+              {totalCount} template{totalCount !== 1 ? 's' : ''}
+            </span>
+            <button
+              style={STYLES.btn}
+              onClick={fetchTemplates}
+              title="Refresh"
+            >
+              <RefreshCw size={13} />
+            </button>
+          </div>
+
+          {canWrite() && (
+            <button
+              style={STYLES.btn}
+              onClick={() => setModalState({ open: true, mode: 'create', template: null })}
+            >
+              <Plus size={14} />
+              Create Template
+            </button>
+          )}
+        </div>
+
+        {/* Error banner */}
+        {error && (
+          <div style={STYLES.errorBanner}>
+            <AlertCircle size={14} />
+            {error}
+          </div>
+        )}
+
+        {/* Loading state */}
+        {loading && (
+          <div style={STYLES.loadingState}>
+            <Loader size={24} style={{ animation: 'spin 1s linear infinite' }} />
+            <span>Loading templates...</span>
+          </div>
+        )}
+
+        {/* Empty state */}
+        {!loading && !error && templates.length === 0 && (
+          <div style={STYLES.emptyState}>
+            <FileText size={32} style={{ marginBottom: '0.75rem', opacity: 0.4 }} />
+            <div>No templates found</div>
+            {canWrite() && (
+              <div style={{ marginTop: '0.5rem', fontSize: '0.8rem', color: '#475569' }}>
+                Click "Create Template" to add your first template.
+              </div>
+            )}
+          </div>
+        )}
+
+        {/* Template list grouped by vendor > platform */}
+        {!loading && grouped.map(({ vendor, platforms }) => (
+          <div key={vendor} style={STYLES.vendorGroup}>
+            {/* Vendor header — collapsible */}
+            <div
+              style={STYLES.vendorHeader}
+              onClick={() => toggleVendor(vendor)}
+              onMouseEnter={e => { e.currentTarget.style.background = 'rgba(0, 212, 255, 0.1)'; }}
+              onMouseLeave={e => { e.currentTarget.style.background = 'rgba(0, 212, 255, 0.05)'; }}
+            >
+              {expandedVendors[vendor]
+                ? <ChevronDown size={14} style={{ color: '#00d4ff' }} />
+                : <ChevronRight size={14} style={{ color: '#64748B' }} />
+              }
+              <span style={STYLES.vendorLabel}>{vendor}</span>
+              <span style={STYLES.vendorCount}>
+                {platforms.reduce((sum, p) => sum + p.templates.length, 0)} template{platforms.reduce((sum, p) => sum + p.templates.length, 0) !== 1 ? 's' : ''}
+              </span>
+            </div>
+
+            {/* Platform subgroups */}
+            {expandedVendors[vendor] && platforms.map(({ platform, templates: platTemplates }) => (
+              <div key={platform} style={STYLES.platformSubgroup}>
+                <div style={STYLES.platformLabel}>{platform}</div>
+                {platTemplates.map(template => (
+                  <div key={template.id}>
+                    <div
+                      style={STYLES.templateRow}
+                      onMouseEnter={e => { e.currentTarget.style.background = 'rgba(0, 212, 255, 0.04)'; }}
+                      onMouseLeave={e => { e.currentTarget.style.background = 'transparent'; }}
+                    >
+                      <span
+                        style={{ ...STYLES.templateModel, cursor: 'pointer', display: 'flex', alignItems: 'center', gap: '0.4rem' }}
+                        onClick={() => toggleView(template.id)}
+                        title="View template sections"
+                      >
+                        {viewExpandedId === template.id
+                          ? <EyeOff size={13} style={{ color: '#00d4ff' }} />
+                          : <Eye size={13} style={{ color: '#64748B' }} />
+                        }
+                        {template.model}
+                      </span>
+                      {canWrite() && (
+                        <div style={STYLES.templateActions}>
+                          <button
+                            style={STYLES.btnSmall}
+                            onClick={() => setModalState({ open: true, mode: 'edit', template })}
+                            title="Edit template"
+                          >
+                            <Edit size={12} />
+                          </button>
+                          <button
+                            style={STYLES.btnSmall}
+                            onClick={() => setModalState({ open: true, mode: 'clone', template })}
+                            title="Clone template"
+                          >
+                            <Copy size={12} />
+                          </button>
+                          <button
+                            style={STYLES.btnDanger}
+                            onClick={() => setDeleteTarget(template)}
+                            title="Delete template"
+                          >
+                            <Trash2 size={12} />
+                          </button>
+                        </div>
+                      )}
+                    </div>
+                    {/* Expandable view panel */}
+                    {viewExpandedId === template.id && (
+                      <div style={{
+                        margin: '0.25rem 0 0.75rem 1.5rem',
+                        padding: '0.75rem 1rem',
+                        background: 'rgba(15, 23, 42, 0.6)',
+                        border: '1px solid rgba(0, 212, 255, 0.12)',
+                        borderRadius: '8px',
+                      }}>
+                        {/* Copy All button */}
+                        <div style={{ display: 'flex', justifyContent: 'flex-end', marginBottom: '0.5rem' }}>
+                          <button
+                            onClick={() => handleCopyAll(template)}
+                            style={{
+                              padding: '0.3rem 0.6rem',
+                              borderRadius: '5px',
+                              border: copyAllCopied ? '1px solid rgba(34, 197, 94, 0.4)' : '1px solid rgba(0, 212, 255, 0.3)',
+                              background: copyAllCopied ? 'rgba(34, 197, 94, 0.12)' : 'rgba(0, 212, 255, 0.08)',
+                              color: copyAllCopied ? '#22c55e' : '#00d4ff',
+                              fontSize: '0.7rem',
+                              fontWeight: 600,
+                              cursor: 'pointer',
+                              display: 'flex',
+                              alignItems: 'center',
+                              gap: '0.3rem',
+                            }}
+                          >
+                            {copyAllCopied ? <><Check size={11} /> Copied!</> : <><Clipboard size={11} /> Copy All</>}
+                          </button>
+                        </div>
+                        {/* Section blocks */}
+                        {SECTIONS.map(section => {
+                          const content = template[section.key];
+                          const isEmpty = !content || !content.trim();
+                          const isCopied = copiedSections[section.key];
+                          return (
+                            <div key={section.key} style={{
+                              marginBottom: '0.5rem',
+                              padding: '0.5rem 0.6rem',
+                              background: 'rgba(30, 41, 59, 0.5)',
+                              border: '1px solid rgba(100, 116, 139, 0.12)',
+                              borderRadius: '6px',
+                            }}>
+                              <div style={{ display: 'flex', alignItems: 'center', justifyContent: 'space-between', marginBottom: '0.25rem' }}>
+                                <span style={{ fontSize: '0.72rem', fontWeight: 600, color: '#94a3b8', textTransform: 'uppercase', letterSpacing: '0.04em' }}>
+                                  {section.label}
+                                </span>
+                                <button
+                                  onClick={() => handleCopySection(section.key, content)}
+                                  disabled={isEmpty}
+                                  style={{
+                                    padding: '0.2rem 0.4rem',
+                                    borderRadius: '4px',
+                                    border: isCopied ? '1px solid rgba(34, 197, 94, 0.3)' : '1px solid rgba(100, 116, 139, 0.25)',
+                                    background: isCopied ? 'rgba(34, 197, 94, 0.1)' : 'rgba(100, 116, 139, 0.1)',
+                                    color: isCopied ? '#22c55e' : '#94a3b8',
+                                    fontSize: '0.65rem',
+                                    cursor: isEmpty ? 'not-allowed' : 'pointer',
+                                    opacity: isEmpty ? 0.4 : 1,
+                                    display: 'flex',
+                                    alignItems: 'center',
+                                    gap: '0.2rem',
+                                  }}
+                                >
+                                  {isCopied ? <><Check size={9} /> Copied!</> : <><Clipboard size={9} /> Copy</>}
+                                </button>
+                              </div>
+                              {isEmpty ? (
+                                <div style={{ fontSize: '0.78rem', color: '#475569', fontStyle: 'italic' }}>No content stored</div>
+                              ) : (
+                                <div style={{ fontSize: '0.78rem', color: '#e0e0e0', lineHeight: 1.5, whiteSpace: 'pre-wrap', wordBreak: 'break-word', maxHeight: '150px', overflowY: 'auto' }}>
+                                  {content}
+                                </div>
+                              )}
+                            </div>
+                          );
+                        })}
+                      </div>
+                    )}
+                  </div>
+                ))}
+              </div>
+            ))}
+          </div>
+        ))}
+      </div>
+
+      {/* Template form modal (create/edit/clone) */}
+      {modalState.open && (
+        <TemplateFormModal
+          mode={modalState.mode}
+          template={modalState.template}
+          onClose={() => setModalState({ open: false, mode: 'create', template: null })}
+          onSuccess={fetchTemplates}
+        />
+      )}
+
+      {/* Delete confirmation modal */}
+      <DeleteConfirmModal
+        template={deleteTarget}
+        onConfirm={() => {
+          setDeleteTarget(null);
+          fetchTemplates();
+        }}
+        onCancel={() => setDeleteTarget(null)}
+      />
+    </div>
+  );
+}

frontend/src/components/pages/CCPMetricsPage.js

@@ -8,6 +8,26 @@ const API_BASE = process.env.REACT_APP_API_BASE || 'http://localhost:3001/api';
 const TEAL = '#14B8A6';
 const PURPLE = '#A78BFA';
 
+// Natural sort comparator for metric IDs like "2.3.6i", "5.2.6", "10.1.1".
+// Splits on "." and compares each segment numerically (trailing letters after digits sort after pure numbers).
+function compareMetricIds(a, b) {
+    const partsA = a.split('.');
+    const partsB = b.split('.');
+    const len = Math.max(partsA.length, partsB.length);
+    for (let i = 0; i < len; i++) {
+        const segA = partsA[i] || '';
+        const segB = partsB[i] || '';
+        const numA = parseFloat(segA) || 0;
+        const numB = parseFloat(segB) || 0;
+        if (numA !== numB) return numA - numB;
+        // Same numeric prefix — compare the suffix (e.g. "6i" vs "6")
+        const suffA = segA.replace(/^[\d.]+/, '');
+        const suffB = segB.replace(/^[\d.]+/, '');
+        if (suffA !== suffB) return suffA.localeCompare(suffB);
+    }
+    return 0;
+}
+
 // ---------------------------------------------------------------------------
 // Styles
 // ---------------------------------------------------------------------------
@@ -106,7 +126,8 @@ function MetricBreakdownPanel({ metrics }) {
     if (!metrics || metrics.length === 0) return null;
 
     // Only show metrics with non_compliant > 0
-    const ncMetrics = metrics.filter(m => m.non_compliant > 0);
+    const ncMetrics = metrics.filter(m => m.non_compliant > 0)
+        .sort((a, b) => compareMetricIds(a.metric_id, b.metric_id));
     if (ncMetrics.length === 0) return null;
 
     const TOP_COUNT = 8;
@@ -227,7 +248,7 @@ function TrendChart({ months }) {
                     <Bar yAxisId="count" dataKey="compliant_count" fill="#10B981" fillOpacity={0.6} name="Compliant Devices" />
                     <Line yAxisId="pct" dataKey="compliance_pct" stroke={TEAL} strokeWidth={2} dot={{ r: 3 }} name="Actual %" />
                     <Line yAxisId="pct" dataKey="forecast_pct" stroke={TEAL} strokeWidth={2} strokeDasharray="5 3" dot={false} name="Forecast %" />
-                    <ReferenceLine yAxisId="pct" y={months[0]?.target_pct || 95} stroke="#F59E0B" strokeDasharray="4 4" label={{ value: 'Target', fill: '#F59E0B', fontSize: 10 }} />
+                    <ReferenceLine yAxisId="pct" y={months[0]?.target != null ? Math.round(months[0].target * 100) : 95} stroke="#F59E0B" strokeDasharray="4 4" label={{ value: 'Target', fill: '#F59E0B', fontSize: 10 }} />
                 </ComposedChart>
             </ResponsiveContainer>
         </div>
@@ -237,6 +258,7 @@ function TrendChart({ months }) {
 // ---------------------------------------------------------------------------
 // Aggregated Burndown Chart
 // ---------------------------------------------------------------------------
+// eslint-disable-next-line no-unused-vars
 function AggregatedBurndownChart({ data, loading, error }) {
     if (loading) {
         return (
@@ -392,8 +414,13 @@ function MetricTable({ metrics, onSelectMetric }) {
 
     return (
         <div style={{ ...CARD_STYLE, marginTop: '1.5rem' }}>
-            <div style={{ fontSize: '0.7rem', color: '#94A3B8', textTransform: 'uppercase', letterSpacing: '0.05em', marginBottom: '1rem' }}>
-                Metrics Overview
+            <div style={{ display: 'flex', alignItems: 'center', gap: '0.5rem', marginBottom: '1rem' }}>
+                <span style={{ fontSize: '0.7rem', color: '#94A3B8', textTransform: 'uppercase', letterSpacing: '0.05em' }}>
+                    Metrics Overview
+                </span>
+                <span style={{ fontSize: '0.6rem', color: '#64748B', background: 'rgba(100, 116, 139, 0.1)', padding: '0.15rem 0.4rem', borderRadius: '3px', fontWeight: '600' }}>
+                    LAST REPORT
+                </span>
             </div>
             <div style={{ overflowX: 'auto' }}>
                 <table style={TABLE_STYLE}>
@@ -595,6 +622,7 @@ function VerticalDetailView({ vertical, onBack, onSelectMetric }) {
     const [loading, setLoading] = useState(true);
     const [expandedMetrics, setExpandedMetrics] = useState(new Set());
     const [teamFilter, setTeamFilter] = useState(''); // '' = all teams (rollup view)
+    // ⚠️ CONVENTION: Missing error state — .catch() below silently swallows fetch errors without displaying them to the user. Add an error state and render an error message.
     // ⚠️ CONVENTION: Missing error state — .catch() silently swallows fetch errors without displaying them to the user. Add an error state and render an error message (see main CCPMetricsPage pattern).
 
     useEffect(() => {
@@ -623,9 +651,10 @@ function VerticalDetailView({ vertical, onBack, onSelectMetric }) {
     if (loading) return <div style={{ padding: '2rem', textAlign: 'center', color: '#64748B' }}><Loader style={{ animation: 'spin 1s linear infinite' }} /> Loading...</div>;
 
     // Filter metrics by team if a team filter is active
-    const displayMetrics = teamFilter
+    const displayMetrics = (teamFilter
         ? metrics.filter(m => m.sub_teams && m.sub_teams.some(st => st.team === teamFilter))
-        : metrics;
+        : metrics
+    ).slice().sort((a, b) => compareMetricIds(a.metric_id, b.metric_id));
 
     return (
         <div>
@@ -1105,7 +1134,7 @@ function DataManagementPanel({ onClose, onDataChanged }) {
             <div style={{ background: 'linear-gradient(180deg, #0F1A2E 0%, #0A1628 100%)', border: '1px solid rgba(239, 68, 68, 0.3)', borderRadius: '1rem', width: '90%', maxWidth: '800px', maxHeight: '80vh', overflow: 'auto', padding: '2rem' }} onClick={e => e.stopPropagation()}>
                 <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginBottom: '1.5rem' }}>
                     <h2 style={{ fontSize: '1.1rem', fontWeight: '700', color: '#E2E8F0', margin: 0 }}>Manage Data</h2>
-                    {/* ⚠️ CONVENTION: Use lucide-react <X /> icon instead of raw Unicode character */}
+                    {/* ⚠️ CONVENTION: Use lucide-react <X /> icon instead of raw Unicode character for the close button */}
                     <button onClick={onClose} style={{ background: 'none', border: 'none', color: '#64748B', cursor: 'pointer' }}>✕</button>
                 </div>
 
@@ -1277,7 +1306,7 @@ function MetricSelector({ onMetricSelect, selectedMetric }) {
                     minWidth: '200px',
                 }}
             >
-                {metrics.map(m => (
+                {metrics.slice().sort((a, b) => compareMetricIds(a.metric_id, b.metric_id)).map(m => (
                     <option key={m.metric_id} value={m.metric_id}>
                         {m.metric_id} — {m.device_count} device{m.device_count !== 1 ? 's' : ''}
                     </option>
@@ -1367,8 +1396,8 @@ function ForecastBurndownChart({ metricId }) {
 
     // Combine historical and forecast into a single array with isForecast flag
     const combinedData = [
-        ...historical.map(d => ({ ...d, isForecast: false })),
-        ...forecast.map(d => ({ ...d, isForecast: true })),
+        ...historical.map(d => ({ ...d, compliant: (d.total_assets || 0) - (d.non_compliant || 0), isForecast: false })),
+        ...forecast.map(d => ({ ...d, compliant: (d.total_assets || 0) - (d.non_compliant || 0), isForecast: true })),
     ];
 
     // Determine the divider position (between last historical and first forecast)
@@ -1397,27 +1426,6 @@ function ForecastBurndownChart({ metricId }) {
         );
     };
 
-    // Custom label for bars (device counts inside bars)
-    const renderTotalLabel = (props) => {
-        const { x, y, width, height, value } = props;
-        if (!value || height < 14) return null;
-        return (
-            <text x={x + width / 2} y={y + height / 2} textAnchor="middle" dominantBaseline="middle" fill="#FFF" fontSize={9} fontWeight="600">
-                {value}
-            </text>
-        );
-    };
-
-    const renderNonCompliantLabel = (props) => {
-        const { x, y, width, height, value } = props;
-        if (!value || height < 14) return null;
-        return (
-            <text x={x + width / 2} y={y + height / 2} textAnchor="middle" dominantBaseline="middle" fill="#FFF" fontSize={9} fontWeight="600">
-                {value}
-            </text>
-        );
-    };
-
     // Custom dot for the line to apply opacity
     const renderDot = (props) => {
         const { cx, cy, payload } = props;
@@ -1433,21 +1441,27 @@ function ForecastBurndownChart({ metricId }) {
         if (value === undefined || value === null) return null;
         const point = combinedData[index];
         const opacity = point && point.isForecast ? 0.5 : 1.0;
+        const displayValue = Number(value).toFixed(1);
         return (
-            <text x={x} y={y - 10} textAnchor="middle" fill="#10B981" fillOpacity={opacity} fontSize={9} fontWeight="600">
-                {value}%
+            <text x={x} y={y - 22} textAnchor="middle" fill="#10B981" fillOpacity={opacity} fontSize={12} fontWeight="700">
+                {displayValue}%
             </text>
         );
     };
 
     return (
         <div style={{ ...CARD_STYLE }}>
-            <div style={{ fontSize: '0.7rem', color: '#94A3B8', textTransform: 'uppercase', letterSpacing: '0.05em', marginBottom: '1rem' }}>
-                Forecast Burndown — {metricId}
+            <div style={{ display: 'flex', alignItems: 'center', gap: '0.5rem', marginBottom: '1rem' }}>
+                <span style={{ fontSize: '0.7rem', color: '#94A3B8', textTransform: 'uppercase', letterSpacing: '0.05em' }}>
+                    Forecast Burndown — {metricId}
+                </span>
+                <span style={{ fontSize: '0.6rem', color: '#10B981', background: 'rgba(16, 185, 129, 0.1)', padding: '0.15rem 0.4rem', borderRadius: '3px', fontWeight: '600' }}>
+                    LIVE
+                </span>
             </div>
-            <ResponsiveContainer width="100%" height={280}>
-                <ComposedChart data={combinedData} margin={{ top: 20, right: 40, left: 10, bottom: 5 }}>
-                    <CartesianGrid stroke="rgba(255,255,255,0.05)" strokeDasharray="3 3" />
+            <ResponsiveContainer width="100%" height={350}>
+                <ComposedChart data={combinedData} margin={{ top: 35, right: 40, left: 10, bottom: 5 }}>
+                    <CartesianGrid stroke="rgba(255,255,255,0.03)" />
                     <XAxis
                         dataKey="month"
                         tick={{ fontSize: 10, fill: '#64748B' }}
@@ -1456,6 +1470,7 @@ function ForecastBurndownChart({ metricId }) {
                     <YAxis
                         yAxisId="left"
                         domain={[0, maxTotal]}
+                        tickCount={5}
                         tick={{ fontSize: 10, fill: '#64748B' }}
                         axisLine={{ stroke: 'rgba(255,255,255,0.1)' }}
                         label={{ value: 'Devices', angle: -90, position: 'insideLeft', style: { fontSize: 10, fill: '#64748B' } }}
@@ -1464,6 +1479,7 @@ function ForecastBurndownChart({ metricId }) {
                         yAxisId="right"
                         orientation="right"
                         domain={[0, 100]}
+                        ticks={[0, 25, 50, 75, 100]}
                         tick={{ fontSize: 10, fill: '#64748B' }}
                         axisLine={{ stroke: 'rgba(255,255,255,0.1)' }}
                         label={{ value: '%', angle: 90, position: 'insideRight', style: { fontSize: 10, fill: '#64748B' } }}
@@ -1473,7 +1489,7 @@ function ForecastBurndownChart({ metricId }) {
                         labelStyle={{ color: '#94A3B8' }}
                     />
                     <Legend
-                        wrapperStyle={{ fontSize: '0.7rem', color: '#94A3B8' }}
+                        wrapperStyle={{ fontSize: '0.75rem', color: '#94A3B8' }}
                     />
                     {dividerMonth && (
                         <ReferenceLine
@@ -1487,19 +1503,21 @@ function ForecastBurndownChart({ metricId }) {
                     )}
                     <Bar
                         yAxisId="left"
-                        dataKey="total_assets"
-                        name="Total Assets"
+                        dataKey="compliant"
+                        name="Compliant"
+                        stackId="devices"
+                        fill="#3B82F6"
                         shape={renderTotalAssetsBar}
-                        label={renderTotalLabel}
-                        barSize={28}
+                        barSize={36}
                     />
                     <Bar
                         yAxisId="left"
                         dataKey="non_compliant"
                         name="Non-Compliant"
+                        stackId="devices"
+                        fill="#F97316"
                         shape={renderNonCompliantBar}
-                        label={renderNonCompliantLabel}
-                        barSize={28}
+                        barSize={36}
                     />
                     <Line
                         yAxisId="right"
@@ -1523,22 +1541,30 @@ function ForecastBurndownChart({ metricId }) {
 // ---------------------------------------------------------------------------
 export default function CCPMetricsPage() {
     const { isAdmin, canWrite } = useAuth();
-    const [stats, setStats] = useState(null);
-    const [trend, setTrend] = useState(null);
+    // Cross-metric aggregate stats — retained only for metric_breakdown (MetricBreakdownPanel)
+    const [metricBreakdownData, setMetricBreakdownData] = useState(null);
     const [metricsData, setMetricsData] = useState(null);
-    const [burndownData, setBurndownData] = useState(null);
-    const [burndownLoading, setBurndownLoading] = useState(true);
-    const [burndownError, setBurndownError] = useState(null);
     const [loading, setLoading] = useState(true);
     const [error, setError] = useState(null);
     const [showUpload, setShowUpload] = useState(false);
     const [showManage, setShowManage] = useState(false);
     const [showMetricBreakdown, setShowMetricBreakdown] = useState(false);
-    const [forecastMetric, setForecastMetric] = useState(null);
+
+    // Per-metric CCP Summary state (Task 4.1)
+    const [selectedCCPMetric, setSelectedCCPMetric] = useState(null);
+    const [metricStats, setMetricStats] = useState(null);
+    const [metricTrend, setMetricTrend] = useState(null);
+    const [metricStatsLoading, setMetricStatsLoading] = useState(false);
+    const [metricStatsError, setMetricStatsError] = useState(null);
+    const [metricTrendLoading, setMetricTrendLoading] = useState(false);
+    const [metricTrendError, setMetricTrendError] = useState(null);
+
+    // Request counter for stale response discarding (Task 4.1 / Requirement 8.5)
+    const metricRequestCounter = useRef(0);
 
     // Drill-down state (metric-first hierarchy: metric → vertical → team)
     const [selectedMetric, setSelectedMetric] = useState(null);
-    const [selectedMetricData, setSelectedMetricData] = useState(null); // eslint-disable-line no-unused-vars
+    const [_selectedMetricData, setSelectedMetricData] = useState(null);
     const [selectedVertical, setSelectedVertical] = useState(null);
     const [selectedVerticalData, setSelectedVerticalData] = useState(null);
     const [selectedTeam, setSelectedTeam] = useState(null);
@@ -1546,31 +1572,75 @@ export default function CCPMetricsPage() {
     const fetchData = useCallback(() => {
         setLoading(true);
         setError(null);
-        setBurndownLoading(true);
-        setBurndownError(null);
         Promise.all([
+            // Retain /vcl-multi/stats only for metric_breakdown field used by MetricBreakdownPanel
             fetch(`${API_BASE}/compliance/vcl-multi/stats`, { credentials: 'include' }).then(r => { if (!r.ok) throw new Error('Failed to load stats'); return r.json(); }),
-            fetch(`${API_BASE}/compliance/vcl-multi/trend`, { credentials: 'include' }).then(r => { if (!r.ok) throw new Error('Failed to load trend'); return r.json(); }),
             fetch(`${API_BASE}/compliance/vcl-multi/metrics`, { credentials: 'include' }).then(r => { if (!r.ok) throw new Error('Failed to load metrics'); return r.json(); }),
-        ]).then(([statsData, trendData, metricsResult]) => {
-            setStats(statsData);
-            setTrend(trendData);
+        ]).then(([statsData, metricsResult]) => {
+            setMetricBreakdownData(statsData?.metric_breakdown || null);
             setMetricsData(metricsResult);
             setLoading(false);
         }).catch(err => {
             setError(err.message);
             setLoading(false);
         });
-
-        // Fetch burndown independently so a failure doesn't block the rest of the page
-        fetch(`${API_BASE}/compliance/vcl-multi/burndown`, { credentials: 'include' })
-            .then(r => { if (!r.ok) throw new Error('Failed to load burndown'); return r.json(); })
-            .then(data => { setBurndownData(data); setBurndownLoading(false); })
-            .catch(err => { setBurndownError(err.message); setBurndownLoading(false); });
     }, []);
 
     useEffect(() => { fetchData(); }, [fetchData]);
 
+    // Handle CCP metric selection (Task 4.2)
+    const handleCCPMetricSelect = useCallback((metricId) => {
+        setSelectedCCPMetric(metricId);
+    }, []);
+
+    // Per-metric data fetching effect — will be wired in task 5.1
+    // For now, just reset state when metric changes
+    useEffect(() => {
+        if (!selectedCCPMetric) {
+            setMetricStats(null);
+            setMetricTrend(null);
+            setMetricStatsLoading(false);
+            setMetricStatsError(null);
+            setMetricTrendLoading(false);
+            setMetricTrendError(null);
+            return;
+        }
+
+        const currentRequest = ++metricRequestCounter.current;
+        setMetricStatsLoading(true);
+        setMetricStatsError(null);
+        setMetricTrendLoading(true);
+        setMetricTrendError(null);
+
+        // Fetch per-metric stats
+        fetch(`${API_BASE}/compliance/vcl-multi/metric/${encodeURIComponent(selectedCCPMetric)}/stats`, { credentials: 'include' })
+            .then(r => { if (!r.ok) throw new Error('Failed to load metric stats'); return r.json(); })
+            .then(data => {
+                if (currentRequest !== metricRequestCounter.current) return;
+                setMetricStats(data);
+                setMetricStatsLoading(false);
+            })
+            .catch(err => {
+                if (currentRequest !== metricRequestCounter.current) return;
+                setMetricStatsError(err.message);
+                setMetricStatsLoading(false);
+            });
+
+        // Fetch per-metric trend
+        fetch(`${API_BASE}/compliance/vcl-multi/metric/${encodeURIComponent(selectedCCPMetric)}/trend`, { credentials: 'include' })
+            .then(r => { if (!r.ok) throw new Error('Failed to load metric trend'); return r.json(); })
+            .then(data => {
+                if (currentRequest !== metricRequestCounter.current) return;
+                setMetricTrend(data);
+                setMetricTrendLoading(false);
+            })
+            .catch(err => {
+                if (currentRequest !== metricRequestCounter.current) return;
+                setMetricTrendError(err.message);
+                setMetricTrendLoading(false);
+            });
+    }, [selectedCCPMetric]);
+
     const handleUploadComplete = () => {
         setShowUpload(false);
         fetchData();
@@ -1693,60 +1763,93 @@ export default function CCPMetricsPage() {
                 </div>
             )}
 
-            {!loading && !error && stats && (
+            {!loading && !error && metricsData && (
                 <>
-                    {/* Stats bar */}
-                    <StatsBar
-                        stats={stats.stats}
-                        onNonCompliantClick={() => setShowMetricBreakdown(!showMetricBreakdown)}
-                        ncExpanded={showMetricBreakdown}
-                    />
+                    {/* Metric Selector — drives CCP Summary (Task 4.2) */}
+                    <div style={{ marginBottom: '1.5rem' }}>
+                        <MetricSelector onMetricSelect={handleCCPMetricSelect} selectedMetric={selectedCCPMetric} />
+                    </div>
 
-                    {/* Metric breakdown (revealed when Non-Compliant is clicked) */}
-                    {showMetricBreakdown && (
-                        <MetricBreakdownPanel metrics={stats.metric_breakdown} />
+                    {/* CCP Summary section — per-metric stats, trend, donut, burndown */}
+                    {selectedCCPMetric && (
+                        <>
+                            {/* Stats bar — driven by per-metric stats */}
+                            {metricStatsLoading ? (
+                                <div style={{ ...CARD_STYLE, textAlign: 'center', padding: '2rem', marginBottom: '1.5rem' }}>
+                                    <Loader style={{ animation: 'spin 1s linear infinite', width: '20px', height: '20px', color: '#64748B' }} />
+                                    <div style={{ fontSize: '0.75rem', color: '#64748B', marginTop: '0.5rem' }}>Loading metric stats...</div>
+                                </div>
+                            ) : metricStatsError ? (
+                                <div style={{ ...CARD_STYLE, borderColor: 'rgba(239, 68, 68, 0.3)', display: 'flex', alignItems: 'center', gap: '0.75rem', padding: '1rem', marginBottom: '1.5rem' }}>
+                                    <AlertCircle style={{ width: '18px', height: '18px', color: '#EF4444', flexShrink: 0 }} />
+                                    <span style={{ color: '#EF4444', fontSize: '0.8rem' }}>{metricStatsError}</span>
+                                </div>
+                            ) : metricStats ? (
+                                <StatsBar
+                                    stats={{
+                                        total_devices: metricStats.total_devices || 0,
+                                        compliant: metricStats.compliant || 0,
+                                        non_compliant: metricStats.non_compliant || 0,
+                                        compliance_pct: metricStats.compliance_pct || 0,
+                                        target_pct: metricStats.target ? Math.round(metricStats.target * 100) : 0,
+                                    }}
+                                    onNonCompliantClick={() => setShowMetricBreakdown(!showMetricBreakdown)}
+                                    ncExpanded={showMetricBreakdown}
+                                />
+                            ) : null}
+
+                            {/* Metric breakdown (revealed when Non-Compliant is clicked) — always cross-metric */}
+                            {showMetricBreakdown && (
+                                <MetricBreakdownPanel metrics={metricBreakdownData} />
+                            )}
+
+                            {/* Charts row — trend and donut */}
+                            <div style={{ display: 'flex', gap: '1.5rem', marginBottom: '1.5rem', flexWrap: 'wrap' }}>
+                                {/* TrendChart — driven by per-metric trend */}
+                                {metricTrendLoading ? (
+                                    <div style={{ ...CARD_STYLE, flex: 2, textAlign: 'center', padding: '2rem' }}>
+                                        <Loader style={{ animation: 'spin 1s linear infinite', width: '20px', height: '20px', color: '#64748B' }} />
+                                        <div style={{ fontSize: '0.75rem', color: '#64748B', marginTop: '0.5rem' }}>Loading trend data...</div>
+                                    </div>
+                                ) : metricTrendError ? (
+                                    <div style={{ ...CARD_STYLE, flex: 2, display: 'flex', alignItems: 'center', gap: '0.75rem', borderColor: 'rgba(239, 68, 68, 0.3)', padding: '1.25rem' }}>
+                                        <AlertCircle style={{ width: '16px', height: '16px', color: '#EF4444', flexShrink: 0 }} />
+                                        <span style={{ color: '#EF4444', fontSize: '0.8rem' }}>{metricTrendError}</span>
+                                    </div>
+                                ) : (
+                                    <TrendChart months={metricTrend?.months} />
+                                )}
+
+                                {/* DonutChart — driven by per-metric stats donut */}
+                                {metricStatsLoading ? (
+                                    <div style={{ ...CARD_STYLE, flex: 1, textAlign: 'center', padding: '2rem' }}>
+                                        <Loader style={{ animation: 'spin 1s linear infinite', width: '20px', height: '20px', color: '#64748B' }} />
+                                    </div>
+                                ) : metricStatsError ? (
+                                    <div style={{ ...CARD_STYLE, flex: 1, display: 'flex', alignItems: 'center', justifyContent: 'center', color: '#64748B', fontSize: '0.8rem' }}>
+                                        No donut data available
+                                    </div>
+                                ) : (
+                                    <DonutChart donut={metricStats?.donut} />
+                                )}
+                            </div>
+
+                            {/* Forecast Burndown — driven by selectedCCPMetric */}
+                            <div style={{ marginBottom: '1.5rem' }}>
+                                <ForecastBurndownChart metricId={selectedCCPMetric} />
+                            </div>
+                        </>
                     )}
 
-                    {/* Charts row */}
-                    <div style={{ display: 'flex', gap: '1.5rem', marginBottom: '1.5rem', flexWrap: 'wrap' }}>
-                        <TrendChart months={trend?.months} />
-                        <DonutChart donut={stats.donut} />
-                    </div>
-
-                    {/* Aggregated burndown forecast */}
-                    <AggregatedBurndownChart
-                        data={burndownData}
-                        loading={burndownLoading}
-                        error={burndownError}
-                    />
-
-                    {/* Per-Metric Forecast Burndown */}
-                    <div style={{ ...CARD_STYLE, marginBottom: '1.5rem' }}>
-                        <h3 style={{ fontSize: '0.85rem', fontWeight: '700', color: '#E2E8F0', margin: '0 0 1rem 0' }}>
-                            Per-Metric Forecast Burndown
-                        </h3>
-                        <MetricSelector onMetricSelect={setForecastMetric} selectedMetric={forecastMetric} />
-                        <div style={{ marginTop: '1rem' }}>
-                            <ForecastBurndownChart metricId={forecastMetric} />
-                        </div>
-                    </div>
-
                     {/* Metrics overview table (metric-first model) */}
                     <MetricTable
                         metrics={metricsData?.metrics}
                         onSelectMetric={(metricId) => setSelectedMetric(metricId)}
                     />
-
-                    {/* Last upload info */}
-                    {stats.last_upload_date && (
-                        <div style={{ marginTop: '1rem', fontSize: '0.65rem', color: '#475569', textAlign: 'right' }}>
-                            Last upload: {stats.last_upload_date}
-                        </div>
-                    )}
                 </>
             )}
 
-            {!loading && !error && (!stats || !stats.vertical_breakdown || stats.vertical_breakdown.length === 0) && (
+            {!loading && !error && !metricsData && (
                 <div style={{ ...CARD_STYLE, textAlign: 'center', padding: '3rem', marginTop: '2rem' }}>
                     <Building2 style={{ width: '48px', height: '48px', color: '#334155', margin: '0 auto 1rem' }} />
                     <div style={{ fontSize: '1rem', color: '#94A3B8', marginBottom: '0.5rem' }}>No multi-vertical data yet</div>

frontend/src/components/pages/ComplianceDetailPanel.js

@@ -1,6 +1,12 @@
 import React, { useState, useEffect, useCallback } from 'react';
 import { X, MessageSquare, Send, Loader, AlertCircle, Clock, Shield, Trash2, Calendar, FileText, Save } from 'lucide-react';
 import ConfirmModal from '../ConfirmModal';
+import {
+    formatResolutionDate,
+    RESOLUTION_DATE_LABEL,
+    NO_DATE_PLACEHOLDER,
+    INVALID_DATE_PLACEHOLDER,
+} from '../../utils/resolutionDate';
 
 const API_BASE = process.env.REACT_APP_API_BASE || 'http://localhost:3001/api';
 
@@ -38,7 +44,7 @@ function MetricChip({ metricId, category, status }) {
     );
 }
 
-export default function ComplianceDetailPanel({ hostname, onClose, onNoteAdded, onNavigate }) {
+export default function ComplianceDetailPanel({ hostname, onClose, onNoteAdded, onMetadataSaved, onNavigate }) {
     const [detail, setDetail]       = useState(null);
     const [loading, setLoading]     = useState(true);
     const [error, setError]         = useState(null);
@@ -55,12 +61,69 @@ export default function ComplianceDetailPanel({ hostname, onClose, onNoteAdded,
     const [metaSaving, setMetaSaving] = useState(false);
     const [metaError, setMetaError] = useState(null);
 
-    const handleSaveMetadata = async (fields) => {
+    // Per-metric metadata selection (separate from notes selector)
+    const [metricSelection, setMetricSelection] = useState([]);
+    // Track whether user has edited fields (to detect "Multiple values" untouched)
+    const [resolutionDateEdited, setResolutionDateEdited] = useState(false);
+    const [remediationPlanEdited, setRemediationPlanEdited] = useState(false);
+
+    // Compute shared values for selected metrics
+    const computeSharedValues = useCallback((selectedIds, metrics) => {
+        if (!metrics || selectedIds.length === 0) return { resolution_date: '', remediation_plan: '', resolutionMultiple: false, planMultiple: false };
+        const selected = metrics.filter(m => selectedIds.includes(m.metric_id));
+        if (selected.length === 0) return { resolution_date: '', remediation_plan: '', resolutionMultiple: false, planMultiple: false };
+
+        const dates = selected.map(m => m.resolution_date || '');
+        const plans = selected.map(m => m.remediation_plan || '');
+
+        const allDatesMatch = dates.every(d => d === dates[0]);
+        const allPlansMatch = plans.every(p => p === plans[0]);
+
+        return {
+            resolution_date: allDatesMatch ? dates[0] : '',
+            remediation_plan: allPlansMatch ? plans[0] : '',
+            resolutionMultiple: !allDatesMatch,
+            planMultiple: !allPlansMatch,
+        };
+    }, []);
+
+    // Recompute displayed values when metric selection changes
+    useEffect(() => {
+        if (!detail || metricSelection.length === 0) return;
+        const shared = computeSharedValues(metricSelection, detail.metrics);
+        setResolutionDate(shared.resolution_date);
+        setRemediationPlan(shared.remediation_plan);
+        setResolutionDateEdited(false);
+        setRemediationPlanEdited(false);
+    }, [metricSelection, detail, computeSharedValues]);
+
+    // Determine if "Multiple values" placeholders should show
+    const sharedInfo = detail ? computeSharedValues(metricSelection, detail.metrics) : { resolutionMultiple: false, planMultiple: false };
+
+    const handleSaveMetadata = async () => {
         setMetaSaving(true);
         setMetaError(null);
         try {
-            const body = { ...fields };
+            const body = {};
+
+            // Only include resolution_date if user edited it or it's not a "Multiple values" situation
+            if (resolutionDateEdited || !sharedInfo.resolutionMultiple) {
+                body.resolution_date = resolutionDate || null;
+            }
+            // Only include remediation_plan if user edited it or it's not a "Multiple values" situation
+            if (remediationPlanEdited || !sharedInfo.planMultiple) {
+                body.remediation_plan = remediationPlan || null;
+            }
+
             if (changeReason.trim()) body.change_reason = changeReason.trim();
+
+            // Per-metric scoping: omit metric_ids when all active metrics are selected (backward compat)
+            const activeIds = (detail?.metrics || []).filter(m => m.status === 'active').map(m => m.metric_id);
+            const allSelected = activeIds.length > 0 && activeIds.every(id => metricSelection.includes(id)) && metricSelection.length === activeIds.length;
+            if (!allSelected && metricSelection.length > 0) {
+                body.metric_ids = metricSelection;
+            }
+
             const res = await fetch(`${API_BASE}/compliance/items/${encodeURIComponent(hostname)}/metadata`, {
                 method: 'PATCH',
                 credentials: 'include',
@@ -70,8 +133,11 @@ export default function ComplianceDetailPanel({ hostname, onClose, onNoteAdded,
             const data = await res.json();
             if (!res.ok) throw new Error(data.error || 'Failed to save metadata');
             setChangeReason('');
+            setResolutionDateEdited(false);
+            setRemediationPlanEdited(false);
             // Re-fetch to get updated history
             await fetchDetail();
+            if (onMetadataSaved) onMetadataSaved();
         } catch (err) {
             setMetaError(err.message);
         } finally {
@@ -88,13 +154,20 @@ export default function ComplianceDetailPanel({ hostname, onClose, onNoteAdded,
             if (!res.ok) throw new Error(data.error || 'Failed to load device');
             setDetail(data);
 
-            // Default selected metrics to first active failing metric
+            // Default selected metrics to first active failing metric (for notes)
             const firstActive = (data.metrics || []).find(m => m.status === 'active');
             if (firstActive) setSelectedMetrics([firstActive.metric_id]);
 
-            // Populate metadata fields
-            setResolutionDate(data.resolution_date || '');
-            setRemediationPlan(data.remediation_plan || '');
+            // Default metricSelection to ALL active metrics (for metadata editing)
+            const allActiveIds = (data.metrics || []).filter(m => m.status === 'active').map(m => m.metric_id);
+            setMetricSelection(allActiveIds);
+
+            // Populate metadata fields from shared values
+            const shared = computeSharedValues(allActiveIds, data.metrics);
+            setResolutionDate(shared.resolution_date);
+            setRemediationPlan(shared.remediation_plan);
+            setResolutionDateEdited(false);
+            setRemediationPlanEdited(false);
         } catch (err) {
             setError(err.message);
         } finally {
@@ -223,29 +296,98 @@ export default function ComplianceDetailPanel({ hostname, onClose, onNoteAdded,
                             </Section>
                         )}
 
-                        {/* Resolved metrics */}
-                        {resolvedMetrics.length > 0 && (
-                            <Section title="Resolved Metrics" muted>
-                                {resolvedMetrics.map(m => (
-                                    <MetricRow key={m.metric_id} metric={m} resolved />
-                                ))}
-                            </Section>
-                        )}
-
-                        {/* Upload history summary */}
+                        {/* Metric Selector for Metadata Editing — placed right after Failing Metrics per issue #21 */}
                         {activeMetrics.length > 0 && (
-                            <Section title="History" icon={<Clock style={{ width: '14px', height: '14px' }} />}>
-                                {activeMetrics.map(m => (
-                                    <div key={m.metric_id} style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginBottom: '0.35rem' }}>
-                                        <MetricChip metricId={m.metric_id} category={m.category} />
-                                        <div style={{ fontSize: '0.72rem', color: '#64748B', fontFamily: 'monospace', textAlign: 'right' }}>
-                                            <span style={{ color: m.seen_count > 2 ? '#F59E0B' : '#94A3B8' }}>
-                                                {m.seen_count}× seen
-                                            </span>
-                                            {m.first_seen && <span style={{ marginLeft: '0.5rem' }}>since {m.first_seen}</span>}
+                            <Section title="Apply To Metrics" icon={<Shield style={{ width: '14px', height: '14px' }} />}>
+                                {activeMetrics.length > 1 && (() => {
+                                    const allMetaSelected = activeMetrics.every(m => metricSelection.includes(m.metric_id)) && metricSelection.length === activeMetrics.length;
+                                    return (
+                                        <div style={{ marginBottom: '0.5rem' }}>
+                                            <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginBottom: '0.35rem' }}>
+                                                <span style={{ fontSize: '0.68rem', fontFamily: 'monospace', color: '#64748B' }}>
+                                                    {metricSelection.length} of {activeMetrics.length} selected
+                                                </span>
+                                                <button
+                                                    onClick={() => {
+                                                        if (allMetaSelected) {
+                                                            setMetricSelection([activeMetrics[0].metric_id]);
+                                                        } else {
+                                                            setMetricSelection(activeMetrics.map(m => m.metric_id));
+                                                        }
+                                                    }}
+                                                    style={{
+                                                        background: 'none', border: 'none', cursor: 'pointer',
+                                                        fontSize: '0.68rem', fontFamily: 'monospace',
+                                                        color: TEAL, padding: 0,
+                                                        transition: 'opacity 0.15s',
+                                                    }}
+                                                    onMouseEnter={e => e.currentTarget.style.opacity = '0.7'}
+                                                    onMouseLeave={e => e.currentTarget.style.opacity = '1'}
+                                                >
+                                                    {allMetaSelected ? 'Deselect All' : 'Select All'}
+                                                </button>
+                                            </div>
+                                            <div style={{ display: 'flex', flexWrap: 'wrap', gap: '0.35rem' }}>
+                                                {activeMetrics.map(m => {
+                                                    const isSelected = metricSelection.includes(m.metric_id);
+                                                    const color = categoryColor(m.category);
+                                                    return (
+                                                        <button
+                                                            key={m.metric_id}
+                                                            onClick={() => {
+                                                                if (isSelected) {
+                                                                    if (metricSelection.length > 1) {
+                                                                        setMetricSelection(metricSelection.filter(id => id !== m.metric_id));
+                                                                    }
+                                                                } else {
+                                                                    setMetricSelection([...metricSelection, m.metric_id]);
+                                                                }
+                                                            }}
+                                                            style={{
+                                                                display: 'inline-flex', alignItems: 'center',
+                                                                padding: '0.25rem 0.5rem',
+                                                                background: isSelected ? `${color}25` : `${color}08`,
+                                                                border: `1px solid ${isSelected ? `${color}90` : `${color}30`}`,
+                                                                borderRadius: '0.25rem',
+                                                                color: isSelected ? color : `${color}90`,
+                                                                fontSize: '0.7rem', fontFamily: 'monospace', fontWeight: '600',
+                                                                cursor: (isSelected && metricSelection.length === 1) ? 'default' : 'pointer',
+                                                                transition: 'all 0.15s',
+                                                                opacity: (isSelected && metricSelection.length === 1) ? 0.85 : 1,
+                                                            }}
+                                                        >
+                                                            {m.metric_id}
+                                                        </button>
+                                                    );
+                                                })}
+                                            </div>
                                         </div>
+                                    );
+                                })()}
+                                {activeMetrics.length === 1 && (
+                                    <div style={{ display: 'flex', flexWrap: 'wrap', gap: '0.35rem' }}>
+                                        {activeMetrics.map(m => {
+                                            const color = categoryColor(m.category);
+                                            return (
+                                                <span
+                                                    key={m.metric_id}
+                                                    style={{
+                                                        display: 'inline-flex', alignItems: 'center',
+                                                        padding: '0.25rem 0.5rem',
+                                                        background: `${color}25`,
+                                                        border: `1px solid ${color}90`,
+                                                        borderRadius: '0.25rem',
+                                                        color: color,
+                                                        fontSize: '0.7rem', fontFamily: 'monospace', fontWeight: '600',
+                                                        opacity: 0.85,
+                                                    }}
+                                                >
+                                                    {m.metric_id}
+                                                </span>
+                                            );
+                                        })}
                                     </div>
-                                ))}
+                                )}
                             </Section>
                         )}
 
@@ -254,20 +396,27 @@ export default function ComplianceDetailPanel({ hostname, onClose, onNoteAdded,
                             <input
                                 type="date"
                                 value={resolutionDate}
-                                onChange={e => setResolutionDate(e.target.value)}
+                                onChange={e => { setResolutionDate(e.target.value); setResolutionDateEdited(true); }}
+                                placeholder={sharedInfo.resolutionMultiple ? 'Multiple values' : ''}
                                 style={{
                                     width: '100%',
                                     background: 'rgba(15,23,42,0.8)',
                                     border: '1px solid rgba(20,184,166,0.25)',
                                     borderRadius: '0.375rem',
-                                    color: '#F8FAFC',
+                                    color: sharedInfo.resolutionMultiple && !resolutionDateEdited ? '#64748B' : '#F8FAFC',
                                     padding: '0.5rem 0.625rem',
                                     fontSize: '0.8rem',
                                     fontFamily: 'monospace',
                                     outline: 'none',
+                                    colorScheme: 'dark',
                                 }}
                                 onFocus={e => e.target.style.borderColor = `${TEAL}70`}
                             />
+                            {sharedInfo.resolutionMultiple && !resolutionDateEdited && (
+                                <div style={{ fontSize: '0.65rem', color: '#64748B', fontStyle: 'italic', marginTop: '0.25rem' }}>
+                                    Multiple values — leave unchanged to preserve per-metric dates
+                                </div>
+                            )}
                         </Section>
 
                         {/* Remediation Plan */}
@@ -275,16 +424,16 @@ export default function ComplianceDetailPanel({ hostname, onClose, onNoteAdded,
                             <textarea
                                 value={remediationPlan}
                                 onChange={e => {
-                                    if (e.target.value.length <= 2000) setRemediationPlan(e.target.value);
+                                    if (e.target.value.length <= 2000) { setRemediationPlan(e.target.value); setRemediationPlanEdited(true); }
                                 }}
-                                placeholder="Describe the remediation plan…"
+                                placeholder={sharedInfo.planMultiple ? 'Multiple values' : 'Describe the remediation plan…'}
                                 rows={4}
                                 style={{
                                     width: '100%', resize: 'vertical',
                                     background: 'rgba(15,23,42,0.8)',
                                     border: '1px solid rgba(20,184,166,0.25)',
                                     borderRadius: '0.375rem',
-                                    color: '#F8FAFC',
+                                    color: sharedInfo.planMultiple && !remediationPlanEdited ? '#64748B' : '#F8FAFC',
                                     padding: '0.5rem 0.625rem',
                                     fontSize: '0.8rem',
                                     outline: 'none',
@@ -293,12 +442,17 @@ export default function ComplianceDetailPanel({ hostname, onClose, onNoteAdded,
                                 onFocus={e => e.target.style.borderColor = `${TEAL}70`}
                                 onBlur={e => e.target.style.borderColor = 'rgba(20,184,166,0.25)'}
                             />
+                            {sharedInfo.planMultiple && !remediationPlanEdited && (
+                                <div style={{ fontSize: '0.65rem', color: '#64748B', fontStyle: 'italic', marginTop: '0.25rem' }}>
+                                    Multiple values — leave unchanged to preserve per-metric plans
+                                </div>
+                            )}
                             <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginTop: '0.4rem' }}>
                                 <span style={{ fontSize: '0.68rem', fontFamily: 'monospace', color: remediationPlan.length > 1900 ? '#F59E0B' : '#475569' }}>
                                     {remediationPlan.length}/2000
                                 </span>
                                 <button
-                                    onClick={() => handleSaveMetadata({ resolution_date: resolutionDate || null, remediation_plan: remediationPlan || null })}
+                                    onClick={() => handleSaveMetadata()}
                                     disabled={metaSaving}
                                     style={{
                                         display: 'inline-flex', alignItems: 'center', gap: '0.3rem',
@@ -342,10 +496,40 @@ export default function ComplianceDetailPanel({ hostname, onClose, onNoteAdded,
                             />
                         </Section>
 
+                        {/* Resolved metrics */}
+                        {resolvedMetrics.length > 0 && (
+                            <Section title="Resolved Metrics" muted>
+                                {resolvedMetrics.map(m => (
+                                    <MetricRow key={m.metric_id} metric={m} resolved />
+                                ))}
+                            </Section>
+                        )}
+
+                        {/* Upload history summary */}
+                        {activeMetrics.length > 0 && (
+                            <Section title="History" icon={<Clock style={{ width: '14px', height: '14px' }} />}>
+                                {activeMetrics.map(m => (
+                                    <div key={m.metric_id} style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginBottom: '0.35rem' }}>
+                                        <MetricChip metricId={m.metric_id} category={m.category} />
+                                        <div style={{ fontSize: '0.72rem', color: '#64748B', fontFamily: 'monospace', textAlign: 'right' }}>
+                                            <span style={{ color: m.seen_count > 2 ? '#F59E0B' : '#94A3B8' }}>
+                                                {m.seen_count}× seen
+                                            </span>
+                                            {m.first_seen && <span style={{ marginLeft: '0.5rem' }}>since {m.first_seen}</span>}
+                                        </div>
+                                    </div>
+                                ))}
+                            </Section>
+                        )}
+
                         {/* Change History */}
                         {detail.history && detail.history.length > 0 && (
                             <Section title="Change History" icon={<Clock style={{ width: '14px', height: '14px' }} />}>
                                 {(() => {
+                                    // Build metricMap from metrics array for chip coloring
+                                    const metricMap = {};
+                                    (detail.metrics || []).forEach(m => { metricMap[m.metric_id] = m.category; });
+
                                     // Group entries by timestamp + user (entries saved together appear as one)
                                     const groups = [];
                                     for (const h of detail.history) {
@@ -366,7 +550,19 @@ export default function ComplianceDetailPanel({ hostname, onClose, onNoteAdded,
                                                 </span>
                                             </div>
                                             {group.entries.map(h => (
-                                                <div key={h.id} style={{ marginBottom: '0.2rem' }}>
+                                                <div key={h.id} style={{ marginBottom: '0.2rem', display: 'flex', alignItems: 'center', gap: '0.35rem', flexWrap: 'wrap' }}>
+                                                    {h.metric_id ? (
+                                                        <MetricChip metricId={h.metric_id} category={metricMap[h.metric_id] || ''} />
+                                                    ) : (
+                                                        <span style={{
+                                                            fontSize: '0.68rem',
+                                                            color: '#64748B',
+                                                            fontStyle: 'italic',
+                                                            padding: '0.15rem 0.4rem',
+                                                            background: 'rgba(100,116,139,0.1)',
+                                                            borderRadius: '0.2rem',
+                                                        }}>All metrics</span>
+                                                    )}
                                                     <span style={{ fontSize: '0.65rem', color: '#64748B' }}>
                                                         {h.field_name === 'resolution_date' ? '📅 ' : '📋 '}
                                                     </span>
@@ -608,6 +804,19 @@ function MetricRow({ metric, resolved, onNavigate }) {
     if (extra['Splunk - Last Seen'])  highlights.push({ label: 'Splunk', value: extra['Splunk - Last Seen'] });
     if (extra['MFA - Software'])      highlights.push({ label: 'MFA SW', value: extra['MFA - Software'] });
 
+    // Read-only estimated resolution date, shown only for active (noncompliant)
+    // metrics at the top of the section. Derived solely from this metric's own
+    // resolution_date — no editing, no shared/"Multiple values" collapsing.
+    const resolutionDisplay = resolved ? null : formatResolutionDate(metric.resolution_date);
+    const resolutionValueText = resolutionDisplay
+        ? (resolutionDisplay.state === 'set'
+            ? resolutionDisplay.value
+            : resolutionDisplay.state === 'invalid'
+                ? INVALID_DATE_PLACEHOLDER
+                : NO_DATE_PLACEHOLDER)
+        : null;
+    const resolutionMuted = resolutionDisplay && resolutionDisplay.state !== 'set';
+
     return (
         <div style={{
             marginBottom: '0.625rem', padding: '0.625rem 0.75rem',
@@ -616,6 +825,23 @@ function MetricRow({ metric, resolved, onNavigate }) {
             borderRadius: '0.375rem',
             opacity: resolved ? 0.5 : 1,
         }}>
+            {resolutionDisplay && (
+                <div style={{ display: 'flex', alignItems: 'center', gap: '0.4rem', marginBottom: '0.4rem' }}>
+                    <Calendar size={12} style={{ color, flexShrink: 0 }} />
+                    <span style={{ fontSize: '0.68rem', color: '#64748B', fontFamily: 'monospace', flexShrink: 0 }}>
+                        {RESOLUTION_DATE_LABEL}
+                    </span>
+                    <span style={{
+                        fontSize: '0.68rem',
+                        color: resolutionMuted ? '#475569' : TEAL,
+                        fontFamily: 'monospace',
+                        fontWeight: resolutionMuted ? '400' : '600',
+                        fontStyle: resolutionMuted ? 'italic' : 'normal',
+                    }}>
+                        {resolutionValueText}
+                    </span>
+                </div>
+            )}
             <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginBottom: highlights.length ? '0.4rem' : 0 }}>
                 <MetricChip metricId={metric.metric_id} category={metric.category} status={metric.status} />
                 {resolved && <span style={{ fontSize: '0.68rem', color: '#334155', fontFamily: 'monospace' }}>resolved {metric.resolved_on || ''}</span>}

frontend/src/components/pages/CompliancePage.js

@@ -7,6 +7,7 @@ import ComplianceChartsPanel from './ComplianceChartsPanel';
 import MetricInfoPanel from './MetricInfoPanel';
 import VCLReportPage from './VCLReportPage';
 import metricDefinitionsRaw from '../../data/metricDefinitions.json';
+import metricCategoriesConfig from '../../data/complianceCategories.json';
 
 const API_BASE = process.env.REACT_APP_API_BASE || 'http://localhost:3001/api';
 const TEAL = '#14B8A6';
@@ -87,12 +88,39 @@ function groupByMetricFamily(allEntries, team) {
     }));
 }
 
+// ---------------------------------------------------------------------------
+// Non-metric category derivation
+// ---------------------------------------------------------------------------
+function deriveNonMetricCategories(devices, summaryEntries, categoriesConfig) {
+    const summaryIds = new Set(summaryEntries.map(e => e.metric_id));
+    const countMap = new Map();
+
+    for (const device of devices) {
+        if (!device.failing_metrics) continue;
+        const seen = new Set();
+        for (const m of device.failing_metrics) {
+            if (!m.metric_id || summaryIds.has(m.metric_id) || seen.has(m.metric_id)) continue;
+            seen.add(m.metric_id);
+            countMap.set(m.metric_id, (countMap.get(m.metric_id) || 0) + 1);
+        }
+    }
+
+    return [...countMap.entries()]
+        .map(([metricId, count]) => {
+            const categoryName = categoriesConfig[metricId] || null;
+            const color = (categoryName && CATEGORY_COLORS[categoryName]) || '#94A3B8';
+            return { metricId, count, category: categoryName || 'Unknown', color };
+        })
+        .sort((a, b) => a.metricId.localeCompare(b.metricId));
+}
+
 // ---------------------------------------------------------------------------
 // Sub-components
 // ---------------------------------------------------------------------------
 function VariantPill({ entry, label }) {
     const color = statusColor(entry.status);
     const isOk = entry.status === 'Meets/Exceeds Target';
+    const hasRawCounts = entry.compliant != null && entry.total != null && entry.total > 0;
     return (
         <span style={{
             display: 'inline-flex',
@@ -116,6 +144,9 @@ function VariantPill({ entry, label }) {
             )}
             {label && <span style={{ color: '#94A3B8' }}>{label}</span>}
             <span style={{ color, fontWeight: '600' }}>{pctDisplay(entry.compliance_pct)}</span>
+            {hasRawCounts && (
+                <span style={{ color: '#64748B', fontSize: '0.58rem' }}>({entry.compliant}/{entry.total})</span>
+            )}
         </span>
     );
 }
@@ -242,6 +273,71 @@ function SeenBadge({ count }) {
     );
 }
 
+function FilterChip({ metricId, count, color, active, dimmed, onClick }) {
+    const label = metricId.length > 24 ? metricId.slice(0, 24) + '…' : metricId;
+    return (
+        <button
+            onClick={onClick}
+            title={metricId.length > 24 ? metricId : undefined}
+            style={{
+                display: 'inline-flex',
+                alignItems: 'center',
+                gap: '0.5rem',
+                padding: '0.375rem 0.75rem',
+                borderRadius: '999px',
+                border: `1px solid ${active ? color : color + '40'}`,
+                background: active ? `${color}1F` : `${color}0A`,
+                cursor: 'pointer',
+                opacity: dimmed ? 0.5 : 1,
+                transition: 'all 0.15s',
+            }}
+            onMouseEnter={e => { e.currentTarget.style.borderColor = color + '80'; }}
+            onMouseLeave={e => { e.currentTarget.style.borderColor = active ? color : color + '40'; }}
+        >
+            <span style={{
+                width: '6px', height: '6px', borderRadius: '50%',
+                background: color, flexShrink: 0,
+            }} />
+            <span style={{ fontSize: '0.72rem', color, fontFamily: 'monospace', fontWeight: '600', whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis', maxWidth: '150px' }}>
+                {label}
+            </span>
+            <span style={{ fontSize: '0.68rem', fontFamily: 'monospace', color: '#64748B', fontWeight: '700' }}>
+                {count}
+            </span>
+        </button>
+    );
+}
+
+function CategoryFilterBar({ categories, activeFilter, onFilterSelect, onClear, dimmed }) {
+    if (!categories || categories.length === 0) return null;
+    return (
+        <div style={{ marginBottom: '1.5rem', opacity: dimmed ? 0.5 : 1, transition: 'opacity 0.15s' }}>
+            <div style={{ fontSize: '0.65rem', color: '#334155', fontFamily: 'monospace', textTransform: 'uppercase', letterSpacing: '0.1em', marginBottom: '0.625rem' }}>
+                Non-Metric Categories
+                {activeFilter && (
+                    <button onClick={onClear}
+                        style={{ marginLeft: '0.75rem', color: TEAL, background: 'none', border: 'none', cursor: 'pointer', fontSize: '0.65rem', fontFamily: 'monospace' }}>
+                        × clear filter
+                    </button>
+                )}
+            </div>
+            <div style={{ display: 'flex', gap: '0.5rem', flexWrap: 'wrap' }}>
+                {categories.map(cat => (
+                    <FilterChip
+                        key={cat.metricId}
+                        metricId={cat.metricId}
+                        count={cat.count}
+                        color={cat.color}
+                        active={activeFilter === cat.metricId}
+                        dimmed={false}
+                        onClick={() => onFilterSelect(cat.metricId)}
+                    />
+                ))}
+            </div>
+        </div>
+    );
+}
+
 // ---------------------------------------------------------------------------
 // Main Page
 // ---------------------------------------------------------------------------
@@ -252,7 +348,7 @@ export default function CompliancePage({ onNavigate }) {
     const [activeTeam,      setActiveTeam]      = useState(() => availableTeams[0] || 'STEAM');
     const [activeTab,       setActiveTab]        = useState('active');
     const [vclView,         setVclView]          = useState(false);
-    const [metricFilter,    setMetricFilter]     = useState(null);
+    const [filterState,     setFilterState]       = useState(null);
     const [hostSearch,      setHostSearch]       = useState('');
     const [summary,         setSummary]          = useState({ entries: [], overall_scores: {}, upload: null });
     const [devices,         setDevices]          = useState([]);
@@ -293,7 +389,7 @@ export default function CompliancePage({ onNavigate }) {
     }, []);
 
     useEffect(() => {
-        setMetricFilter(null);
+        setFilterState(null);
         setHostSearch('');
         setSelectedHost(null);
         fetchSummary(activeTeam);
@@ -309,7 +405,7 @@ export default function CompliancePage({ onNavigate }) {
     }, [adminScope]); // eslint-disable-line react-hooks/exhaustive-deps
 
     useEffect(() => {
-        setMetricFilter(null);
+        setFilterState(null);
         fetchDevices(activeTeam, activeTab);
     }, [activeTab]); // eslint-disable-line react-hooks/exhaustive-deps
 
@@ -342,7 +438,12 @@ export default function CompliancePage({ onNavigate }) {
 
     // In-memory filters
     const filteredDevices = devices
-        .filter(d => !metricFilter || d.failing_metrics.some(m => metricFilter.includes(m.metric_id)))
+        .filter(d => {
+            if (!filterState) return true;
+            if (filterState.type === 'metric') return d.failing_metrics.some(m => filterState.ids.includes(m.metric_id));
+            if (filterState.type === 'nonmetric') return d.failing_metrics.some(m => m.metric_id === filterState.id);
+            return true;
+        })
         .filter(d => !hostSearch  || d.hostname.toLowerCase().includes(hostSearch.toLowerCase()));
 
     const families  = groupByMetricFamily(summary.entries, activeTeam);
@@ -491,8 +592,8 @@ export default function CompliancePage({ onNavigate }) {
                 <div style={{ marginBottom: '1.5rem' }}>
                     <div style={{ fontSize: '0.65rem', color: '#334155', fontFamily: 'monospace', textTransform: 'uppercase', letterSpacing: '0.1em', marginBottom: '0.625rem' }}>
                         Metric Health — click to filter
-                        {metricFilter && (
-                            <button onClick={() => setMetricFilter(null)}
+                        {filterState && (
+                            <button onClick={() => setFilterState(null)}
                                 style={{ marginLeft: '0.75rem', color: TEAL, background: 'none', border: 'none', cursor: 'pointer', fontSize: '0.65rem', fontFamily: 'monospace' }}>
                                 × clear filter
                             </button>
@@ -501,7 +602,7 @@ export default function CompliancePage({ onNavigate }) {
                     <div style={{ display: 'flex', gap: '0.625rem', flexWrap: 'wrap' }}>
                         {families.map(family => {
                             const familyIds = family.entries.map(e => e.metric_id);
-                            const isActive = metricFilter !== null && metricFilter.length === familyIds.length && familyIds.every(id => metricFilter.includes(id));
+                            const isActive = filterState?.type === 'metric' && filterState.ids.length === familyIds.length && familyIds.every(id => filterState.ids.includes(id));
                             return (
                                 <div
                                     key={family.metricId}
@@ -516,12 +617,12 @@ export default function CompliancePage({ onNavigate }) {
                                         hoveredCardRef.current = null;
                                         setHoveredMetric(null);
                                     }}
-                                    style={{ display: 'flex', flex: '1 1 0', minWidth: '160px' }}
+                                    style={{ display: 'flex', flex: '1 1 0', minWidth: '160px', opacity: filterState?.type === 'nonmetric' ? 0.5 : 1, transition: 'opacity 0.15s' }}
                                 >
                                     <MetricHealthCard
                                         family={family}
                                         active={isActive}
-                                        onClick={() => setMetricFilter(isActive ? null : familyIds)}
+                                        onClick={() => setFilterState(isActive ? null : { type: 'metric', ids: familyIds })}
                                         onInfoClick={(metricId) => setInfoMetric(metricId)}
                                         definitionLookup={METRIC_DEFINITIONS}
                                     />
@@ -587,6 +688,27 @@ export default function CompliancePage({ onNavigate }) {
                 </div>
             ) : null}
 
+            {/* ── Non-metric category filter bar ─────────────────────── */}
+            {!vclView && !loading && (() => {
+                const nonMetricCategories = deriveNonMetricCategories(devices, summary.entries.filter(e => e.team === activeTeam), metricCategoriesConfig);
+                if (nonMetricCategories.length === 0) return null;
+                return (
+                    <CategoryFilterBar
+                        categories={nonMetricCategories}
+                        activeFilter={filterState?.type === 'nonmetric' ? filterState.id : null}
+                        onFilterSelect={(metricId) => {
+                            if (filterState?.type === 'nonmetric' && filterState.id === metricId) {
+                                setFilterState(null);
+                            } else {
+                                setFilterState({ type: 'nonmetric', id: metricId });
+                            }
+                        }}
+                        onClear={() => setFilterState(null)}
+                        dimmed={filterState?.type === 'metric'}
+                    />
+                );
+            })()}
+
             {/* ── Historical trend charts ──────────────────────────────── */}
             {!vclView && <ComplianceChartsPanel />}
 
@@ -673,7 +795,7 @@ export default function CompliancePage({ onNavigate }) {
                     </div>
                 ) : filteredDevices.length === 0 ? (
                     <div style={{ padding: '3rem', textAlign: 'center', color: '#334155', fontFamily: 'monospace', fontSize: '0.8rem' }}>
-                        {lastUpload === null ? 'No reports uploaded yet' : activeTab === 'active' ? 'No non-compliant devices' : 'No resolved items'}
+                        {lastUpload === null ? 'No reports uploaded yet' : filterState ? 'No devices match the selected filter' : activeTab === 'active' ? 'No non-compliant devices' : 'No resolved items'}
                     </div>
                 ) : (
                     filteredDevices.map(device => (
@@ -693,6 +815,7 @@ export default function CompliancePage({ onNavigate }) {
                     hostname={selectedHost}
                     onClose={() => setSelectedHost(null)}
                     onNoteAdded={refresh}
+                    onMetadataSaved={refresh}
                     onNavigate={onNavigate}
                 />
             )}
@@ -877,7 +1000,7 @@ function DeviceRow({ device, selected, onClick }) {
 
             {/* Resolution Date */}
             <div style={{ fontFamily: 'monospace', fontSize: '0.72rem', color: '#94A3B8' }}>
-                {device.resolution_date || '—'}
+                {device.resolution_date ? device.resolution_date.slice(0, 10) : '—'}
             </div>
 
             {/* Remediation Plan */}
@@ -901,4 +1024,4 @@ function DeviceRow({ device, selected, onClick }) {
 }
 
 // Named exports for testing
-export { computeWorstStatus, groupByMetricFamily };
+export { computeWorstStatus, groupByMetricFamily, deriveNonMetricCategories, CATEGORY_COLORS };

frontend/src/components/pages/ExportsPage.js

@@ -132,6 +132,42 @@ async function fetchAtlasStatus() {
     return res.json();
 }
 
+async function fetchJiraTickets() {
+    const res = await fetch(`${API_BASE}/jira-tickets`, { credentials: 'include' });
+    if (!res.ok) throw new Error(`Jira tickets returned ${res.status}`);
+    return res.json();
+}
+
+async function fetchCCPStats() {
+    const res = await fetch(`${API_BASE}/compliance/vcl-multi/stats`, { credentials: 'include' });
+    if (!res.ok) throw new Error(`CCP stats returned ${res.status}`);
+    return res.json();
+}
+
+async function fetchCCPVerticals() {
+    const res = await fetch(`${API_BASE}/compliance/vcl-multi/verticals`, { credentials: 'include' });
+    if (!res.ok) throw new Error(`CCP verticals returned ${res.status}`);
+    return res.json();
+}
+
+async function fetchCCPMetrics() {
+    const res = await fetch(`${API_BASE}/compliance/vcl-multi/metrics`, { credentials: 'include' });
+    if (!res.ok) throw new Error(`CCP metrics returned ${res.status}`);
+    return res.json();
+}
+
+async function fetchCCPTrend() {
+    const res = await fetch(`${API_BASE}/compliance/vcl-multi/trend`, { credentials: 'include' });
+    if (!res.ok) throw new Error(`CCP trend returned ${res.status}`);
+    return res.json();
+}
+
+async function fetchCCPVerticalMetrics(code) {
+    const res = await fetch(`${API_BASE}/compliance/vcl-multi/vertical/${encodeURIComponent(code)}/metrics`, { credentials: 'include' });
+    if (!res.ok) throw new Error(`CCP vertical metrics returned ${res.status}`);
+    return res.json();
+}
+
 async function fetchAtlasAndFindings(teamsParam) {
     const [atlasRows, findings] = await Promise.all([fetchAtlasStatus(), fetchFindings(teamsParam)]);
     // Build a lookup from hostId → finding details (hostname, IP, BU, etc.)
@@ -430,6 +466,234 @@ export default function ExportsPage() {
         toMultiXLSX(sheets, `atlas-full-report-${dateStr()}.xlsx`);
     });
 
+    // ---- Card 7: Jira Tickets ----
+
+    const exportJiraAll = () => run('jira-all', async () => {
+        const tickets = await fetchJiraTickets();
+        const headers = ['Ticket Key', 'CVE', 'Vendor', 'Summary', 'Status', 'Source', 'URL', 'Last Synced', 'Created'];
+        const rows = tickets.map(t => [
+            t.ticket_key, t.cve_id, t.vendor || '', t.summary || '', t.status || 'Open',
+            t.source_context || 'cve', t.url || '',
+            t.last_synced_at ? new Date(t.last_synced_at).toLocaleDateString() : 'Never',
+            t.created_at ? new Date(t.created_at).toLocaleDateString() : '',
+        ]);
+        toXLSX([headers, ...rows], 'All Tickets', `jira-tickets-all-${dateStr()}.xlsx`);
+    });
+
+    const exportJiraOpen = () => run('jira-open', async () => {
+        const tickets = await fetchJiraTickets();
+        const closedStatuses = ['closed', 'done', 'resolved', 'complete', 'completed', 'cancelled', 'canceled', "won't do", 'declined'];
+        const open = tickets.filter(t => {
+            const lower = (t.status || '').toLowerCase();
+            return !closedStatuses.some(s => lower.includes(s));
+        });
+        const headers = ['Ticket Key', 'CVE', 'Vendor', 'Summary', 'Status', 'Source', 'URL', 'Last Synced', 'Created'];
+        const rows = open.map(t => [
+            t.ticket_key, t.cve_id, t.vendor || '', t.summary || '', t.status || 'Open',
+            t.source_context || 'cve', t.url || '',
+            t.last_synced_at ? new Date(t.last_synced_at).toLocaleDateString() : 'Never',
+            t.created_at ? new Date(t.created_at).toLocaleDateString() : '',
+        ]);
+        toXLSX([headers, ...rows], 'Open Tickets', `jira-tickets-open-${dateStr()}.xlsx`);
+    });
+
+    const exportJiraByCVE = () => run('jira-by-cve', async () => {
+        const tickets = await fetchJiraTickets();
+        const groups = {};
+        tickets.forEach(t => {
+            const key = t.cve_id || 'No CVE';
+            if (!groups[key]) groups[key] = [];
+            groups[key].push(t);
+        });
+        const headers = ['Ticket Key', 'Vendor', 'Summary', 'Status', 'Source', 'URL', 'Last Synced'];
+        const sheets = Object.entries(groups)
+            .sort(([a], [b]) => a.localeCompare(b))
+            .map(([cve, tix]) => ({
+                name: cve.slice(0, 31),
+                rows: [headers, ...tix.map(t => [
+                    t.ticket_key, t.vendor || '', t.summary || '', t.status || 'Open',
+                    t.source_context || 'cve', t.url || '',
+                    t.last_synced_at ? new Date(t.last_synced_at).toLocaleDateString() : 'Never',
+                ])],
+            }));
+        if (sheets.length === 0) sheets.push({ name: 'No Data', rows: [headers] });
+        toMultiXLSX(sheets, `jira-tickets-by-cve-${dateStr()}.xlsx`);
+    });
+
+    // ---- Card 8: CCP Metrics ----
+
+    const exportCCPSnapshot = () => run('ccp-snapshot', async () => {
+        const stats = await fetchCCPStats();
+        const verticals = stats.verticals || [];
+        const headers = ['Vertical', 'Total Devices', 'Non-Compliant', 'Compliance %', 'Failing Metrics', 'Report Date'];
+        const rows = verticals.map(v => [
+            v.vertical || v.code || '',
+            v.total_devices ?? v.totalDevices ?? '',
+            v.non_compliant_devices ?? v.nonCompliantDevices ?? '',
+            v.compliance_pct != null ? `${Number(v.compliance_pct).toFixed(1)}%` : (v.compliancePct != null ? `${Number(v.compliancePct).toFixed(1)}%` : ''),
+            v.failing_metrics ?? v.failingMetrics ?? '',
+            v.report_date ?? v.reportDate ?? '',
+        ]);
+        toXLSX([headers, ...rows], 'CCP Snapshot', `ccp-compliance-snapshot-${dateStr()}.xlsx`);
+    });
+
+    const exportCCPNonCompliant = () => run('ccp-noncompliant', async () => {
+        const verticals = await fetchCCPVerticals();
+        const allRows = [];
+        for (const v of verticals) {
+            const code = v.code || v.vertical;
+            if (!code) continue;
+            try {
+                const metrics = await fetchCCPVerticalMetrics(code);
+                const metricList = metrics.metrics || metrics || [];
+                metricList.forEach(m => {
+                    const devices = m.devices || [];
+                    devices.forEach(d => {
+                        allRows.push([
+                            code, m.metric_id || m.metricId || '', m.metric_desc || m.metricDesc || '',
+                            d.hostname || '', d.ip_address || d.ipAddress || '', d.device_type || d.deviceType || '',
+                            d.team || '',
+                        ]);
+                    });
+                });
+            } catch (e) {
+                // Skip verticals that fail
+            }
+        }
+        const headers = ['Vertical', 'Metric ID', 'Metric Description', 'Hostname', 'IP Address', 'Device Type', 'Team'];
+        toXLSX([headers, ...allRows], 'Non-Compliant Devices', `ccp-non-compliant-devices-${dateStr()}.xlsx`);
+    });
+
+    const exportCCPTrend = () => run('ccp-trend', async () => {
+        const trend = await fetchCCPTrend();
+        const snapshots = trend.snapshots || trend || [];
+        const headers = ['Date', 'Vertical', 'Total Devices', 'Non-Compliant', 'Compliance %'];
+        const rows = snapshots.flatMap(s => {
+            const date = s.report_date || s.reportDate || s.date || '';
+            const verts = s.verticals || [s];
+            return verts.map(v => [
+                date,
+                v.vertical || v.code || '',
+                v.total_devices ?? v.totalDevices ?? '',
+                v.non_compliant_devices ?? v.nonCompliantDevices ?? '',
+                v.compliance_pct != null ? `${Number(v.compliance_pct).toFixed(1)}%` : '',
+            ]);
+        });
+        toXLSX([headers, ...rows], 'Trend', `ccp-compliance-trend-${dateStr()}.xlsx`);
+    });
+
+    const exportCCPFull = () => run('ccp-full', async () => {
+        const [stats, trend] = await Promise.all([fetchCCPStats(), fetchCCPTrend()]);
+        const verticals = stats.verticals || [];
+        const snapshots = trend.snapshots || trend || [];
+
+        // Sheet 1: Summary
+        const summaryHeaders = ['Vertical', 'Total Devices', 'Non-Compliant', 'Compliance %', 'Failing Metrics', 'Report Date'];
+        const summaryRows = verticals.map(v => [
+            v.vertical || v.code || '',
+            v.total_devices ?? v.totalDevices ?? '',
+            v.non_compliant_devices ?? v.nonCompliantDevices ?? '',
+            v.compliance_pct != null ? `${Number(v.compliance_pct).toFixed(1)}%` : '',
+            v.failing_metrics ?? v.failingMetrics ?? '',
+            v.report_date ?? v.reportDate ?? '',
+        ]);
+
+        // Sheet 2: Trend
+        const trendHeaders = ['Date', 'Vertical', 'Total Devices', 'Non-Compliant', 'Compliance %'];
+        const trendRows = snapshots.flatMap(s => {
+            const date = s.report_date || s.reportDate || s.date || '';
+            const verts = s.verticals || [s];
+            return verts.map(v => [
+                date, v.vertical || v.code || '',
+                v.total_devices ?? v.totalDevices ?? '',
+                v.non_compliant_devices ?? v.nonCompliantDevices ?? '',
+                v.compliance_pct != null ? `${Number(v.compliance_pct).toFixed(1)}%` : '',
+            ]);
+        });
+
+        toMultiXLSX([
+            { name: 'Summary', rows: [summaryHeaders, ...summaryRows] },
+            { name: 'Trend', rows: [trendHeaders, ...trendRows] },
+        ], `ccp-full-report-${dateStr()}.xlsx`);
+    });
+
+    // ---- Card 9: Remediation Status (Cross-Domain) ----
+
+    const exportRemediationStatus = () => run('remediation', async () => {
+        const [cves, tickets, archer, findings] = await Promise.all([
+            fetchCVEs(''),
+            fetchJiraTickets(),
+            fetchArcher(),
+            fetchFindings(teamsParam),
+        ]);
+
+        // Build lookup maps
+        const ticketsByCVE = {};
+        tickets.forEach(t => {
+            const key = `${t.cve_id}|${t.vendor || ''}`;
+            if (!ticketsByCVE[key]) ticketsByCVE[key] = [];
+            ticketsByCVE[key].push(t);
+        });
+
+        const archerByCVE = {};
+        archer.forEach(a => {
+            const key = `${a.cve_id}|${a.vendor || ''}`;
+            if (!archerByCVE[key]) archerByCVE[key] = [];
+            archerByCVE[key].push(a);
+        });
+
+        const findingsByCVE = {};
+        findings.forEach(f => {
+            (f.cves || []).forEach(cve => {
+                if (!findingsByCVE[cve]) findingsByCVE[cve] = [];
+                findingsByCVE[cve].push(f);
+            });
+        });
+
+        const headers = [
+            'CVE ID', 'Vendor', 'Severity', 'CVE Status',
+            'Jira Tickets', 'Jira Statuses',
+            'Archer EXC#', 'Archer Status',
+            'Ivanti Findings', 'Overdue Findings',
+            'Overall Progress',
+        ];
+
+        const rows = cves.map(c => {
+            const key = `${c.cve_id}|${c.vendor}`;
+            const cveTickets = ticketsByCVE[key] || [];
+            const cveArcher = archerByCVE[key] || [];
+            const cveFindings = findingsByCVE[c.cve_id] || [];
+            const today = dateStr();
+            const overdueCount = cveFindings.filter(f => f.dueDate && f.dueDate < today).length;
+
+            // Determine overall progress
+            let progress = 'Not Started';
+            if (cveTickets.length > 0 || cveArcher.length > 0) {
+                const closedKeywords = ['closed', 'done', 'resolved', 'complete', 'completed'];
+                const allTicketsClosed = cveTickets.length > 0 && cveTickets.every(t => closedKeywords.some(s => (t.status || '').toLowerCase().includes(s)));
+                const allArcherAccepted = cveArcher.length > 0 && cveArcher.every(a => a.status === 'Accepted');
+                if (allTicketsClosed && (cveArcher.length === 0 || allArcherAccepted)) {
+                    progress = 'Complete';
+                } else {
+                    progress = 'In Progress';
+                }
+            }
+
+            return [
+                c.cve_id, c.vendor, c.severity, c.status,
+                cveTickets.map(t => t.ticket_key).join(', '),
+                cveTickets.map(t => `${t.ticket_key}: ${t.status || 'Open'}`).join('; '),
+                cveArcher.map(a => a.exc_number).join(', '),
+                cveArcher.map(a => `${a.exc_number}: ${a.status}`).join('; '),
+                cveFindings.length,
+                overdueCount,
+                progress,
+            ];
+        });
+
+        toXLSX([headers, ...rows], 'Remediation Status', `remediation-status-${dateStr()}.xlsx`);
+    });
+
     // ---- Render ----
 
     if (!canExport()) {
@@ -581,6 +845,53 @@ export default function ExportsPage() {
                     </p>
                 </ExportCard>
 
+                {/* ── Card 7: Jira Tickets ── */}
+                <ExportCard
+                    color="#7DD3FC" colorRgb="125,211,252"
+                    icon={FileText}
+                    title="Jira Tickets"
+                    description="Export Jira ticket tracking data. Full list, open/active only, or a multi-sheet workbook grouped by CVE for remediation status meetings."
+                >
+                    <div style={{ display: 'grid', gridTemplateColumns: '1fr 1fr', gap: '0.5rem' }}>
+                        <ExportBtn label="All Tickets" exportKey="jira-all" loading={loading} color="#7DD3FC" colorRgb="125,211,252" onClick={exportJiraAll} />
+                        <ExportBtn label="Open/Active Only" exportKey="jira-open" loading={loading} color="#7DD3FC" colorRgb="125,211,252" onClick={exportJiraOpen} />
+                    </div>
+                    <div style={{ marginTop: '0.5rem' }}>
+                        <ExportBtn label="By CVE (multi-sheet)" exportKey="jira-by-cve" loading={loading} color="#7DD3FC" colorRgb="125,211,252" onClick={exportJiraByCVE} />
+                    </div>
+                </ExportCard>
+
+                {/* ── Card 8: CCP Metrics ── */}
+                <ExportCard
+                    color="#14B8A6" colorRgb="20,184,166"
+                    icon={BarChart2}
+                    title="CCP Compliance Metrics"
+                    description="Export cross-vertical compliance posture data. Current snapshot, non-compliant device list, historical trend, or a combined multi-sheet report."
+                >
+                    <div style={{ display: 'grid', gridTemplateColumns: '1fr 1fr', gap: '0.5rem' }}>
+                        <ExportBtn label="Current Snapshot" exportKey="ccp-snapshot" loading={loading} color="#14B8A6" colorRgb="20,184,166" onClick={exportCCPSnapshot} />
+                        <ExportBtn label="Non-Compliant Devices" exportKey="ccp-noncompliant" loading={loading} color="#14B8A6" colorRgb="20,184,166" onClick={exportCCPNonCompliant} />
+                        <ExportBtn label="Trend History" exportKey="ccp-trend" loading={loading} color="#14B8A6" colorRgb="20,184,166" onClick={exportCCPTrend} />
+                        <ExportBtn label="Full Report (multi-sheet)" exportKey="ccp-full" loading={loading} color="#14B8A6" colorRgb="20,184,166" onClick={exportCCPFull} />
+                    </div>
+                    <p style={{ fontFamily: 'monospace', fontSize: '0.65rem', color: '#334155', margin: '0.75rem 0 0', lineHeight: 1.5 }}>
+                        "Non-Compliant Devices" fetches per-metric device lists for all verticals — may take a moment.
+                    </p>
+                </ExportCard>
+
+                {/* ── Card 9: Remediation Status (Cross-Domain) ── */}
+                <ExportCard
+                    color="#EC4899" colorRgb="236,72,153"
+                    icon={Shield}
+                    title="Remediation Status Report"
+                    description="Cross-domain view combining CVE entries, linked Jira tickets, Archer exceptions, and Ivanti findings into a single per-CVE/vendor row. Shows overall progress (Not Started, In Progress, Complete) based on ticket and exception statuses."
+                >
+                    <ExportBtn label="Export Remediation Status (.xlsx)" exportKey="remediation" loading={loading} color="#EC4899" colorRgb="236,72,153" onClick={exportRemediationStatus} />
+                    <p style={{ fontFamily: 'monospace', fontSize: '0.65rem', color: '#334155', margin: '0.75rem 0 0', lineHeight: 1.5 }}>
+                        Pulls from CVE database, Jira tickets, Archer tickets, and Ivanti findings cache. Best for leadership status updates.
+                    </p>
+                </ExportCard>
+
             </div>
         </div>
     );

frontend/src/components/pages/JiraPage.js

@@ -99,7 +99,7 @@ const STYLES = {
     fontSize: '0.7rem',
     fontWeight: 600,
     border: `1px solid ${color}`,
-    background: color.replace(')', ', 0.15)').replace('rgb', 'rgba'),
+    background: `${color}26`,
     color: color,
   }),
   modal: {
@@ -134,6 +134,94 @@ const STATUS_COLORS = {
   'Open': '#F59E0B',
   'In Progress': '#0EA5E9',
   'Closed': '#10B981',
+  'Done': '#10B981',
+  'Resolved': '#10B981',
+  'Approval/Handoff': '#8B5CF6',
+  'Prioritizing': '#0EA5E9',
+  'In Review': '#0EA5E9',
+  'In Development': '#0EA5E9',
+  'In Testing': '#0EA5E9',
+};
+
+// Determine if a status represents a "closed/done" state
+function isClosedStatus(status) {
+  if (!status) return false;
+  const lower = status.toLowerCase();
+  return ['closed', 'done', 'resolved', 'complete', 'completed', 'cancelled', 'canceled', "won't do", 'declined'].some(s => lower.includes(s));
+}
+
+function getStatusColor(status) {
+  if (STATUS_COLORS[status]) return STATUS_COLORS[status];
+  if (isClosedStatus(status)) return '#10B981';
+  return '#F59E0B';
+}
+
+// ---------------------------------------------------------------------------
+// Vendor issue type configuration
+// ---------------------------------------------------------------------------
+// Add new vendor project keys here to enable vendor-specific issue types
+const VENDOR_PROJECT_KEYS = [
+  'AA_ADTRAN',
+  'AA_ADVA',
+  'AA_CASA',
+  'AA_CISCO',
+  'AACOMMSCOP',
+  'AA_COMMSCOP',
+  'AA_HARMONI',
+  'AA_JUNIPER',
+  'AA_VECIMA',
+  'AA_VIAVI',
+];
+
+const VENDOR_ISSUE_TYPES = [
+  'Epic',
+  'Story',
+  'Task',
+  'Defect',
+  'Production Defect/Incident Fix',
+  'New Feature',
+  'Spike',
+  'Release Candidate',
+  'Documentation',
+];
+
+const STEAM_ISSUE_TYPES = [
+  'Story',
+  'Epic',
+  'Program',
+  'Project',
+  'Reservation',
+  'Automation Maintenance',
+];
+
+/**
+ * Determines whether a project key belongs to a vendor project.
+ */
+function isVendorProject(projectKey, vendorKeys) {
+  if (!projectKey || typeof projectKey !== 'string') return false;
+  const normalized = projectKey.trim().toUpperCase();
+  if (normalized.length === 0) return false;
+  return vendorKeys.includes(normalized);
+}
+
+/**
+ * Returns the appropriate issue type list for a given project key.
+ */
+function getIssueTypesForProject(projectKey, vendorKeys, vendorTypes, steamTypes) {
+  return isVendorProject(projectKey, vendorKeys) ? vendorTypes : steamTypes;
+}
+
+const SOURCE_CONTEXT_CONFIG = {
+  cve: { label: 'CVE', color: '#0EA5E9' },
+  archer: { label: 'Archer', color: '#8B5CF6' },
+  ivanti_queue: { label: 'Ivanti', color: '#F59E0B' },
+  email: { label: 'Email', color: '#10B981' },
+  manual: { label: 'Manual', color: '#94A3B8' },
+};
+
+const getSourceBadge = (sourceContext) => {
+  if (!sourceContext) return SOURCE_CONTEXT_CONFIG.cve; // legacy tickets default to CVE
+  return SOURCE_CONTEXT_CONFIG[sourceContext] || SOURCE_CONTEXT_CONFIG.cve;
 };
 
 
@@ -150,6 +238,7 @@ export default function JiraPage() {
 
   // Filters
   const [filterStatus, setFilterStatus] = useState('');
+  const [filterSource, setFilterSource] = useState('');
   const [filterSearch, setFilterSearch] = useState('');
 
   // Connection test
@@ -168,6 +257,9 @@ export default function JiraPage() {
   const [lookupResult, setLookupResult] = useState(null);
   const [lookupLoading, setLookupLoading] = useState(false);
   const [lookupError, setLookupError] = useState(null);
+  const [linkingSaving, setLinkingSaving] = useState(false);
+  const [linkingError, setLinkingError] = useState(null);
+  const [linkingSuccess, setLinkingSuccess] = useState(null);
 
   // Add/Edit modal
   const [showForm, setShowForm] = useState(false);
@@ -178,9 +270,11 @@ export default function JiraPage() {
 
   // Create-in-Jira modal
   const [showCreateJira, setShowCreateJira] = useState(false);
-  const [createJiraForm, setCreateJiraForm] = useState({ cve_id: '', vendor: '', summary: '', description: '', project_key: '', issue_type: '' });
+  const [createJiraForm, setCreateJiraForm] = useState({ cve_id: '', vendor: '', summary: '', description: '', project_key: '', issue_type: '', source_context: '' });
   const [createJiraError, setCreateJiraError] = useState(null);
   const [createJiraSaving, setCreateJiraSaving] = useState(false);
+  const [createJiraLocked, setCreateJiraLocked] = useState({}); // { source_context: true } when set externally
+  const [summaryError, setSummaryError] = useState(null);
 
   // ---------------------------------------------------------------------------
   // Data fetching
@@ -271,6 +365,37 @@ export default function JiraPage() {
     }
   };
 
+  // ---------------------------------------------------------------------------
+  // Link existing Jira ticket — save to local DB without recreating in Jira
+  // ---------------------------------------------------------------------------
+  const linkExistingTicket = async (issue) => {
+    setLinkingError(null);
+    setLinkingSuccess(null);
+    setLinkingSaving(true);
+    try {
+      const jiraUrl = `https://jira.charter.com/browse/${issue.key}`;
+      const res = await fetch(`${API_BASE}/jira-tickets`, {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        credentials: 'include',
+        body: JSON.stringify({
+          ticket_key: issue.key,
+          url: jiraUrl,
+          summary: issue.summary || '',
+          status: issue.status || 'Open',
+        }),
+      });
+      const data = await res.json();
+      if (!res.ok) throw new Error(data.error || `HTTP ${res.status}`);
+      setLinkingSuccess(`${issue.key} saved to dashboard.`);
+      fetchTickets();
+    } catch (err) {
+      setLinkingError(err.message);
+    } finally {
+      setLinkingSaving(false);
+    }
+  };
+
 
   // ---------------------------------------------------------------------------
   // CRUD — save (create or update)
@@ -333,21 +458,41 @@ export default function JiraPage() {
   // Create in Jira
   // ---------------------------------------------------------------------------
   const createInJira = async () => {
+    // Inline summary validation
+    setSummaryError(null);
+    const trimmedSummary = (createJiraForm.summary || '').trim();
+    if (!trimmedSummary) {
+      setSummaryError('Summary is required.');
+      return;
+    }
+    if (trimmedSummary.length > 255) {
+      setSummaryError('Summary must be 255 characters or fewer.');
+      return;
+    }
+
     setCreateJiraError(null);
     setCreateJiraSaving(true);
     try {
+      // Build payload — only include source_context when selected
+      const payload = { ...createJiraForm };
+      if (!payload.source_context) {
+        delete payload.source_context;
+      }
+
       const res = await fetch(`${API_BASE}/jira-tickets/create-in-jira`, {
         method: 'POST',
         headers: { 'Content-Type': 'application/json' },
         credentials: 'include',
-        body: JSON.stringify(createJiraForm),
+        body: JSON.stringify(payload),
       });
       const data = await res.json();
       if (!res.ok && res.status !== 207) {
         throw new Error(data.error || `HTTP ${res.status}`);
       }
       setShowCreateJira(false);
-      setCreateJiraForm({ cve_id: '', vendor: '', summary: '', description: '', project_key: '', issue_type: '' });
+      setCreateJiraForm({ cve_id: '', vendor: '', summary: '', description: '', project_key: '', issue_type: '', source_context: '' });
+      setCreateJiraLocked({});
+      setSummaryError(null);
       fetchTickets();
       fetchRateLimit();
     } catch (err) {
@@ -357,28 +502,57 @@ export default function JiraPage() {
     }
   };
 
+  // ---------------------------------------------------------------------------
+  // Open Create-in-Jira modal with optional pre-populated values and locks
+  // Called externally from Ivanti queue or Archer detail views
+  // ---------------------------------------------------------------------------
+  // eslint-disable-next-line no-unused-vars
+  const openCreateJiraModal = (prePopulate = {}, locked = {}) => {
+    setCreateJiraForm({
+      cve_id: prePopulate.cve_id || '',
+      vendor: prePopulate.vendor || '',
+      summary: prePopulate.summary || '',
+      description: prePopulate.description || '',
+      project_key: prePopulate.project_key || '',
+      issue_type: prePopulate.issue_type || '',
+      source_context: prePopulate.source_context || '',
+    });
+    setCreateJiraLocked(locked);
+    setCreateJiraError(null);
+    setSummaryError(null);
+    setShowCreateJira(true);
+  };
+
   // ---------------------------------------------------------------------------
   // Filtering
   // ---------------------------------------------------------------------------
   const filtered = tickets.filter(t => {
     if (filterStatus && t.status !== filterStatus) return false;
+    if (filterSource) {
+      const ticketSource = t.source_context || 'cve';
+      if (ticketSource !== filterSource) return false;
+    }
     if (filterSearch) {
       const q = filterSearch.toLowerCase();
       return (t.ticket_key || '').toLowerCase().includes(q)
         || (t.cve_id || '').toLowerCase().includes(q)
         || (t.vendor || '').toLowerCase().includes(q)
-        || (t.summary || '').toLowerCase().includes(q);
+        || (t.summary || '').toLowerCase().includes(q)
+        || (t.source_context || '').toLowerCase().includes(q);
     }
     return true;
   });
 
   const counts = {
     total: tickets.length,
-    open: tickets.filter(t => t.status === 'Open').length,
-    inProgress: tickets.filter(t => t.status === 'In Progress').length,
-    closed: tickets.filter(t => t.status === 'Closed').length,
+    open: tickets.filter(t => !isClosedStatus(t.status)).length,
+    closed: tickets.filter(t => isClosedStatus(t.status)).length,
   };
 
+  // Split filtered into active and completed for separate display
+  const activeFiltered = filtered.filter(t => !isClosedStatus(t.status));
+  const completedFiltered = filtered.filter(t => isClosedStatus(t.status));
+
 
   // ---------------------------------------------------------------------------
   // Render
@@ -405,7 +579,7 @@ export default function JiraPage() {
           </button>
           {canWrite() && (
             <>
-              <button style={STYLES.btn} onClick={() => { setShowCreateJira(true); setCreateJiraError(null); }}>
+              <button style={STYLES.btn} onClick={() => { setShowCreateJira(true); setCreateJiraError(null); setSummaryError(null); setCreateJiraLocked({}); setCreateJiraForm({ cve_id: '', vendor: '', summary: '', description: '', project_key: '', issue_type: '', source_context: '' }); }}>
                 <Plus size={14} /> Create in Jira
               </button>
               <button style={STYLES.btn} onClick={() => { setEditingId(null); setForm({ cve_id: '', vendor: '', ticket_key: '', url: '', summary: '', status: 'Open' }); setFormError(null); setShowForm(true); }}>
@@ -453,7 +627,6 @@ export default function JiraPage() {
         {[
           { label: 'Total', value: counts.total, color: '#0EA5E9' },
           { label: 'Open', value: counts.open, color: '#F59E0B' },
-          { label: 'In Progress', value: counts.inProgress, color: '#0EA5E9' },
           { label: 'Closed', value: counts.closed, color: '#10B981' },
         ].map(s => (
           <div key={s.label} style={STYLES.statCard}>
@@ -490,9 +663,21 @@ export default function JiraPage() {
           onChange={e => setFilterStatus(e.target.value)}
         >
           <option value="">All Statuses</option>
-          <option value="Open">Open</option>
-          <option value="In Progress">In Progress</option>
-          <option value="Closed">Closed</option>
+          {[...new Set(tickets.map(t => t.status).filter(Boolean))].sort().map(s => (
+            <option key={s} value={s}>{s}</option>
+          ))}
+        </select>
+        <select
+          style={{ ...STYLES.input, width: 'auto', minWidth: '140px', cursor: 'pointer' }}
+          value={filterSource}
+          onChange={e => setFilterSource(e.target.value)}
+        >
+          <option value="">All Sources</option>
+          <option value="cve">CVE</option>
+          <option value="archer">Archer</option>
+          <option value="ivanti_queue">Ivanti</option>
+          <option value="email">Email</option>
+          <option value="manual">Manual</option>
         </select>
       </div>
 
@@ -512,6 +697,9 @@ export default function JiraPage() {
           {tickets.length === 0 ? 'No Jira tickets yet. Add one manually or create from Jira.' : 'No tickets match your filters.'}
         </div>
       ) : (
+        <>
+        {/* Active tickets */}
+        {activeFiltered.length > 0 && (
         <div style={{ ...STYLES.card, padding: '0', overflow: 'auto' }}>
           <table style={STYLES.table}>
             <thead>
@@ -519,15 +707,15 @@ export default function JiraPage() {
                 <th style={STYLES.th}>Ticket</th>
                 <th style={STYLES.th}>CVE</th>
                 <th style={STYLES.th}>Vendor</th>
+                <th style={STYLES.th}>Source</th>
                 <th style={STYLES.th}>Summary</th>
                 <th style={STYLES.th}>Status</th>
-                <th style={STYLES.th}>Jira Status</th>
                 <th style={STYLES.th}>Last Synced</th>
                 <th style={STYLES.th}>Actions</th>
               </tr>
             </thead>
             <tbody>
-              {filtered.map(t => (
+              {activeFiltered.map(t => (
                 <tr key={t.id} style={{ transition: 'background 0.15s' }}
                   onMouseEnter={e => e.currentTarget.style.background = 'rgba(14, 165, 233, 0.05)'}
                   onMouseLeave={e => e.currentTarget.style.background = 'transparent'}
@@ -544,14 +732,35 @@ export default function JiraPage() {
                   </td>
                   <td style={{ ...STYLES.td, fontFamily: 'monospace', fontSize: '0.8rem' }}>{t.cve_id}</td>
                   <td style={STYLES.td}>{t.vendor}</td>
+                  <td style={STYLES.td}>
+                    {(() => {
+                      const badge = getSourceBadge(t.source_context);
+                      return (
+                        <span style={{
+                          display: 'inline-flex',
+                          alignItems: 'center',
+                          padding: '0.15rem 0.5rem',
+                          borderRadius: '9999px',
+                          fontSize: '0.65rem',
+                          fontWeight: 600,
+                          letterSpacing: '0.02em',
+                          background: `${badge.color}22`,
+                          color: badge.color,
+                          border: `1px solid ${badge.color}44`,
+                          whiteSpace: 'nowrap',
+                        }}>
+                          {badge.label}
+                        </span>
+                      );
+                    })()}
+                  </td>
                   <td style={{ ...STYLES.td, maxWidth: '250px', overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>{t.summary || '-'}</td>
                   <td style={STYLES.td}>
-                    <span style={STYLES.badge(STATUS_COLORS[t.status] || '#94A3B8')}>
-                      <span style={{ width: 6, height: 6, borderRadius: '50%', background: STATUS_COLORS[t.status] || '#94A3B8' }} />
+                    <span style={STYLES.badge(getStatusColor(t.status))}>
+                      <span style={{ width: 6, height: 6, borderRadius: '50%', background: getStatusColor(t.status) }} />
                       {t.status}
                     </span>
                   </td>
-                  <td style={{ ...STYLES.td, fontSize: '0.8rem', color: '#CBD5E1' }}>{t.jira_status || '-'}</td>
                   <td style={{ ...STYLES.td, fontSize: '0.75rem', color: '#94A3B8' }}>
                     {t.last_synced_at ? new Date(t.last_synced_at).toLocaleDateString() : 'Never'}
                   </td>
@@ -565,7 +774,7 @@ export default function JiraPage() {
                       {canWrite() && (
                         <button style={{ ...STYLES.btn, padding: '0.25rem 0.5rem', fontSize: '0.7rem' }} onClick={() => {
                           setEditingId(t.id);
-                          setForm({ cve_id: t.cve_id, vendor: t.vendor, ticket_key: t.ticket_key, url: t.url || '', summary: t.summary || '', status: t.status });
+                          setForm({ cve_id: t.cve_id || '', vendor: t.vendor || '', ticket_key: t.ticket_key, url: t.url || '', summary: t.summary || '', status: t.status });
                           setFormError(null);
                           setShowForm(true);
                         }} title="Edit">
@@ -584,6 +793,117 @@ export default function JiraPage() {
             </tbody>
           </table>
         </div>
+        )}
+
+        {/* Completed tickets — collapsible section */}
+        {completedFiltered.length > 0 && (
+        <details style={{ marginTop: '1.5rem' }}>
+          <summary style={{
+            cursor: 'pointer',
+            fontSize: '0.85rem',
+            fontWeight: 600,
+            color: '#64748B',
+            padding: '0.5rem 0',
+            userSelect: 'none',
+            display: 'flex',
+            alignItems: 'center',
+            gap: '0.5rem',
+          }}>
+            <CheckCircle size={14} style={{ color: '#10B981' }} />
+            Completed ({completedFiltered.length})
+            <span style={{ fontSize: '0.7rem', fontWeight: 400, color: '#475569' }}>— not synced on subsequent runs</span>
+          </summary>
+          <div style={{ ...STYLES.card, padding: '0', overflow: 'auto', marginTop: '0.5rem', opacity: 0.75 }}>
+            <table style={STYLES.table}>
+              <thead>
+                <tr>
+                  <th style={STYLES.th}>Ticket</th>
+                  <th style={STYLES.th}>CVE</th>
+                  <th style={STYLES.th}>Vendor</th>
+                  <th style={STYLES.th}>Source</th>
+                  <th style={STYLES.th}>Summary</th>
+                  <th style={STYLES.th}>Status</th>
+                  <th style={STYLES.th}>Last Synced</th>
+                  <th style={STYLES.th}>Actions</th>
+                </tr>
+              </thead>
+              <tbody>
+                {completedFiltered.map(t => (
+                  <tr key={t.id} style={{ transition: 'background 0.15s' }}
+                    onMouseEnter={e => e.currentTarget.style.background = 'rgba(14, 165, 233, 0.05)'}
+                    onMouseLeave={e => e.currentTarget.style.background = 'transparent'}
+                  >
+                    <td style={STYLES.td}>
+                      <div style={{ display: 'flex', alignItems: 'center', gap: '0.4rem' }}>
+                        <span style={{ fontFamily: 'monospace', fontWeight: 600, color: '#7DD3FC' }}>{t.ticket_key}</span>
+                        {t.url && (
+                          <a href={t.url} target="_blank" rel="noopener noreferrer" style={{ color: '#94A3B8' }} title="Open in Jira">
+                            <ExternalLink size={12} />
+                          </a>
+                        )}
+                      </div>
+                    </td>
+                    <td style={{ ...STYLES.td, fontFamily: 'monospace', fontSize: '0.8rem' }}>{t.cve_id}</td>
+                    <td style={STYLES.td}>{t.vendor}</td>
+                    <td style={STYLES.td}>
+                      {(() => {
+                        const badge = getSourceBadge(t.source_context);
+                        return (
+                          <span style={{
+                            display: 'inline-flex',
+                            alignItems: 'center',
+                            padding: '0.15rem 0.5rem',
+                            borderRadius: '9999px',
+                            fontSize: '0.65rem',
+                            fontWeight: 600,
+                            letterSpacing: '0.02em',
+                            background: `${badge.color}22`,
+                            color: badge.color,
+                            border: `1px solid ${badge.color}44`,
+                            whiteSpace: 'nowrap',
+                          }}>
+                            {badge.label}
+                          </span>
+                        );
+                      })()}
+                    </td>
+                    <td style={{ ...STYLES.td, maxWidth: '250px', overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>{t.summary || '-'}</td>
+                    <td style={STYLES.td}>
+                      <span style={STYLES.badge(getStatusColor(t.status))}>
+                        <span style={{ width: 6, height: 6, borderRadius: '50%', background: getStatusColor(t.status) }} />
+                        {t.status}
+                      </span>
+                    </td>
+                    <td style={{ ...STYLES.td, fontSize: '0.75rem', color: '#94A3B8' }}>
+                      {t.last_synced_at ? new Date(t.last_synced_at).toLocaleDateString() : 'Never'}
+                    </td>
+                    <td style={STYLES.td}>
+                      <div style={{ display: 'flex', gap: '0.3rem' }}>
+                        {canWrite() && (
+                          <button style={{ ...STYLES.btn, padding: '0.25rem 0.5rem', fontSize: '0.7rem' }} onClick={() => {
+                            setEditingId(t.id);
+                            setForm({ cve_id: t.cve_id || '', vendor: t.vendor || '', ticket_key: t.ticket_key, url: t.url || '', summary: t.summary || '', status: t.status });
+                            setFormError(null);
+                            setShowForm(true);
+                          }} title="Edit">
+                            <Edit3 size={12} />
+                          </button>
+                        )}
+                        {canWrite() && (
+                          <button style={{ ...STYLES.btn, ...STYLES.btnDanger, padding: '0.25rem 0.5rem', fontSize: '0.7rem' }} onClick={() => deleteTicket(t.id)} title="Delete">
+                            <Trash2 size={12} />
+                          </button>
+                        )}
+                      </div>
+                    </td>
+                  </tr>
+                ))}
+              </tbody>
+            </table>
+          </div>
+        </details>
+        )}
+        </>
       )}
 
       {/* Lookup Modal */}
@@ -618,6 +938,18 @@ export default function JiraPage() {
                 <div><strong>Priority:</strong> {lookupResult.priority}</div>
                 <div><strong>Assignee:</strong> {lookupResult.assignee || 'Unassigned'}</div>
                 <div><strong>Updated:</strong> {lookupResult.updated ? new Date(lookupResult.updated).toLocaleString() : '-'}</div>
+                {canWrite() && (
+                  <button
+                    style={{ ...STYLES.btn, ...STYLES.btnSuccess, marginTop: '0.75rem' }}
+                    onClick={() => linkExistingTicket(lookupResult)}
+                    disabled={linkingSaving}
+                  >
+                    {linkingSaving ? <Loader size={14} className="animate-spin" /> : <Plus size={14} />}
+                    Save to Dashboard
+                  </button>
+                )}
+                {linkingError && <div style={{ color: '#FCA5A5', fontSize: '0.75rem', marginTop: '0.5rem' }}>{linkingError}</div>}
+                {linkingSuccess && <div style={{ color: '#6EE7B7', fontSize: '0.75rem', marginTop: '0.5rem' }}>{linkingSuccess}</div>}
               </div>
             )}
           </div>
@@ -637,11 +969,11 @@ export default function JiraPage() {
             <div style={{ display: 'flex', flexDirection: 'column', gap: '0.75rem' }}>
               <div>
                 <label style={{ fontSize: '0.75rem', color: '#94A3B8', display: 'block', marginBottom: '0.25rem' }}>CVE ID</label>
-                <input style={STYLES.input} placeholder="CVE-2024-1234" value={form.cve_id} onChange={e => setForm(f => ({ ...f, cve_id: e.target.value }))} disabled={!!editingId} />
+                <input style={STYLES.input} placeholder="CVE-2024-1234" value={form.cve_id} onChange={e => setForm(f => ({ ...f, cve_id: e.target.value }))} />
               </div>
               <div>
                 <label style={{ fontSize: '0.75rem', color: '#94A3B8', display: 'block', marginBottom: '0.25rem' }}>Vendor</label>
-                <input style={STYLES.input} placeholder="Vendor name" value={form.vendor} onChange={e => setForm(f => ({ ...f, vendor: e.target.value }))} disabled={!!editingId} />
+                <input style={STYLES.input} placeholder="Vendor name" value={form.vendor} onChange={e => setForm(f => ({ ...f, vendor: e.target.value }))} />
               </div>
               <div>
                 <label style={{ fontSize: '0.75rem', color: '#94A3B8', display: 'block', marginBottom: '0.25rem' }}>Ticket Key</label>
@@ -661,6 +993,9 @@ export default function JiraPage() {
                   <option value="Open">Open</option>
                   <option value="In Progress">In Progress</option>
                   <option value="Closed">Closed</option>
+                  {form.status && !['Open', 'In Progress', 'Closed'].includes(form.status) && (
+                    <option value={form.status}>{form.status}</option>
+                  )}
                 </select>
               </div>
               <button style={{ ...STYLES.btn, ...STYLES.btnSuccess, justifyContent: 'center', marginTop: '0.5rem' }} onClick={saveTicket} disabled={formSaving}>
@@ -682,21 +1017,44 @@ export default function JiraPage() {
               <button onClick={() => setShowCreateJira(false)} style={{ background: 'none', border: 'none', color: '#94A3B8', cursor: 'pointer' }}><X size={18} /></button>
             </div>
             <p style={{ fontSize: '0.8rem', color: '#94A3B8', marginTop: 0, marginBottom: '1rem' }}>
-              Creates a new issue in Jira via the REST API and links it to a CVE locally.
+              Creates a new issue in Jira via the REST API and tracks it locally.
             </p>
             {createJiraError && <div style={{ color: '#FCA5A5', fontSize: '0.85rem', marginBottom: '0.75rem' }}>{createJiraError}</div>}
             <div style={{ display: 'flex', flexDirection: 'column', gap: '0.75rem' }}>
               <div>
-                <label style={{ fontSize: '0.75rem', color: '#94A3B8', display: 'block', marginBottom: '0.25rem' }}>CVE ID</label>
-                <input style={STYLES.input} placeholder="CVE-2024-1234" value={createJiraForm.cve_id} onChange={e => setCreateJiraForm(f => ({ ...f, cve_id: e.target.value }))} />
+                <label style={{ fontSize: '0.75rem', color: '#94A3B8', display: 'block', marginBottom: '0.25rem' }}>CVE ID (optional)</label>
+                <input style={STYLES.input} placeholder="e.g. CVE-2024-12345" value={createJiraForm.cve_id} onChange={e => setCreateJiraForm(f => ({ ...f, cve_id: e.target.value }))} />
               </div>
               <div>
-                <label style={{ fontSize: '0.75rem', color: '#94A3B8', display: 'block', marginBottom: '0.25rem' }}>Vendor</label>
-                <input style={STYLES.input} placeholder="Vendor name" value={createJiraForm.vendor} onChange={e => setCreateJiraForm(f => ({ ...f, vendor: e.target.value }))} />
+                <label style={{ fontSize: '0.75rem', color: '#94A3B8', display: 'block', marginBottom: '0.25rem' }}>Vendor (optional)</label>
+                <input style={STYLES.input} placeholder="e.g. Microsoft" value={createJiraForm.vendor} onChange={e => setCreateJiraForm(f => ({ ...f, vendor: e.target.value }))} />
               </div>
               <div>
-                <label style={{ fontSize: '0.75rem', color: '#94A3B8', display: 'block', marginBottom: '0.25rem' }}>Summary</label>
-                <input style={STYLES.input} placeholder="Issue summary (max 255 chars)" value={createJiraForm.summary} onChange={e => setCreateJiraForm(f => ({ ...f, summary: e.target.value }))} maxLength={255} />
+                <label style={{ fontSize: '0.75rem', color: '#94A3B8', display: 'block', marginBottom: '0.25rem' }}>Summary <span style={{ color: '#F59E0B' }}>*</span></label>
+                <input
+                  style={{ ...STYLES.input, ...(summaryError ? { borderColor: 'rgba(239, 68, 68, 0.6)' } : {}) }}
+                  placeholder="Issue summary (max 255 chars)"
+                  value={createJiraForm.summary}
+                  onChange={e => { setCreateJiraForm(f => ({ ...f, summary: e.target.value })); if (summaryError) setSummaryError(null); }}
+                  maxLength={255}
+                />
+                {summaryError && <div style={{ color: '#FCA5A5', fontSize: '0.75rem', marginTop: '0.25rem' }}>{summaryError}</div>}
+              </div>
+              <div>
+                <label style={{ fontSize: '0.75rem', color: '#94A3B8', display: 'block', marginBottom: '0.25rem' }}>Source Context</label>
+                <select
+                  style={{ ...STYLES.input, cursor: createJiraLocked.source_context ? 'not-allowed' : 'pointer', opacity: createJiraLocked.source_context ? 0.7 : 1 }}
+                  value={createJiraForm.source_context}
+                  onChange={e => setCreateJiraForm(f => ({ ...f, source_context: e.target.value }))}
+                  disabled={createJiraLocked.source_context}
+                >
+                  <option value="">— Select source —</option>
+                  <option value="cve">CVE</option>
+                  <option value="archer">Archer Request</option>
+                  <option value="ivanti_queue">Ivanti Queue</option>
+                  <option value="email">Email</option>
+                  <option value="manual">Manual</option>
+                </select>
               </div>
               <div>
                 <label style={{ fontSize: '0.75rem', color: '#94A3B8', display: 'block', marginBottom: '0.25rem' }}>Description (optional)</label>
@@ -705,11 +1063,25 @@ export default function JiraPage() {
               <div style={{ display: 'grid', gridTemplateColumns: '1fr 1fr', gap: '0.75rem' }}>
                 <div>
                   <label style={{ fontSize: '0.75rem', color: '#94A3B8', display: 'block', marginBottom: '0.25rem' }}>Project Key (optional)</label>
-                  <input style={STYLES.input} placeholder="Uses .env default" value={createJiraForm.project_key} onChange={e => setCreateJiraForm(f => ({ ...f, project_key: e.target.value.toUpperCase() }))} />
+                  <input style={STYLES.input} placeholder="Uses .env default" value={createJiraForm.project_key} onChange={e => {
+                    const newKey = e.target.value.toUpperCase();
+                    const wasVendor = isVendorProject(createJiraForm.project_key, VENDOR_PROJECT_KEYS);
+                    const isNowVendor = isVendorProject(newKey, VENDOR_PROJECT_KEYS);
+                    setCreateJiraForm(f => ({
+                      ...f,
+                      project_key: newKey,
+                      issue_type: (wasVendor !== isNowVendor) ? '' : f.issue_type,
+                    }));
+                  }} />
                 </div>
                 <div>
-                  <label style={{ fontSize: '0.75rem', color: '#94A3B8', display: 'block', marginBottom: '0.25rem' }}>Issue Type (optional)</label>
-                  <input style={STYLES.input} placeholder="Task" value={createJiraForm.issue_type} onChange={e => setCreateJiraForm(f => ({ ...f, issue_type: e.target.value }))} />
+                  <label style={{ fontSize: '0.75rem', color: '#94A3B8', display: 'block', marginBottom: '0.25rem' }}>Issue Type</label>
+                  <select style={{ ...STYLES.input, cursor: 'pointer' }} value={createJiraForm.issue_type} onChange={e => setCreateJiraForm(f => ({ ...f, issue_type: e.target.value }))}>
+                    <option value="">Story (default)</option>
+                    {getIssueTypesForProject(createJiraForm.project_key, VENDOR_PROJECT_KEYS, VENDOR_ISSUE_TYPES, STEAM_ISSUE_TYPES).map(type => (
+                      <option key={type} value={type}>{type}</option>
+                    ))}
+                  </select>
                 </div>
               </div>
               <button style={{ ...STYLES.btn, ...STYLES.btnSuccess, justifyContent: 'center', marginTop: '0.5rem' }} onClick={createInJira} disabled={createJiraSaving}>
@@ -722,4 +1094,8 @@ export default function JiraPage() {
       )}
     </div>
   );
-}
+}
+
+
+// Named exports for reuse by other pages (e.g., IvantiTodoQueuePage)
+export { VENDOR_PROJECT_KEYS, VENDOR_ISSUE_TYPES, STEAM_ISSUE_TYPES, isVendorProject, getIssueTypesForProject };

frontend/src/components/pages/__tests__/ComplianceDetailPanel.metricRow.test.js

@@ -0,0 +1,427 @@
+/**
+ * Render and interaction tests for the per-metric estimated-resolution-date
+ * line in the asset sidebar (ComplianceDetailPanel.js / MetricRow).
+ *
+ * Feature: compliance-metric-estimated-resolution-date
+ * Spec: .kiro/specs/compliance-metric-estimated-resolution-date
+ *
+ * Covers tasks 3.2 (placement, labels, placeholders), 3.3 (resolved
+ * suppression, read-only structure, role-independence, existing editor
+ * preserved), and 3.4 (existing save round-trip).
+ *
+ * Requirements covered: 1.1, 1.2, 1.4, 1.5, 1.6, 2.1, 3.1, 3.4, 4.1, 4.2,
+ * 4.3, 4.4, 4.5, 5.1, 5.2, 5.3, 5.4.
+ *
+ * The component fetches the asset detail via GET
+ * `${API_BASE}/compliance/items/:hostname` (credentials included) and saves
+ * metadata via PATCH `${API_BASE}/compliance/items/:hostname/metadata`, so
+ * global.fetch is mocked to serve the asset detail JSON and PATCH responses.
+ */
+import React from 'react';
+import { render, screen, fireEvent, waitFor } from '@testing-library/react';
+import ComplianceDetailPanel from '../ComplianceDetailPanel';
+import {
+  RESOLUTION_DATE_LABEL,
+  NO_DATE_PLACEHOLDER,
+  INVALID_DATE_PLACEHOLDER,
+} from '../../../utils/resolutionDate';
+
+const HOSTNAME = 'host-1.example.com';
+
+// ---------------------------------------------------------------------------
+// Fixtures
+// ---------------------------------------------------------------------------
+
+function makeMetric(overrides = {}) {
+  return {
+    metric_id: '2.3.6i',
+    category: 'Vulnerability Management',
+    status: 'active',
+    metric_desc: 'Outbound encryption required on all endpoints',
+    resolution_date: null,
+    remediation_plan: null,
+    seen_count: 1,
+    first_seen: '2025-01-01',
+    resolved_on: null,
+    extra: {},
+    ...overrides,
+  };
+}
+
+function makeDetail(metrics, overrides = {}) {
+  return {
+    hostname: HOSTNAME,
+    ip_address: '10.0.0.1',
+    device_type: 'server',
+    team: 'STEAM',
+    metrics,
+    history: [],
+    notes: [],
+    ...overrides,
+  };
+}
+
+const jsonResponse = (body, ok = true) => ({ ok, json: async () => body });
+
+/**
+ * Mock global.fetch. GET requests to the detail endpoint are served from a
+ * queue of detail objects (the last one is reused once the queue drains, so
+ * the initial load and any re-fetch can each return a distinct snapshot).
+ * PATCH requests to the metadata endpoint return the configured response.
+ */
+function mockFetch({ details, patchOk = true, patchBody = {} }) {
+  const queue = [...details];
+  let last = details[details.length - 1];
+  global.fetch = jest.fn((url, options = {}) => {
+    const method = (options.method || 'GET').toUpperCase();
+    if (method === 'PATCH') {
+      return Promise.resolve(jsonResponse(patchBody, patchOk));
+    }
+    // GET detail (fetchDetail)
+    const next = queue.length > 0 ? queue.shift() : last;
+    last = next;
+    return Promise.resolve(jsonResponse(next));
+  });
+}
+
+// ---------------------------------------------------------------------------
+// DOM query helpers
+// ---------------------------------------------------------------------------
+
+// The estimated-resolution date line renders as:
+//   <div>
+//     <svg .../>                      (Calendar icon)
+//     <span>{RESOLUTION_DATE_LABEL}</span>
+//     <span>{value | placeholder}</span>
+//   </div>
+// We locate each line by its label span, which contains exactly the label text.
+
+function getDateLineLabels(container) {
+  return Array.from(container.querySelectorAll('span')).filter(
+    (s) => s.textContent === RESOLUTION_DATE_LABEL
+  );
+}
+
+function getDateLineValueTexts(container) {
+  return getDateLineLabels(container).map((label) =>
+    label.nextElementSibling ? label.nextElementSibling.textContent : null
+  );
+}
+
+async function renderAndLoad(detail, props = {}) {
+  const utils = render(
+    <ComplianceDetailPanel
+      hostname={HOSTNAME}
+      onClose={() => {}}
+      onNoteAdded={() => {}}
+      {...props}
+    />
+  );
+  // Wait for the async detail load to complete (a metric description renders).
+  await screen.findByText(detail.metrics[0].metric_desc);
+  return utils;
+}
+
+beforeEach(() => {
+  process.env.REACT_APP_API_BASE = 'http://localhost:3001/api';
+});
+
+afterEach(() => {
+  jest.restoreAllMocks();
+});
+
+// ===========================================================================
+// Task 3.2 — Render tests for placement, labels, and placeholders
+// ===========================================================================
+
+describe('Task 3.2 — placement, labels, and placeholders', () => {
+  test('placement (Req 1.2): estimated-resolution element precedes the metric description', async () => {
+    const detail = makeDetail([
+      makeMetric({ resolution_date: '2026-07-01' }),
+    ]);
+    mockFetch({ details: [detail] });
+
+    const { container } = await renderAndLoad(detail);
+
+    const labelEl = screen.getByText(RESOLUTION_DATE_LABEL);
+    const descEl = screen.getByText(detail.metrics[0].metric_desc);
+
+    // descEl must come AFTER labelEl in document order.
+    expect(
+      labelEl.compareDocumentPosition(descEl) &
+        Node.DOCUMENT_POSITION_FOLLOWING
+    ).toBeTruthy();
+
+    // Sanity: there is exactly one date line for the single active metric.
+    expect(getDateLineLabels(container)).toHaveLength(1);
+  });
+
+  test('label presence (Req 1.5): RESOLUTION_DATE_LABEL appears adjacent to the value', async () => {
+    const detail = makeDetail([
+      makeMetric({ resolution_date: '2026-07-01' }),
+    ]);
+    mockFetch({ details: [detail] });
+
+    const { container } = await renderAndLoad(detail);
+
+    const labels = getDateLineLabels(container);
+    expect(labels).toHaveLength(1);
+    // The value span is the immediate next sibling of the label span.
+    expect(labels[0].nextElementSibling).not.toBeNull();
+    expect(labels[0].nextElementSibling.textContent).toBe('2026-07-01');
+  });
+
+  test('set value (Req 1.1, 1.4): an active row with 2026-07-01 renders 2026-07-01', async () => {
+    const detail = makeDetail([
+      makeMetric({ resolution_date: '2026-07-01' }),
+    ]);
+    mockFetch({ details: [detail] });
+
+    const { container } = await renderAndLoad(detail);
+
+    expect(getDateLineValueTexts(container)).toEqual(['2026-07-01']);
+  });
+
+  test('no-date placeholder (Req 2.1, 4.5): null/empty/whitespace render NO_DATE_PLACEHOLDER and keep the description', async () => {
+    const metrics = [
+      makeMetric({
+        metric_id: '2.3.6i',
+        metric_desc: 'Metric with null resolution date',
+        resolution_date: null,
+      }),
+      makeMetric({
+        metric_id: '2.3.8i',
+        metric_desc: 'Metric with empty resolution date',
+        resolution_date: '',
+      }),
+      makeMetric({
+        metric_id: 'Vulns_Aging',
+        metric_desc: 'Metric with whitespace resolution date',
+        resolution_date: '   ',
+      }),
+    ];
+    const detail = makeDetail(metrics);
+    mockFetch({ details: [detail] });
+
+    const { container } = await renderAndLoad(detail);
+
+    // All three active rows show the no-date placeholder.
+    expect(getDateLineValueTexts(container)).toEqual([
+      NO_DATE_PLACEHOLDER,
+      NO_DATE_PLACEHOLDER,
+      NO_DATE_PLACEHOLDER,
+    ]);
+
+    // Each metric's description still renders.
+    for (const m of metrics) {
+      expect(screen.getByText(m.metric_desc)).toBeInTheDocument();
+    }
+  });
+
+  test('invalid placeholder (Req 1.6): malformed date renders INVALID_DATE_PLACEHOLDER and keeps the description', async () => {
+    const detail = makeDetail([
+      makeMetric({
+        metric_desc: 'Metric with a malformed resolution date',
+        resolution_date: '2026-13-99',
+      }),
+    ]);
+    mockFetch({ details: [detail] });
+
+    const { container } = await renderAndLoad(detail);
+
+    expect(getDateLineValueTexts(container)).toEqual([INVALID_DATE_PLACEHOLDER]);
+    expect(
+      screen.getByText('Metric with a malformed resolution date')
+    ).toBeInTheDocument();
+  });
+});
+
+// ===========================================================================
+// Task 3.3 — resolved suppression, read-only structure, role-independence
+// ===========================================================================
+
+describe('Task 3.3 — suppression, read-only structure, role-independence', () => {
+  test('resolved suppression (Req 3.1, 3.4): a resolved metric with a populated date renders no estimated-resolution line', async () => {
+    const detail = makeDetail([
+      makeMetric({
+        metric_id: '2.3.6i',
+        status: 'resolved',
+        metric_desc: 'Resolved metric with a populated resolution date',
+        resolution_date: '2026-07-01',
+        resolved_on: '2026-06-15',
+      }),
+    ]);
+    mockFetch({ details: [detail] });
+
+    const { container } = await renderAndLoad(detail);
+
+    // No estimated-resolution line anywhere for a resolved-only asset.
+    expect(getDateLineLabels(container)).toHaveLength(0);
+    expect(screen.queryByText(RESOLUTION_DATE_LABEL)).toBeNull();
+  });
+
+  test('mixed list (Req 3.4): the estimated-resolution line appears only within active rows', async () => {
+    const metrics = [
+      makeMetric({
+        metric_id: '2.3.6i',
+        status: 'active',
+        metric_desc: 'Active metric one',
+        resolution_date: '2026-07-01',
+      }),
+      makeMetric({
+        metric_id: '2.3.8i',
+        status: 'active',
+        metric_desc: 'Active metric two',
+        resolution_date: '2026-09-30',
+      }),
+      makeMetric({
+        metric_id: 'Vulns_Aging',
+        status: 'resolved',
+        metric_desc: 'Resolved metric',
+        resolution_date: '2026-01-15',
+        resolved_on: '2026-01-10',
+      }),
+    ];
+    const detail = makeDetail(metrics);
+    mockFetch({ details: [detail] });
+
+    const { container } = await renderAndLoad(detail);
+
+    // Exactly two date lines (one per active metric), each its own value.
+    expect(getDateLineValueTexts(container)).toEqual([
+      '2026-07-01',
+      '2026-09-30',
+    ]);
+  });
+
+  test('read-only structure (Req 5.3): the date-line subtree has no input, button, or anchor', async () => {
+    const detail = makeDetail([
+      makeMetric({ resolution_date: '2026-07-01' }),
+    ]);
+    mockFetch({ details: [detail] });
+
+    const { container } = await renderAndLoad(detail);
+
+    const labels = getDateLineLabels(container);
+    expect(labels).toHaveLength(1);
+    const dateLineSubtree = labels[0].parentElement;
+
+    // Plain text only — no interactive controls capable of modifying the field.
+    expect(
+      dateLineSubtree.querySelectorAll('input, button, a, select, textarea')
+    ).toHaveLength(0);
+  });
+
+  test('role-independence (Req 5.1, 5.2, 5.4): the date line is plain, non-interactive text', async () => {
+    // ComplianceDetailPanel does not consume a role/auth context for the
+    // estimated-resolution subtree: the line is derived purely from
+    // metric.resolution_date and rendered as static spans. The display is
+    // therefore role-independent by construction — a viewer, editor, and
+    // admin all receive byte-for-byte identical output and no editing control
+    // is introduced. We assert the plain-text value and the absence of any
+    // interactive element in the subtree.
+    const detail = makeDetail([
+      makeMetric({ resolution_date: '2026-07-01' }),
+    ]);
+    mockFetch({ details: [detail] });
+
+    const { container } = await renderAndLoad(detail);
+
+    expect(getDateLineValueTexts(container)).toEqual(['2026-07-01']);
+
+    const dateLineSubtree = getDateLineLabels(container)[0].parentElement;
+    expect(
+      dateLineSubtree.querySelectorAll('input, button, a, select, textarea')
+    ).toHaveLength(0);
+  });
+
+  test('existing editor preserved (Req 4.1): the editable Resolution Date input[type=date] still renders', async () => {
+    const detail = makeDetail([
+      makeMetric({ resolution_date: '2026-07-01' }),
+    ]);
+    mockFetch({ details: [detail] });
+
+    const { container } = await renderAndLoad(detail);
+
+    expect(container.querySelector('input[type="date"]')).not.toBeNull();
+  });
+});
+
+// ===========================================================================
+// Task 3.4 — Interaction tests for the existing save round-trip
+// ===========================================================================
+
+describe('Task 3.4 — save round-trip', () => {
+  test('successful save (Req 4.2, 4.3): displayed estimated-resolution updates to the new date after save + re-fetch', async () => {
+    const before = makeDetail([
+      makeMetric({ resolution_date: '2026-07-01' }),
+    ]);
+    const after = makeDetail([
+      makeMetric({ resolution_date: '2026-08-15' }),
+    ]);
+    // GET (initial) -> before, PATCH -> ok, GET (re-fetch) -> after
+    mockFetch({ details: [before, after], patchOk: true });
+
+    const { container } = await renderAndLoad(before);
+
+    // Pre-condition: original date displayed.
+    expect(getDateLineValueTexts(container)).toEqual(['2026-07-01']);
+
+    // Editor updates the editable Resolution Date field and saves.
+    const dateInput = container.querySelector('input[type="date"]');
+    fireEvent.change(dateInput, { target: { value: '2026-08-15' } });
+    fireEvent.click(screen.getByRole('button', { name: /save/i }));
+
+    // The displayed estimated-resolution value updates from the re-fetch.
+    await waitFor(() => {
+      expect(getDateLineValueTexts(container)).toEqual(['2026-08-15']);
+    });
+  });
+
+  test('successful clear (Req 4.5): clearing the field renders NO_DATE_PLACEHOLDER after save + re-fetch', async () => {
+    const before = makeDetail([
+      makeMetric({ resolution_date: '2026-07-01' }),
+    ]);
+    const after = makeDetail([makeMetric({ resolution_date: '' })]);
+    mockFetch({ details: [before, after], patchOk: true });
+
+    const { container } = await renderAndLoad(before);
+
+    expect(getDateLineValueTexts(container)).toEqual(['2026-07-01']);
+
+    const dateInput = container.querySelector('input[type="date"]');
+    fireEvent.change(dateInput, { target: { value: '' } });
+    fireEvent.click(screen.getByRole('button', { name: /save/i }));
+
+    await waitFor(() => {
+      expect(getDateLineValueTexts(container)).toEqual([NO_DATE_PLACEHOLDER]);
+    });
+  });
+
+  test('failed save (Req 4.4): previously displayed date is retained and an error is shown', async () => {
+    const before = makeDetail([
+      makeMetric({ resolution_date: '2026-07-01' }),
+    ]);
+    // PATCH fails; fetchDetail is never re-issued, so the queue only needs the
+    // initial detail.
+    mockFetch({
+      details: [before],
+      patchOk: false,
+      patchBody: { error: 'Save failed' },
+    });
+
+    const { container } = await renderAndLoad(before);
+
+    expect(getDateLineValueTexts(container)).toEqual(['2026-07-01']);
+
+    const dateInput = container.querySelector('input[type="date"]');
+    fireEvent.change(dateInput, { target: { value: '2099-01-01' } });
+    fireEvent.click(screen.getByRole('button', { name: /save/i }));
+
+    // Error indication appears.
+    await screen.findByText('Save failed');
+
+    // The previously displayed estimated-resolution date is retained.
+    expect(getDateLineValueTexts(container)).toEqual(['2026-07-01']);
+  });
+});

frontend/src/components/pages/__tests__/compliance-list-stale-after-sidebar-edit.exploration.property.test.js

@@ -0,0 +1,237 @@
+/**
+ * Bug Condition Exploration Property Test:
+ *   Compliance List Stale After Sidebar Edit
+ *
+ * Spec:  .kiro/specs/compliance-list-stale-after-sidebar-edit/ (bugfix)
+ * Issue: #23 — "[Bug] Update Res Date/Remed Plan in list after updating in sidebar"
+ *        http://steam-gitlab.charterlab.com/steam/cve-dashboard/-/issues/23
+ *
+ * BUG CONDITION (bugfix.md Current Behavior 1.1–1.3):
+ *   isBugCondition(input) = a successful PATCH /api/compliance/items/:hostname/metadata
+ *   occurred from the sidebar (ComplianceDetailPanel). Under this condition the parent
+ *   CompliancePage list is never re-fetched: handleSaveMetadata() does not notify the
+ *   parent (1.1), onClose only clears selectedHost (1.2), and the row keeps the stale
+ *   Resolution Date / Remediation Plan held in the parent `devices` state (1.3).
+ *
+ * THIS TEST IS EXPECTED TO FAIL ON UNFIXED CODE — failure confirms the bug.
+ *   The property encodes the expected behavior (bugfix.md 2.1, 2.2): for any saved
+ *   metadata value, after a successful sidebar save the parent list row for that
+ *   hostname displays the saved value WITHOUT a manual filter/team/tab change or a
+ *   manual refresh click, because a parent refresh callback re-issues fetchDevices.
+ *   On unfixed code no parent callback fires, so the list GET is never re-issued after
+ *   the PATCH and the row keeps showing the stale value ("—").
+ *
+ * Mirrors the tagging convention of
+ *   backend/__tests__/compliance-remediation-display-fix.exploration.property.test.js
+ *
+ * **Validates: Requirements 1.1, 1.2, 1.3, 2.1, 2.2**
+ */
+import React from 'react';
+import { render, screen, fireEvent, waitFor, within, cleanup } from '@testing-library/react';
+import fc from 'fast-check';
+
+// --- Mocks (hoisted by babel-jest above the CompliancePage import) ---
+
+// Stub auth so CompliancePage renders the STEAM team with write access.
+jest.mock('../../../contexts/AuthContext', () => ({
+  useAuth: () => ({
+    canWrite: () => true,
+    isAdmin: () => false,
+    getAvailableTeams: () => ['STEAM'],
+    adminScope: null,
+  }),
+}));
+
+// The historical charts panel is irrelevant to the list-staleness bug and pulls
+// in recharts; stub it so the test stays focused and fast across property runs.
+jest.mock('../ComplianceChartsPanel', () => () => null);
+
+import CompliancePage from '../CompliancePage';
+
+const HOSTNAME = 'HOST-001';
+const METRIC_ID = '2.3.6i';
+
+// --- Fixtures --------------------------------------------------------------
+
+function jsonResponse(body, ok = true) {
+  return Promise.resolve({ ok, json: async () => body });
+}
+
+function makeListDevice({ resolution_date, remediation_plan }) {
+  return {
+    hostname: HOSTNAME,
+    ip_address: '10.0.0.1',
+    device_type: 'Switch',
+    failing_metrics: [{ metric_id: METRIC_ID, category: 'Vulnerability Management' }],
+    resolution_date,
+    remediation_plan,
+    seen_count: 3,
+    has_notes: false,
+  };
+}
+
+function makeDetail() {
+  return {
+    hostname: HOSTNAME,
+    ip_address: '10.0.0.1',
+    device_type: 'Switch',
+    team: 'STEAM',
+    metrics: [
+      {
+        metric_id: METRIC_ID,
+        category: 'Vulnerability Management',
+        status: 'active',
+        metric_desc: 'Outbound encryption required on all endpoints',
+        resolution_date: null,
+        remediation_plan: null,
+        seen_count: 3,
+        first_seen: '2025-01-01',
+        resolved_on: null,
+        extra: {},
+      },
+    ],
+    history: [],
+    notes: [],
+  };
+}
+
+/**
+ * Install a URL-routing global.fetch.
+ *
+ * The list device starts stale (resolution_date / remediation_plan = null). Only
+ * AFTER a successful metadata PATCH does the list endpoint return the saved values —
+ * modelling the backend, which already persists and returns the new metadata. Thus a
+ * post-save re-fetch is observable in the row, while on unfixed code (no re-fetch) the
+ * row keeps showing the stale value.
+ */
+function installFetchMock(savedResolutionDate, savedRemediationPlan) {
+  const state = { patchOccurred: false, patchCalls: 0, listCalls: 0, listCallsAfterPatch: 0 };
+
+  global.fetch = jest.fn((url, options = {}) => {
+    const method = (options.method || 'GET').toUpperCase();
+
+    // PATCH /compliance/items/:hostname/metadata → success
+    if (method === 'PATCH' && url.includes('/compliance/items/') && url.includes('/metadata')) {
+      state.patchCalls++;
+      state.patchOccurred = true;
+      return jsonResponse({ ok: true });
+    }
+
+    // GET /compliance/summary?team=STEAM → minimal valid summary
+    if (url.includes('/compliance/summary')) {
+      return jsonResponse({ entries: [], overall_scores: {}, upload: { report_date: '2025-01-01' } });
+    }
+
+    // GET /compliance/items?team=STEAM&status=active → device list (query string)
+    if (url.includes('/compliance/items?')) {
+      state.listCalls++;
+      if (state.patchOccurred) state.listCallsAfterPatch++;
+      const device = state.patchOccurred
+        ? makeListDevice({ resolution_date: savedResolutionDate, remediation_plan: savedRemediationPlan })
+        : makeListDevice({ resolution_date: null, remediation_plan: null });
+      return jsonResponse({ devices: [device] });
+    }
+
+    // GET /compliance/items/:hostname → detail (one active metric)
+    if (url.includes('/compliance/items/')) {
+      return jsonResponse(makeDetail());
+    }
+
+    // Any other URL (charts panel is mocked out) → safe empty payload
+    return jsonResponse({});
+  });
+
+  return state;
+}
+
+// --- Generators ------------------------------------------------------------
+
+/**
+ * YYYY-MM-DD strings built from integer tuples. Do NOT call toISOString on shrunk
+ * values (mirrors the predecessor exploration test's date-generator pattern).
+ */
+const arbResolutionDate = fc
+  .tuple(
+    fc.integer({ min: 2026, max: 2030 }),
+    fc.integer({ min: 1, max: 12 }),
+    fc.integer({ min: 1, max: 28 })
+  )
+  .map(([y, m, d]) => `${y}-${String(m).padStart(2, '0')}-${String(d).padStart(2, '0')}`);
+
+/** Non-empty, trimmed remediation plan strings, length-bounded 1–200. */
+const arbRemediationPlan = fc
+  .string({ minLength: 1, maxLength: 200 })
+  .filter((s) => s.trim().length > 0);
+
+// --- Setup / teardown ------------------------------------------------------
+
+beforeEach(() => {
+  process.env.REACT_APP_API_BASE = 'http://localhost:3001/api';
+});
+
+afterEach(() => {
+  cleanup();
+  jest.restoreAllMocks();
+});
+
+// --- Property Test ---------------------------------------------------------
+
+describe('Bug Condition Exploration: list row stays stale after sidebar metadata save', () => {
+  it(
+    'Property 1: for any saved metadata, the parent list row reflects the saved Resolution Date after a successful sidebar save (no manual refresh)',
+    async () => {
+      await fc.assert(
+        fc.asyncProperty(arbResolutionDate, arbRemediationPlan, async (savedResolutionDate, savedRemediationPlan) => {
+          const state = installFetchMock(savedResolutionDate, savedRemediationPlan);
+
+          try {
+            const { container } = render(<CompliancePage onNavigate={() => {}} />);
+
+            // Wait for the (stale) device row, then capture the row element.
+            const hostCell = await screen.findByText(HOSTNAME);
+            const row = hostCell.parentElement;
+
+            // Pre-condition: the stale row does not yet show the to-be-saved date.
+            expect(within(row).queryByText(savedResolutionDate)).toBeNull();
+
+            // Open the sidebar detail panel.
+            fireEvent.click(row);
+
+            // Wait for the panel's editable Resolution Date input to render.
+            const dateInput = await waitFor(() => {
+              const el = container.querySelector('input[type="date"]');
+              if (!el) throw new Error('resolution date input not ready');
+              return el;
+            });
+            const planInput = screen.getByPlaceholderText(/Describe the remediation plan/i);
+
+            // Enter the generated metadata values and click Save.
+            fireEvent.change(dateInput, { target: { value: savedResolutionDate } });
+            fireEvent.change(planInput, { target: { value: savedRemediationPlan } });
+            fireEvent.click(screen.getByRole('button', { name: /save/i }));
+
+            // The PATCH is issued on both fixed and unfixed code.
+            await waitFor(() => expect(state.patchCalls).toBeGreaterThan(0));
+
+            // PROPERTY (expected behavior, bugfix.md 2.1/2.2): the parent list row
+            // reflects the saved Resolution Date without a manual refresh. This holds
+            // only if a parent refresh callback re-issued fetchDevices after the save.
+            await waitFor(
+              () => {
+                expect(within(row).getByText(savedResolutionDate)).toBeInTheDocument();
+              },
+              { timeout: 2000 }
+            );
+
+            // Supporting: the list endpoint was re-issued after the save.
+            expect(state.listCallsAfterPatch).toBeGreaterThan(0);
+          } finally {
+            cleanup();
+          }
+        }),
+        { numRuns: 10, endOnFailure: true }
+      );
+    },
+    60000
+  );
+});

frontend/src/components/pages/__tests__/compliance-list-stale-after-sidebar-edit.preservation.property.test.js

@@ -0,0 +1,467 @@
+/**
+ * Preservation / Regression Property Tests:
+ *   Compliance List Stale After Sidebar Edit
+ *
+ * Spec:  .kiro/specs/compliance-list-stale-after-sidebar-edit/ (bugfix)
+ * Issue: #23 — "[Bug] Update Res Date/Remed Plan in list after updating in sidebar"
+ *        http://steam-gitlab.charterlab.com/steam/cve-dashboard/-/issues/23
+ *
+ * Property 2 (Preservation): the behaviors below must hold AFTER the fix. Following
+ * observation-first methodology, the preservation properties (note-add refresh, failed
+ * save surfaces an error without falsely updating the list, close-without-change clears
+ * selection, other row fields render) were observed to hold on UNFIXED code and must
+ * keep holding. The "regression guard" (the list row reflects a saved metadata value)
+ * is the one behavior that flips from failing (pre-fix) to passing (post-fix); it is
+ * kept here as a standing guard against re-introducing the bug.
+ *
+ * Mirrors the tagging convention of
+ *   backend/__tests__/compliance-remediation-display-fix.preservation.property.test.js
+ *
+ * Properties tested:
+ *   P2.1 — Regression guard: after a successful sidebar save the list row shows the
+ *          saved Resolution Date with no manual refresh           (bugfix.md 2.1, 2.2)
+ *   P2.2 — Note-add still triggers a list re-fetch via onNoteAdded (bugfix.md 3.1)
+ *   P2.3 — Failed metadata save surfaces metaError and does NOT
+ *          falsely update the list row                            (bugfix.md 3.3)
+ *   P2.4 — Close-without-change clears the selection, no PATCH     (bugfix.md 3.4)
+ *   P2.5 — Other row fields (hostname, IP, type, failing metrics,
+ *          seen count) render unchanged                           (bugfix.md 3.5)
+ *
+ * **Validates: Requirements 3.1, 3.2, 3.3, 3.4, 3.5, 3.6**
+ */
+import React from 'react';
+import { render, screen, fireEvent, waitFor, within, cleanup } from '@testing-library/react';
+import fc from 'fast-check';
+
+// --- Mocks (hoisted by babel-jest above the CompliancePage import) ---
+
+// Stub auth so CompliancePage renders the STEAM team with write access.
+jest.mock('../../../contexts/AuthContext', () => ({
+  useAuth: () => ({
+    canWrite: () => true,
+    isAdmin: () => false,
+    getAvailableTeams: () => ['STEAM'],
+    adminScope: null,
+  }),
+}));
+
+// The historical charts panel is irrelevant to the list-staleness bug and pulls
+// in recharts; stub it so the tests stay focused and fast across property runs.
+jest.mock('../ComplianceChartsPanel', () => () => null);
+
+import CompliancePage from '../CompliancePage';
+
+const HOSTNAME = 'HOST-001';
+const METRIC_ID = '2.3.6i';
+
+// --- Fixtures --------------------------------------------------------------
+
+function jsonResponse(body, ok = true) {
+  return Promise.resolve({ ok, json: async () => body });
+}
+
+function makeListDevice({ resolution_date, remediation_plan }) {
+  return {
+    hostname: HOSTNAME,
+    ip_address: '10.0.0.1',
+    device_type: 'Switch',
+    failing_metrics: [{ metric_id: METRIC_ID, category: 'Vulnerability Management' }],
+    resolution_date,
+    remediation_plan,
+    seen_count: 3,
+    has_notes: false,
+  };
+}
+
+function makeDetail() {
+  return {
+    hostname: HOSTNAME,
+    ip_address: '10.0.0.1',
+    device_type: 'Switch',
+    team: 'STEAM',
+    metrics: [
+      {
+        metric_id: METRIC_ID,
+        category: 'Vulnerability Management',
+        status: 'active',
+        metric_desc: 'Outbound encryption required on all endpoints',
+        resolution_date: null,
+        remediation_plan: null,
+        seen_count: 3,
+        first_seen: '2025-01-01',
+        resolved_on: null,
+        extra: {},
+      },
+    ],
+    history: [],
+    notes: [],
+  };
+}
+
+/**
+ * Install a URL-routing global.fetch shared by every property.
+ *
+ * Options:
+ *   savedResolutionDate / savedRemediationPlan — values the list endpoint returns
+ *     AFTER a successful metadata PATCH (models the backend persisting the new value).
+ *   patchOk  — whether PATCH /compliance/items/:hostname/metadata succeeds (default true).
+ *   noteOk   — whether POST /compliance/notes succeeds (default true).
+ *   fixedDevice — when provided, the list always returns this device unchanged (used by
+ *     the row-field rendering property which never edits metadata).
+ *
+ * The list device starts stale (resolution_date / remediation_plan = null) and only
+ * returns the saved values once a SUCCESSFUL patch has occurred, so a post-save
+ * re-fetch is observable in the rendered row.
+ */
+function installFetchMock(opts = {}) {
+  const {
+    savedResolutionDate = '2027-06-15',
+    savedRemediationPlan = 'Patch firmware',
+    patchOk = true,
+    noteOk = true,
+    fixedDevice = null,
+  } = opts;
+
+  const state = {
+    patchOccurred: false,
+    patchCalls: 0,
+    noteOccurred: false,
+    noteCalls: 0,
+    listCalls: 0,
+    listCallsAfterPatch: 0,
+    listCallsAfterNote: 0,
+  };
+
+  global.fetch = jest.fn((url, options = {}) => {
+    const method = (options.method || 'GET').toUpperCase();
+
+    // POST /compliance/notes → success / failure
+    if (method === 'POST' && url.includes('/compliance/notes')) {
+      state.noteCalls++;
+      if (noteOk) {
+        state.noteOccurred = true;
+        return jsonResponse({ ok: true, id: 1 });
+      }
+      return jsonResponse({ error: 'Failed to save note' }, false);
+    }
+
+    // PATCH /compliance/items/:hostname/metadata → success / failure
+    if (method === 'PATCH' && url.includes('/compliance/items/') && url.includes('/metadata')) {
+      state.patchCalls++;
+      if (patchOk) {
+        state.patchOccurred = true;
+        return jsonResponse({ ok: true });
+      }
+      return jsonResponse({ error: 'Failed to save metadata' }, false);
+    }
+
+    // GET /compliance/summary?team=STEAM → minimal valid summary
+    if (url.includes('/compliance/summary')) {
+      return jsonResponse({ entries: [], overall_scores: {}, upload: { report_date: '2025-01-01' } });
+    }
+
+    // GET /compliance/items?team=STEAM&status=active → device list (query string)
+    if (url.includes('/compliance/items?')) {
+      state.listCalls++;
+      if (state.patchOccurred) state.listCallsAfterPatch++;
+      if (state.noteOccurred) state.listCallsAfterNote++;
+      let device;
+      if (fixedDevice) {
+        device = fixedDevice;
+      } else if (state.patchOccurred) {
+        device = makeListDevice({ resolution_date: savedResolutionDate, remediation_plan: savedRemediationPlan });
+      } else {
+        device = makeListDevice({ resolution_date: null, remediation_plan: null });
+      }
+      return jsonResponse({ devices: [device] });
+    }
+
+    // GET /compliance/items/:hostname → detail (one active metric)
+    if (url.includes('/compliance/items/')) {
+      return jsonResponse(makeDetail());
+    }
+
+    // Any other URL (charts panel is mocked out) → safe empty payload
+    return jsonResponse({});
+  });
+
+  return state;
+}
+
+// --- Generators ------------------------------------------------------------
+
+/**
+ * YYYY-MM-DD strings built from integer tuples. Do NOT call toISOString on shrunk
+ * values (mirrors the predecessor exploration test's date-generator pattern).
+ */
+const arbResolutionDate = fc
+  .tuple(
+    fc.integer({ min: 2026, max: 2030 }),
+    fc.integer({ min: 1, max: 12 }),
+    fc.integer({ min: 1, max: 28 })
+  )
+  .map(([y, m, d]) => `${y}-${String(m).padStart(2, '0')}-${String(d).padStart(2, '0')}`);
+
+/** Non-empty, trimmed remediation plan strings, length-bounded 1–200. */
+const arbRemediationPlan = fc
+  .string({ minLength: 1, maxLength: 200 })
+  .filter((s) => s.trim().length > 0);
+
+/** Non-empty, trimmed note text, length-bounded 1–200. */
+const arbNoteText = fc
+  .string({ minLength: 1, maxLength: 200 })
+  .filter((s) => s.trim().length > 0);
+
+/** Hostnames like HOST-0001 — unique, regex-safe, distinct from IP/type cells. */
+const arbHostname = fc
+  .integer({ min: 1, max: 9999 })
+  .map((n) => `HOST-${String(n).padStart(4, '0')}`);
+
+/** IPv4 dotted-quad strings built from integer tuples. */
+const arbIp = fc
+  .tuple(
+    fc.integer({ min: 1, max: 254 }),
+    fc.integer({ min: 0, max: 255 }),
+    fc.integer({ min: 0, max: 255 }),
+    fc.integer({ min: 1, max: 254 })
+  )
+  .map(([a, b, c, d]) => `${a}.${b}.${c}.${d}`);
+
+const arbDeviceType = fc.constantFrom('Switch', 'Router', 'Firewall', 'Server', 'Workstation');
+
+/** metric_id like "7.1.3", built from integer tuples. */
+const arbMetricId = fc
+  .tuple(fc.integer({ min: 1, max: 9 }), fc.integer({ min: 1, max: 9 }), fc.integer({ min: 1, max: 9 }))
+  .map(([a, b, c]) => `${a}.${b}.${c}`);
+
+/** 1–3 unique metric ids (unique to avoid duplicate React keys / ambiguous queries). */
+const arbMetricIds = fc.uniqueArray(arbMetricId, { minLength: 1, maxLength: 3 });
+
+const arbSeenCount = fc.integer({ min: 1, max: 20 });
+
+// --- Helpers ---------------------------------------------------------------
+
+/** Render CompliancePage, wait for the device row, return { container, row }. */
+async function renderAndGetRow(hostname = HOSTNAME) {
+  const utils = render(<CompliancePage onNavigate={() => {}} />);
+  const hostCell = await screen.findByText(hostname);
+  return { ...utils, row: hostCell.parentElement };
+}
+
+/** Open the sidebar by clicking the row, wait for the editable date input. */
+async function openPanel(row, container) {
+  fireEvent.click(row);
+  const dateInput = await waitFor(() => {
+    const el = container.querySelector('input[type="date"]');
+    if (!el) throw new Error('resolution date input not ready');
+    return el;
+  });
+  return dateInput;
+}
+
+// --- Setup / teardown ------------------------------------------------------
+
+beforeEach(() => {
+  process.env.REACT_APP_API_BASE = 'http://localhost:3001/api';
+});
+
+afterEach(() => {
+  cleanup();
+  jest.restoreAllMocks();
+});
+
+// ===========================================================================
+// P2.1 — Regression guard: list row reflects a saved Resolution Date
+//        after a successful sidebar save, with no manual refresh.
+//        (bugfix.md 2.1, 2.2 — kept as a standing regression guard)
+// ===========================================================================
+describe('P2.1 — Regression guard: list row reflects saved metadata after a successful save', () => {
+  it('for any saved metadata, the parent row shows the saved Resolution Date without a manual refresh', async () => {
+    await fc.assert(
+      fc.asyncProperty(arbResolutionDate, arbRemediationPlan, async (savedResolutionDate, savedRemediationPlan) => {
+        const state = installFetchMock({ savedResolutionDate, savedRemediationPlan });
+        try {
+          const { container, row } = await renderAndGetRow();
+
+          // Pre-condition: the stale row does not yet show the to-be-saved date.
+          expect(within(row).queryByText(savedResolutionDate)).toBeNull();
+
+          const dateInput = await openPanel(row, container);
+          const planInput = screen.getByPlaceholderText(/Describe the remediation plan/i);
+
+          fireEvent.change(dateInput, { target: { value: savedResolutionDate } });
+          fireEvent.change(planInput, { target: { value: savedRemediationPlan } });
+          fireEvent.click(screen.getByRole('button', { name: /save/i }));
+
+          await waitFor(() => expect(state.patchCalls).toBeGreaterThan(0));
+
+          // Regression guard: the row reflects the saved value (the fix re-fetches).
+          await waitFor(
+            () => {
+              expect(within(row).getByText(savedResolutionDate)).toBeInTheDocument();
+            },
+            { timeout: 2000 }
+          );
+          expect(state.listCallsAfterPatch).toBeGreaterThan(0);
+        } finally {
+          cleanup();
+        }
+      }),
+      { numRuns: 6, endOnFailure: true }
+    );
+  }, 60000);
+});
+
+// ===========================================================================
+// P2.2 — Note-add refresh still works: adding a note re-issues the list GET
+//        via the existing onNoteAdded callback. (bugfix.md 3.1)
+// ===========================================================================
+describe('P2.2 — Note-add still triggers a list re-fetch (onNoteAdded preserved)', () => {
+  it('for any note text, a successful note add re-issues GET /compliance/items', async () => {
+    await fc.assert(
+      fc.asyncProperty(arbNoteText, async (noteText) => {
+        const state = installFetchMock({ noteOk: true });
+        try {
+          const { container, row } = await renderAndGetRow();
+          await openPanel(row, container);
+
+          const noteInput = await screen.findByPlaceholderText(/Add a note/i);
+          fireEvent.change(noteInput, { target: { value: noteText } });
+
+          const addButton = container.querySelector('.lucide-send').closest('button');
+          fireEvent.click(addButton);
+
+          await waitFor(() => expect(state.noteCalls).toBeGreaterThan(0));
+          // Preservation: the list is re-fetched after the note add.
+          await waitFor(() => expect(state.listCallsAfterNote).toBeGreaterThan(0), { timeout: 2000 });
+        } finally {
+          cleanup();
+        }
+      }),
+      { numRuns: 6, endOnFailure: true }
+    );
+  }, 60000);
+});
+
+// ===========================================================================
+// P2.3 — Failed metadata save surfaces metaError and does NOT falsely
+//        update the list row. (bugfix.md 3.3)
+// ===========================================================================
+describe('P2.3 — Failed save shows an error and does not falsely update the list', () => {
+  it('for any attempted value, a non-OK PATCH surfaces metaError and the row stays stale', async () => {
+    await fc.assert(
+      fc.asyncProperty(arbResolutionDate, async (attemptedResolutionDate) => {
+        const state = installFetchMock({ savedResolutionDate: attemptedResolutionDate, patchOk: false });
+        try {
+          const { container, row } = await renderAndGetRow();
+          const dateInput = await openPanel(row, container);
+
+          fireEvent.change(dateInput, { target: { value: attemptedResolutionDate } });
+          fireEvent.click(screen.getByRole('button', { name: /save/i }));
+
+          await waitFor(() => expect(state.patchCalls).toBeGreaterThan(0));
+
+          // The panel surfaces the error from the failed save.
+          await waitFor(() => expect(screen.getByText('Failed to save metadata')).toBeInTheDocument());
+
+          // The list row was NOT updated to a value that never persisted.
+          expect(within(row).queryByText(attemptedResolutionDate)).toBeNull();
+          expect(state.listCallsAfterPatch).toBe(0);
+        } finally {
+          cleanup();
+        }
+      }),
+      { numRuns: 6, endOnFailure: true }
+    );
+  }, 60000);
+});
+
+// ===========================================================================
+// P2.4 — Close-without-change clears the selection and issues no PATCH.
+//        (bugfix.md 3.4) — example-style assertion (no value in varying inputs).
+// ===========================================================================
+describe('P2.4 — Close without change clears selection and saves nothing', () => {
+  it('clicking the close (X) removes the panel and triggers no metadata save', async () => {
+    const state = installFetchMock();
+    const { container, row } = await renderAndGetRow();
+
+    // Open the panel and confirm the editable date input rendered.
+    await openPanel(row, container);
+
+    // Click the close (X) control without saving anything.
+    const closeButton = container.querySelector('.lucide-x').closest('button');
+    fireEvent.click(closeButton);
+
+    // The panel is gone (selection cleared) — its date input no longer exists.
+    await waitFor(() => expect(container.querySelector('input[type="date"]')).toBeNull());
+
+    // The row remains and no metadata save was attempted.
+    expect(screen.getByText(HOSTNAME)).toBeInTheDocument();
+    expect(state.patchCalls).toBe(0);
+  }, 30000);
+
+  it('clicking the backdrop also clears selection and triggers no metadata save', async () => {
+    const state = installFetchMock();
+    const { container, row } = await renderAndGetRow();
+
+    await openPanel(row, container);
+
+    // The first fixed/inset overlay is the backdrop (onClick={onClose}).
+    const backdrop = container.querySelector('div[style*="position: fixed"]');
+    fireEvent.click(backdrop);
+
+    await waitFor(() => expect(container.querySelector('input[type="date"]')).toBeNull());
+    expect(screen.getByText(HOSTNAME)).toBeInTheDocument();
+    expect(state.patchCalls).toBe(0);
+  }, 30000);
+});
+
+// ===========================================================================
+// P2.5 — Other row fields render unchanged: hostname, IP, device type,
+//        failing metrics, seen count. (bugfix.md 3.5)
+// ===========================================================================
+describe('P2.5 — Other row fields render correctly and unchanged', () => {
+  it('for any generated device, the row displays hostname, IP, type, metrics, and seen count', async () => {
+    await fc.assert(
+      fc.asyncProperty(
+        arbHostname,
+        arbIp,
+        arbDeviceType,
+        arbMetricIds,
+        arbSeenCount,
+        async (hostname, ip, deviceType, metricIds, seenCount) => {
+          const device = {
+            hostname,
+            ip_address: ip,
+            device_type: deviceType,
+            failing_metrics: metricIds.map((id) => ({ metric_id: id, category: 'Vulnerability Management' })),
+            resolution_date: null,
+            remediation_plan: null,
+            seen_count: seenCount,
+            has_notes: false,
+          };
+          installFetchMock({ fixedDevice: device });
+          try {
+            const { row } = await renderAndGetRow(hostname);
+
+            // Hostname, IP, and device type render verbatim.
+            expect(within(row).getByText(hostname)).toBeInTheDocument();
+            expect(within(row).getByText(ip)).toBeInTheDocument();
+            expect(within(row).getByText(deviceType)).toBeInTheDocument();
+
+            // Every failing-metric badge renders its metric_id.
+            for (const id of metricIds) {
+              expect(within(row).getByText(id)).toBeInTheDocument();
+            }
+
+            // The seen-count badge renders "<count>×".
+            expect(within(row).getByText(`${seenCount}\u00D7`)).toBeInTheDocument();
+          } finally {
+            cleanup();
+          }
+        }
+      ),
+      { numRuns: 8, endOnFailure: true }
+    );
+  }, 60000);
+});

frontend/src/data/complianceCategories.json

@@ -0,0 +1,25 @@
+{
+  "1.1.1": "Logging & Monitoring",
+  "1.1.3": "Logging & Monitoring",
+  "1.4.1": "Logging & Monitoring",
+  "2.3.4i": "Vulnerability Management",
+  "2.3.6i": "Vulnerability Management",
+  "2.3.8i": "Vulnerability Management",
+  "5.2.4": "Access & MFA",
+  "5.2.5": "Access & MFA",
+  "5.2.6": "Access & MFA",
+  "5.2.7": "Access & MFA",
+  "5.2.8": "Access & MFA",
+  "5.3.4": "Endpoint Protection",
+  "5.5.4i": "Vulnerability Management",
+  "5.5.5": "Decommissioned Assets",
+  "5.8.1": "Application Security",
+  "7.1.1": "Logging & Monitoring",
+  "7.1.4": "Logging & Monitoring",
+  "7.6.13": "Disaster Recovery",
+  "7.6.16": "Disaster Recovery",
+  "Missing_AppID": "Asset Data Quality",
+  "Missing_DF": "Asset Data Quality",
+  "Missing_OS": "Asset Data Quality",
+  "5.5.2": "Other"
+}

frontend/src/utils/__tests__/resolutionDate.property.test.js

@@ -0,0 +1,300 @@
+/**
+ * Property-Based Tests: Resolution-date helper
+ *
+ * Feature: compliance-metric-estimated-resolution-date
+ *
+ * Exercises the pure helper `formatResolutionDate(raw)` from
+ * `frontend/src/utils/resolutionDate.js`, which classifies a raw per-metric
+ * `resolution_date` value into a discriminated union:
+ *   { state: 'set', value } | { state: 'none' } | { state: 'invalid' }
+ *
+ * Library: fast-check (v4) with Jest (react-scripts test). Generators are built
+ * from fast-check arbitraries only — none are hand-rolled. Each property runs a
+ * minimum of 100 iterations.
+ *
+ * Validates: Requirements 1.1, 1.3, 1.4, 1.6, 2.1, 2.2, 3.2, 3.3, 4.5
+ */
+
+import * as fc from 'fast-check';
+import { formatResolutionDate } from '../resolutionDate';
+
+const NUM_RUNS = 200;
+const VALID_STATES = ['set', 'none', 'invalid'];
+const SHARED_SENTINEL = 'Multiple values';
+
+// --- Independent oracle (NOT the function under test) ----------------------
+// Used only to filter generated inputs so we never assert the wrong class.
+
+function daysInMonthOracle(year, month) {
+  const isLeap = (year % 4 === 0 && year % 100 !== 0) || year % 400 === 0;
+  const lengths = [31, isLeap ? 29 : 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
+  return lengths[month - 1];
+}
+
+// True iff `s` is a strict YYYY-MM-DD string that names a real calendar date.
+function isValidCalendarYmd(s) {
+  if (typeof s !== 'string') return false;
+  if (!/^\d{4}-\d{2}-\d{2}$/.test(s)) return false;
+  const year = Number(s.slice(0, 4));
+  const month = Number(s.slice(5, 7));
+  const day = Number(s.slice(8, 10));
+  if (month < 1 || month > 12) return false;
+  if (day < 1 || day > daysInMonthOracle(year, month)) return false;
+  return true;
+}
+
+// True iff `s` is an ISO datetime string whose date prefix is a valid calendar date.
+// e.g. "2026-07-01T00:00:00.000Z" → true (the helper now extracts the date prefix).
+function isIsoDateTimeWithValidDate(s) {
+  if (typeof s !== 'string') return false;
+  if (!/^\d{4}-\d{2}-\d{2}T/.test(s)) return false;
+  return isValidCalendarYmd(s.slice(0, 10));
+}
+
+// --- Shared arbitraries -----------------------------------------------------
+
+// Four-digit zero-padded year string (0000–9999) — always matches \d{4}.
+const year4Arb = fc.integer({ min: 0, max: 9999 }).map(y => String(y).padStart(4, '0'));
+
+// Valid calendar dates spanning years, all months, month-length boundaries
+// (28/29/30/31), and leap days. The `dim` boundary value guarantees the true
+// last day of each month is exercised, including Feb 29 in leap years.
+const validDateStringArb = year4Arb.chain(y =>
+  fc.integer({ min: 1, max: 12 }).chain(m => {
+    const dim = daysInMonthOracle(Number(y), m);
+    const dayArb = fc.oneof(
+      fc.constant(1),
+      fc.constant(dim),
+      fc.integer({ min: 1, max: dim })
+    );
+    return dayArb.map(
+      d => `${y}-${String(m).padStart(2, '0')}-${String(d).padStart(2, '0')}`
+    );
+  })
+);
+
+// null / undefined / empty / whitespace-only (spaces, tabs, newlines).
+const whitespaceChar = fc.constantFrom(' ', '\t', '\n');
+const whitespaceStringArb = fc
+  .array(whitespaceChar, { minLength: 1, maxLength: 20 })
+  .map(chars => chars.join(''));
+const absentArb = fc.oneof(
+  fc.constantFrom(null, undefined, ''),
+  whitespaceStringArb
+);
+
+// Non-empty, non-whitespace-only strings that are NOT valid YYYY-MM-DD dates.
+// Built from several invalid-by-construction families, then defensively
+// filtered against the oracle to drop any accidentally-valid value.
+const twoDigitArb = fc.integer({ min: 0, max: 99 }).map(n => String(n).padStart(2, '0'));
+const nonLeapYear4Arb = fc
+  .integer({ min: 0, max: 9999 })
+  .filter(y => !((y % 4 === 0 && y % 100 !== 0) || y % 400 === 0))
+  .map(y => String(y).padStart(4, '0'));
+
+// Valid shape but month out of range (00 or 13–99).
+const badMonthArb = fc
+  .tuple(
+    year4Arb,
+    fc.oneof(fc.constant('00'), fc.integer({ min: 13, max: 99 }).map(n => String(n).padStart(2, '0'))),
+    fc.integer({ min: 1, max: 28 }).map(n => String(n).padStart(2, '0'))
+  )
+  .map(([y, m, d]) => `${y}-${m}-${d}`);
+
+// Valid shape but day out of range (00 or 32–99).
+const badDayArb = fc
+  .tuple(
+    year4Arb,
+    fc.integer({ min: 1, max: 12 }).map(n => String(n).padStart(2, '0')),
+    fc.oneof(fc.constant('00'), fc.integer({ min: 32, max: 99 }).map(n => String(n).padStart(2, '0')))
+  )
+  .map(([y, m, d]) => `${y}-${m}-${d}`);
+
+// Valid shape but impossible calendar day (Feb 30/31, 31 in 30-day months,
+// Feb 29 in a non-leap year).
+const impossibleDayArb = fc.oneof(
+  fc.tuple(year4Arb, fc.constant('02'), fc.constantFrom('30', '31')).map(([y, m, d]) => `${y}-${m}-${d}`),
+  fc.tuple(year4Arb, fc.constantFrom('04', '06', '09', '11'), fc.constant('31')).map(([y, m, d]) => `${y}-${m}-${d}`),
+  nonLeapYear4Arb.map(y => `${y}-02-29`)
+);
+
+// Wrong shapes (not matching ^\d{4}-\d{2}-\d{2}$).
+const wrongShapeArb = fc.oneof(
+  fc.constantFrom(
+    '2026-7-1',
+    '2026-7-01',
+    '2026-07-1',
+    '07/01/2026',
+    '2026/07/01',
+    '20260701',
+    '2026-07',
+    '2026-07-01T00:00:00',
+    '2026-07-01 ', // trailing handled by trim, still wrong below
+    'not-a-date',
+    'July 1 2026'
+  ),
+  fc.string({ minLength: 1, maxLength: 30 })
+);
+
+const invalidStringArb = fc
+  .oneof(wrongShapeArb, badMonthArb, badDayArb, impossibleDayArb, twoDigitArb)
+  .filter(s => typeof s === 'string' && s.trim() !== '' && !isValidCalendarYmd(s.trim()) && !isIsoDateTimeWithValidDate(s.trim()));
+
+// Any input category (used for totality / independence properties).
+const anyInputArb = fc.oneof(
+  validDateStringArb,
+  absentArb,
+  invalidStringArb
+);
+
+// --- Property 1 -------------------------------------------------------------
+
+// Feature: compliance-metric-estimated-resolution-date, Property 1: Valid calendar dates classify as "set" and format as YYYY-MM-DD
+describe('Property 1: Valid calendar dates classify as "set" and format as YYYY-MM-DD', () => {
+  /**
+   * **Validates: Requirements 1.1, 1.4**
+   *
+   * For any valid calendar date in YYYY-MM-DD form, formatResolutionDate
+   * returns { state: 'set', value } where value matches ^\d{4}-\d{2}-\d{2}$
+   * and equals the canonical normalized form (the input itself).
+   */
+  test('valid calendar dates are classified set and normalized to YYYY-MM-DD', () => {
+    fc.assert(
+      fc.property(validDateStringArb, dateStr => {
+        const result = formatResolutionDate(dateStr);
+        expect(result.state).toBe('set');
+        expect(result.value).toMatch(/^\d{4}-\d{2}-\d{2}$/);
+        expect(result.value).toBe(dateStr);
+      }),
+      { numRuns: NUM_RUNS }
+    );
+  });
+});
+
+// --- Property 2 -------------------------------------------------------------
+
+// Feature: compliance-metric-estimated-resolution-date, Property 2: Absent values classify as "none"
+describe('Property 2: Absent values classify as "none"', () => {
+  /**
+   * **Validates: Requirements 2.1, 4.5**
+   *
+   * For any input that is null, undefined, the empty string, or a string
+   * composed entirely of whitespace, formatResolutionDate returns
+   * { state: 'none' }.
+   */
+  test('null, undefined, empty, and whitespace-only inputs classify as none', () => {
+    fc.assert(
+      fc.property(absentArb, raw => {
+        const result = formatResolutionDate(raw);
+        expect(result.state).toBe('none');
+      }),
+      { numRuns: NUM_RUNS }
+    );
+  });
+});
+
+// --- Property 3 -------------------------------------------------------------
+
+// Feature: compliance-metric-estimated-resolution-date, Property 3: Non-empty non-calendar-date values classify as "invalid"
+describe('Property 3: Non-empty non-calendar-date values classify as "invalid"', () => {
+  /**
+   * **Validates: Requirements 1.6**
+   *
+   * For any non-empty, non-whitespace-only string that is not a valid
+   * YYYY-MM-DD calendar date — wrong shapes, out-of-range months/days,
+   * impossible days such as 2026-02-30, and arbitrary text —
+   * formatResolutionDate returns { state: 'invalid' }.
+   */
+  test('non-empty non-calendar-date strings classify as invalid', () => {
+    fc.assert(
+      fc.property(invalidStringArb, raw => {
+        const result = formatResolutionDate(raw);
+        expect(result.state).toBe('invalid');
+      }),
+      { numRuns: NUM_RUNS }
+    );
+  });
+});
+
+// --- Property 4 -------------------------------------------------------------
+
+// Feature: compliance-metric-estimated-resolution-date, Property 4: Classification is total over any metric list
+describe('Property 4: Classification is total over any metric list', () => {
+  /**
+   * **Validates: Requirements 2.2**
+   *
+   * For any array of resolution_date values drawn from all categories,
+   * formatResolutionDate never throws, every result's state is one of
+   * { 'set', 'none', 'invalid' }, and the number of classified results
+   * equals the number of inputs.
+   */
+  test('classification is total: no throw, valid state, one result per input', () => {
+    fc.assert(
+      fc.property(fc.array(anyInputArb, { maxLength: 30 }), inputs => {
+        const results = inputs.map(raw => formatResolutionDate(raw));
+        expect(results).toHaveLength(inputs.length);
+        results.forEach(result => {
+          expect(VALID_STATES).toContain(result.state);
+        });
+      }),
+      { numRuns: NUM_RUNS }
+    );
+  });
+});
+
+// --- Property 5 -------------------------------------------------------------
+
+// Metric-like object with an independently chosen resolution_date.
+const metricArb = fc.record({
+  metric_id: fc.string({ minLength: 1, maxLength: 8 }),
+  resolution_date: anyInputArb,
+});
+
+// General metric arrays plus arrays forced to contain two differing dates.
+const differingMetricsArb = fc
+  .tuple(validDateStringArb, validDateStringArb)
+  .filter(([a, b]) => a !== b)
+  .chain(([a, b]) =>
+    fc.array(metricArb, { maxLength: 5 }).map(rest => [
+      { metric_id: 'm-a', resolution_date: a },
+      { metric_id: 'm-b', resolution_date: b },
+      ...rest,
+    ])
+  );
+const metricsArrayArb = fc.oneof(
+  fc.array(metricArb, { maxLength: 30 }),
+  differingMetricsArb
+);
+
+// Feature: compliance-metric-estimated-resolution-date, Property 5: Each metric's display derives only from its own field (no collapsing)
+describe('Property 5: Each metric\'s display derives only from its own field (no collapsing)', () => {
+  /**
+   * **Validates: Requirements 1.3, 3.2, 3.3**
+   *
+   * For any array of metrics — including arrays where metrics carry different
+   * resolution_date values — the derived display for each metric equals
+   * formatResolutionDate applied to that same metric's own field in isolation,
+   * independent of every sibling, and no result collapses to a shared
+   * "Multiple values" sentinel.
+   */
+  test('each metric maps to its own field with no shared/collapsed value', () => {
+    fc.assert(
+      fc.property(metricsArrayArb, metrics => {
+        const displayed = metrics.map(m => formatResolutionDate(m.resolution_date));
+        expect(displayed).toHaveLength(metrics.length);
+
+        metrics.forEach((metric, index) => {
+          // Computed in isolation from this metric's own field only.
+          const isolated = formatResolutionDate(metric.resolution_date);
+          expect(displayed[index]).toEqual(isolated);
+
+          // No collapsing to a shared "Multiple values" sentinel.
+          expect(displayed[index].state).not.toBe(SHARED_SENTINEL);
+          expect(displayed[index].value).not.toBe(SHARED_SENTINEL);
+          expect(VALID_STATES).toContain(displayed[index].state);
+        });
+      }),
+      { numRuns: NUM_RUNS }
+    );
+  });
+});

frontend/src/utils/__tests__/resolutionDate.test.js

@@ -0,0 +1,95 @@
+/**
+ * Example and edge-case unit tests for the resolution-date helper.
+ *
+ * Spec: .kiro/specs/compliance-metric-estimated-resolution-date
+ * Task: 1.7 — Example and edge-case unit tests for the helper
+ * Requirements: 1.1, 1.4, 1.6, 2.1
+ *
+ * These concrete fixtures anchor the contract of `formatResolutionDate` and
+ * double as regression cases. The universal behavior is covered separately by
+ * the property-based tests in `resolutionDate.property.test.js`.
+ */
+
+import {
+  formatResolutionDate,
+  RESOLUTION_DATE_LABEL,
+  NO_DATE_PLACEHOLDER,
+  INVALID_DATE_PLACEHOLDER,
+} from '../resolutionDate';
+
+describe('formatResolutionDate', () => {
+  describe('set — valid calendar dates (Requirements 1.1, 1.4)', () => {
+    it("classifies '2026-07-01' as set with the normalized YYYY-MM-DD value", () => {
+      expect(formatResolutionDate('2026-07-01')).toEqual({
+        state: 'set',
+        value: '2026-07-01',
+      });
+    });
+
+    it("classifies the leap day '2024-02-29' as set (2024 is a leap year)", () => {
+      expect(formatResolutionDate('2024-02-29')).toEqual({
+        state: 'set',
+        value: '2024-02-29',
+      });
+    });
+
+    it("classifies an ISO datetime '2026-07-03T00:00:00.000Z' as set with the date prefix", () => {
+      expect(formatResolutionDate('2026-07-03T00:00:00.000Z')).toEqual({
+        state: 'set',
+        value: '2026-07-03',
+      });
+    });
+  });
+
+  describe('invalid — present but not a valid calendar date (Requirement 1.6)', () => {
+    it("classifies '2026-7-1' as invalid (components not zero-padded)", () => {
+      expect(formatResolutionDate('2026-7-1')).toEqual({ state: 'invalid' });
+    });
+
+    it("classifies '07/01/2026' as invalid (wrong shape / separators)", () => {
+      expect(formatResolutionDate('07/01/2026')).toEqual({ state: 'invalid' });
+    });
+
+    it("classifies '2023-02-29' as invalid (2023 is not a leap year)", () => {
+      expect(formatResolutionDate('2023-02-29')).toEqual({ state: 'invalid' });
+    });
+
+    it("classifies '2026-13-01' as invalid (month out of range)", () => {
+      expect(formatResolutionDate('2026-13-01')).toEqual({ state: 'invalid' });
+    });
+
+    it("classifies '2026-00-10' as invalid (month below range)", () => {
+      expect(formatResolutionDate('2026-00-10')).toEqual({ state: 'invalid' });
+    });
+
+    it("classifies '2026-01-32' as invalid (day above month length)", () => {
+      expect(formatResolutionDate('2026-01-32')).toEqual({ state: 'invalid' });
+    });
+  });
+
+  describe('none — absent values (Requirements 2.1)', () => {
+    it('classifies whitespace-only input as none', () => {
+      expect(formatResolutionDate('  ')).toEqual({ state: 'none' });
+    });
+
+    it('classifies null as none', () => {
+      expect(formatResolutionDate(null)).toEqual({ state: 'none' });
+    });
+
+    it('classifies undefined as none', () => {
+      expect(formatResolutionDate(undefined)).toEqual({ state: 'none' });
+    });
+
+    it('classifies the empty string as none', () => {
+      expect(formatResolutionDate('')).toEqual({ state: 'none' });
+    });
+  });
+
+  describe('display constants', () => {
+    it('exposes the expected label and placeholder strings', () => {
+      expect(RESOLUTION_DATE_LABEL).toBe('Est. Resolution');
+      expect(NO_DATE_PLACEHOLDER).toBe('not set');
+      expect(INVALID_DATE_PLACEHOLDER).toBe('invalid date');
+    });
+  });
+});

frontend/src/utils/graniteLoaderConfig.js

@@ -0,0 +1,77 @@
+/**
+ * Granite Team_Device Loader column configuration.
+ * Defines all 41 columns in canonical order, their groupings,
+ * and which are required for each operation type.
+ */
+
+export const LOADER_COLUMNS = [
+  { id: 'DELETE', label: 'DELETE', group: 'Identification', requiredFor: ['Delete'] },
+  { id: 'SET_CONFIRMED', label: 'SET_CONFIRMED', group: 'Identification', requiredFor: [] },
+  { id: 'EQUIPMENT_CLASS', label: 'EQUIPMENT CLASS', group: 'Identification', requiredFor: ['Add'] },
+  { id: 'EQUIP_INST_ID', label: 'EQUIP_INST_ID', group: 'Identification', requiredFor: ['Change', 'Move', 'Delete'] },
+  { id: 'SITE_NAME', label: 'SITE_NAME', group: 'Identification', requiredFor: ['Add', 'Move'] },
+  { id: 'EQUIP_NAME', label: 'EQUIP_NAME', group: 'Identification', requiredFor: ['Add'] },
+  { id: 'EQUIP_TEMPLATE', label: 'EQUIP_TEMPLATE', group: 'Identification', requiredFor: ['Add'] },
+  { id: 'EQUIP_STATUS', label: 'EQUIP_STATUS', group: 'Identification', requiredFor: ['Add'] },
+  { id: 'RESPONSIBLE_TEAM', label: 'UDA#RESPONSIBLE ORGANIZATION#RESPONSIBLE TEAM', group: 'Responsible Org', requiredFor: ['Add'] },
+  { id: 'IPV4_ADDRESS', label: 'UDA#IP_ADDRESSING#IPV4_ADDRESS', group: 'IP Addressing', requiredFor: ['Add'] },
+  { id: 'MAC_ADDRESS', label: 'UDA#IP_ADDRESSING#MAC ADDRESS', group: 'IP Addressing', requiredFor: [] },
+  { id: 'MGMT_IP_ASN', label: 'UDA#IP_ADDRESSING#MGMT_IP_ASN', group: 'IP Addressing', requiredFor: ['Add'] },
+  { id: 'SERIALNUMBER', label: 'SERIALNUMBER', group: 'Equipment Info', requiredFor: [] },
+  { id: 'EXCLUDED_DISCOVERY', label: 'UDA#AUTO DISCOVERY#EXCLUDED FROM DISCOVERY', group: 'Discovery', requiredFor: [] },
+  { id: 'EXCLUDED_REASON', label: 'UDA#AUTO DISCOVERY#EXCLUDED FROM DISCOVERY REASON', group: 'Discovery', requiredFor: [] },
+  { id: 'IPV6_ADDRESS', label: 'UDA#IP_ADDRESSING#IPV6_ADDRESS', group: 'IP Addressing', requiredFor: [] },
+  { id: 'ILOM_ADDRESS', label: 'UDA#IP_ADDRESSING#IPV4_ILOM_ADDRESS', group: 'IP Addressing', requiredFor: [] },
+  { id: 'APP_ID_ASSET_TAG', label: 'UDA#CHERWELL_CMDB#APP ID ASSET TAG', group: 'Cyber Metrics', requiredFor: [] },
+  { id: 'DEVICE_FUNCTION', label: 'UDA#CHERWELL_CMDB#DEVICE_FUNCTION', group: 'Cyber Metrics', requiredFor: [] },
+  { id: 'ENVIRONMENT', label: 'UDA#CHERWELL_CMDB#ENVIRONMENT', group: 'Cyber Metrics', requiredFor: [] },
+  { id: 'SECONDARY_MGMT_IP', label: 'UDA#IP_ADDRESSING#SECONDARY_MGMT_IP_ADDRESS', group: 'IP Addressing', requiredFor: [] },
+  { id: 'VIP', label: 'UDA#IP_ADDRESSING#VIP', group: 'IP Addressing', requiredFor: [] },
+  { id: 'FLOATING_IP', label: 'UDA#IP_ADDRESSING#FLOATING IP ADDRESS', group: 'IP Addressing', requiredFor: [] },
+  { id: 'SCAN_IP_1', label: 'UDA#IP_ADDRESSING#SCAN IP ADDRESS 1', group: 'IP Addressing', requiredFor: [] },
+  { id: 'SCAN_IP_2', label: 'UDA#IP_ADDRESSING#SCAN IP ADDRESS 2', group: 'IP Addressing', requiredFor: [] },
+  { id: 'SCAN_IP_3', label: 'UDA#IP_ADDRESSING#SCAN IP ADDRESS 3', group: 'IP Addressing', requiredFor: [] },
+  { id: 'EQUIP_MODEL', label: 'EQUIP_MODEL', group: 'Equipment Info', requiredFor: [] },
+  { id: 'EQUIP_COMMENTS', label: 'EQUIP_COMMENTS', group: 'Equipment Info', requiredFor: [] },
+  { id: 'EQUIP_PARTNUMBER', label: 'EQUIP_PARTNUMBER', group: 'Equipment Info', requiredFor: [] },
+  { id: 'OS', label: 'UDA#CONTROLLER CONFIG#OS', group: 'Equipment Info', requiredFor: [] },
+  { id: 'OS_VERSION', label: 'UDA#CONTROLLER CONFIG#OS VERSION', group: 'Equipment Info', requiredFor: [] },
+  { id: 'CPU_CORES', label: 'UDA#CONTROLLER CONFIG#TOTAL CPU CORES', group: 'Equipment Info', requiredFor: [] },
+  { id: 'RAM_GB', label: 'UDA#CONTROLLER CONFIG#RAM IN GB', group: 'Equipment Info', requiredFor: [] },
+  { id: 'STORAGE_GB', label: 'UDA#CONTROLLER CONFIG#STORAGE IN GB', group: 'Equipment Info', requiredFor: [] },
+  { id: 'ARCHER_ID', label: 'UDA#WIFI EQUIP INFO#ARCHER ID', group: 'Other', requiredFor: [] },
+  { id: 'INSTALL_LOCATION', label: 'UDA#WIFI EQUIP INFO#INSTALL LOCATION', group: 'Other', requiredFor: [] },
+  { id: 'SYSNAME', label: 'UDA#EQUIPMENT_INFO#SYSNAME', group: 'Other', requiredFor: [] },
+  { id: 'LATITUDE', label: 'UDA#WIFI EQUIP INFO#LATITUDE', group: 'Other', requiredFor: [] },
+  { id: 'LONGITUDE', label: 'UDA#WIFI EQUIP INFO#LONGITUDE', group: 'Other', requiredFor: [] },
+  { id: 'OSTYPE', label: 'UDA#EQUIP MIGRATION#OSTYPE', group: 'Other', requiredFor: [] },
+  { id: 'OSVERSION', label: 'UDA#EQUIP MIGRATION#OSVERSION', group: 'Other', requiredFor: [] },
+];
+
+export const COLUMN_GROUPS = [
+  'Identification',
+  'Responsible Org',
+  'IP Addressing',
+  'Discovery',
+  'Cyber Metrics',
+  'Equipment Info',
+  'Other',
+];
+
+export const OPERATION_TYPES = ['Change', 'Add', 'Delete', 'Move'];
+
+/**
+ * Returns column IDs required for the given operation type.
+ */
+export function getRequiredColumns(operationType) {
+  return LOADER_COLUMNS
+    .filter(col => col.requiredFor.includes(operationType))
+    .map(col => col.id);
+}
+
+/**
+ * Returns columns belonging to a specific group.
+ */
+export function getColumnsByGroup(group) {
+  return LOADER_COLUMNS.filter(col => col.group === group);
+}

frontend/src/utils/graniteLoaderExport.js

@@ -0,0 +1,82 @@
+/**
+ * Granite Team_Device Loader xlsx generation.
+ * Produces a properly formatted xlsx file for upload to SNIP XperLoad.
+ */
+
+import * as XLSX from 'xlsx';
+import { LOADER_COLUMNS } from './graniteLoaderConfig';
+
+/**
+ * Generate a Granite Loader Sheet xlsx file.
+ *
+ * @param {Object} config
+ * @param {string} config.operationType - 'Change' | 'Add' | 'Delete' | 'Move'
+ * @param {Array<string>} config.columnIds - selected column IDs (in any order; output uses canonical order)
+ * @param {Array<Object>} config.rows - device rows, each keyed by column ID with string values
+ * @returns {Blob} xlsx file as a Blob for browser download
+ */
+export function generateLoaderXlsx(config) {
+  const { operationType, columnIds, rows } = config;
+
+  // Filter LOADER_COLUMNS to only selected columns, preserving canonical order
+  const selectedColumns = LOADER_COLUMNS.filter(col => columnIds.includes(col.id));
+
+  // Build header row from canonical labels
+  const headers = selectedColumns.map(col => col.label);
+
+  // Build data rows
+  const dataRows = rows.map(row => {
+    return selectedColumns.map(col => {
+      // DELETE column auto-fill for Delete operations
+      if (col.id === 'DELETE' && operationType === 'Delete') {
+        return 'X';
+      }
+
+      // Get the value from the row
+      let value = row[col.id];
+
+      // EQUIPMENT CLASS defaults to "S" if not explicitly set
+      if (col.id === 'EQUIPMENT_CLASS' && (value === undefined || value === null || value === '')) {
+        value = 'S';
+      }
+
+      // Convert null/undefined to empty string (not "null" or "undefined")
+      if (value === null || value === undefined) {
+        return '';
+      }
+
+      return String(value);
+    });
+  });
+
+  // Combine headers + data into array-of-arrays
+  const aoa = [headers, ...dataRows];
+
+  // Create workbook and worksheet
+  const ws = XLSX.utils.aoa_to_sheet(aoa);
+  const wb = XLSX.utils.book_new();
+  XLSX.utils.book_append_sheet(wb, ws, 'Load_Sheet');
+
+  // Write to array buffer
+  const wbOut = XLSX.write(wb, { bookType: 'xlsx', type: 'array' });
+
+  // Return as Blob
+  return new Blob([wbOut], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
+}
+
+/**
+ * Generate a descriptive filename for the loader sheet.
+ *
+ * @param {string} operationType - 'Change' | 'Add' | 'Delete' | 'Move'
+ * @param {string} [teamName] - optional team name to include in filename
+ * @returns {string} filename like "Loader_Change_NTS-AEO-STEAM_2026-05-27.xlsx"
+ */
+export function generateFilename(operationType, teamName) {
+  const date = new Date().toISOString().slice(0, 10);
+  const parts = ['Loader', operationType];
+  if (teamName) {
+    parts.push(teamName.replace(/[^a-zA-Z0-9_-]/g, '-'));
+  }
+  parts.push(date);
+  return parts.join('_') + '.xlsx';
+}

frontend/src/utils/graniteLoaderPicklists.js

@@ -0,0 +1,65 @@
+/**
+ * Granite Loader Sheet picklist values.
+ * Extracted from docs/Team_Device Loader.xlsx reference sheets.
+ * These values are used for searchable dropdowns in the LoaderModal.
+ */
+
+export const RESPONSIBLE_TEAMS = [
+  'AE-LESS-ENDS', 'AE-TI-LESS-PIES', 'APVS-PCDS-DIGITAL-ACCESS', 'APVS-PCDS-DIGITAL-IDENTITY',
+  'APVS-UNKNOWN', 'ARCHIVED', 'AVWO-NON-CHARTER', 'AVWO-UNKNOWN', 'CARD-ABANDONED-UNKNOWN',
+  'CARD-UNKNOWN', 'CTEC-LAB-SQUAD', 'CTEC-UNKNOWN', 'FOE-FIELD OPS', 'FOE-FIELD OPS-ROC',
+  'ISP-NDC-CENTENNIAL', 'ISP-NDC-CHARLOTTE', 'ISP-NDC-COUDERSPORT', 'ISP-NDC-SIMPSONVILLE',
+  'ISP-UNKNOWN', 'IT', 'IT-DSSS-EDP', 'IT-SA-OPS', 'IT-SOC', 'MTG-CORE-ENG',
+  'MTG-WSTC-SYSTEM CERTIFICATION', 'NEO-UNKNOWN', 'NOC-METRICS-DATA WAREHOUSE', 'NON-CHARTER',
+  'NTS-AEO-ACCESS-ENG', 'NTS-AEO-ACCESS-OPS', 'NTS-AEO-INTELDEV', 'NTS-AEO-STEAM',
+  'NTS-AVOC-AIA-ANALYTICS-OPS', 'NTS-AVOC-AIA-TOOLS', 'NTS-AVOC-AIA-TOOLS-CHANGEAUTO',
+  'NTS-AVOC-AIA-TOOLS-PERFMANAG', 'NTS-AVOC-CVO', 'NTS-AVOC-OPSINTEL',
+  'NTS-AVOC-OPSINTEL-NSIGHTS', 'NTS-AVOC-RC-KM', 'NTS-AVOC-RC-TICKETING',
+  'NTS-AVOC-SCM-ISS', 'NTS-AVOC-SCM-SAPO', 'NTS-AVOC-VCO',
+  'NTS-CPE-IRCS-DASDNS', 'NTS-CPE-IRCS-DATAENG', 'NTS-CPE-IRCS-DCMS',
+  'NTS-CPE-IRCS-DEVICE-AUTOMATION', 'NTS-CPE-IRCS-DEVICE-OPERATIONS',
+  'NTS-CPE-IRCS-INTERNETRELIABILITY', 'NTS-CPE-IRCS-SCP-OPERATIONS',
+  'NTS-CPE-WIFIHWDEV-CPEHW-AUTOMATION', 'NTS-CVWO-VOICE-LAB', 'NTS-CVWO-VOICE-OPS',
+  'NTS-CVWO-WIRELESS-HMNO-WHO', 'NTS-CVWO-WIRELESS-RANEA', 'NTS-CVWO-WIRELESS-WNBO',
+  'NTS-CVWO-WIRELESS-WNO-MWF', 'NTS-CVWO-WIRELESS-WOP-WCO', 'NTS-ISP-NDC', 'NTS-ISP-OPS',
+  'NTS-NEO-BB-IP', 'NTS-NEO-BB-OPTICAL', 'NTS-NEO-CORE-IP', 'NTS-NEO-CORE-OPTICAL',
+  'NTS-NEO-IP-MGMT', 'NTS-NEO-OPSENG-LAB', 'NTS-NEO-OPSENG-TOOLS',
+  'PRDCT-VSO-VDE-ADV-DEV', 'PRDCT-VSO-VDE-ADV-FOCUS', 'PRDCT-VSO-VDE-ADV-IPOIS',
+  'PRDCT-VSO-VDE-ADV-PQI', 'PRDCT-VSO-VDE-ADV-SRTA', 'PRDCT-VSO-VDE-CI',
+  'PRDCT-VSO-VDE-ENT', 'PRDCT-VSO-VDE-IPVENG', 'PRDCT-VSO-VDE-VCDT',
+  'PRDCT-VSO-VDE-VOD-CMS', 'PRDCT-VSO-VDE-VOD-DEV', 'PRDCT-VSO-VDE-VOD-LAB',
+  'PRDCT-VSO-VSW-AIS', 'PRDCT-VSO-VSW-CRESCENDO', 'PRDCT-VSO-VSW-ENTITLEMENTS',
+  'PRDCT-VSO-VSW-GSD', 'PRDCT-VSO-VSW-IPVS', 'PRDCT-VSO-VSW-LANTERN',
+  'PRDCT-VSO-VSW-LINEUPS', 'PRDCT-VSO-VSW-METADATA', 'PRDCT-VSO-VSW-NNS',
+  'PRDCT-VSO-VSW-SETTINGS', 'PRDCT-VSO-VSW-SPECFLOW', 'PRDCT-VSO-VSW-SRE',
+  'PRDCT-VSO-VSW-TEAM', 'PRDCT-VSO-VSW-TVE', 'PRDCT-VSO-VSW-VOD', 'PRDCT-VSO-VSW-VSI',
+  'SB-EPS-ENTDATA', 'SDIT-CSD-ITLS-ACT', 'SDIT-CSD-ITLS-ENDS', 'SDIT-CSD-ITLS-LABOPS',
+  'SDIT-CSD-ITLS-LNE', 'SDIT-CSD-ITLS-LPE', 'SDIT-CSD-ITLS-NSIE', 'SDIT-CSD-ITLS-PACE',
+  'SDIT-CSD-ITLS-PIES', 'SDIT-CSD-ITLS-VLEO', 'SDIT-CSD-OBO-RDE', 'SDIT-DATA-ASSETS',
+  'SDIT-DATAASSETS-MONGODBA', 'SDIT-DATAASSETS-ORACLEDBA', 'SDIT-EDIS-CDP-DAAS-DATALOGISTICS',
+  'SDIT-EDIS-CDP-DAAS-NDS', 'SDIT-EDIS-CDS-DIGITALSERVICES', 'SDIT-EDIS-CIC-NEBULA',
+  'SDIT-EDIS-ITEI-CLOUD', 'SDIT-EDIS-ITEI-EMAIL', 'SDIT-EDIS-ITEI-TAAS-CIE',
+  'SDIT-EDIS-ITEI-TAAS-DM', 'SDIT-EDIS-NAAS-DESIGN', 'SDIT-EDIS-NAAS-FIREWALL',
+  'SDIT-EDIS-NAAS-IMPLEMENTATION', 'SDIT-EDIS-NAAS-INSTALL', 'SDIT-EDIS-NAAS-NAT',
+  'SDIT-EDIS-NAAS-OPERATIONS', 'SDIT-EDIS-PAAS-PRIVATE-CLOUD', 'SDIT-EDIS-PAAS-PUBCLD',
+  'SDIT-ITSA-OPS', 'SDIT-ITSA-OPS-IDOS', 'SDIT-ITSA-OPS-PQR-SCI', 'SDIT-ITSA-TOO',
+  'SDIT-MOBILE', 'SDIT-MOBILE-ACTIVATION', 'SDIT-PCDS-SA-ACTIVATIONS',
+  'SDIT-PCDS-SA-ANALYSTS', 'SDIT-PCDS-SA-PROVISIONING', 'SDIT-PCDS-SA-SCI',
+  'SDIT-SVCEXP-VCT-DESIGN', 'SN-OPS-NEWS', 'SPECTRUM ENTERPRISE', 'SPECTRUM REACH',
+  'SROPS-DATA', 'SROPS-SPECTRUM REACH OPS', 'TEST-NEW-TEAM', 'TEST-OLD-TEAM',
+  'VDE-MAPD-DEV', 'VDE-MAPD-DEV2', 'VDE-VOD-NVIS', 'VDE-VOD-REPORTING',
+  'WTG-WAE-ACCESS ENGINEERING', 'WTG-WCE-SYS ENG', 'WTG-WDE-DEVICE ENGINEERING',
+  'WTG-WRD-CONNECTIVITY', 'WTG-WRD-RESEARCH AND DEVELOPMENT',
+];
+
+export const EQUIP_STATUSES = ['ACTIVE', 'DESIGNED', 'PENDING DECOMMISSION', 'DECOMMISSIONED'];
+
+export const EQUIPMENT_CLASSES = ['S', 'C'];
+
+// Small list — columns that should render as searchable dropdowns
+// Maps column ID → options array
+export const COLUMN_PICKLISTS = {
+  RESPONSIBLE_TEAM: RESPONSIBLE_TEAMS,
+  EQUIP_STATUS: EQUIP_STATUSES,
+  EQUIPMENT_CLASS: EQUIPMENT_CLASSES,
+};