@striae-org/striae 5.2.1 → 5.3.1

package/app/routes/striae/striae.tsx

@@ -5,13 +5,15 @@ import { Navbar } from '~/components/navbar/navbar';
 import { RenameCaseModal } from '~/components/navbar/case-modals/rename-case-modal';
 import { ArchiveCaseModal } from '~/components/navbar/case-modals/archive-case-modal';
 import { OpenCaseModal } from '~/components/navbar/case-modals/open-case-modal';
+import { ExportCaseModal } from '~/components/navbar/case-modals/export-case-modal';
+import { ExportConfirmationsModal } from '~/components/navbar/case-modals/export-confirmations-modal';
 import { Toolbar } from '~/components/toolbar/toolbar';
 import { Canvas } from '~/components/canvas/canvas';
-import { Toast } from '~/components/toast/toast';
+import { Toast, type ToastType } from '~/components/toast/toast';
 import { getImageUrl, fetchFiles, deleteFile } from '~/components/actions/image-manage';
 import { getNotes, saveNotes } from '~/components/actions/notes-manage';
 import { generatePDF } from '~/components/actions/generate-pdf';
-import { CaseExport, type ExportFormat } from '~/components/sidebar/case-export/case-export';
+import { exportConfirmationData } from '~/components/actions/confirm-export';
 import { CasesModal } from '~/components/sidebar/cases/cases-modal';
 import { FilesModal } from '~/components/sidebar/files/files-modal';
 import { NotesEditorModal } from '~/components/sidebar/notes/notes-editor-modal';
@@ -20,7 +22,7 @@ import { fetchUserApi } from '~/utils/api';
 import { type AnnotationData, type FileData } from '~/types';
 import { validateCaseNumber, renameCase, deleteCase, checkExistingCase, createNewCase, archiveCase, getCaseArchiveDetails } from '~/components/actions/case-manage';
 import { checkReadOnlyCaseExists, deleteReadOnlyCase } from '~/components/actions/case-review';
-import { canCreateCase } from '~/utils/data';
+import { canCreateCase, getCaseConfirmationSummary } from '~/utils/data';
 import {
   resolveEarliestAnnotationTimestamp,
   CREATE_READ_ONLY_CASE_EXISTS_ERROR,
@@ -77,8 +79,8 @@ export const Striae = ({ user }: StriaePage) => {
   const [isGeneratingPDF, setIsGeneratingPDF] = useState(false);
   const [showToast, setShowToast] = useState(false);
   const [toastMessage, setToastMessage] = useState('');
-  const [toastType, setToastType] = useState<'success' | 'error' | 'warning'>('success');
-  const [isCaseExportModalOpen, setIsCaseExportModalOpen] = useState(false);
+  const [toastType, setToastType] = useState<ToastType>('success');
+  const [toastDuration, setToastDuration] = useState(4000);
   const [isAuditTrailOpen, setIsAuditTrailOpen] = useState(false);
   const [isRenameCaseModalOpen, setIsRenameCaseModalOpen] = useState(false);
   const [isOpenCaseModalOpen, setIsOpenCaseModalOpen] = useState(false);
@@ -91,6 +93,14 @@ export const Striae = ({ user }: StriaePage) => {
   const [isOpeningCase, setIsOpeningCase] = useState(false);
   const [openCaseHelperText, setOpenCaseHelperText] = useState('');
   const [isArchiveCaseModalOpen, setIsArchiveCaseModalOpen] = useState(false);
+  const [isExportCaseModalOpen, setIsExportCaseModalOpen] = useState(false);
+  const [isExportingCase, setIsExportingCase] = useState(false);
+  const [isExportConfirmationsModalOpen, setIsExportConfirmationsModalOpen] = useState(false);
+  const [isExportingConfirmations, setIsExportingConfirmations] = useState(false);
+  const [exportConfirmationStats, setExportConfirmationStats] = useState<{
+    confirmedCount: number;
+    unconfirmedCount: number;
+  } | null>(null);
   const [archiveDetails, setArchiveDetails] = useState<{
     archived: boolean;
     archivedAt?: string;
@@ -253,13 +263,19 @@ export const Striae = ({ user }: StriaePage) => {
       setIsGeneratingPDF,
       setToastType,
       setToastMessage,
-      setShowToast
+      setShowToast,
+      setToastDuration
     });
   };
 
-  const showNotification = (message: string, type: 'success' | 'error' | 'warning' = 'success') => {
+  const showNotification = (
+    message: string,
+    type: ToastType = 'success',
+    duration = 4000
+  ) => {
     setToastType(type);
     setToastMessage(message);
+    setToastDuration(duration);
     setShowToast(true);
   };
 
@@ -270,60 +286,82 @@ export const Striae = ({ user }: StriaePage) => {
 
   const handleExport = async (
     exportCaseNumber: string,
-    format: ExportFormat,
-    includeImages?: boolean,
+    designatedReviewerEmail?: string,
     onProgress?: (progress: number, label: string) => void
   ) => {
-    const caseExportActions = await loadCaseExportActions();
-
-    if (includeImages) {
-      await caseExportActions.downloadCaseAsZip(user, exportCaseNumber, format, (progress) => {
-        const label = getExportProgressLabel(progress);
-        onProgress?.(Math.round(progress), label);
-      });
-      showNotification(`Case ${exportCaseNumber} exported successfully.`, 'success');
+    if (!exportCaseNumber) {
+      showNotification('Select a case before exporting.', 'error');
       return;
     }
 
-    onProgress?.(5, 'Loading case data');
-    const exportData = await caseExportActions.exportCaseData(
-      user,
-      exportCaseNumber,
-      { includeMetadata: true },
-      (current, total, label) => {
-        const progress = total > 0 ? Math.round(10 + (current / total) * 60) : 10;
-        onProgress?.(progress, label);
-      }
-    );
+    showNotification(`Exporting case ${exportCaseNumber}...`, 'loading', 0);
+
+    try {
+      const caseExportActions = await loadCaseExportActions();
+
+      await caseExportActions.downloadCaseAsZip(
+        user,
+        exportCaseNumber,
+        (progress) => {
+          const roundedProgress = Math.round(progress);
+          const label = getExportProgressLabel(progress);
+          setToastType('loading');
+          setToastMessage(`Exporting case ${exportCaseNumber}... ${label} (${roundedProgress}%)`);
+          setToastDuration(0);
+          setShowToast(true);
+          onProgress?.(roundedProgress, label);
+        },
+        { designatedReviewerEmail }
+      );
 
-    onProgress?.(75, 'Preparing download');
-    if (format === 'json') {
-      await caseExportActions.downloadCaseAsJSON(user, exportData);
-    } else {
-      await caseExportActions.downloadCaseAsCSV(user, exportData);
+      showNotification(`Case ${exportCaseNumber} exported successfully.`, 'success');
+    } catch (error) {
+      showNotification(error instanceof Error ? error.message : 'Export failed. Please try again.', 'error');
     }
-    onProgress?.(100, 'Complete');
-    showNotification(`Case ${exportCaseNumber} exported successfully.`, 'success');
   };
 
-  const handleExportAll = async (
-    onProgress: (current: number, total: number, caseName: string) => void,
-    format: ExportFormat
-  ) => {
-    const caseExportActions = await loadCaseExportActions();
-    const exportData = await caseExportActions.exportAllCases(
-      user,
-      { includeMetadata: true },
-      onProgress
-    );
+  const handleExportCaseModalSubmit = async (designatedReviewerEmail: string | undefined) => {
+    setIsExportingCase(true);
+    setIsExportCaseModalOpen(false);
+    try {
+      await handleExport(currentCase || '', designatedReviewerEmail);
+    } finally {
+      setIsExportingCase(false);
+    }
+  };
+
+  const handleOpenExportConfirmationsModal = async () => {
+    if (!currentCase || !user) return;
 
-    if (format === 'json') {
-      await caseExportActions.downloadAllCasesAsJSON(user, exportData);
-    } else {
-      await caseExportActions.downloadAllCasesAsCSV(user, exportData);
+    try {
+      const summary = await getCaseConfirmationSummary(user, currentCase);
+      const filesById = summary?.filesById ?? {};
+      const values = Object.values(filesById);
+      const confirmedCount = values.filter((f) => f.includeConfirmation && f.isConfirmed).length;
+      const unconfirmedCount = values.filter((f) => f.includeConfirmation && !f.isConfirmed).length;
+      setExportConfirmationStats({ confirmedCount, unconfirmedCount });
+    } catch {
+      setExportConfirmationStats({ confirmedCount: 0, unconfirmedCount: 0 });
     }
 
-    showNotification('All cases exported successfully.', 'success');
+    setIsExportConfirmationsModalOpen(true);
+  };
+
+  const handleExportConfirmations = async () => {
+    if (!currentCase || !user) return;
+
+    setIsExportingConfirmations(true);
+    showNotification(`Exporting confirmations for case ${currentCase}...`, 'loading', 0);
+
+    try {
+      await exportConfirmationData(user, currentCase);
+      setIsExportConfirmationsModalOpen(false);
+      showNotification(`Confirmations for case ${currentCase} exported successfully.`, 'success');
+    } catch (e) {
+      showNotification(e instanceof Error ? e.message : 'Confirmation export failed. Please try again.', 'error');
+    } finally {
+      setIsExportingConfirmations(false);
+    }
   };
 
   const handleRenameCaseSubmit = async (newCaseName: string) => {
@@ -370,6 +408,8 @@ export const Striae = ({ user }: StriaePage) => {
     }
 
     setIsDeletingCase(true);
+    showNotification(`Deleting case ${currentCase}...`, 'loading', 0);
+
     try {
       const deleteResult = await deleteCase(user, currentCase);
       clearLoadedCaseState();
@@ -474,6 +514,8 @@ export const Striae = ({ user }: StriaePage) => {
     }
 
     setIsArchivingCase(true);
+    showNotification(`Archiving case ${currentCase}... Preparing archive package.`, 'loading', 0);
+
     try {
       await archiveCase(user, currentCase, archiveReason);
       setIsReadOnlyCase(true);
@@ -767,7 +809,13 @@ export const Striae = ({ user }: StriaePage) => {
           void handleOpenCaseModal();
         }}
         onOpenListAllCases={() => setIsListCasesModalOpen(true)}
-        onOpenCaseExport={() => setIsCaseExportModalOpen(true)}
+        onOpenCaseExport={() => {
+          if (isReadOnlyCase) {
+            void handleOpenExportConfirmationsModal();
+          } else {
+            setIsExportCaseModalOpen(true);
+          }
+        }}
         onOpenAuditTrail={() => setIsAuditTrailOpen(true)}
         onOpenRenameCase={() => setIsRenameCaseModalOpen(true)}
         onDeleteCase={() => {
@@ -790,7 +838,7 @@ export const Striae = ({ user }: StriaePage) => {
           onOpenCase={() => {
             void handleOpenCaseModal();
           }}
-          onOpenCaseExport={() => setIsCaseExportModalOpen(true)}
+          onOpenCaseExport={() => void handleOpenExportConfirmationsModal()}
           imageId={imageId}
           currentCase={currentCase}
           imageLoaded={imageLoaded}
@@ -883,14 +931,6 @@ export const Striae = ({ user }: StriaePage) => {
         isUploading={isUploading}
         showNotification={showNotification}
       />
-      <CaseExport
-        isOpen={isCaseExportModalOpen}
-        onClose={() => setIsCaseExportModalOpen(false)}
-        onExport={handleExport}
-        onExportAll={handleExportAll}
-        currentCaseNumber={currentCase}
-        isReadOnly={isReadOnlyCase}
-      />
       <UserAuditViewer
         caseNumber={currentCase || ''}
         isOpen={isAuditTrailOpen}
@@ -911,11 +951,29 @@ export const Striae = ({ user }: StriaePage) => {
         onClose={() => setIsArchiveCaseModalOpen(false)}
         onSubmit={handleArchiveCaseSubmit}
       />
+      <ExportCaseModal
+        isOpen={isExportCaseModalOpen}
+        caseNumber={currentCase || ''}
+        currentUserEmail={user.email ?? undefined}
+        isSubmitting={isExportingCase}
+        onClose={() => setIsExportCaseModalOpen(false)}
+        onSubmit={handleExportCaseModalSubmit}
+      />
+      <ExportConfirmationsModal
+        isOpen={isExportConfirmationsModalOpen}
+        caseNumber={currentCase || ''}
+        confirmedCount={exportConfirmationStats?.confirmedCount ?? 0}
+        unconfirmedCount={exportConfirmationStats?.unconfirmedCount ?? 0}
+        isSubmitting={isExportingConfirmations}
+        onClose={() => setIsExportConfirmationsModalOpen(false)}
+        onConfirm={() => void handleExportConfirmations()}
+      />
       <Toast
         message={toastMessage}
         type={toastType}
         isVisible={showToast}
         onClose={closeToast}
+        duration={toastDuration}
       />
     </div>
   );

package/app/services/firebase/index.ts

@@ -6,14 +6,11 @@ import {
     //connectAuthEmulator,    
  } from 'firebase/auth';
 import firebaseConfig from '~/config/firebase';
-import { getAppVersion } from '~/utils/common';
 
 export const app = initializeApp(firebaseConfig, "Striae");
 export const auth = getAuth(app);
 
 setPersistence(auth, browserSessionPersistence);
 
-console.log(`Welcome to ${app.name} v${getAppVersion()}`);
-
 //Connect to the Firebase Auth emulator if running locally
 //connectAuthEmulator(auth, 'http://127.0.0.1:9099');

package/app/types/case.ts

@@ -50,6 +50,7 @@ export interface CaseExportData {
     exportedByName: string;
     exportedByCompany: string;
     exportedByBadgeId?: string;
+    designatedReviewerEmail?: string;
     striaeExportSchemaVersion: string;
     totalFiles: number;
   };

package/app/types/export.ts

@@ -1,8 +1,8 @@
 // Export-related types and interfaces
 
 export interface ExportOptions {
-  format?: 'json' | 'csv';
   includeMetadata?: boolean;
   includeUserInfo?: boolean;
-  protectForensicData?: boolean; // Enable read-only protection
+  protectForensicData?: boolean;
+  designatedReviewerEmail?: string;
 }

package/app/types/import.ts

@@ -78,6 +78,16 @@ export interface ConfirmationImportData {
   };
 }
 
+export interface ConfirmationImportPreview {
+  caseNumber: string;
+  exportedBy: string;
+  exportedByName: string;
+  exportedByCompany: string;
+  exportedByBadgeId?: string;
+  exportDate: string;
+  totalConfirmations: number;
+}
+
 export interface CaseImportPreview {
   caseNumber: string;
   archived?: boolean;

package/app/utils/auth/index.ts

@@ -1,4 +1,3 @@
-export * from './auth';
 export * from './auth-action-settings';
 export * from './mfa';
 export * from './mfa-phone';

package/app/utils/data/permissions.ts

@@ -103,7 +103,8 @@ export const createUser = async (
   firstName: string, 
   lastName: string, 
   company: string,
-  permitted: boolean = false
+  permitted: boolean = false,
+  badgeId: string = ''
 ): Promise<UserData> => {
   try {
     const userData: UserData = {
@@ -112,7 +113,7 @@ export const createUser = async (
       firstName,
       lastName,
       company,
-      badgeId: '',
+      badgeId,
       permitted,
       cases: [],
       readOnlyCases: [],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@striae-org/striae",
-  "version": "5.2.1",
+  "version": "5.3.1",
   "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",
@@ -49,14 +49,15 @@
     "load-context.ts",
     "functions/",
     "public/",
-    "scripts/",
     "workers/*/package.json",
-    "workers/*/src/*.example.ts",
-    "workers/*/src/*.example.js",
-    "workers/*/src/*.ts",
+    "workers/*/src/**/*.example.ts",
+    "workers/*/src/**/*.example.js",
+    "workers/*/src/**/*.ts",
     "workers/pdf-worker/scripts/*.js",
-    "!workers/*/src/*worker.ts",
+    "!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",
     "workers/pdf-worker/src/report-types.ts",
     "workers/*/wrangler.jsonc.example",
@@ -96,7 +97,7 @@
     "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:keys && npm run deploy-workers:pdf && npm run deploy-workers:user",
+    "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 --production-only",
     "deploy-pages": "bash ./scripts/deploy-pages.sh",
@@ -104,13 +105,11 @@
     "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:keys": "cd workers/keys-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.13.2",
-    "exceljs": "^4.4.0",
     "firebase": "^12.10.0",
     "isbot": "^5.1.36",
     "jszip": "^3.10.1",
@@ -139,13 +138,7 @@
   },
   "overrides": {
     "tar": "7.5.11",
-    "undici": "7.24.1",
-    "exceljs": {
-      "archiver": "7.0.1",
-      "fast-csv": "5.0.5",
-      "unzipper": "0.12.3",
-      "glob": "13.0.6"
-    }
+    "undici": "7.24.1"
   },
   "engines": {
     "node": ">=20.0.0"

package/public/_headers

@@ -1,7 +1,3 @@
-/favicon.ico
-  Cache-Control: public, max-age=3600, s-maxage=3600
-/favicon.svg
-  Cache-Control: public, max-age=3600, s-maxage=3600
 /*.css
   Cache-Control: public, max-age=31536000, immutable
 /*.js

package/public/_routes.json

@@ -2,7 +2,6 @@
   "version": 1,
   "include": ["/*"],
   "exclude": [
-    "/favicon.ico",    
     "/assets/*",
     "/build/*",
     "/*.css",

package/worker-configuration.d.ts

@@ -1,6 +1,6 @@
 /* eslint-disable */
-// Generated by Wrangler by running `wrangler types` (hash: 3fce96aefe167606678b821d5dbcc109)
-// Runtime types generated with workerd@1.20250823.0 2026-03-25 nodejs_compat
+// Generated by Wrangler by running `wrangler types` (hash: d8f8f87d89a635e81e94aa31fb52008f)
+// Runtime types generated with workerd@1.20250823.0 2026-03-26 nodejs_compat
 declare namespace Cloudflare {
 	interface Env {
 		ACCOUNT_ID: string;
@@ -16,31 +16,35 @@ declare namespace Cloudflare {
 		MEASUREMENT_ID: string;
 		FIREBASE_SERVICE_ACCOUNT_EMAIL: string;
 		FIREBASE_SERVICE_ACCOUNT_PRIVATE_KEY: string;
-		PAGES_PROJECT_NAME: string;
-		PAGES_CUSTOM_DOMAIN: string;
-		KEYS_WORKER_NAME: string;
-		KEYS_WORKER_DOMAIN: string;
-		KEYS_AUTH: string;
-		ACCOUNT_HASH: string;
-		USER_WORKER_NAME: string;
-		USER_WORKER_DOMAIN: string;
-		KV_STORE_ID: string;
 		USER_KV_ENCRYPTION_PRIVATE_KEY: string;
 		USER_KV_ENCRYPTION_KEY_ID: string;
 		USER_KV_ENCRYPTION_PUBLIC_KEY: string;
-		DATA_WORKER_NAME: string;
-		DATA_BUCKET_NAME: string;
-		FILES_BUCKET_NAME: string;
-		DATA_WORKER_DOMAIN: string;
+		USER_KV_WRITE_ENDPOINTS_ENABLED: string;
+		USER_KV_ENCRYPTION_KEYS_JSON: string;
+		USER_KV_ENCRYPTION_ACTIVE_KEY_ID: string;
 		MANIFEST_SIGNING_PRIVATE_KEY: string;
 		MANIFEST_SIGNING_KEY_ID: string;
 		MANIFEST_SIGNING_PUBLIC_KEY: string;
 		EXPORT_ENCRYPTION_PRIVATE_KEY: string;
 		EXPORT_ENCRYPTION_KEY_ID: string;
 		EXPORT_ENCRYPTION_PUBLIC_KEY: string;
+		EXPORT_ENCRYPTION_KEYS_JSON: string;
+		EXPORT_ENCRYPTION_ACTIVE_KEY_ID: string;
+		DATA_AT_REST_ENCRYPTION_ENABLED: string;
 		DATA_AT_REST_ENCRYPTION_PRIVATE_KEY: string;
 		DATA_AT_REST_ENCRYPTION_KEY_ID: string;
 		DATA_AT_REST_ENCRYPTION_PUBLIC_KEY: string;
+		DATA_AT_REST_ENCRYPTION_KEYS_JSON: string;
+		DATA_AT_REST_ENCRYPTION_ACTIVE_KEY_ID: string;
+		PAGES_PROJECT_NAME: string;
+		PAGES_CUSTOM_DOMAIN: string;
+		USER_WORKER_NAME: string;
+		USER_WORKER_DOMAIN: string;
+		KV_STORE_ID: string;
+		DATA_WORKER_NAME: string;
+		DATA_BUCKET_NAME: string;
+		FILES_BUCKET_NAME: string;
+		DATA_WORKER_DOMAIN: string;
 		AUDIT_WORKER_NAME: string;
 		AUDIT_BUCKET_NAME: string;
 		AUDIT_WORKER_DOMAIN: string;
@@ -53,7 +57,6 @@ declare namespace Cloudflare {
 		PDF_WORKER_AUTH: string;
 		BROWSER_API_TOKEN: string;
 		PRIMERSHEAR_EMAILS: string;
-		DATA_AT_REST_ENCRYPTION_ENABLED: string;
 	}
 }
 interface Env extends Cloudflare.Env {}
@@ -61,7 +64,7 @@ type StringifyValues<EnvType extends Record<string, unknown>> = {
 	[Binding in keyof EnvType]: EnvType[Binding] extends string ? EnvType[Binding] : string;
 };
 declare namespace NodeJS {
-	interface ProcessEnv extends StringifyValues<Pick<Cloudflare.Env, "ACCOUNT_ID" | "USER_DB_AUTH" | "R2_KEY_SECRET" | "IMAGES_API_TOKEN" | "API_KEY" | "AUTH_DOMAIN" | "PROJECT_ID" | "STORAGE_BUCKET" | "MESSAGING_SENDER_ID" | "APP_ID" | "MEASUREMENT_ID" | "FIREBASE_SERVICE_ACCOUNT_EMAIL" | "FIREBASE_SERVICE_ACCOUNT_PRIVATE_KEY" | "PAGES_PROJECT_NAME" | "PAGES_CUSTOM_DOMAIN" | "KEYS_WORKER_NAME" | "KEYS_WORKER_DOMAIN" | "KEYS_AUTH" | "ACCOUNT_HASH" | "USER_WORKER_NAME" | "USER_WORKER_DOMAIN" | "KV_STORE_ID" | "USER_KV_ENCRYPTION_PRIVATE_KEY" | "USER_KV_ENCRYPTION_KEY_ID" | "USER_KV_ENCRYPTION_PUBLIC_KEY" | "DATA_WORKER_NAME" | "DATA_BUCKET_NAME" | "FILES_BUCKET_NAME" | "DATA_WORKER_DOMAIN" | "MANIFEST_SIGNING_PRIVATE_KEY" | "MANIFEST_SIGNING_KEY_ID" | "MANIFEST_SIGNING_PUBLIC_KEY" | "EXPORT_ENCRYPTION_PRIVATE_KEY" | "EXPORT_ENCRYPTION_KEY_ID" | "EXPORT_ENCRYPTION_PUBLIC_KEY" | "DATA_AT_REST_ENCRYPTION_PRIVATE_KEY" | "DATA_AT_REST_ENCRYPTION_KEY_ID" | "DATA_AT_REST_ENCRYPTION_PUBLIC_KEY" | "AUDIT_WORKER_NAME" | "AUDIT_BUCKET_NAME" | "AUDIT_WORKER_DOMAIN" | "IMAGES_WORKER_NAME" | "IMAGES_WORKER_DOMAIN" | "IMAGE_SIGNED_URL_SECRET" | "IMAGE_SIGNED_URL_TTL_SECONDS" | "PDF_WORKER_NAME" | "PDF_WORKER_DOMAIN" | "PDF_WORKER_AUTH" | "BROWSER_API_TOKEN" | "PRIMERSHEAR_EMAILS" | "DATA_AT_REST_ENCRYPTION_ENABLED">> {}
+	interface ProcessEnv extends StringifyValues<Pick<Cloudflare.Env, "ACCOUNT_ID" | "USER_DB_AUTH" | "R2_KEY_SECRET" | "IMAGES_API_TOKEN" | "API_KEY" | "AUTH_DOMAIN" | "PROJECT_ID" | "STORAGE_BUCKET" | "MESSAGING_SENDER_ID" | "APP_ID" | "MEASUREMENT_ID" | "FIREBASE_SERVICE_ACCOUNT_EMAIL" | "FIREBASE_SERVICE_ACCOUNT_PRIVATE_KEY" | "USER_KV_ENCRYPTION_PRIVATE_KEY" | "USER_KV_ENCRYPTION_KEY_ID" | "USER_KV_ENCRYPTION_PUBLIC_KEY" | "USER_KV_WRITE_ENDPOINTS_ENABLED" | "USER_KV_ENCRYPTION_KEYS_JSON" | "USER_KV_ENCRYPTION_ACTIVE_KEY_ID" | "MANIFEST_SIGNING_PRIVATE_KEY" | "MANIFEST_SIGNING_KEY_ID" | "MANIFEST_SIGNING_PUBLIC_KEY" | "EXPORT_ENCRYPTION_PRIVATE_KEY" | "EXPORT_ENCRYPTION_KEY_ID" | "EXPORT_ENCRYPTION_PUBLIC_KEY" | "EXPORT_ENCRYPTION_KEYS_JSON" | "EXPORT_ENCRYPTION_ACTIVE_KEY_ID" | "DATA_AT_REST_ENCRYPTION_ENABLED" | "DATA_AT_REST_ENCRYPTION_PRIVATE_KEY" | "DATA_AT_REST_ENCRYPTION_KEY_ID" | "DATA_AT_REST_ENCRYPTION_PUBLIC_KEY" | "DATA_AT_REST_ENCRYPTION_KEYS_JSON" | "DATA_AT_REST_ENCRYPTION_ACTIVE_KEY_ID" | "PAGES_PROJECT_NAME" | "PAGES_CUSTOM_DOMAIN" | "USER_WORKER_NAME" | "USER_WORKER_DOMAIN" | "KV_STORE_ID" | "DATA_WORKER_NAME" | "DATA_BUCKET_NAME" | "FILES_BUCKET_NAME" | "DATA_WORKER_DOMAIN" | "AUDIT_WORKER_NAME" | "AUDIT_BUCKET_NAME" | "AUDIT_WORKER_DOMAIN" | "IMAGES_WORKER_NAME" | "IMAGES_WORKER_DOMAIN" | "IMAGE_SIGNED_URL_SECRET" | "IMAGE_SIGNED_URL_TTL_SECONDS" | "PDF_WORKER_NAME" | "PDF_WORKER_DOMAIN" | "PDF_WORKER_AUTH" | "BROWSER_API_TOKEN" | "PRIMERSHEAR_EMAILS">> {}
 }
 
 // Begin runtime types