create-safest-tools 0.4.0 → 0.4.1

package/template/src/report-workflow.ts

@@ -1,4 +1,5 @@
 import { AUDIT_GENESIS_HASH, canonicalJson, hashAuditEntry } from "./audit";
+import { selectParticipantDelivery, type ParticipantDelivery } from "./report-email";
 import { ApiError } from "./report-http";
 import { analystAvatarColor } from "./report-presence";
 import type { DeliveryJob, OperatorSession, ParticipantAudience, ReportState } from "./report-types";
@@ -6,6 +7,7 @@ import type { AppealDecisionInput, DecisionInput, ReviewerMessageInput } from ".
 
 interface WorkflowReportRow {
   id: string;
+  installation_id: string;
   public_reference: string;
   state: ReportState;
   queue_id: string | null;
@@ -14,6 +16,8 @@ interface WorkflowReportRow {
   target_reference: string;
   owner_reference: string | null;
   reporter_reference: string | null;
+  reporter_contact_mode: string;
+  reporter_contact_ciphertext: string | null;
 }
 
 interface ClaimRow {
@@ -62,8 +66,9 @@ function auditEvent(
 
 async function workflowReport(db: D1Database, reportId: string): Promise<WorkflowReportRow | null> {
   return db.prepare(`
-    SELECT r.id, r.public_reference, r.state, r.queue_id, r.queue_version_id, r.policy_version_id,
-           t.target_reference, t.owner_reference, p.reference AS reporter_reference
+    SELECT r.id, r.installation_id, r.public_reference, r.state, r.queue_id, r.queue_version_id, r.policy_version_id,
+           t.target_reference, t.owner_reference, p.reference AS reporter_reference,
+           p.contact_mode AS reporter_contact_mode, p.contact_ciphertext AS reporter_contact_ciphertext
     FROM reports r
     JOIN report_targets t ON t.report_id = r.id
     JOIN report_participants p ON p.report_id = r.id AND p.audience = 'reporter'
@@ -160,6 +165,8 @@ export async function loadReportDetail(db: D1Database, reportId: string): Promis
     SELECT r.id, r.public_reference AS reference, r.source, r.state, r.priority, r.reason_code AS reasonCode,
            r.locale, r.queue_id AS queueId, r.submitted_at AS submittedAt, r.received_at AS receivedAt,
            r.updated_at AS updatedAt, r.due_at AS dueAt, r.resolved_at AS resolvedAt,
+           r.form_version_id AS formVersionId, form.title AS formTitle,
+           form.fields_json AS formFieldsJson, form.consent_notice AS consentNotice,
            r.policy_version_id AS policyVersionId, policy.title AS policyTitle,
            policy.rules_json AS policyRulesJson, r.queue_version_id AS queuePolicyVersionId,
            qv.management_mode AS queueManagementMode, qv.reviewer_instructions AS reviewerInstructions,
@@ -170,6 +177,7 @@ export async function loadReportDetail(db: D1Database, reportId: string): Promis
     JOIN report_targets t ON t.report_id = r.id
     JOIN report_participants p ON p.report_id = r.id AND p.audience = 'reporter'
     LEFT JOIN policy_versions policy ON policy.id = r.policy_version_id
+    LEFT JOIN report_form_versions form ON form.id = r.form_version_id
     LEFT JOIN queue_versions qv ON qv.id = r.queue_version_id
     WHERE r.id = ?1
     LIMIT 1
@@ -227,6 +235,37 @@ export async function loadReportDetail(db: D1Database, reportId: string): Promis
       LIMIT 500
     `).bind(reportId).all<Record<string, unknown>>(),
   ]);
+  const formFieldsValue = parsedJson(report.formFieldsJson, []);
+  const formFields = Array.isArray(formFieldsValue)
+    ? formFieldsValue.filter((field): field is Record<string, unknown> => Boolean(field) && typeof field === "object" && !Array.isArray(field))
+    : [];
+  const answerRows = new Map(answers.results.map((row) => [String(row.fieldKey), row]));
+  const projectedAnswers = formFields.flatMap((field) => {
+    const fieldKey = typeof field.key === "string" ? field.key : "";
+    if (!fieldKey) return [];
+    const row = answerRows.get(fieldKey);
+    answerRows.delete(fieldKey);
+    return [{
+      fieldKey,
+      label: typeof field.label === "string" ? field.label : fieldKey,
+      type: typeof field.type === "string" ? field.type : "unknown",
+      required: field.required === true,
+      options: Array.isArray(field.options) ? field.options : [],
+      answered: Boolean(row),
+      value: row ? parsedJson(row.valueJson, null) : null,
+    }];
+  });
+  for (const [fieldKey, row] of answerRows) {
+    projectedAnswers.push({
+      fieldKey,
+      label: fieldKey,
+      type: "unknown",
+      required: false,
+      options: [],
+      answered: true,
+      value: parsedJson(row.valueJson, null),
+    });
+  }
   return {
     ...report,
     policyRules: (() => {
@@ -236,7 +275,8 @@ export async function loadReportDetail(db: D1Database, reportId: string): Promis
       } catch { return []; }
     })(),
     policyRulesJson: undefined,
-    answers: answers.results.map((row) => ({ fieldKey: row.fieldKey, value: JSON.parse(String(row.valueJson)) })),
+    formFieldsJson: undefined,
+    answers: projectedAnswers,
     evidence: evidence.results,
     messages: messages.results.map((row) => ({ ...row, automated: row.automated === 1 })),
     decisions: decisions.results.map((row) => ({
@@ -278,20 +318,43 @@ export async function loadReportDetail(db: D1Database, reportId: string): Promis
 }
 
 export interface WorkflowDeliveryOptions {
+  emailEnabled: boolean;
+  contactEncryptionKey: string;
+  recipientHashPepper: string;
   notificationEnabled: boolean;
 }
 
+async function reporterDelivery(
+  report: WorkflowReportRow,
+  options: WorkflowDeliveryOptions,
+): Promise<ParticipantDelivery> {
+  return selectParticipantDelivery({
+    reportId: report.id,
+    audience: "reporter",
+    contactMode: report.reporter_contact_mode,
+    contactCiphertext: report.reporter_contact_ciphertext,
+    reference: report.reporter_reference,
+    ...options,
+  });
+}
+
 export async function addReviewerMessage(
   db: D1Database,
   reportId: string,
   session: OperatorSession,
   input: ReviewerMessageInput,
   options: WorkflowDeliveryOptions,
-): Promise<{ messageId: string; jobs: DeliveryJob[]; idempotentReplay: boolean }> {
+): Promise<{ messageId: string; jobs: DeliveryJob[]; deliveryState: string; deliveryChannel: ParticipantDelivery["channel"]; idempotentReplay: boolean }> {
   const existing = await db.prepare(`
-    SELECT id FROM case_messages WHERE report_id = ?1 AND idempotency_key = ?2 LIMIT 1
-  `).bind(reportId, input.idempotencyKey).first<{ id: string }>();
-  if (existing) return { messageId: existing.id, jobs: [], idempotentReplay: true };
+    SELECT m.id, m.delivery_state AS deliveryState,
+      CASE
+        WHEN EXISTS (SELECT 1 FROM email_deliveries e WHERE e.message_id = m.id) THEN 'email'
+        WHEN EXISTS (SELECT 1 FROM notices n JOIN notification_outbox o ON o.notice_id = n.id WHERE n.message_id = m.id) THEN 'customer_webhook'
+        ELSE NULL
+      END AS deliveryChannel
+    FROM case_messages m WHERE m.report_id = ?1 AND m.idempotency_key = ?2 LIMIT 1
+  `).bind(reportId, input.idempotencyKey).first<{ id: string; deliveryState: string; deliveryChannel: ParticipantDelivery["channel"] }>();
+  if (existing) return { messageId: existing.id, jobs: [], deliveryState: existing.deliveryState, deliveryChannel: existing.deliveryChannel, idempotentReplay: true };
   const createdAt = now();
   await requireActiveClaim(db, reportId, session.actor.id, createdAt);
   const report = await workflowReport(db, reportId);
@@ -301,24 +364,27 @@ export async function addReviewerMessage(
   }
   const messageId = crypto.randomUUID();
   const noticeId = crypto.randomUUID();
-  const notificationId = crypto.randomUUID();
+  const deliveryId = crypto.randomUUID();
+  const delivery = await reporterDelivery(report, options);
   const nextState: ReportState = input.awaitReporter ? "awaiting_reporter" : report.state;
-  const jobs: DeliveryJob[] = options.notificationEnabled
-    ? [{ version: 1, jobId: `notification:${notificationId}`, type: "deliver_notification", outboxId: notificationId }]
-    : [];
+  const jobs: DeliveryJob[] = delivery.channel === "email"
+    ? [{ version: 1, jobId: `email:${deliveryId}`, type: "deliver_email", outboxId: deliveryId }]
+    : delivery.channel === "customer_webhook"
+      ? [{ version: 1, jobId: `notification:${deliveryId}`, type: "deliver_notification", outboxId: deliveryId }]
+      : [];
   const statements: D1PreparedStatement[] = [
     db.prepare(`
       INSERT INTO case_messages (
         id, report_id, audience, direction, sender_type, sender_id, body, template_version_id,
         automated, delivery_state, created_at, idempotency_key
       ) VALUES (?1, ?2, 'reporter', 'outbound', 'human', ?3, ?4, 'reporter-follow-up-v1', 0, ?5, ?6, ?7)
-    `).bind(messageId, reportId, session.actor.id, input.body, options.notificationEnabled ? "queued" : "suppressed", createdAt, input.idempotencyKey),
+    `).bind(messageId, reportId, session.actor.id, input.body, delivery.state, createdAt, input.idempotencyKey),
     db.prepare(`
       INSERT INTO notices (
         id, report_id, audience, template_version_id, rendered_body, delivery_state,
         created_at, updated_at, idempotency_key, message_id
       ) VALUES (?1, ?2, 'reporter', 'reporter-follow-up-v1', ?3, ?4, ?5, ?5, ?6, ?7)
-    `).bind(noticeId, reportId, input.body, options.notificationEnabled ? "queued" : "suppressed", createdAt, input.idempotencyKey, messageId),
+    `).bind(noticeId, reportId, input.body, delivery.state, createdAt, input.idempotencyKey, messageId),
     auditEvent(db, {
       idempotencyKey: `reviewer-message:${reportId}:${input.idempotencyKey}`,
       action: "report.reporter_message_created",
@@ -326,7 +392,7 @@ export async function addReviewerMessage(
       actorId: session.actor.id,
       targetType: "report",
       targetId: reportId,
-      details: { messageId, audience: "reporter", nextState },
+      details: { messageId, audience: "reporter", nextState, deliveryChannel: delivery.channel, deliveryState: delivery.state },
       createdAt,
     }),
   ];
@@ -339,15 +405,22 @@ export async function addReviewerMessage(
       `).bind(crypto.randomUUID(), reportId, report.state, nextState, session.actor.type, session.actor.id, createdAt),
     );
   }
-  if (options.notificationEnabled) {
+  if (delivery.channel === "email" && delivery.recipientHash) {
+    statements.push(db.prepare(`
+      INSERT INTO email_deliveries (
+        id, installation_id, message_id, audience, recipient_hash,
+        provider, state, attempt_count, next_attempt_at, created_at, updated_at
+      ) VALUES (?1, ?2, ?3, 'reporter', ?4, 'cloudflare_email_service', 'pending', 0, ?5, ?5, ?5)
+    `).bind(deliveryId, report.installation_id, messageId, delivery.recipientHash, createdAt));
+  } else if (delivery.channel === "customer_webhook") {
     statements.push(db.prepare(`
       INSERT INTO notification_outbox (
         id, notice_id, idempotency_key, channel, payload_json, status, next_attempt_at, created_at, updated_at
       ) VALUES (?1, ?2, ?3, 'customer_webhook', ?4, 'pending', ?5, ?5, ?5)
-    `).bind(notificationId, noticeId, `notice:${noticeId}`, canonicalJson({
+    `).bind(deliveryId, noticeId, `notice:${noticeId}`, canonicalJson({
       version: 1,
       event: "report.message.available",
-      notification_id: notificationId,
+      notification_id: deliveryId,
       report_reference: report.public_reference,
       ...(report.reporter_reference ? { recipient_reference: report.reporter_reference } : {}),
       audience: "reporter",
@@ -355,7 +428,7 @@ export async function addReviewerMessage(
     }), createdAt));
   }
   await db.batch(statements);
-  return { messageId, jobs, idempotentReplay: false };
+  return { messageId, jobs, deliveryState: delivery.state, deliveryChannel: delivery.channel, idempotentReplay: false };
 }
 
 
@@ -416,6 +489,7 @@ export async function recordHumanDecision(
   const reporterMessageId = crypto.randomUUID();
   const reporterNoticeId = crypto.randomUUID();
   const reporterNotificationId = crypto.randomUUID();
+  const reporterDeliveryPlan = await reporterDelivery(report, options);
   const actionId = input.actionCode ? crypto.randomUUID() : null;
   const jobs: DeliveryJob[] = [];
   const statements: D1PreparedStatement[] = [
@@ -435,13 +509,13 @@ export async function recordHumanDecision(
         id, report_id, audience, direction, sender_type, sender_id, body, template_version_id,
         automated, delivery_state, created_at, idempotency_key
       ) VALUES (?1, ?2, 'reporter', 'outbound', 'human', ?3, ?4, 'reporter-outcome-v1', 0, ?5, ?6, ?7)
-    `).bind(reporterMessageId, reportId, session.actor.id, input.reporterNotice, options.notificationEnabled ? "queued" : "suppressed", createdAt, `decision:${decisionId}:reporter-message`),
+    `).bind(reporterMessageId, reportId, session.actor.id, input.reporterNotice, reporterDeliveryPlan.state, createdAt, `decision:${decisionId}:reporter-message`),
     db.prepare(`
       INSERT INTO notices (
         id, report_id, decision_id, audience, template_version_id, rendered_body,
         delivery_state, created_at, updated_at, idempotency_key, message_id
       ) VALUES (?1, ?2, ?3, 'reporter', 'reporter-outcome-v1', ?4, ?5, ?6, ?6, ?7, ?8)
-    `).bind(reporterNoticeId, reportId, decisionId, input.reporterNotice, options.notificationEnabled ? "queued" : "suppressed", createdAt, `decision:${decisionId}:reporter-notice`, reporterMessageId),
+    `).bind(reporterNoticeId, reportId, decisionId, input.reporterNotice, reporterDeliveryPlan.state, createdAt, `decision:${decisionId}:reporter-notice`, reporterMessageId),
     db.prepare(`
       UPDATE reports SET state = 'resolved_by_human', resolved_at = ?2, updated_at = ?2 WHERE id = ?1
     `).bind(reportId, createdAt),
@@ -475,7 +549,15 @@ export async function recordHumanDecision(
     `).bind(reportId, crypto.randomUUID(), createdAt),
   ];
 
-  if (options.notificationEnabled) {
+  if (reporterDeliveryPlan.channel === "email" && reporterDeliveryPlan.recipientHash) {
+    statements.push(db.prepare(`
+      INSERT INTO email_deliveries (
+        id, installation_id, message_id, audience, recipient_hash,
+        provider, state, attempt_count, next_attempt_at, created_at, updated_at
+      ) VALUES (?1, ?2, ?3, 'reporter', ?4, 'cloudflare_email_service', 'pending', 0, ?5, ?5, ?5)
+    `).bind(reporterNotificationId, report.installation_id, reporterMessageId, reporterDeliveryPlan.recipientHash, createdAt));
+    jobs.push({ version: 1, jobId: `email:${reporterNotificationId}`, type: "deliver_email", outboxId: reporterNotificationId });
+  } else if (reporterDeliveryPlan.channel === "customer_webhook") {
     statements.push(db.prepare(`
       INSERT INTO notification_outbox (
         id, notice_id, idempotency_key, channel, payload_json, status, next_attempt_at, created_at, updated_at

package/template/src/workflow-effects.ts

@@ -1,6 +1,7 @@
 import { canonicalJson } from "./audit";
 import { loadWorkflowExecutionContext } from "./component-executor";
 import { decryptReportContact, sha256 } from "./report-crypto";
+import { reporterEmailBinding, reporterEmailFrom } from "./report-email";
 import type { DeliveryJob } from "./report-types";
 import { evaluateInputMapping } from "./workflow-expressions";
 import type { JsonObject, JsonValue, WorkflowNodeV1 } from "./workflow-platform-types";
@@ -96,11 +97,11 @@ export async function sendWorkflowMessage(
   const deliveryChannels = Array.isArray(input.node.config.delivery_channels)
     ? input.node.config.delivery_channels.filter((entry): entry is string => typeof entry === "string")
     : audience === "internal" ? [] : ["customer_webhook", "email"];
-  const emailBinding = (env as unknown as { EMAIL?: { send(message: Record<string, unknown>): Promise<{ messageId?: string }> } }).EMAIL;
+  const emailBinding = reporterEmailBinding(env);
   const emailAddress = participant?.contactCiphertext
     ? (await decryptReportContact(env.CREDENTIAL_ENCRYPTION_KEY, participant.contactCiphertext, run.reportId, audience as "reporter" | "affected_user")).trim().toLowerCase()
     : "";
-  const emailFrom = env.EMAIL_FROM_ADDRESS?.trim().toLowerCase() ?? "";
+  const emailFrom = reporterEmailFrom(env);
   const emailEnabled = Boolean(
     audience !== "internal" && deliveryChannels.includes("email")
     && participant?.contactMode === "customer_notification"
@@ -187,7 +188,7 @@ export async function sendWorkflowMessage(
     deliveryChannels, emailEnabled, notificationEnabled,
   }), timestamp));
   await env.DB.batch(statements);
-  if (job) await env.REPORT_JOBS.send(job, { contentType: "json" }).catch(() => {});
+  if (job) await env.DELIVERY_JOBS.send(job, { contentType: "json" }).catch(() => {});
   return { port: "sent", messageId, deliveryState: audience === "internal" ? "not_required" : externalDeliveryEnabled ? "queued" : "suppressed", idempotentReplay: false };
 }
 

package/template/worker-configuration.d.ts

@@ -12,6 +12,8 @@ interface __BaseEnv_Env {
 	LOADER: WorkerLoader;
 	AI: Ai;
 	ASSETS: Fetcher;
+	AUTH_EMAIL: SendEmail;
+	REPORTER_EMAIL: SendEmail;
 	PUBLIC_BASE_URL: string;
 	ALLOWED_ORIGINS: string;
 	CONTEXT_TOKEN_TTL_SECONDS: string;
@@ -25,8 +27,8 @@ interface __BaseEnv_Env {
 	PUBLIC_REPORT_LIMIT_PER_10_MINUTES: string;
 	PUBLIC_REPORT_SURGE_PER_5_MINUTES: string;
 	OPERATOR_NOTIFICATION_WEBHOOK_URL: string;
-	EMAIL_FROM_ADDRESS: string;
-	EMAIL_SUBJECT_PREFIX: string;
+	REPORTER_EMAIL_FROM: string;
+	REPORTER_EMAIL_SUBJECT_PREFIX: string;
 	ADMIN_API_KEY: string;
 	BETTER_AUTH_SECRET: string;
 	AUTH_EMAIL_FROM: string;
@@ -59,5 +61,5 @@ 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, "PUBLIC_BASE_URL" | "ALLOWED_ORIGINS" | "CONTEXT_TOKEN_TTL_SECONDS" | "CLAIM_TTL_MINUTES" | "REPORT_RETENTION_DAYS" | "MESSAGE_RETENTION_DAYS" | "APPEAL_WINDOW_DAYS" | "ALLOWED_ACTION_CODES" | "OPERATIONS_DLQ_NAME" | "PUBLIC_INTEGRATION_ID" | "PUBLIC_REPORT_LIMIT_PER_10_MINUTES" | "PUBLIC_REPORT_SURGE_PER_5_MINUTES" | "OPERATOR_NOTIFICATION_WEBHOOK_URL" | "EMAIL_FROM_ADDRESS" | "EMAIL_SUBJECT_PREFIX" | "ADMIN_API_KEY" | "BETTER_AUTH_SECRET" | "AUTH_EMAIL_FROM" | "CONTEXT_SIGNING_SECRET" | "CREDENTIAL_ENCRYPTION_KEY" | "RATE_LIMIT_PEPPER" | "INTEGRATION_API_KEYS_JSON" | "TURNSTILE_SITE_KEY" | "TURNSTILE_SECRET_KEY" | "ACTION_WEBHOOK_URL" | "ACTION_WEBHOOK_SECRET" | "NOTIFICATION_WEBHOOK_URL" | "NOTIFICATION_WEBHOOK_SECRET" | "OPERATOR_NOTIFICATION_WEBHOOK_SECRET" | "EXAMPLE_ENRICHMENT_SECRET" | "AI_LOCAL_FIXTURE_ENABLED" | "AI_LOCAL_FIXTURE_JSON">> {}
+	interface ProcessEnv extends StringifyValues<Pick<Cloudflare.Env, "PUBLIC_BASE_URL" | "ALLOWED_ORIGINS" | "CONTEXT_TOKEN_TTL_SECONDS" | "CLAIM_TTL_MINUTES" | "REPORT_RETENTION_DAYS" | "MESSAGE_RETENTION_DAYS" | "APPEAL_WINDOW_DAYS" | "ALLOWED_ACTION_CODES" | "OPERATIONS_DLQ_NAME" | "PUBLIC_INTEGRATION_ID" | "PUBLIC_REPORT_LIMIT_PER_10_MINUTES" | "PUBLIC_REPORT_SURGE_PER_5_MINUTES" | "OPERATOR_NOTIFICATION_WEBHOOK_URL" | "REPORTER_EMAIL_FROM" | "REPORTER_EMAIL_SUBJECT_PREFIX" | "ADMIN_API_KEY" | "BETTER_AUTH_SECRET" | "AUTH_EMAIL_FROM" | "CONTEXT_SIGNING_SECRET" | "CREDENTIAL_ENCRYPTION_KEY" | "RATE_LIMIT_PEPPER" | "INTEGRATION_API_KEYS_JSON" | "TURNSTILE_SITE_KEY" | "TURNSTILE_SECRET_KEY" | "ACTION_WEBHOOK_URL" | "ACTION_WEBHOOK_SECRET" | "NOTIFICATION_WEBHOOK_URL" | "NOTIFICATION_WEBHOOK_SECRET" | "OPERATOR_NOTIFICATION_WEBHOOK_SECRET" | "EXAMPLE_ENRICHMENT_SECRET" | "AI_LOCAL_FIXTURE_ENABLED" | "AI_LOCAL_FIXTURE_JSON">> {}
 }