@agent-native/core 0.79.21 → 0.79.22

package/corpus/templates/clips/desktop/package.json

@@ -17,6 +17,7 @@
   "dependencies": {
     "@radix-ui/react-popover": "^1.1.15",
     "@radix-ui/react-tooltip": "^1.2.8",
+    "@sentry/browser": "10.62.0",
     "@tabler/icons-react": "^3.26.0",
     "@tauri-apps/api": "^2.11.0",
     "@tauri-apps/plugin-fs": "2.5.1",

package/corpus/templates/clips/desktop/scripts/check-tauri-prereqs.mjs

@@ -14,6 +14,7 @@ const RED = "\x1b[31m";
 const YELLOW = "\x1b[33m";
 const CYAN = "\x1b[36m";
 const DIM = "\x1b[2m";
+const MIN_RUST_VERSION = [1, 88, 0];
 
 function has(cmd) {
   try {
@@ -107,3 +108,47 @@ if (!has("cargo")) {
 
   fail(installLines);
 }
+
+function parseRustVersion(output) {
+  const match = output.match(/rustc\s+(\d+)\.(\d+)\.(\d+)/);
+  if (!match) return null;
+  return match.slice(1, 4).map((part) => Number(part));
+}
+
+function compareVersions(a, b) {
+  for (let i = 0; i < 3; i += 1) {
+    if (a[i] > b[i]) return 1;
+    if (a[i] < b[i]) return -1;
+  }
+  return 0;
+}
+
+let rustcOutput = "";
+try {
+  rustcOutput = execFileSync("rustc", ["--version"], {
+    encoding: "utf8",
+  });
+} catch {
+  fail([
+    "",
+    `${YELLOW}Cargo is installed, but ${BOLD}rustc${RESET}${YELLOW} is not available.${RESET}`,
+    "",
+    `${BOLD}Fix:${RESET} update your Rust toolchain, then retry:`,
+    "",
+    `  ${CYAN}rustup update stable${RESET}`,
+  ]);
+}
+
+const rustVersion = parseRustVersion(rustcOutput);
+if (!rustVersion || compareVersions(rustVersion, MIN_RUST_VERSION) < 0) {
+  fail([
+    "",
+    `${YELLOW}Clips Desktop needs Rust ${BOLD}${MIN_RUST_VERSION.join(".")}+${RESET}${YELLOW} for the current Tauri/Sentry native SDKs.${RESET}`,
+    "",
+    `Found: ${DIM}${rustcOutput.trim() || "unknown"}${RESET}`,
+    "",
+    `${BOLD}Fix:${RESET} update Rust, then retry:`,
+    "",
+    `  ${CYAN}rustup update stable${RESET}`,
+  ]);
+}

package/corpus/templates/clips/desktop/src/lib/sentry.ts

@@ -0,0 +1,71 @@
+import * as Sentry from "@sentry/browser";
+
+declare const __CLIPS_DESKTOP_SENTRY_DSN__: string;
+declare const __CLIPS_DESKTOP_SENTRY_ENVIRONMENT__: string;
+declare const __CLIPS_DESKTOP_VERSION__: string;
+
+let initialized = false;
+
+function configuredDsn(): string {
+  return typeof __CLIPS_DESKTOP_SENTRY_DSN__ === "string"
+    ? __CLIPS_DESKTOP_SENTRY_DSN__.trim()
+    : "";
+}
+
+function configuredEnvironment(): string {
+  return typeof __CLIPS_DESKTOP_SENTRY_ENVIRONMENT__ === "string" &&
+    __CLIPS_DESKTOP_SENTRY_ENVIRONMENT__
+    ? __CLIPS_DESKTOP_SENTRY_ENVIRONMENT__
+    : "production";
+}
+
+function scrubUrl(value: string): string {
+  try {
+    const url = new URL(value);
+    for (const key of [...url.searchParams.keys()]) {
+      url.searchParams.set(key, "<redacted>");
+    }
+    return url.toString();
+  } catch {
+    return value;
+  }
+}
+
+function scrubEvent<T extends Sentry.Event>(event: T): T {
+  if (event.request?.url) {
+    event.request.url = scrubUrl(event.request.url);
+  }
+  if (event.user) {
+    delete (event.user as Record<string, unknown>).ip_address;
+  }
+  return event;
+}
+
+export function initDesktopSentry(route: string): void {
+  if (initialized) return;
+  const dsn = configuredDsn();
+  if (!dsn) return;
+  initialized = true;
+
+  Sentry.init({
+    dsn,
+    environment: configuredEnvironment(),
+    release: `clips-desktop@${__CLIPS_DESKTOP_VERSION__ || "0.0.0"}`,
+    sendDefaultPii: false,
+    beforeSend(event) {
+      event.tags = {
+        ...event.tags,
+        app: "agent-native-clips",
+        template: "clips",
+        runtime: "tauri-webview",
+        surface: route,
+      };
+      return scrubEvent(event);
+    },
+  });
+
+  Sentry.setTag("app", "agent-native-clips");
+  Sentry.setTag("template", "clips");
+  Sentry.setTag("runtime", "tauri-webview");
+  Sentry.setTag("surface", route);
+}

package/corpus/templates/clips/desktop/src/main.tsx

@@ -3,6 +3,7 @@ import React from "react";
 import ReactDOM from "react-dom/client";
 
 import { App } from "./app";
+import { initDesktopSentry } from "./lib/sentry";
 import { Bubble } from "./overlays/bubble";
 import { Countdown } from "./overlays/countdown";
 import { Finalizing } from "./overlays/finalizing";
@@ -211,6 +212,7 @@ const rootEl = document.getElementById("root");
 if (rootEl) {
   const route = currentRoute();
   installRouteAttributes(route);
+  initDesktopSentry(route);
   installConsoleCapture(route);
   installBeforeUnloadCleanup();
   installHeapDebugLog();

package/corpus/templates/clips/desktop/src-tauri/Cargo.toml

@@ -5,7 +5,7 @@ description = "Clips — menu-bar tray app (Tauri 2)"
 authors = ["Clips"]
 license = "MIT"
 edition = "2021"
-rust-version = "1.77.2"
+rust-version = "1.88"
 
 # See https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -44,6 +44,7 @@ tauri-plugin-fs = "2.5.1"
 tauri-plugin-notification = "2"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
+sentry = "0.48.3"
 url = "2"
 # Used by meetings_watcher.rs to poll the backend on a background tokio
 # task. Tauri 2 already pulls reqwest in transitively, but we declare it

package/corpus/templates/clips/desktop/src-tauri/build.rs

@@ -2,10 +2,39 @@ use std::path::Path;
 use std::process::Command;
 
 fn main() {
+    emit_sentry_env_reruns();
     add_swift_runtime_rpaths();
     tauri_build::build()
 }
 
+fn emit_sentry_env_reruns() {
+    for name in [
+        "CLIPS_DESKTOP_SENTRY_DSN",
+        "TAURI_SENTRY_DSN",
+        "SENTRY_DESKTOP_DSN",
+        "SENTRY_CLIENT_DSN",
+        "VITE_SENTRY_CLIENT_DSN",
+        "VITE_SENTRY_DSN",
+        "SENTRY_DSN",
+        "CLIPS_DESKTOP_SENTRY_CLIENT_KEY",
+        "SENTRY_CLIENT_KEY",
+        "VITE_SENTRY_CLIENT_KEY",
+        "CLIPS_DESKTOP_SENTRY_PROJECT_ID",
+        "SENTRY_PROJECT_ID",
+        "VITE_SENTRY_PROJECT_ID",
+        "CLIPS_DESKTOP_SENTRY_INGEST_HOST",
+        "SENTRY_INGEST_HOST",
+        "VITE_SENTRY_INGEST_HOST",
+        "CLIPS_DESKTOP_SENTRY_ENVIRONMENT",
+        "SENTRY_ENVIRONMENT",
+        "NETLIFY_CONTEXT",
+        "VERCEL_ENV",
+        "NODE_ENV",
+    ] {
+        println!("cargo:rerun-if-env-changed={name}");
+    }
+}
+
 fn add_swift_runtime_rpaths() {
     if std::env::var("CARGO_CFG_TARGET_OS").as_deref() != Ok("macos") {
         return;

package/corpus/templates/clips/desktop/src-tauri/src/lib.rs

@@ -16,6 +16,7 @@ mod native_speech;
 mod notifications;
 mod permission_status;
 mod recording_indicator;
+mod sentry_report;
 mod shortcuts;
 mod silence_detector;
 mod state;
@@ -46,6 +47,8 @@ pub(crate) const TRAY_PNG: &[u8] = include_bytes!("../icons/tray.png");
 
 #[cfg_attr(mobile, tauri::mobile_entry_point)]
 pub fn run() {
+    sentry_report::init();
+
     tauri::Builder::default()
         .plugin(tauri_plugin_single_instance::init(|app, _argv, _cwd| {
             // Second launch just focuses the popover of the already-running

package/corpus/templates/clips/desktop/src-tauri/src/logfile.rs

@@ -98,6 +98,7 @@ fn install_panic_hook() {
             append_line(&path, &format!("[clips-tray] panic: {info}"));
         }
         prev(info);
+        crate::sentry_report::flush(std::time::Duration::from_secs(2));
     }));
 }
 

package/corpus/templates/clips/desktop/src-tauri/src/sentry_report.rs

@@ -0,0 +1,142 @@
+use std::sync::OnceLock;
+use std::time::Duration;
+
+static SENTRY_GUARD: OnceLock<&'static sentry::ClientInitGuard> = OnceLock::new();
+
+const DIRECT_DSN_ENV: [(&str, Option<&str>); 7] = [
+    (
+        "CLIPS_DESKTOP_SENTRY_DSN",
+        option_env!("CLIPS_DESKTOP_SENTRY_DSN"),
+    ),
+    ("TAURI_SENTRY_DSN", option_env!("TAURI_SENTRY_DSN")),
+    ("SENTRY_DESKTOP_DSN", option_env!("SENTRY_DESKTOP_DSN")),
+    ("SENTRY_CLIENT_DSN", option_env!("SENTRY_CLIENT_DSN")),
+    (
+        "VITE_SENTRY_CLIENT_DSN",
+        option_env!("VITE_SENTRY_CLIENT_DSN"),
+    ),
+    ("VITE_SENTRY_DSN", option_env!("VITE_SENTRY_DSN")),
+    ("SENTRY_DSN", option_env!("SENTRY_DSN")),
+];
+
+const KEY_ENV: [(&str, Option<&str>); 3] = [
+    (
+        "CLIPS_DESKTOP_SENTRY_CLIENT_KEY",
+        option_env!("CLIPS_DESKTOP_SENTRY_CLIENT_KEY"),
+    ),
+    ("SENTRY_CLIENT_KEY", option_env!("SENTRY_CLIENT_KEY")),
+    (
+        "VITE_SENTRY_CLIENT_KEY",
+        option_env!("VITE_SENTRY_CLIENT_KEY"),
+    ),
+];
+
+const PROJECT_ENV: [(&str, Option<&str>); 3] = [
+    (
+        "CLIPS_DESKTOP_SENTRY_PROJECT_ID",
+        option_env!("CLIPS_DESKTOP_SENTRY_PROJECT_ID"),
+    ),
+    ("SENTRY_PROJECT_ID", option_env!("SENTRY_PROJECT_ID")),
+    (
+        "VITE_SENTRY_PROJECT_ID",
+        option_env!("VITE_SENTRY_PROJECT_ID"),
+    ),
+];
+
+const HOST_ENV: [(&str, Option<&str>); 3] = [
+    (
+        "CLIPS_DESKTOP_SENTRY_INGEST_HOST",
+        option_env!("CLIPS_DESKTOP_SENTRY_INGEST_HOST"),
+    ),
+    ("SENTRY_INGEST_HOST", option_env!("SENTRY_INGEST_HOST")),
+    (
+        "VITE_SENTRY_INGEST_HOST",
+        option_env!("VITE_SENTRY_INGEST_HOST"),
+    ),
+];
+
+const ENVIRONMENT_ENV: [(&str, Option<&str>); 5] = [
+    (
+        "CLIPS_DESKTOP_SENTRY_ENVIRONMENT",
+        option_env!("CLIPS_DESKTOP_SENTRY_ENVIRONMENT"),
+    ),
+    ("SENTRY_ENVIRONMENT", option_env!("SENTRY_ENVIRONMENT")),
+    ("NETLIFY_CONTEXT", option_env!("NETLIFY_CONTEXT")),
+    ("VERCEL_ENV", option_env!("VERCEL_ENV")),
+    ("NODE_ENV", option_env!("NODE_ENV")),
+];
+
+pub fn init() {
+    if SENTRY_GUARD.get().is_some() {
+        return;
+    }
+
+    let Some(dsn) = resolve_sentry_dsn() else {
+        return;
+    };
+    let Ok(dsn) = dsn.parse() else {
+        eprintln!("[clips-tray] ignoring invalid Sentry DSN");
+        return;
+    };
+
+    let guard = sentry::init(sentry::ClientOptions {
+        dsn: Some(dsn),
+        environment: Some(resolve_sentry_environment().into()),
+        release: Some(format!("clips-desktop@{}", env!("CARGO_PKG_VERSION")).into()),
+        send_default_pii: false,
+        before_send: Some(std::sync::Arc::new(|mut event| {
+            event.user = None;
+            Some(event)
+        })),
+        ..Default::default()
+    });
+
+    if guard.is_enabled() {
+        sentry::configure_scope(|scope| {
+            scope.set_tag("app", "agent-native-clips");
+            scope.set_tag("template", "clips");
+            scope.set_tag("runtime", "tauri-native");
+        });
+    }
+
+    let _ = SENTRY_GUARD.set(Box::leak(Box::new(guard)));
+}
+
+pub fn flush(timeout: Duration) {
+    if let Some(guard) = SENTRY_GUARD.get() {
+        guard.close(Some(timeout));
+    }
+}
+
+fn resolve_sentry_dsn() -> Option<String> {
+    if let Some(dsn) = first_env(&DIRECT_DSN_ENV) {
+        return Some(dsn);
+    }
+
+    let key = first_env(&KEY_ENV)?;
+    let project = first_env(&PROJECT_ENV)?;
+    let host = first_env(&HOST_ENV)?;
+    Some(format!("https://{key}@{host}/{project}"))
+}
+
+fn resolve_sentry_environment() -> String {
+    first_env(&ENVIRONMENT_ENV).unwrap_or_else(|| "production".to_string())
+}
+
+fn first_env(values: &[(&str, Option<&str>)]) -> Option<String> {
+    for (name, embedded) in values {
+        if let Ok(value) = std::env::var(name) {
+            let trimmed = value.trim();
+            if !trimmed.is_empty() {
+                return Some(trimmed.to_string());
+            }
+        }
+        if let Some(value) = embedded {
+            let trimmed = value.trim();
+            if !trimmed.is_empty() {
+                return Some(trimmed.to_string());
+            }
+        }
+    }
+    None
+}

package/corpus/templates/clips/desktop/vite.config.ts

@@ -1,6 +1,65 @@
+import { readFileSync } from "node:fs";
+import { dirname, resolve } from "node:path";
+import { fileURLToPath } from "node:url";
+
 import react from "@vitejs/plugin-react";
 import { defineConfig } from "vite";
 
+const root = dirname(fileURLToPath(import.meta.url));
+const packageJson = JSON.parse(
+  readFileSync(resolve(root, "package.json"), "utf8"),
+) as { version?: string };
+
+function firstNonEmpty(...values: Array<string | undefined>): string {
+  for (const value of values) {
+    const trimmed = value?.trim();
+    if (trimmed) return trimmed;
+  }
+  return "";
+}
+
+function resolveSentryDsn(): string {
+  const direct = firstNonEmpty(
+    process.env.CLIPS_DESKTOP_SENTRY_DSN,
+    process.env.TAURI_SENTRY_DSN,
+    process.env.SENTRY_DESKTOP_DSN,
+    process.env.SENTRY_CLIENT_DSN,
+    process.env.VITE_SENTRY_CLIENT_DSN,
+    process.env.VITE_SENTRY_DSN,
+    process.env.SENTRY_DSN,
+  );
+  if (direct) return direct;
+
+  const key = firstNonEmpty(
+    process.env.CLIPS_DESKTOP_SENTRY_CLIENT_KEY,
+    process.env.SENTRY_CLIENT_KEY,
+    process.env.VITE_SENTRY_CLIENT_KEY,
+  );
+  const projectId = firstNonEmpty(
+    process.env.CLIPS_DESKTOP_SENTRY_PROJECT_ID,
+    process.env.SENTRY_PROJECT_ID,
+    process.env.VITE_SENTRY_PROJECT_ID,
+  );
+  const host = firstNonEmpty(
+    process.env.CLIPS_DESKTOP_SENTRY_INGEST_HOST,
+    process.env.SENTRY_INGEST_HOST,
+    process.env.VITE_SENTRY_INGEST_HOST,
+  );
+  return key && projectId && host ? `https://${key}@${host}/${projectId}` : "";
+}
+
+function resolveSentryEnvironment(): string {
+  return (
+    firstNonEmpty(
+      process.env.CLIPS_DESKTOP_SENTRY_ENVIRONMENT,
+      process.env.SENTRY_ENVIRONMENT,
+      process.env.NETLIFY_CONTEXT,
+      process.env.VERCEL_ENV,
+      process.env.NODE_ENV,
+    ) || "production"
+  );
+}
+
 // Tauri expects the frontend to be served from a fixed port during dev.
 // 1420 is the convention the Tauri docs use; we keep it here so
 // `tauri dev` and `vite dev` stay in sync out of the box.
@@ -20,6 +79,13 @@ import { defineConfig } from "vite";
 export default defineConfig({
   plugins: [react()],
   clearScreen: false,
+  define: {
+    __CLIPS_DESKTOP_SENTRY_DSN__: JSON.stringify(resolveSentryDsn()),
+    __CLIPS_DESKTOP_SENTRY_ENVIRONMENT__: JSON.stringify(
+      resolveSentryEnvironment(),
+    ),
+    __CLIPS_DESKTOP_VERSION__: JSON.stringify(packageJson.version ?? "0.0.0"),
+  },
   server: {
     port: 1420,
     strictPort: true,

package/corpus/templates/design/changelog/2026-06-27-mobile-navigation-chrome-and-motion.md

@@ -2,4 +2,5 @@
 type: improved
 date: 2026-06-27
 ---
+
 Improved mobile navigation chrome and sidebar drawer motion.

package/corpus/templates/forms/actions/export-responses.ts

@@ -6,6 +6,7 @@ import { eq, desc } from "drizzle-orm";
 import { z } from "zod";
 
 import { getDb, schema } from "../server/db/index.js";
+import { publicSubmitterEmail } from "../shared/submitter-email.js";
 
 export default defineAction({
   description: "Export form responses to CSV or JSON file.",
@@ -36,7 +37,7 @@ export default defineAction({
       const data = responses.map((r) => ({
         id: r.id,
         submittedAt: r.submittedAt,
-        submitterEmail: r.submitterEmail ?? null,
+        submitterEmail: publicSubmitterEmail(r.submitterEmail),
         pageUrl: r.pageUrl ?? null,
         clientSurface: r.clientSurface ?? null,
         ...JSON.parse(r.data),
@@ -56,7 +57,7 @@ export default defineAction({
         return [
           r.id,
           r.submittedAt,
-          r.submitterEmail ?? "",
+          publicSubmitterEmail(r.submitterEmail) ?? "",
           r.pageUrl ?? "",
           r.clientSurface ?? "",
           ...fields.map((f: any) => {

package/corpus/templates/forms/actions/list-responses.ts

@@ -4,6 +4,7 @@ import { eq, desc, sql } from "drizzle-orm";
 import { z } from "zod";
 
 import { getDb, schema } from "../server/db/index.js";
+import { publicSubmitterEmail } from "../shared/submitter-email.js";
 import type { FormResponse } from "../shared/types.js";
 
 export default defineAction({
@@ -49,7 +50,7 @@ export default defineAction({
         formId: r.formId,
         data: JSON.parse(r.data),
         submittedAt: r.submittedAt,
-        submitterEmail: r.submitterEmail ?? null,
+        submitterEmail: publicSubmitterEmail(r.submitterEmail),
         pageUrl: r.pageUrl ?? null,
         clientSurface: r.clientSurface ?? null,
       })) as FormResponse[],

package/corpus/templates/forms/actions/response-insights.ts

@@ -14,6 +14,7 @@ import { and, desc, eq, inArray, isNull, sql } from "drizzle-orm";
 import { z } from "zod";
 
 import { getDb, schema } from "../server/db/index.js";
+import { publicSubmitterEmail } from "../shared/submitter-email.js";
 import type {
   FormField,
   ResponseInsightsChartSeries,
@@ -161,7 +162,9 @@ function buildSpecificFormTable(
   totalRows: number,
 ): ResponseInsightsTable {
   const fields = safeJson<FormField[]>(form.fields, []).slice(0, 7);
-  const hasSubmitter = responses.some((row) => row.submitterEmail);
+  const hasSubmitter = responses.some((row) =>
+    publicSubmitterEmail(row.submitterEmail),
+  );
   const columns = [
     { key: "submittedAt", label: "Submitted" },
     ...(hasSubmitter ? [{ key: "submitterEmail", label: "Email" }] : []),
@@ -173,7 +176,9 @@ function buildSpecificFormTable(
       id: response.id,
       submittedAt: response.submittedAt,
       ...(hasSubmitter
-        ? { submitterEmail: response.submitterEmail ?? "" }
+        ? {
+            submitterEmail: publicSubmitterEmail(response.submitterEmail) ?? "",
+          }
         : {}),
       ...Object.fromEntries(
         fields.map((field) => [field.id, cleanText(data[field.id])]),
@@ -198,7 +203,9 @@ function buildAllFormsTable(
   tableLimit: number,
   totalRows: number,
 ): ResponseInsightsTable {
-  const hasSubmitter = responses.some((row) => row.submitterEmail);
+  const hasSubmitter = responses.some((row) =>
+    publicSubmitterEmail(row.submitterEmail),
+  );
   const columns = [
     { key: "submittedAt", label: "Submitted" },
     { key: "form", label: "Form" },
@@ -210,7 +217,9 @@ function buildAllFormsTable(
     formId: response.formId,
     submittedAt: response.submittedAt,
     form: formsById.get(response.formId)?.title ?? response.formId,
-    ...(hasSubmitter ? { submitterEmail: response.submitterEmail ?? "" } : {}),
+    ...(hasSubmitter
+      ? { submitterEmail: publicSubmitterEmail(response.submitterEmail) ?? "" }
+      : {}),
     summary: responseSummary(response, fieldsByForm),
   }));
 

package/corpus/templates/forms/changelog/2026-06-27-anonymous-feedback-no-longer-shows-internal-agent-native-ano.md

@@ -0,0 +1,6 @@
+---
+type: fixed
+date: 2026-06-27
+---
+
+Anonymous feedback no longer shows internal Agent Native anonymous-owner emails as submitter addresses.

package/corpus/templates/forms/server/handlers/submissions.ts

@@ -17,6 +17,10 @@ import {
 } from "h3";
 import { nanoid } from "nanoid";
 
+import {
+  cleanSubmitterEmail,
+  publicSubmitterEmail,
+} from "../../shared/submitter-email.js";
 import type {
   FormField,
   FormIntegration,
@@ -42,13 +46,6 @@ function cleanMetaText(value: unknown): string | null {
   return trimmed.slice(0, MAX_META_TEXT_LENGTH);
 }
 
-function cleanSubmitterEmail(value: unknown): string | null {
-  if (typeof value !== "string") return null;
-  const trimmed = value.trim();
-  if (!trimmed || trimmed.length > 320 || !trimmed.includes("@")) return null;
-  return trimmed;
-}
-
 // Allowlist the client-surface hint so only known values are stored. Anything
 // else (including spoofed direct POSTs) is dropped to NULL.
 const KNOWN_CLIENT_SURFACES = new Set(["web", "electron", "tauri"]);
@@ -340,7 +337,7 @@ export const listResponses = defineEventHandler(async (event: H3Event) => {
           formId: r.formId,
           data: JSON.parse(r.data),
           submittedAt: r.submittedAt,
-          submitterEmail: r.submitterEmail,
+          submitterEmail: publicSubmitterEmail(r.submitterEmail),
           pageUrl: r.pageUrl ?? null,
           clientSurface: r.clientSurface ?? null,
         })) as FormResponse[],

package/corpus/templates/forms/server/lib/integrations.ts

@@ -3,6 +3,7 @@ import {
   ssrfSafeToolFetch,
 } from "@agent-native/core/tools/url-safety";
 
+import { publicSubmitterEmail } from "../../shared/submitter-email.js";
 import type {
   FormIntegration,
   FormField,
@@ -155,6 +156,7 @@ function formatDebugContext(submission: SubmissionPayload): string[] {
 
 /** Slack Block Kit message */
 export function buildSlackPayload(submission: SubmissionPayload) {
+  const submitterEmail = publicSubmitterEmail(submission.submitterEmail);
   const fieldLines = submission.fields
     .filter((f) => submission.data[f.id] !== undefined)
     .map((f) => {
@@ -164,8 +166,8 @@ export function buildSlackPayload(submission: SubmissionPayload) {
     });
 
   const tsContext = `Submitted <!date^${Math.floor(new Date(submission.submittedAt).getTime() / 1000)}^{date_short_pretty} at {time}|${submission.submittedAt}>`;
-  const contextText = submission.submitterEmail
-    ? `${tsContext} by *${submission.submitterEmail}*`
+  const contextText = submitterEmail
+    ? `${tsContext} by *${submitterEmail}*`
     : tsContext;
   const debugContext = formatDebugContext(submission);
 
@@ -201,6 +203,7 @@ export function buildSlackPayload(submission: SubmissionPayload) {
 
 /** Discord webhook embed */
 function buildDiscordPayload(submission: SubmissionPayload) {
+  const submitterEmail = publicSubmitterEmail(submission.submitterEmail);
   const discordFields = submission.fields
     .filter((f) => submission.data[f.id] !== undefined)
     .map((f) => {
@@ -208,10 +211,10 @@ function buildDiscordPayload(submission: SubmissionPayload) {
       const display = Array.isArray(val) ? val.join(", ") : String(val);
       return { name: f.label, value: display, inline: true };
     });
-  if (submission.submitterEmail) {
+  if (submitterEmail) {
     discordFields.push({
       name: "Submitted by",
-      value: submission.submitterEmail,
+      value: submitterEmail,
       inline: true,
     });
   }
@@ -261,7 +264,7 @@ function buildGoogleSheetsPayload(submission: SubmissionPayload) {
   return {
     formTitle: submission.formTitle,
     submittedAt: submission.submittedAt,
-    submitterEmail: submission.submitterEmail ?? "",
+    submitterEmail: publicSubmitterEmail(submission.submitterEmail) ?? "",
     chatSessionIds: (submission.chatSessionIds ?? []).join(", "),
     activeRunId: submission.activeRunId ?? "",
     pageUrl: submission.pageUrl ?? "",
@@ -278,7 +281,7 @@ function buildWebhookPayload(submission: SubmissionPayload) {
     formTitle: submission.formTitle,
     responseId: submission.responseId,
     submittedAt: submission.submittedAt,
-    submitterEmail: submission.submitterEmail ?? null,
+    submitterEmail: publicSubmitterEmail(submission.submitterEmail),
     chatSessionIds: submission.chatSessionIds ?? [],
     activeRunId: submission.activeRunId ?? null,
     pageUrl: submission.pageUrl ?? null,