Merge pull request #3291 from seanbearden/fix/resolve-rig-scoped-mayor

fix: resolve rig-scoped mayor/deacon to town-level address (gt-te23)

Author: steveyegge

internal/mail/types.go

@@ -564,10 +564,22 @@ func normalizeAddress(s string) string {
 		return "deacon/"
 	}
 
+	// Resolve rig-scoped town-level roles to their canonical form (gt-te23).
+	// "gastown/mayor" → "mayor/", "gastown/deacon" → "deacon/"
+	// Mayor and deacon are town-level singletons, not rig-level agents.
+	parts := strings.Split(s, "/")
+	if len(parts) == 2 {
+		switch parts[1] {
+		case "mayor":
+			return "mayor/"
+		case "deacon":
+			return "deacon/"
+		}
+	}
+
 	// Normalize crew/ and polecats/ to canonical form:
 	// "rig/crew/name" → "rig/name"
 	// "rig/polecats/name" → "rig/name"
-	parts := strings.Split(s, "/")
 	if len(parts) == 3 && (parts[1] == "crew" || parts[1] == "polecats") {
 		return parts[0] + "/" + parts[2]
 	}

internal/mail/types_test.go

@@ -17,6 +17,12 @@ func TestAddressToIdentity(t *testing.T) {
 		{"deacon", "deacon/"},
 		{"deacon/", "deacon/"},
 
+		// Rig-scoped town-level roles resolve to canonical form (gt-te23)
+		{"gastown/mayor", "mayor/"},
+		{"gastown/deacon", "deacon/"},
+		{"laser/mayor", "mayor/"},
+		{"laser/deacon", "deacon/"},
+
 		// Rig-level agents: crew/ and polecats/ normalized to canonical form
 		{"gastown/polecats/Toast", "gastown/Toast"},
 		{"gastown/crew/max", "gastown/max"},