@striae-org/striae 6.0.0 → 6.1.0

package/package.json

@@ -1,142 +1,140 @@
-{
-  "name": "@striae-org/striae",
-  "version": "6.0.0",
-  "private": false,
-  "description": "Striae is a specialized, cloud-native platform designed to streamline forensic firearms identification by providing an intuitive environment for digital comparison image annotation, authenticated confirmations, and automated report generation.",
-  "license": "Apache-2.0",
-  "homepage": "https://github.com/striae-org/striae/wiki",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/striae-org/striae.git"
-  },
-  "funding": {
-    "type": "github",
-    "url": "https://github.com/sponsors/striae-org"
-  },
-  "bugs": {
-    "url": "https://github.com/striae-org/striae/issues"
-  },
-  "keywords": [
-    "forensics",
-    "firearms",
-    "annotation",
-    "react",
-    "cloudflare-workers",
-    "authenticated",
-    "confirmations",
-    "chain-of-custody",
-    "audit-trail"
-  ],
-  "publishConfig": {
-    "access": "public"
-  },
-  "files": [
-    "app/",
-    "!app/config",
-    "!app/routes/auth/login.tsx",
-    "!app/routes/auth/login.module.css",
-    "react-router.config.ts",
-    "load-context.ts",
-    "scripts/",
-    "functions/",
-    "public/",
-    "workers/",
-    "!workers/*/.wrangler",
-    "!workers/*/package-lock.json",
-    "!workers/*/worker-configuration.d.ts",
-    "!workers/*/wrangler.jsonc",
-    "!workers/*/src/**/*worker.ts",
-    "!workers/pdf-worker/src/assets/**/*",
-    "workers/pdf-worker/src/assets/generated-assets.example.ts",
-    "!workers/pdf-worker/src/formats/**/*",
-    "workers/pdf-worker/src/formats/format-striae.ts",
-    ".env.example",
-    "primershear.emails.example",
-    "members.emails.example",
-    "firebase.json",
-    "tsconfig.json",
-    "vite.config.ts",
-    "/worker-configuration.d.ts",
-    "wrangler.toml.example",    
-    "LICENSE"
-  ],
-  "sideEffects": false,
-  "type": "module",
-  "scripts": {
-    "deploy:all": "bash ./scripts/deploy-all.sh",
-    "emulators": "firebase emulators:start --only auth",
-    "dev": "node ./scripts/dev.cjs && react-router dev",
-    "build": "node ./scripts/dev.cjs && react-router build",
-    "clean": "rm -rf build node_modules/.cache .cache",
-    "clean:build": "npm run clean && npm run build",
-    "deploy": "npm run build && wrangler pages deploy",
-    "publish:npm": "npm publish --access public --registry=https://registry.npmjs.org --@striae-org:registry=https://registry.npmjs.org",
-    "publish:npm:dry-run": "npm publish --dry-run --access public --registry=https://registry.npmjs.org --@striae-org:registry=https://registry.npmjs.org",
-    "publish:github": "npm publish --registry=https://npm.pkg.github.com --@striae-org:registry=https://npm.pkg.github.com",
-    "publish:github:dry-run": "npm publish --dry-run --registry=https://npm.pkg.github.com --@striae-org:registry=https://npm.pkg.github.com",
-    "publish:all": "npm run publish:npm && npm run publish:github",
-    "publish:all:dry-run": "npm run publish:npm:dry-run && npm run publish:github:dry-run",
-    "lint": "node ./scripts/run-eslint.cjs",
-    "start": "node ./scripts/dev.cjs && wrangler pages dev",
-    "typecheck": "react-router typegen && tsc",
-    "typegen": "wrangler types",
-    "preview": "npm run build && wrangler pages dev",
-    "cf-typegen": "wrangler types",
-    "enable-totp-mfa": "node ./scripts/enable-totp-mfa.mjs",
-    "unenroll-totp-mfa": "node ./scripts/unenroll-totp-mfa.mjs",
-    "update-versions": "node ./scripts/update-markdown-versions.cjs",
-    "update-compatibility-dates": "node ./scripts/update-compatibility-dates.cjs",
-    "deploy-config": "bash ./scripts/deploy-config.sh",
-    "update-env": "bash ./scripts/deploy-config.sh --update-env",
-    "install-workers": "bash ./scripts/install-workers.sh",
-    "deploy-workers": "npm run deploy-workers:audit && npm run deploy-workers:data && npm run deploy-workers:image && npm run deploy-workers:pdf && npm run deploy-workers:user",
-    "deploy-workers:secrets": "bash ./scripts/deploy-worker-secrets.sh",
-    "deploy-pages:secrets": "bash ./scripts/deploy-pages-secrets.sh",
-    "deploy-pages": "bash ./scripts/deploy-pages.sh",
-    "deploy-primershear": "bash ./scripts/deploy-primershear-emails.sh",
-    "deploy-members": "bash ./scripts/deploy-members-emails.sh",
-    "deploy-workers:audit": "cd workers/audit-worker && npm run deploy",
-    "deploy-workers:data": "cd workers/data-worker && npm run deploy",
-    "deploy-workers:image": "cd workers/image-worker && npm run deploy",
-    "deploy-workers:pdf": "cd workers/pdf-worker && npm run deploy",
-    "deploy-workers:user": "cd workers/user-worker && npm run deploy"
-  },
-  "dependencies": {
-    "@react-router/cloudflare": "^7.14.0",
-    "firebase": "^12.12.0",
-    "isbot": "^5.1.37",
-    "jszip": "^3.10.1",
-    "qrcode": "^1.5.4",
-    "react": "^19.2.5",
-    "react-dom": "^19.2.5",
-    "react-router": "^7.14.0"
-  },
-  "devDependencies": {
-    "@react-router/dev": "^7.14.0",
-    "@react-router/fs-routes": "^7.14.0",
-    "@types/qrcode": "^1.5.6",
-    "@types/react": "^19.2.14",
-    "@types/react-dom": "^19.2.3",
-    "@typescript-eslint/eslint-plugin": "^8.58.1",
-    "@typescript-eslint/parser": "^8.58.1",
-    "eslint": "^9.39.4",
-    "eslint-import-resolver-typescript": "^4.4.4",
-    "eslint-plugin-import": "^2.32.0",
-    "eslint-plugin-jsx-a11y": "^6.10.2",
-    "eslint-plugin-react": "^7.37.5",
-    "eslint-plugin-react-hooks": "^7.0.1",
-    "firebase-admin": "^13.8.0",
-    "modern-normalize": "^3.0.1",
-    "typescript": "^5.9.3",
-    "vite": "^7.3.2",
-    "vite-tsconfig-paths": "^6.1.1",
-    "wrangler": "^4.81.1"
-  },
-  "overrides": {
-    "@tootallnate/once": "3.0.1"
-  },
-  "engines": {
-    "node": ">=20.19.0"
-  },
-  "packageManager": "npm@11.11.0"
+{
+  "name": "@striae-org/striae",
+  "version": "6.1.0",
+  "private": false,
+  "description": "Striae is a specialized, cloud-native platform designed to streamline forensic firearms identification by providing an intuitive environment for digital comparison image annotation, authenticated confirmations, and automated report generation.",
+  "license": "Apache-2.0",
+  "homepage": "https://github.com/striae-org/striae/wiki",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/striae-org/striae.git"
+  },
+  "funding": {
+    "type": "github",
+    "url": "https://github.com/sponsors/striae-org"
+  },
+  "bugs": {
+    "url": "https://github.com/striae-org/striae/issues"
+  },
+  "keywords": [
+    "forensics",
+    "firearms",
+    "annotation",
+    "react",
+    "cloudflare-workers",
+    "authenticated",
+    "confirmations",
+    "chain-of-custody",
+    "audit-trail"
+  ],
+  "publishConfig": {
+    "access": "public"
+  },
+  "files": [
+    "app/",
+    "!app/config",
+    "!app/routes/auth/login.tsx",
+    "!app/routes/auth/login.module.css",
+    "react-router.config.ts",
+    "load-context.ts",
+    "scripts/",
+    "functions/",
+    "public/",
+    "workers/",
+    "!workers/*/.wrangler",
+    "!workers/*/package-lock.json",
+    "!workers/*/worker-configuration.d.ts",
+    "!workers/*/wrangler.jsonc",
+    "!workers/*/src/**/*worker.ts",
+    "!workers/pdf-worker/src/assets/**/*",
+    "workers/pdf-worker/src/assets/generated-assets.example.ts",
+    "!workers/pdf-worker/src/formats/**/*",
+    "workers/pdf-worker/src/formats/format-striae.ts",
+    ".env.example",
+    "firebase.json",
+    "tsconfig.json",
+    "vite.config.ts",
+    "/worker-configuration.d.ts",
+    "wrangler.toml.example",
+    "LICENSE"
+  ],
+  "sideEffects": false,
+  "type": "module",
+  "scripts": {
+    "deploy:all": "bash ./scripts/deploy-all.sh",
+    "emulators": "firebase emulators:start --only auth",
+    "dev": "node ./scripts/dev.cjs && react-router dev",
+    "build": "node ./scripts/dev.cjs && react-router build",
+    "clean": "rm -rf build node_modules/.cache .cache",
+    "clean:build": "npm run clean && npm run build",
+    "deploy": "npm run build && wrangler pages deploy",
+    "publish:npm": "npm publish --access public --registry=https://registry.npmjs.org --@striae-org:registry=https://registry.npmjs.org",
+    "publish:npm:dry-run": "npm publish --dry-run --access public --registry=https://registry.npmjs.org --@striae-org:registry=https://registry.npmjs.org",
+    "publish:github": "npm publish --registry=https://npm.pkg.github.com --@striae-org:registry=https://npm.pkg.github.com",
+    "publish:github:dry-run": "npm publish --dry-run --registry=https://npm.pkg.github.com --@striae-org:registry=https://npm.pkg.github.com",
+    "publish:all": "npm run publish:npm && npm run publish:github",
+    "publish:all:dry-run": "npm run publish:npm:dry-run && npm run publish:github:dry-run",
+    "lint": "node ./scripts/run-eslint.cjs",
+    "start": "node ./scripts/dev.cjs && wrangler pages dev",
+    "typecheck": "react-router typegen && tsc",
+    "typegen": "wrangler types",
+    "preview": "npm run build && wrangler pages dev",
+    "cf-typegen": "wrangler types",
+    "enable-totp-mfa": "node ./scripts/enable-totp-mfa.mjs",
+    "unenroll-totp-mfa": "node ./scripts/unenroll-totp-mfa.mjs",
+    "update-versions": "node ./scripts/update-markdown-versions.cjs",
+    "update-compatibility-dates": "node ./scripts/update-compatibility-dates.cjs",
+    "deploy-config": "bash ./scripts/deploy-config.sh",
+    "update-env": "bash ./scripts/deploy-config.sh --update-env",
+    "install-workers": "bash ./scripts/install-workers.sh",
+    "deploy-workers": "npm run deploy-workers:audit && npm run deploy-workers:data && npm run deploy-workers:image && npm run deploy-workers:pdf && npm run deploy-workers:user",
+    "deploy-workers:secrets": "bash ./scripts/deploy-worker-secrets.sh",
+    "deploy-pages:secrets": "bash ./scripts/deploy-pages-secrets.sh",
+    "deploy-pages": "bash ./scripts/deploy-pages.sh",
+    "deploy-primershear": "bash ./scripts/deploy-primershear-emails.sh",
+    "deploy-members": "bash ./scripts/deploy-members-emails.sh",
+    "deploy-workers:audit": "cd workers/audit-worker && npm run deploy",
+    "deploy-workers:data": "cd workers/data-worker && npm run deploy",
+    "deploy-workers:image": "cd workers/image-worker && npm run deploy",
+    "deploy-workers:pdf": "cd workers/pdf-worker && npm run deploy",
+    "deploy-workers:user": "cd workers/user-worker && npm run deploy"
+  },
+  "dependencies": {
+    "@react-router/cloudflare": "^7.14.1",
+    "firebase": "^12.12.0",
+    "isbot": "^5.1.38",
+    "jszip": "^3.10.1",
+    "qrcode": "^1.5.4",
+    "react": "^19.2.5",
+    "react-dom": "^19.2.5",
+    "react-router": "^7.14.1"
+  },
+  "devDependencies": {
+    "@react-router/dev": "^7.14.1",
+    "@react-router/fs-routes": "^7.14.1",
+    "@types/qrcode": "^1.5.6",
+    "@types/react": "^19.2.14",
+    "@types/react-dom": "^19.2.3",
+    "@typescript-eslint/eslint-plugin": "^8.58.2",
+    "@typescript-eslint/parser": "^8.58.2",
+    "eslint": "^9.39.4",
+    "eslint-import-resolver-typescript": "^4.4.4",
+    "eslint-plugin-import": "^2.32.0",
+    "eslint-plugin-jsx-a11y": "^6.10.2",
+    "eslint-plugin-react": "^7.37.5",
+    "eslint-plugin-react-hooks": "^7.0.1",
+    "firebase-admin": "^13.8.0",
+    "modern-normalize": "^3.0.1",
+    "typescript": "^5.9.3",
+    "vite": "^7.3.2",
+    "vite-tsconfig-paths": "^6.1.1",
+    "wrangler": "^4.82.2"
+  },
+  "overrides": {
+    "@tootallnate/once": "3.0.1"
+  },
+  "engines": {
+    "node": ">=20.19.0"
+  },
+  "packageManager": "npm@11.12.0"
 }

package/scripts/deploy-config.sh

@@ -200,6 +200,36 @@ source "$DEPLOY_CONFIG_VALIDATION_MODULE"
 source "$DEPLOY_CONFIG_SCAFFOLDING_MODULE"
 source "$DEPLOY_CONFIG_PROMPT_MODULE"
 
+EMAIL_LIST_CONFIG_DIR="app/config"
+MEMBERS_EMAILS_FILE="$EMAIL_LIST_CONFIG_DIR/members.emails"
+PRIMERSHEAR_EMAILS_FILE="$EMAIL_LIST_CONFIG_DIR/primershear.emails"
+
+sync_env_var_from_email_list_file() {
+    local env_var_name=$1
+    local file_path=$2
+    local loaded_values=""
+
+    if [ ! -f "$file_path" ]; then
+        echo -e "${YELLOW}⚠️  $file_path not found; keeping existing $env_var_name value in .env${NC}"
+        return 0
+    fi
+
+    loaded_values=$(grep -v '^[[:space:]]*#' "$file_path" | grep -v '^[[:space:]]*$' | sed -e 's/\r$//' -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//' | paste -sd ',' - || true)
+
+    write_env_var "$env_var_name" "$loaded_values"
+    export "$env_var_name=$loaded_values"
+
+    local loaded_count
+    loaded_count=$(echo "$loaded_values" | tr ',' '\n' | grep -c '[^[:space:]]' || true)
+    echo -e "${GREEN}✅ Synced $env_var_name from $file_path ($loaded_count entry/entries)${NC}"
+}
+
+sync_email_list_env_vars_from_config() {
+    echo -e "${YELLOW}📧 Syncing optional email list env vars from app/config...${NC}"
+    sync_env_var_from_email_list_file "REGISTRATION_EMAILS" "$MEMBERS_EMAILS_FILE"
+    sync_env_var_from_email_list_file "PRIMERSHEAR_EMAILS" "$PRIMERSHEAR_EMAILS_FILE"
+}
+
 if [ "$validate_only" = "true" ]; then
     echo -e "\n${BLUE}🧪 Validate-only mode enabled${NC}"
     run_validation_checkpoint
@@ -217,6 +247,9 @@ load_admin_service_credentials
 # Always prompt for secrets to ensure configuration
 prompt_for_secrets
 
+# Keep optional email list env vars aligned with app/config source files.
+sync_email_list_env_vars_from_config
+
 # Validate after secrets have been configured
 validate_required_vars
 

package/scripts/deploy-members-emails.sh

@@ -3,7 +3,7 @@
 # ============================================
 # MEMBERS EMAIL LIST DEPLOYMENT SCRIPT
 # ============================================
-# Reads members.emails, updates REGISTRATION_EMAILS in .env,
+# Reads app/config/members.emails, updates REGISTRATION_EMAILS in .env,
 # then deploys that secret directly to Cloudflare Pages (production).
 
 set -e
@@ -26,12 +26,12 @@ trap 'echo -e "\n${RED}❌ deploy-members-emails.sh failed near line ${LINENO}${
 
 # ── Read emails file ──────────────────────────────────────────────────────────
 
-EMAILS_FILE="$PROJECT_ROOT/members.emails"
+EMAILS_FILE="$PROJECT_ROOT/app/config/members.emails"
 
 if [ ! -f "$EMAILS_FILE" ]; then
     echo -e "${RED}❌ members.emails not found at: $EMAILS_FILE${NC}"
     echo -e "${YELLOW}   Create it with one email address or @domain.com wildcard per line.${NC}"
-    echo -e "${YELLOW}   See members.emails.example for the format.${NC}"
+    echo -e "${YELLOW}   See app/config-example/members.emails for the format.${NC}"
     exit 1
 fi
 
@@ -45,7 +45,7 @@ if [ -z "$REGISTRATION_EMAILS" ]; then
 fi
 
 ENTRY_COUNT=$(echo "$REGISTRATION_EMAILS" | tr ',' '\n' | grep -c '[^[:space:]]' || true)
-echo -e "${GREEN}✅ Loaded $ENTRY_COUNT entry(ies) from members.emails${NC}"
+echo -e "${GREEN}✅ Loaded $ENTRY_COUNT entry(ies) from app/config/members.emails${NC}"
 
 # ── Update .env ───────────────────────────────────────────────────────────────
 

package/scripts/deploy-primershear-emails.sh

@@ -3,7 +3,7 @@
 # ============================================
 # PRIMERSHEAR EMAIL LIST DEPLOYMENT SCRIPT
 # ============================================
-# Reads primershear.emails, updates PRIMERSHEAR_EMAILS in .env,
+# Reads app/config/primershear.emails, updates PRIMERSHEAR_EMAILS in .env,
 # then deploys that secret directly to Cloudflare Pages (production).
 
 set -e
@@ -26,7 +26,7 @@ trap 'echo -e "\n${RED}❌ deploy-primershear-emails.sh failed near line ${LINEN
 
 # ── Read emails file ──────────────────────────────────────────────────────────
 
-EMAILS_FILE="$PROJECT_ROOT/primershear.emails"
+EMAILS_FILE="$PROJECT_ROOT/app/config/primershear.emails"
 
 if [ ! -f "$EMAILS_FILE" ]; then
     echo -e "${RED}❌ primershear.emails not found at: $EMAILS_FILE${NC}"
@@ -44,7 +44,7 @@ if [ -z "$PRIMERSHEAR_EMAILS" ]; then
 fi
 
 EMAIL_COUNT=$(echo "$PRIMERSHEAR_EMAILS" | tr ',' '\n' | grep -c '[^[:space:]]' || true)
-echo -e "${GREEN}✅ Loaded $EMAIL_COUNT email address(es) from primershear.emails${NC}"
+echo -e "${GREEN}✅ Loaded $EMAIL_COUNT email address(es) from app/config/primershear.emails${NC}"
 
 # ── Update .env ───────────────────────────────────────────────────────────────
 

package/workers/audit-worker/package.json

@@ -1,6 +1,6 @@
 {
   "name": "audit-worker",
-  "version": "6.0.0",
+  "version": "6.1.0",
   "private": true,
   "scripts": {
     "deploy": "wrangler deploy",
@@ -8,6 +8,6 @@
     "start": "wrangler dev"
   },
   "devDependencies": {
-    "wrangler": "^4.81.1"
+    "wrangler": "^4.82.2"
   }
 }

package/workers/audit-worker/wrangler.jsonc.example

@@ -7,7 +7,7 @@
   "name": "AUDIT_WORKER_NAME",
   "account_id": "ACCOUNT_ID",
   "main": "src/audit-worker.ts",
-  "compatibility_date": "2026-04-11",
+  "compatibility_date": "2026-04-14",
   "compatibility_flags": [
     "nodejs_compat"
   ], 

package/workers/data-worker/package.json

@@ -1,6 +1,6 @@
 {
   "name": "data-worker",
-  "version": "6.0.0",
+  "version": "6.1.0",
   "private": true,
   "scripts": {
     "deploy": "wrangler deploy",
@@ -8,6 +8,6 @@
     "start": "wrangler dev"
   },
   "devDependencies": {
-    "wrangler": "^4.81.1"
+    "wrangler": "^4.82.2"
   }
 }

package/workers/data-worker/wrangler.jsonc.example

@@ -5,7 +5,7 @@
   "name": "DATA_WORKER_NAME",
   "account_id": "ACCOUNT_ID",
   "main": "src/data-worker.ts",
-  "compatibility_date": "2026-04-11",
+  "compatibility_date": "2026-04-14",
   "compatibility_flags": [
     "nodejs_compat"
   ], 

package/workers/image-worker/package.json

@@ -1,6 +1,6 @@
 {
   "name": "image-worker",
-  "version": "6.0.0",
+  "version": "6.1.0",
   "private": true,
   "scripts": {
     "deploy": "wrangler deploy",
@@ -8,6 +8,6 @@
     "start": "wrangler dev"
   },
   "devDependencies": {
-    "wrangler": "^4.81.1"
+    "wrangler": "^4.82.2"
   }
 }

package/workers/image-worker/wrangler.jsonc.example

@@ -2,7 +2,7 @@
   "name": "IMAGES_WORKER_NAME",
   "account_id": "ACCOUNT_ID",
   "main": "src/image-worker.ts",
-  "compatibility_date": "2026-04-11",
+  "compatibility_date": "2026-04-14",
   "compatibility_flags": [
     "nodejs_compat"
   ], 

package/workers/pdf-worker/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pdf-worker",
-  "version": "6.0.0",
+  "version": "6.1.0",
   "private": true,
   "scripts": {
     "generate:assets": "node scripts/generate-assets.js",
@@ -9,6 +9,6 @@
     "start": "wrangler dev"
   },
   "devDependencies": {
-    "wrangler": "^4.81.1"
+    "wrangler": "^4.82.2"
   }
 }

package/workers/pdf-worker/src/formats/format-striae.ts

@@ -7,6 +7,14 @@ export const renderReport: ReportRenderer = (data: PDFGenerationData): string =>
   const annotationsSet = new Set(activeAnnotations);
   const hasImage = Boolean(imageUrl && imageUrl !== '/clear.jpg');
   const safeText = (value: unknown): string => escapeHtml(String(value ?? ''));
+  const leftAdditionalNotes = annotationData?.leftAdditionalNotes?.trim() || '';
+  const rightAdditionalNotes = annotationData?.rightAdditionalNotes?.trim() || '';
+  const generalAdditionalNotes = annotationData?.additionalNotes?.trim() || '';
+  const hasSideAdditionalNotes = Boolean(leftAdditionalNotes || rightAdditionalNotes);
+  const hasGeneralAdditionalNotes = Boolean(generalAdditionalNotes);
+  const hasAdditionalNotes = hasSideAdditionalNotes || hasGeneralAdditionalNotes;
+  const hasConfirmationOrNotes = Boolean(annotationData && ((annotationData.includeConfirmation === true) || hasAdditionalNotes));
+  const notesShouldStartNewPage = hasImage || annotationData?.includeConfirmation === true;
 
   // Programmatically determine if a color is dark and needs a light background
   const needsLightBackground = (color: string | undefined): boolean => {
@@ -323,6 +331,15 @@ export const renderReport: ReportRenderer = (data: PDFGenerationData): string =>
         font-family: 'Inter', Arial, sans-serif;
         color: #333;
       }
+      .additional-notes-grid {
+        display: flex;
+        align-items: stretch;
+        gap: 12px;
+      }
+      .additional-notes-section--half {
+        flex: 1 1 50%;
+        width: 50%;
+      }
       .additional-notes-title {
         margin: 0 0 10px;
         font-size: 12px;
@@ -415,15 +432,31 @@ export const renderReport: ReportRenderer = (data: PDFGenerationData): string =>
         </div>
         ` : '<div class="support-level-annotation"></div>'}
         
-        ${annotationData && annotationsSet?.has('class') ? `
+        ${annotationData && annotationsSet?.has('item') ? `
         <div class="class-annotation">
           <div class="class-text-annotation">
-            ${safeText(annotationData.customClass || annotationData.classType)}${annotationData.classNote ? ` (${safeText(annotationData.classNote)})` : ''}
+            ${(() => {
+              const leftValue = annotationData.leftCustomClass || annotationData.leftItemType;
+              const rightValue = annotationData.rightCustomClass || annotationData.rightItemType;
+              const legacyValue = annotationData.customClass || annotationData.itemType || annotationData.classType;
+              const displayValue =
+                leftValue && rightValue && leftValue !== rightValue
+                  ? `${leftValue} / ${rightValue}`
+                  : leftValue || rightValue || legacyValue;
+              const leftClassNote = annotationData.leftClassNote?.trim();
+              const rightClassNote = annotationData.rightClassNote?.trim();
+              const legacyClassNote = annotationData.classNote?.trim();
+              const displayClassNote =
+                leftClassNote && rightClassNote && leftClassNote !== rightClassNote
+                  ? `${leftClassNote} / ${rightClassNote}`
+                  : leftClassNote || rightClassNote || legacyClassNote;
+              return safeText(displayValue || '') + (displayClassNote ? ` (${safeText(displayClassNote)})` : '');
+            })()}
           </div>
         </div>
         ` : '<div class="class-annotation"></div>'}
         
-        ${annotationData && annotationsSet?.has('class') && annotationData.hasSubclass ? `
+        ${annotationData && annotationsSet?.has('item') && (annotationData.leftHasSubclass || annotationData.rightHasSubclass || annotationData.hasSubclass) ? `
         <div class="subclass-annotation">
           <div class="subclass-text">
             POTENTIAL SUBCLASS
@@ -434,7 +467,7 @@ export const renderReport: ReportRenderer = (data: PDFGenerationData): string =>
     </div>
     ` : ''}
     
-    ${annotationData && ((annotationData.includeConfirmation === true) || annotationData.additionalNotes) ? `
+    ${hasConfirmationOrNotes ? `
     <div class="confirmation-section">
       ${annotationData && (annotationData.includeConfirmation === true) ? `
         <div class="confirmation-summary">
@@ -465,10 +498,34 @@ export const renderReport: ReportRenderer = (data: PDFGenerationData): string =>
         </div>
       ` : ''}
 
-      ${annotationData && annotationsSet?.has('notes') && annotationData.additionalNotes && annotationData.additionalNotes.trim() ? `
-      <section class="additional-notes-section ${hasImage || annotationData.includeConfirmation === true ? 'notes-page' : ''}">
-        <h2 class="additional-notes-title">Additional Notes</h2>
-        <p class="additional-notes-body">${escapeHtml(annotationData.additionalNotes.trim())}</p>
+      ${annotationData && annotationsSet?.has('notes') && hasAdditionalNotes ? `
+      <section class="${notesShouldStartNewPage ? 'notes-page' : ''}">
+        ${hasSideAdditionalNotes ? `
+          ${leftAdditionalNotes && rightAdditionalNotes ? `
+            <div class="additional-notes-grid">
+              <div class="additional-notes-section additional-notes-section--half">
+                <h2 class="additional-notes-title">Additional Notes (L)</h2>
+                <p class="additional-notes-body">${escapeHtml(leftAdditionalNotes)}</p>
+              </div>
+              <div class="additional-notes-section additional-notes-section--half">
+                <h2 class="additional-notes-title">Additional Notes (R)</h2>
+                <p class="additional-notes-body">${escapeHtml(rightAdditionalNotes)}</p>
+              </div>
+            </div>
+          ` : `
+            <div class="additional-notes-section">
+              <h2 class="additional-notes-title">Additional Notes (${leftAdditionalNotes ? 'L' : 'R'})</h2>
+              <p class="additional-notes-body">${escapeHtml(leftAdditionalNotes || rightAdditionalNotes)}</p>
+            </div>
+          `}
+        ` : ''}
+
+        ${hasGeneralAdditionalNotes ? `
+          <div class="additional-notes-section" style="margin-top: ${hasSideAdditionalNotes ? '12px' : '0'};">
+            <h2 class="additional-notes-title">Additional Notes (General)</h2>
+            <p class="additional-notes-body">${escapeHtml(generalAdditionalNotes)}</p>
+          </div>
+        ` : ''}
       </section>
       ` : ''}
     </div>

package/workers/pdf-worker/src/report-types.ts

@@ -33,7 +33,17 @@ export interface AnnotationData {
   // ID/Support level annotations
   supportLevel?: 'ID' | 'Exclusion' | 'Inconclusive';
 
-  // Class annotations
+  // Class annotations (left/right per-item)
+  leftItemType?: string;
+  leftCustomClass?: string;
+  leftClassNote?: string;
+  leftHasSubclass?: boolean;
+  rightItemType?: string;
+  rightCustomClass?: string;
+  rightClassNote?: string;
+  rightHasSubclass?: boolean;
+  // Legacy (kept for backward compatibility)
+  itemType?: string;
   classType?: string;
   customClass?: string;
   classNote?: string;
@@ -44,6 +54,8 @@ export interface AnnotationData {
   confirmationData?: ConfirmationData;
 
   // Notes
+  leftAdditionalNotes?: string;
+  rightAdditionalNotes?: string;
   additionalNotes?: string;
 }