Update usage alert email to use App ID #5704

Author: carmenlau

.claude/skills/update-email-templates/SKILL.md

@@ -32,11 +32,17 @@ Follow this workflow whenever updating email templates.
 2. Generate `.mjml` from `.mjml.gotemplate`:
    - `go run ./scripts/generatemjml/main.go -i resources/authgear/templates`
 3. Commit source edits and generated `.mjml` in one commit.
-4. In a separate commit, generate non-English translations:
+4. Before regenerating non-English translations, delete the changed keys from all non-`en` locale files so the generator knows to recreate them:
+   - For `en/messages/translation.json` changes, delete the **top-level key** (e.g. `UsageAlert`, not `UsageAlert.Alert.Title`) from all non-`en` `messages/translation.json` files:
+     - `make templates-translation-json-del-key KEY=<TopLevelKey>`
+   - For `en/translation.json` subject changes, delete the changed key from all non-`en` `translation.json` files:
+     - `make translation-json-del-key KEY=<key>`
+   - Run once per changed top-level key.
+5. In a separate commit, generate non-English translations:
    - `make -C scripts/python generate-translations`
    - `ANTHROPIC_API_KEY` must be set.
    - If `ANTHROPIC_API_KEY` is not set, stop and ask the user to run this step.
-5. Finally, generate HTML emails:
+6. Finally, generate HTML emails:
    - `make html-email`
 
 ## Commit Boundaries (Required)

AGENTS.md

@@ -96,7 +96,8 @@ Use existing repo skills instead of one-off instructions when they fit:
 - `dep-audit`
 - `new-siteadmin-api`
 - `update-portal-ui` — **use this before adding or editing any portal UI page** (link components, i18n inline links, FluentUI Text pitfalls)
-- `write-e2e-test`
+- `update-email-templates` — **use this before editing any email template, translation string, or email subject line** (`*.gotemplate`, `messages/translation.json`, `translation.json` subjects)
+- `write-e2e-test` — **use this before writing, editing, or running e2e tests**
 - Repo-local skills for Go tests, Portal GraphQL operations, Go version updates, important-module updates, and vetted-position updates
 
 ## Git workflow

cmd/authgear/background/wire_gen.go

@@ -408,9 +408,13 @@ func (tc *TestCase) executeStep(
 			return nil, state, false
 		}
 		if step.SMTPLogOutput != nil {
-			ok := validateQueryResult(t, Step{
+			renderedRows, ok := renderTemplateString(t, cmd, prevSteps, step.SMTPLogOutput.Rows)
+			if !ok {
+				return nil, state, false
+			}
+			ok = validateQueryResult(t, Step{
 				Name:        step.Name,
-				QueryOutput: step.SMTPLogOutput,
+				QueryOutput: &QueryOutput{Rows: renderedRows},
 			}, rows)
 			if !ok {
 				return nil, state, false

e2e/cmd/e2e/pkg/wire_gen.go

@@ -91,13 +91,13 @@ steps:
     sleep_for: 2s
   - name: query smtp log
     action: smtp_log_query
-    smtp_log_subject: "SMS usage has been blocked (Authgear)"
+    smtp_log_subject: "SMS usage has been blocked ({{ .AppID }})"
     smtp_log_recipient: "usage-alert@example.com"
     smtp_log_output:
       rows: |
         [
           {
-            "subject": "SMS usage has been blocked (Authgear)",
+            "subject": "SMS usage has been blocked ({{ .AppID }})",
             "recipient": "usage-alert@example.com"
           }
         ]

e2e/pkg/testrunner/testcase.go

@@ -47,13 +47,13 @@ steps:
     sleep_for: 2s
   - name: query smtp log
     action: smtp_log_query
-    smtp_log_subject: "Your SMS usage has reached 1 (Authgear)"
+    smtp_log_subject: "Your SMS usage has reached 1 ({{ .AppID }})"
     smtp_log_recipient: "usage-alert@example.com"
     smtp_log_output:
       rows: |
         [
           {
-            "subject": "Your SMS usage has reached 1 (Authgear)",
+            "subject": "Your SMS usage has reached 1 ({{ .AppID }})",
             "recipient": "usage-alert@example.com"
           }
         ]