@cosmicdrift/kumiko-samples 0.362.0 → 0.363.0

package/packages/bundled-features/src/auth-email-password/index.ts

@@ -21,23 +21,7 @@ export type {
 } from "./bootstrap.js";
 export { BootstrapPlanError, BootstrapWriteError, bootstrapTenants } from "./bootstrap.js";
 export { AUTH_EMAIL_PASSWORD_FEATURE, AuthErrors, AuthHandlers, AuthQueries } from "./constants.js";
-// Renderers for the auth mails. All four magic-link flows (reset, verify,
-// signup-activation, invite) emit structured AuthMailContent through delivery
-// (ctx.notify).
-export type {
-  AuthMailContent,
-  AuthMailLocale,
-  AuthMailSection,
-  RenderInviteEmailArgs,
-  RenderTokenContentArgs,
-} from "./email-templates.js";
-export {
-  renderActivationEmail,
-  renderInviteEmail,
-  renderResetPasswordEmail,
-  renderUnlockAccountEmail,
-  renderVerifyEmail,
-} from "./email-templates.js";
+export type { AuthMailLocale } from "./email-templates.js";
 export type {
   AccountLockoutOptions,
   AccountUnlockOptions,
@@ -48,6 +32,7 @@ export type {
   SignupOptions,
 } from "./feature.js";
 export { authEmailPasswordEnvSchema, createAuthEmailPasswordFeature } from "./feature.js";
+export { AuthMailNotificationTypes } from "./mail-notifications.js";
 export {
   AUTH_SELF_REGISTRATION_FEATURE,
   createAuthSelfRegistrationToggleFeature,

package/packages/bundled-features/src/auth-email-password/magic-link-mail.ts

@@ -1,24 +1,24 @@
 // Shared dispatch for the magic-link mails (password-reset, email-verification,
-// signup-activation). All three follow the same delivery shape: append the
-// token to the app page, render structured content, and notify the recipient
-// email directly (route:{email} skips preferences — the recipient may not have
-// a user account yet — and critical priority keeps a security mail
-// non-unsubscribable). No r.notification is declared; buildMessage falls back
-// to the structured `data` for the renderer.
+// account-unlock, signup-activation, invite). All follow the same delivery
+// shape: append the token to the app page and notify the recipient email
+// directly (route:{email} skips preferences — the recipient may not have a user
+// account yet — and critical priority keeps a security mail non-unsubscribable).
+// Each mail type is a trigger-less r.notification whose stored template renders
+// from the variables passed here.
 
 import { requestContext } from "@cosmicdrift/kumiko-framework/api";
 import type { NotifyFn } from "@cosmicdrift/kumiko-framework/engine";
 import { InternalError } from "@cosmicdrift/kumiko-framework/errors";
-import { resolveMailLocale } from "@cosmicdrift/kumiko-framework/i18n";
-import type { AuthMailContent, AuthMailLocale, RenderTokenContentArgs } from "./email-templates.js";
+import { mailT, resolveMailLocale } from "@cosmicdrift/kumiko-framework/i18n";
+import { type AuthMailLocale, tokenMailExpiry } from "./email-templates.js";
+import { authMailTemplateLocale } from "./mail-notifications.js";
 
-// Per-flow constants: which notification type to dispatch and how to render the
-// body. renderContent is the flow's template (renderResetPasswordEmail / … /
-// renderActivationEmail), all unified on RenderTokenContentArgs → AuthMailContent.
+// Per-flow constants: which notification type to dispatch. fallbackAppName
+// replaces the translated default when the flow has no app name of its own.
 export type MagicLinkMailSpec = {
   readonly handlerName: string;
   readonly notificationType: string;
-  readonly renderContent: (args: RenderTokenContentArgs) => AuthMailContent;
+  readonly fallbackAppName?: string;
 };
 
 // Per-request values: the recipient + the app page that receives the token, plus
@@ -36,6 +36,8 @@ export type MagicLinkMailParams = {
   readonly locale?: AuthMailLocale;
   readonly issuedAt?: string;
   readonly timeZone?: string;
+  // Invite mails name the role the recipient is invited as.
+  readonly role?: string;
 };
 
 function resolveAppUrl(appUrl: string | ((locale: string) => string), locale: string): string {
@@ -75,18 +77,24 @@ export async function dispatchMagicLinkMail(
   // mailT already root-falls-back; appUrl must use the same negotiated tag
   // or language-in-path apps 404 on e.g. /de-AT/activate.
   const urlLocale = resolveMailLocale(locale);
-  const content = spec.renderContent({
-    url: appendToken(resolveAppUrl(params.appUrl, urlLocale), params.token),
-    expiresAt: params.expiresAt,
-    ...(params.locale !== undefined && { locale: params.locale }),
-    ...(params.appName !== undefined && { appName: params.appName }),
-    ...(params.issuedAt !== undefined && { issuedAt: params.issuedAt }),
-    ...(params.timeZone !== undefined && { timeZone: params.timeZone }),
-  });
+  const { validFor, validUntil } = tokenMailExpiry(
+    {
+      expiresAt: params.expiresAt,
+      ...(params.issuedAt !== undefined && { issuedAt: params.issuedAt }),
+      ...(params.timeZone !== undefined && { timeZone: params.timeZone }),
+    },
+    locale,
+  );
   await notify(spec.notificationType, {
     route: { email: params.email },
-    data: content,
-    locale,
+    data: {
+      appName: params.appName ?? spec.fallbackAppName ?? mailT(locale, "auth.mail.appNameDefault"),
+      actionUrl: appendToken(resolveAppUrl(params.appUrl, urlLocale), params.token),
+      validFor,
+      validUntil,
+      ...(params.role !== undefined && { role: params.role }),
+    },
+    locale: authMailTemplateLocale(spec.notificationType, locale),
     priority: "critical",
   });
 }

package/packages/bundled-features/src/auth-email-password/mail-notifications.ts

@@ -0,0 +1,158 @@
+import {
+  type NotificationLocalizedTemplate,
+  QnTypes,
+  qn,
+  type TemplateVariables,
+  templateVariable,
+} from "@cosmicdrift/kumiko-framework/engine";
+import {
+  hasMailTranslationKey,
+  listMailLocales,
+  mailT,
+  resolveMailLocale,
+} from "@cosmicdrift/kumiko-framework/i18n";
+import { escapeHtml, escapeHtmlAttr } from "@cosmicdrift/kumiko-headless";
+import { AUTH_EMAIL_PASSWORD_FEATURE } from "./constants.js";
+
+export const AUTH_MAIL_KINDS = {
+  passwordReset: { name: "password-reset", translationKey: "reset" },
+  accountUnlock: { name: "account-unlock", translationKey: "unlock" },
+  emailVerification: { name: "email-verification", translationKey: "verify" },
+  signupActivation: { name: "signup-activation", translationKey: "activation" },
+  invite: { name: "invite", translationKey: "invite" },
+} as const;
+
+export type AuthMailKind = keyof typeof AUTH_MAIL_KINDS;
+
+type MagicLinkFlowOptions = Partial<
+  Record<"passwordReset" | "emailVerification" | "signup" | "invite" | "accountUnlock", unknown>
+>;
+
+export function sendsMagicLinkMail(flows: MagicLinkFlowOptions): boolean {
+  return Boolean(
+    flows.passwordReset ||
+      flows.emailVerification ||
+      flows.signup ||
+      flows.invite ||
+      flows.accountUnlock,
+  );
+}
+
+function authMailType(kind: AuthMailKind): string {
+  return qn(AUTH_EMAIL_PASSWORD_FEATURE, QnTypes.notify, AUTH_MAIL_KINDS[kind].name);
+}
+
+export const AuthMailNotificationTypes: Readonly<Record<AuthMailKind, string>> = {
+  passwordReset: authMailType("passwordReset"),
+  accountUnlock: authMailType("accountUnlock"),
+  emailVerification: authMailType("emailVerification"),
+  signupActivation: authMailType("signupActivation"),
+  invite: authMailType("invite"),
+};
+
+function subjectKey(kind: AuthMailKind): string {
+  return `auth.mail.${AUTH_MAIL_KINDS[kind].translationKey}.subject`;
+}
+
+const ALL_AUTH_MAIL_KINDS: readonly AuthMailKind[] = [
+  "passwordReset",
+  "accountUnlock",
+  "emailVerification",
+  "signupActivation",
+  "invite",
+];
+
+const SUBJECT_KEY_BY_TYPE: ReadonlyMap<string, string> = new Map(
+  ALL_AUTH_MAIL_KINDS.map((kind) => [AuthMailNotificationTypes[kind], subjectKey(kind)]),
+);
+
+// A registered locale whose bundle lacks the subject key has no template (see
+// authMailLocalizedTemplate); the renderer has no locale fallback, so the
+// sender must pick a locale that has one or the mail would not go out at all.
+export function authMailTemplateLocale(notificationType: string, requestedLocale: string): string {
+  const locale = resolveMailLocale(requestedLocale);
+  const key = SUBJECT_KEY_BY_TYPE.get(notificationType);
+  return key !== undefined && hasMailTranslationKey(locale, key) ? locale : "en";
+}
+
+export const AUTH_MAIL_VARIABLES: TemplateVariables = {
+  appName: templateVariable.text({ required: true }),
+  actionUrl: templateVariable.link({ required: true }),
+  validFor: templateVariable.text({ required: true }),
+  validUntil: templateVariable.text({ required: true }),
+};
+
+export const INVITE_MAIL_VARIABLES: TemplateVariables = {
+  ...AUTH_MAIL_VARIABLES,
+  role: templateVariable.text({ required: true }),
+};
+
+// Translation placeholder -> template variable. The markers survive HTML
+// escaping, so only the translated text is escaped, never the placeholders.
+const PLACEHOLDER_VARIABLES: Readonly<Record<string, string>> = {
+  app: "appName",
+  duration: "validFor",
+  when: "validUntil",
+  role: "role",
+};
+const MARKER_OPEN = "\uE000";
+const MARKER_CLOSE = "\uE001";
+const MARKER_PATTERN = new RegExp(`${MARKER_OPEN}(\\w+)${MARKER_CLOSE}`, "g");
+
+function markers(): Readonly<Record<string, string>> {
+  return Object.fromEntries(
+    Object.keys(PLACEHOLDER_VARIABLES).map((name) => [
+      name,
+      `${MARKER_OPEN}${name}${MARKER_CLOSE}`,
+    ]),
+  );
+}
+
+function translatedHtml(locale: string, key: string): string {
+  return escapeHtml(mailT(locale, key, markers())).replace(MARKER_PATTERN, (_, name: string) => {
+    const variable = PLACEHOLDER_VARIABLES[name];
+    return variable === undefined
+      ? ""
+      : `<span data-variable="${escapeHtmlAttr(variable)}"></span>`;
+  });
+}
+
+function mailBody(locale: string, translationKey: string): string {
+  const html = (part: string) => translatedHtml(locale, `auth.mail.${translationKey}.${part}`);
+  return [
+    `<p>${html("greeting")}</p>`,
+    `<p>${html("intro")}</p>`,
+    `<p><a data-button href="{{actionUrl}}">${html("button")}</a></p>`,
+    `<p>${html("expiry")}</p>`,
+    `<p>${html("ignore")}</p>`,
+  ].join("");
+}
+
+// Evaluated when the registry is built, after every locale feature has
+// registered its mail translations. English always ships; another locale only
+// gets a template when it has its own subject, so a missing translation never
+// silently becomes an English mail in that locale's slot.
+export function authMailLocalizedTemplate(kind: AuthMailKind): () => NotificationLocalizedTemplate {
+  const { translationKey } = AUTH_MAIL_KINDS[kind];
+  const kindSubjectKey = subjectKey(kind);
+  return () => {
+    const locales = [
+      "en",
+      ...listMailLocales().filter(
+        (locale) => locale !== "en" && hasMailTranslationKey(locale, kindSubjectKey),
+      ),
+    ];
+    return Object.fromEntries(
+      locales.map((locale) => [
+        locale,
+        {
+          body: mailBody(locale, translationKey),
+          meta: {
+            subject: mailT(locale, kindSubjectKey, { app: "{{appName}}" }),
+            category: "transactional" as const,
+          },
+        },
+      ]),
+    );
+  };
+}

package/packages/bundled-features/src/auth-email-password/signup-activation.ts

@@ -9,15 +9,15 @@ import type { NotifyFn } from "@cosmicdrift/kumiko-framework/engine";
 import { Temporal } from "@cosmicdrift/kumiko-types/temporal";
 import type { Redis } from "ioredis";
 import { AUTH_SIGNUP_DEFAULT_TTL_MINUTES } from "./constants.js";
-import { renderActivationEmail } from "./email-templates.js";
 import { dispatchMagicLinkMail } from "./magic-link-mail.js";
+import { AuthMailNotificationTypes } from "./mail-notifications.js";
 import {
   invalidateExistingSignupToken,
   normalizeEmail,
   storeSignupToken,
 } from "./signup-token-store.js";
 
-export const SIGNUP_ACTIVATION_NOTIFICATION_TYPE = "auth-email-password:signup-activation";
+export const SIGNUP_ACTIVATION_NOTIFICATION_TYPE = AuthMailNotificationTypes.signupActivation;
 
 export type IssueSignupActivationArgs = {
   readonly redis: Redis;
@@ -65,7 +65,6 @@ export async function issueSignupActivation(
     {
       handlerName: "signup-request",
       notificationType: SIGNUP_ACTIVATION_NOTIFICATION_TYPE,
-      renderContent: renderActivationEmail,
     },
     {
       email,

package/packages/bundled-features/src/auth-foundation/types.ts

@@ -48,10 +48,10 @@ export type AuthProviderPlugin = {
 
 export function isValidTokenShape(shape: unknown): shape is TokenShape {
   if (typeof shape !== "object" || shape === null || !("kind" in shape)) return false;
-  const kind = (shape as { kind: unknown }).kind;
+  const kind = shape.kind;
   if (kind === "jwt") return true;
   if (kind === "prefix") {
-    const prefix = "prefix" in shape ? (shape as { prefix: unknown }).prefix : undefined;
+    const prefix = "prefix" in shape ? shape.prefix : undefined;
     return typeof prefix === "string" && prefix.length > 0;
   }
   return false;
@@ -64,9 +64,9 @@ export function isAuthProviderPlugin(o: unknown): o is AuthProviderPlugin {
     typeof o === "object" &&
     o !== null &&
     "build" in o &&
-    typeof (o as { build: unknown }).build === "function" &&
+    typeof o.build === "function" &&
     "shape" in o &&
-    isValidTokenShape((o as { shape: unknown }).shape)
+    isValidTokenShape(o.shape)
   );
 }
 
@@ -105,12 +105,7 @@ export type SessionStoreProvider = {
 };
 
 export function isSessionStoreProvider(o: unknown): o is SessionStoreProvider {
-  return (
-    typeof o === "object" &&
-    o !== null &&
-    "build" in o &&
-    typeof (o as { build: unknown }).build === "function"
-  );
+  return typeof o === "object" && o !== null && "build" in o && typeof o.build === "function";
 }
 
 // Tenant-resolution extension points (#1373). Both are single-provider and
@@ -154,19 +149,14 @@ export function isTenantResolverProvider(o: unknown): o is TenantResolverProvide
     typeof o === "object" &&
     o !== null &&
     "build" in o &&
-    typeof (o as { build: unknown }).build === "function" &&
+    typeof o.build === "function" &&
     "trust" in o &&
-    isTenantResolverTrust((o as { trust: unknown }).trust)
+    isTenantResolverTrust(o.trust)
   );
 }
 
 export function isTenantExistenceProvider(o: unknown): o is TenantExistenceProvider {
-  return (
-    typeof o === "object" &&
-    o !== null &&
-    "build" in o &&
-    typeof (o as { build: unknown }).build === "function"
-  );
+  return typeof o === "object" && o !== null && "build" in o && typeof o.build === "function";
 }
 
 // r.useExtension options-shape for auth-foundation's four extension points.

package/packages/bundled-features/src/auth-mfa/feature.ts

@@ -53,11 +53,9 @@ export function bindMfaRevokeAllOtherSessionsFromFeature(
 ): BindMfaRevokeAllOtherSessions | undefined {
   const exports = feature.exports;
   if (exports && typeof exports === "object" && "bindRevokeAllOtherSessions" in exports) {
-    const { bindRevokeAllOtherSessions } = exports as {
-      bindRevokeAllOtherSessions: unknown;
-    };
+    const { bindRevokeAllOtherSessions } = exports;
     if (typeof bindRevokeAllOtherSessions === "function") {
-      // @cast-boundary exports-walk — feature.exports is untyped by design
+      // @cast-boundary feature-exports — feature.exports is untyped by design
       return bindRevokeAllOtherSessions as BindMfaRevokeAllOtherSessions;
     }
   }
@@ -71,9 +69,9 @@ export function mfaStatusCheckerFromFeature(
 ): MfaStatusChecker | undefined {
   const exports = feature.exports;
   if (exports && typeof exports === "object" && "checkMfaStatus" in exports) {
-    const { checkMfaStatus } = exports as { checkMfaStatus: unknown };
+    const { checkMfaStatus } = exports;
     if (typeof checkMfaStatus === "function") {
-      // @cast-boundary exports-walk — feature.exports is untyped by design
+      // @cast-boundary feature-exports — feature.exports is untyped by design
       return checkMfaStatus as MfaStatusChecker;
     }
   }
@@ -87,9 +85,9 @@ export function mfaStatusCheckerFromFeature(
 export function mfaVerifierFromFeature(feature: FeatureDefinition): MfaCodeVerifier | undefined {
   const exports = feature.exports;
   if (exports && typeof exports === "object" && "verifyMfaCode" in exports) {
-    const { verifyMfaCode } = exports as { verifyMfaCode: unknown };
+    const { verifyMfaCode } = exports;
     if (typeof verifyMfaCode === "function") {
-      // @cast-boundary exports-walk — feature.exports is untyped by design
+      // @cast-boundary feature-exports — feature.exports is untyped by design
       return verifyMfaCode as MfaCodeVerifier;
     }
   }
@@ -107,9 +105,9 @@ export function bindRevokeAllPatTokensFromFeature(
 ): BindRevokeAllPatTokens | undefined {
   const exports = feature.exports;
   if (exports && typeof exports === "object" && "bindRevokeAllPatTokens" in exports) {
-    const { bindRevokeAllPatTokens } = exports as { bindRevokeAllPatTokens: unknown };
+    const { bindRevokeAllPatTokens } = exports;
     if (typeof bindRevokeAllPatTokens === "function") {
-      // @cast-boundary exports-walk — feature.exports is untyped by design
+      // @cast-boundary feature-exports — feature.exports is untyped by design
       return bindRevokeAllPatTokens as BindRevokeAllPatTokens;
     }
   }

package/packages/bundled-features/src/auth-mfa/hmac-token-codec.ts

@@ -1,5 +1,6 @@
 import { createHmac, timingSafeEqual } from "node:crypto";
 import { Temporal } from "@cosmicdrift/kumiko-types/temporal";
+import { isPlainObject } from "@cosmicdrift/kumiko-types/type-guards";
 
 function hmacSign(input: string, secret: string): string {
   return createHmac("sha256", secret).update(input).digest("base64url");
@@ -20,11 +21,10 @@ export function createHmacTokenCodec<
   function splitEncodedBody(
     value: unknown,
   ): { readonly payload: TPayload; readonly expiresAtMs: number } | null {
-    if (typeof value !== "object" || value === null) return null;
-    const v = value as Record<string, unknown>;
-    const expiresAtMs = v["expiresAtMs"];
+    if (!isPlainObject(value)) return null;
+    const expiresAtMs = value["expiresAtMs"];
     if (typeof expiresAtMs !== "number") return null;
-    const { expiresAtMs: _drop, ...rest } = v;
+    const { expiresAtMs: _drop, ...rest } = value;
     return isPayload(rest) ? { payload: rest, expiresAtMs } : null;
   }
 

package/packages/bundled-features/src/auth-mfa/mfa-challenge-token.ts

@@ -1,5 +1,6 @@
 import type { TenantId } from "@cosmicdrift/kumiko-framework/engine";
 import { Temporal } from "@cosmicdrift/kumiko-types/temporal";
+import { isPlainObject } from "@cosmicdrift/kumiko-types/type-guards";
 import { createHmacTokenCodec, type HmacTokenVerifyResult } from "./hmac-token-codec.js";
 
 export type MfaChallengePayload = {
@@ -8,9 +9,8 @@ export type MfaChallengePayload = {
 };
 
 function isPayload(value: unknown): value is MfaChallengePayload {
-  if (typeof value !== "object" || value === null) return false;
-  const v = value as Record<string, unknown>;
-  return typeof v["userId"] === "string" && typeof v["tenantId"] === "string";
+  if (!isPlainObject(value)) return false;
+  return typeof value["userId"] === "string" && typeof value["tenantId"] === "string";
 }
 
 // Domain-separated from mfa-preauth-setup (see hmac-token-codec). Single-use is

package/packages/bundled-features/src/auth-mfa/mfa-preauth-setup-token.ts

@@ -1,5 +1,6 @@
 import type { TenantId } from "@cosmicdrift/kumiko-framework/engine";
 import { Temporal } from "@cosmicdrift/kumiko-types/temporal";
+import { isPlainObject } from "@cosmicdrift/kumiko-types/type-guards";
 import { createHmacTokenCodec, type HmacTokenVerifyResult } from "./hmac-token-codec.js";
 
 export type MfaPreauthSetupPayload = {
@@ -8,9 +9,8 @@ export type MfaPreauthSetupPayload = {
 };
 
 function isPayload(value: unknown): value is MfaPreauthSetupPayload {
-  if (typeof value !== "object" || value === null) return false;
-  const v = value as Record<string, unknown>;
-  return typeof v["userId"] === "string" && typeof v["tenantId"] === "string";
+  if (!isPlainObject(value)) return false;
+  return typeof value["userId"] === "string" && typeof value["tenantId"] === "string";
 }
 
 // Domain "mfa-preauth-setup" must never equal the challenge domain: a setup

package/packages/bundled-features/src/auth-mfa/mfa-setup-token.ts

@@ -11,6 +11,7 @@
 // generated secret material, not just re-derive it from a lookup.
 import { createHmac, timingSafeEqual } from "node:crypto";
 import { Temporal } from "@cosmicdrift/kumiko-types/temporal";
+import { isPlainObject } from "@cosmicdrift/kumiko-types/type-guards";
 
 export type MfaSetupPayload = {
   readonly userId: string;
@@ -47,15 +48,14 @@ export type VerifyMfaSetupResult =
   | { readonly ok: false; readonly reason: "malformed" | "bad_signature" | "expired" };
 
 function isEncodedBody(value: unknown): value is EncodedBody {
-  if (typeof value !== "object" || value === null) return false;
-  const v = value as Record<string, unknown>;
+  if (!isPlainObject(value)) return false;
   return (
-    typeof v["userId"] === "string" &&
-    typeof v["totpSecretBase32"] === "string" &&
-    Array.isArray(v["recoveryCodeHashes"]) &&
-    v["recoveryCodeHashes"].every((h) => typeof h === "string") &&
-    typeof v["expiresAtMs"] === "number" &&
-    (v["tenantId"] === undefined || typeof v["tenantId"] === "string")
+    typeof value["userId"] === "string" &&
+    typeof value["totpSecretBase32"] === "string" &&
+    Array.isArray(value["recoveryCodeHashes"]) &&
+    value["recoveryCodeHashes"].every((h) => typeof h === "string") &&
+    typeof value["expiresAtMs"] === "number" &&
+    (value["tenantId"] === undefined || typeof value["tenantId"] === "string")
   );
 }
 

package/packages/bundled-features/src/billing-foundation/changes.json

@@ -1,4 +1,11 @@
 [
+  {
+    "version": "0.363.0",
+    "type": "breaking",
+    "title": "Contract confirmation and termination mails use template variables",
+    "detail": "contract-confirmation, contract-termination-receipt and contract-termination-operator-notice are r.notification declarations with variables and localized templates (de, en). The notification types are qualified names now (billing-foundation:notify:<name>). The notify data is the template variable object (subject, details, contractLines, termsParagraphs, operatorEmail), not sections.",
+    "migration": "Update delivery preferences and tests that referenced the old type strings, and anything that listens to the notification data. An app that mounts it without includeBundled needs template-resolver, renderer-foundation and @cosmicdrift/kumiko-renderer-mail-html at boot (composeRendererStack() from dev-server mounts all of them), plus a delivery with the channel-email feature; apps without the template tables need a schema migration (`kumiko schema generate`)."
+  },
   {
     "version": "0.354.0",
     "type": "breaking",

package/packages/bundled-features/src/billing-foundation/constants.ts

@@ -1,6 +1,7 @@
 /// <reference types="temporal-polyfill/global" preserve="true" />
 // @runtime client
 import { Temporal } from "@cosmicdrift/kumiko-types/temporal";
+import { isOneOf } from "@cosmicdrift/kumiko-types/type-guards";
 
 // Feature name
 export const BILLING_FOUNDATION_FEATURE = "billing-foundation" as const;
@@ -11,14 +12,14 @@ export const SUBSCRIPTION_PROVIDER_EXTENSION = "subscriptionProvider" as const;
 
 /** delivery notification type of the § 312f contract confirmation mail. */
 export const CONTRACT_CONFIRMATION_NOTIFICATION_TYPE =
-  "billing-foundation:contract-confirmation" as const;
+  "billing-foundation:notify:contract-confirmation" as const;
 
 /** delivery notification types of the § 312k termination receipt and the
  *  operator notice. */
 export const CONTRACT_TERMINATION_RECEIPT_NOTIFICATION_TYPE =
-  "billing-foundation:contract-termination-receipt" as const;
+  "billing-foundation:notify:contract-termination-receipt" as const;
 export const CONTRACT_TERMINATION_OPERATOR_NOTIFICATION_TYPE =
-  "billing-foundation:contract-termination-operator-notice" as const;
+  "billing-foundation:notify:contract-termination-operator-notice" as const;
 
 // Qualified write handler names (QN format: scope:type:name).
 export const SubscriptionFoundationHandlers = {
@@ -230,5 +231,5 @@ export const TERMINATION_SCOPES = ["tenant-host", "platform"] as const;
 export type TerminationScope = (typeof TERMINATION_SCOPES)[number];
 
 export function isTerminationScope(value: unknown): value is TerminationScope {
-  return (TERMINATION_SCOPES as readonly unknown[]).includes(value);
+  return isOneOf(TERMINATION_SCOPES, value);
 }