@cosmicdrift/kumiko-bundled-features 0.354.1 → 0.356.0

package/dist/template-resolver/handlers/set.write.js

@@ -1,7 +1,7 @@
 import { fetchOne } from "@cosmicdrift/kumiko-framework/bun-db";
-import { crossTenantOverrideDenied, defineWriteHandler, SYSTEM_TENANT_ID, } from "@cosmicdrift/kumiko-framework/engine";
-import { writeFailure } from "@cosmicdrift/kumiko-framework/errors";
+import { defineWriteHandler, SYSTEM_TENANT_ID, } from "@cosmicdrift/kumiko-framework/engine";
 import * as z from "zod";
+import { requireForTenant } from "../../shared/index.js";
 import { TEMPLATE_KINDS, TEXT_BLOCK_KIND } from "../constants.js";
 import { templateResourcesTable } from "../table.js";
 import { contentFormatSchema, executor, folderSchema, localeSchema, slugSchema } from "./shared.js";
@@ -43,18 +43,11 @@ export const setWrite = defineWriteHandler({
     access: { roles: ["TenantAdmin", "SystemAdmin"] },
     description: "Creates or overwrites one content-tree resource addressed by slug, kind and locale, carrying a title and folder and going live on save with no draft stage; a SystemAdmin may target the system tenant, where shared legal and marketing copy lives.",
     handler: async (event, ctx) => {
-        const db = ctx.db;
         const override = event.payload.tenantIdOverride;
-        const overrideDenied = crossTenantOverrideDenied(event.user, override, "templateResolver.errors.tenantOverrideRequiresSystemAdmin");
-        if (overrideDenied)
-            return writeFailure(overrideDenied);
         // @cast-boundary engine-payload — override is a zod-validated string, the
         // user's own tenantId is already TenantId-branded.
         const tenantId = (override ?? event.user.tenantId);
-        // With an override the executor user has to move to the target tenant too,
-        // otherwise the event-store stream lookup runs against event.user.tenantId
-        // and reports a version conflict although the projection row exists.
-        const executorUser = override !== undefined ? { ...event.user, tenantId } : event.user;
+        const { db, streamTenantId } = requireForTenant(ctx, tenantId);
         const kind = event.payload.kind ?? TEXT_BLOCK_KIND;
         const existing = await fetchOne(db, templateResourcesTable, {
             tenantId,
@@ -91,7 +84,7 @@ export const setWrite = defineWriteHandler({
                     contentFormat: fields.contentFormat,
                     folder: fields.folder,
                 },
-            }, executorUser, db);
+            }, event.user, db, { streamTenantId });
             if (!result.isSuccess)
                 return result;
             return {
@@ -99,7 +92,9 @@ export const setWrite = defineWriteHandler({
                 data: { slug: event.payload.slug, locale: event.payload.locale, isNew: false },
             };
         }
-        const result = await executor.create({ ...fields, tenantId }, executorUser, db);
+        const result = await executor.create({ ...fields, tenantId }, event.user, db, {
+            streamTenantId,
+        });
         if (!result.isSuccess)
             return result;
         return {

package/dist/template-resolver/handlers/upsert-system.write.js

@@ -1,5 +1,6 @@
 import { fetchOne } from "@cosmicdrift/kumiko-framework/bun-db";
 import { defineWriteHandler, SYSTEM_TENANT_ID, } from "@cosmicdrift/kumiko-framework/engine";
+import { requireForTenant } from "../../shared/index.js";
 import { templateResourcesTable } from "../table.js";
 import { executor, upsertPayloadSchema } from "./shared.js";
 // System-Template anlegen/updaten. Liegt unter SYSTEM_TENANT_ID,
@@ -12,13 +13,10 @@ export const upsertSystemWrite = defineWriteHandler({
     access: { roles: ["SystemAdmin"] },
     description: "Creates or overwrites a system-default template under the system tenant with its full variable schema and linked resources, active straight away with no draft stage; SystemAdmin only, since tenants shadow these defaults through upsert-tenant instead.",
     handler: async (event, ctx) => {
-        const db = ctx.db;
         // @cast-boundary engine-payload — SYSTEM_TENANT_ID is a UUID literal,
         // asserted to the branded TenantId (parseTenantId equivalent).
         const tenantId = SYSTEM_TENANT_ID;
-        // The executor user must carry SYSTEM_TENANT as tenantId, otherwise the
-        // event store looks up the stream under user.tenantId → conflict.
-        const executorUser = { ...event.user, tenantId };
+        const { db, streamTenantId } = requireForTenant(ctx, tenantId);
         const existing = await fetchOne(db, templateResourcesTable, {
             tenantId,
             slug: event.payload.slug,
@@ -41,7 +39,7 @@ export const upsertSystemWrite = defineWriteHandler({
             status: "active",
         };
         if (existing) {
-            const result = await executor.update({ id: existing.id, version: existing.version, changes: fields }, executorUser, db);
+            const result = await executor.update({ id: existing.id, version: existing.version, changes: fields }, event.user, db, { streamTenantId });
             if (!result.isSuccess)
                 return result;
             return {
@@ -49,7 +47,9 @@ export const upsertSystemWrite = defineWriteHandler({
                 data: { id: String(existing.id), slug: event.payload.slug, isNew: false },
             };
         }
-        const result = await executor.create({ ...fields, tenantId }, executorUser, db);
+        const result = await executor.create({ ...fields, tenantId }, event.user, db, {
+            streamTenantId,
+        });
         if (!result.isSuccess)
             return result;
         // @cast-boundary db-row — executor.create returnt Record-row aus

package/dist/template-resolver/handlers/upsert-tenant.write.js

@@ -1,7 +1,8 @@
 import { fetchOne } from "@cosmicdrift/kumiko-framework/bun-db";
-import { crossTenantOverrideDenied, defineWriteHandler, SYSTEM_TENANT_ID, } from "@cosmicdrift/kumiko-framework/engine";
+import { defineWriteHandler, SYSTEM_TENANT_ID, } from "@cosmicdrift/kumiko-framework/engine";
 import { AccessDeniedError, writeFailure } from "@cosmicdrift/kumiko-framework/errors";
 import * as z from "zod";
+import { requireForTenant } from "../../shared/index.js";
 import { templateResourcesTable } from "../table.js";
 import { executor, upsertPayloadSchema } from "./shared.js";
 // Tenant-Override anlegen/updaten. Liegt unter event.user.tenantId,
@@ -18,11 +19,7 @@ export const upsertTenantWrite = defineWriteHandler({
     access: { roles: ["TenantAdmin", "SystemAdmin"] },
     description: "Creates or overwrites a tenant-scoped template override with its variable schema, landing as a draft that only publish makes live; it refuses a system-tenant target, which is what upsert-system is for.",
     handler: async (event, ctx) => {
-        const db = ctx.db;
         const override = event.payload.tenantIdOverride;
-        const overrideDenied = crossTenantOverrideDenied(event.user, override, "templateResolver.errors.tenantOverrideRequiresSystemAdmin");
-        if (overrideDenied)
-            return writeFailure(overrideDenied);
         // upsertTenant erzeugt scope='tenant'. SYSTEM_TENANT_ID-Override würde
         // scope='tenant' unter SYSTEM_TENANT_ID schreiben → inkonsistenter Zustand
         // (Resolver-Logik trennt sauber zwischen system+tenant). SystemAdmin muss
@@ -37,7 +34,7 @@ export const upsertTenantWrite = defineWriteHandler({
         // event.user.tenantId schon TenantId-branded; union als TenantId casten
         // ist legit (override ist UUID-Format-validiert in schema).
         const tenantId = (override ?? event.user.tenantId);
-        const executorUser = override !== undefined ? { ...event.user, tenantId } : event.user;
+        const { db, streamTenantId } = requireForTenant(ctx, tenantId);
         const existing = await fetchOne(db, templateResourcesTable, {
             tenantId,
             slug: event.payload.slug,
@@ -59,7 +56,7 @@ export const upsertTenantWrite = defineWriteHandler({
             status: event.payload.status,
         };
         if (existing) {
-            const result = await executor.update({ id: existing.id, version: existing.version, changes: fields }, executorUser, db);
+            const result = await executor.update({ id: existing.id, version: existing.version, changes: fields }, event.user, db, { streamTenantId });
             if (!result.isSuccess)
                 return result;
             return {
@@ -67,7 +64,9 @@ export const upsertTenantWrite = defineWriteHandler({
                 data: { id: String(existing.id), slug: event.payload.slug, isNew: false },
             };
         }
-        const result = await executor.create({ ...fields, tenantId }, executorUser, db);
+        const result = await executor.create({ ...fields, tenantId }, event.user, db, {
+            streamTenantId,
+        });
         if (!result.isSuccess)
             return result;
         // @cast-boundary db-row — executor.create returnt Record-row aus

package/dist/template-resolver/seeding.js

@@ -29,8 +29,7 @@ async function resolveExistingForEventStoreSeed(db, tdb, existingRow, tenantId)
         if (unscoped !== 0) {
             throw new Error(`seed orphan check: projection ${id} has no events for tenant ${tenantId} but unscoped stream version is ${unscoped} — refusing delete/recreate to avoid wiping a live stream`);
         }
-        // @cast-boundary orphan projection cleanup: empty stream, no executor verb;
-        // plain table ident trips guard-direct-entity-writes (infra EXCLUDE follow-up).
+        // The cast strips the executor-only brand that WritableTable rejects; the orphan row has no events, so no executor verb applies.
         await deleteMany(tdb, templateResourcesTable, { id, tenantId });
         return null;
     }

package/dist/tenant/cancel-pending-invitation.d.ts

@@ -1,8 +1,8 @@
 import { type TenantDb } from "@cosmicdrift/kumiko-framework/db";
-import type { SessionUser } from "@cosmicdrift/kumiko-framework/engine";
+import type { SessionUser, TenantId } from "@cosmicdrift/kumiko-framework/engine";
 import type { WriteFailure } from "@cosmicdrift/kumiko-framework/errors";
 import type { Redis } from "ioredis";
 export declare function cancelPendingInvitation(db: TenantDb, invitation: {
     readonly id: string;
     readonly version: number;
-}, actor: SessionUser, redis: Redis | undefined): Promise<WriteFailure | undefined>;
+}, actor: SessionUser, redis: Redis | undefined, streamTenantId?: TenantId): Promise<WriteFailure | undefined>;

package/dist/tenant/cancel-pending-invitation.js

@@ -5,12 +5,12 @@ import { INVITATION_STATUS, tenantInvitationEntity, tenantInvitationsTable, } fr
 const invitationExecutor = createEventStoreExecutor(tenantInvitationsTable, tenantInvitationEntity, { entityName: "tenant-invitation" });
 // Shared by cancel-invitation and remove-member so the cancel behavior
 // (status transition + token invalidation) cannot drift between them.
-export async function cancelPendingInvitation(db, invitation, actor, redis) {
+export async function cancelPendingInvitation(db, invitation, actor, redis, streamTenantId) {
     const updateResult = await invitationExecutor.update({
         id: invitation.id,
         version: invitation.version,
         changes: { status: INVITATION_STATUS.cancelled },
-    }, actor, db);
+    }, actor, db, { streamTenantId });
     if (!updateResult.isSuccess)
         return updateResult;
     // Delete the token from Redis (if still there). If Redis is

package/dist/tenant/handlers/remove-member.write.js

@@ -1,6 +1,6 @@
 import { fetchOne, selectMany } from "@cosmicdrift/kumiko-framework/bun-db";
 import { createEventStoreExecutor, } from "@cosmicdrift/kumiko-framework/db";
-import { createSystemUser, defineWriteHandler, withResponseData, } from "@cosmicdrift/kumiko-framework/engine";
+import { createSystemUser, defineWriteHandler, parseTenantId, withResponseData, } from "@cosmicdrift/kumiko-framework/engine";
 import { InternalError, NotFoundError, writeFailure, } from "@cosmicdrift/kumiko-framework/errors";
 import { parseRoles } from "@cosmicdrift/kumiko-framework/utils";
 import * as z from "zod";
@@ -20,7 +20,7 @@ async function cancelPendingInvitationsOfUser(db, options) {
     const email = (await decryptStoredPii(user.email, "email", "tenant:remove-member")).toLowerCase();
     const pendingInvitations = await selectMany(db, tenantInvitationsTable, { tenantId: options.tenantId, email, status: INVITATION_STATUS.pending });
     for (const invitation of pendingInvitations) {
-        const failure = await cancelPendingInvitation(db, invitation, options.actor, options.redis);
+        const failure = await cancelPendingInvitation(db, invitation, options.actor, options.redis, options.streamTenantId);
         if (failure)
             return failure;
     }
@@ -43,11 +43,14 @@ export const removeMemberWrite = defineWriteHandler({
             });
         }
         const db = ctx.systemDb.acknowledgeCrossTenant("SystemAdmin manages memberships across tenants");
-        const existing = await fetchOne(db, tenantMembershipsTable, {
-            userId: event.payload.userId,
-            tenantId: event.payload.tenantId,
-        });
-        if (!existing) {
+        const streamTenantId = parseTenantId(event.payload.tenantId);
+        const existing = streamTenantId === null
+            ? undefined
+            : await fetchOne(db, tenantMembershipsTable, {
+                userId: event.payload.userId,
+                tenantId: streamTenantId,
+            });
+        if (!existing || streamTenantId === null) {
             return writeFailure(new NotFoundError("membership", undefined, {
                 i18nKey: "tenant.errors.membershipNotFound",
                 i18nParams: { userId: event.payload.userId, tenantId: event.payload.tenantId },
@@ -75,14 +78,14 @@ export const removeMemberWrite = defineWriteHandler({
             });
         }
         const result = await executor.delete({ id: existing["id"] }, // @cast-boundary db-row
-        event.user, db);
+        event.user, db, { streamTenantId });
         if (!result.isSuccess)
             return result;
-        // Actor tenant = invitation tenant so the update hits the invitation's stream.
         const cancelFailure = await cancelPendingInvitationsOfUser(db, {
             userId: event.payload.userId,
             tenantId: event.payload.tenantId,
-            actor: { ...event.user, tenantId: event.payload.tenantId },
+            actor: event.user,
+            streamTenantId,
             redis: ctx.redis,
         });
         if (cancelFailure !== undefined)

package/dist/tenant/handlers/update-member-roles.write.js

@@ -1,6 +1,6 @@
 import { fetchOne } from "@cosmicdrift/kumiko-framework/bun-db";
 import { createEventStoreExecutor } from "@cosmicdrift/kumiko-framework/db";
-import { access, assignableAppRolesOf, createSystemUser, defineWriteHandler, findForbiddenRoleAssignment, mergeAssignedRoles, SYSTEM_ROLE, withResponseData, } from "@cosmicdrift/kumiko-framework/engine";
+import { access, assignableAppRolesOf, createSystemUser, defineWriteHandler, findForbiddenRoleAssignment, mayOverrideTenant, mergeAssignedRoles, parseTenantId, SYSTEM_ROLE, withResponseData, } from "@cosmicdrift/kumiko-framework/engine";
 import { InternalError, NotFoundError, ValidationError, writeFailure, } from "@cosmicdrift/kumiko-framework/errors";
 import { parseRoles } from "@cosmicdrift/kumiko-framework/utils";
 import * as z from "zod";
@@ -17,7 +17,12 @@ const REVOKE_ALL_SESSIONS_QN = "sessions:write:user-session:revoke-all-for-user"
 /** SystemAdmin may pass payload.tenantId (cross-tenant); the members actionForm
  *  only sends userId+roles, so fall back to the active session tenant. */
 function resolveTargetTenantId(isSystem, payloadTenantId, sessionTenantId) {
-    return isSystem ? (payloadTenantId ?? sessionTenantId) : sessionTenantId;
+    if (!isSystem || payloadTenantId === undefined)
+        return sessionTenantId;
+    return parseTenantId(payloadTenantId) ?? undefined;
+}
+function foreignStreamTenant(user, targetTenantId) {
+    return targetTenantId === user.tenantId ? undefined : targetTenantId;
 }
 // Editing your OWN roles keeps the current session: roles are re-derived per
 // request, so the new roles apply at once without a re-login. Other sessions
@@ -49,7 +54,7 @@ export const updateMemberRolesWrite = defineWriteHandler({
             });
         }
         const isSystemActor = event.user.roles.includes(SYSTEM_ROLE);
-        const isSystem = event.user.roles.includes("SystemAdmin") || isSystemActor;
+        const isSystem = mayOverrideTenant(event.user) || isSystemActor;
         const assignableAppRoles = assignableAppRolesOf(ctx.registry);
         const targetTenantId = resolveTargetTenantId(isSystem, event.payload.tenantId, event.user.tenantId);
         if (!targetTenantId) {
@@ -117,16 +122,14 @@ export const updateMemberRolesWrite = defineWriteHandler({
         if (revoker) {
             await ctx.writeAs(createSystemUser(targetTenantId), REVOKE_ALL_SESSIONS_QN, revokeSessionsPayload(event.payload.userId, targetTenantId, event.user));
         }
-        // Stream tenant follows the actor via streamTenantFor — use the
-        // membership tenant so SystemAdmin/cross-tenant and TenantAdmin paths
-        // hit the same stream seedTenantMembership/invite-accept wrote.
-        // Keep the real actor for audit metadata; only override tenantId so
-        // streamTenantFor writes into the membership tenant (#2401).
+        // The membership stream lives on the membership's tenant (where seedTenantMembership/
+        // invite-accept wrote it); a cross-tenant operator addresses it without becoming a member.
+        // Same-tenant writes run on a tenant-mode db, which refuses a stream override.
         const result = await executor.update({
             id: row["id"], // @cast-boundary db-row
             version: row["version"], // @cast-boundary db-row
             changes: { roles: JSON.stringify(nextRoles) },
-        }, { ...event.user, tenantId: targetTenantId }, db);
+        }, event.user, db, { streamTenantId: foreignStreamTenant(event.user, targetTenantId) });
         return withResponseData(result, {
             ...event.payload,
             roles: nextRoles,

package/dist/tenant-lifecycle/feature.js

@@ -89,6 +89,7 @@ export function createTenantLifecycleFeature() {
                     fileProviderResolver: ctx._fileProviderResolver,
                     searchAdapter: ctx.searchAdapter,
                     escapeHatchAuditSink: ctx._escapeHatchAuditSink,
+                    escapeHatchAuditLog: ctx.log,
                     actor: ctx.systemUser.id,
                 });
             },

package/dist/tenant-lifecycle/run-tenant-destroy.d.ts

@@ -2,6 +2,7 @@
 import type { DbRunner, TenantDb } from "@cosmicdrift/kumiko-framework/db";
 import { type EscapeHatchAuditSink, type Registry, type TenantId } from "@cosmicdrift/kumiko-framework/engine";
 import type { FileProviderResolver } from "@cosmicdrift/kumiko-framework/files";
+import type { Logger } from "@cosmicdrift/kumiko-framework/logging";
 import type { SearchAdapter } from "@cosmicdrift/kumiko-framework/search";
 type StageTickResult = {
     readonly done: boolean;
@@ -17,6 +18,7 @@ export declare function runNextDestructionStage(args: {
     readonly fileProviderResolver?: FileProviderResolver;
     readonly searchAdapter?: SearchAdapter;
     readonly escapeHatchAuditSink?: EscapeHatchAuditSink;
+    readonly escapeHatchAuditLog?: Logger;
     readonly actor?: string;
 }): Promise<StageTickResult>;
 export declare function hasTenantDestructionWork(reads: Pick<TenantDb, "count">, now: Temporal.Instant): Promise<boolean>;
@@ -29,6 +31,7 @@ export declare function runTenantDestructionSweep(args: {
     readonly fileProviderResolver?: FileProviderResolver;
     readonly searchAdapter?: SearchAdapter;
     readonly escapeHatchAuditSink?: EscapeHatchAuditSink;
+    readonly escapeHatchAuditLog?: Logger;
     readonly actor?: string;
 }): Promise<{
     readonly triggered: number;

package/dist/tenant-lifecycle/run-tenant-destroy.js

@@ -162,6 +162,7 @@ export async function runNextDestructionStage(args) {
         fileProviderResolver: args.fileProviderResolver,
         searchAdapter: args.searchAdapter,
         escapeHatchAuditSink: args.escapeHatchAuditSink,
+        escapeHatchAuditLog: args.escapeHatchAuditLog,
         actor: args.actor,
         deadlineAt: Date.now() + DESTRUCTION_STAGE_TICK_BUDGET_MS,
     };
@@ -258,6 +259,7 @@ export async function runTenantDestructionSweep(args) {
                 fileProviderResolver: args.fileProviderResolver,
                 searchAdapter: args.searchAdapter,
                 escapeHatchAuditSink: args.escapeHatchAuditSink,
+                escapeHatchAuditLog: args.escapeHatchAuditLog,
                 actor: args.actor,
             });
             if (!result.error && !result.halted)

package/dist/tenant-lifecycle/stages.d.ts

@@ -1,6 +1,7 @@
 import { type DbRunner } from "@cosmicdrift/kumiko-framework/db";
 import { type EscapeHatchAuditSink, type Registry, type TenantId } from "@cosmicdrift/kumiko-framework/engine";
 import type { FileProviderResolver } from "@cosmicdrift/kumiko-framework/files";
+import { type Logger } from "@cosmicdrift/kumiko-framework/logging";
 import { type SearchAdapter } from "@cosmicdrift/kumiko-framework/search";
 import type { TenantDestructionStageName } from "./constants.js";
 export type DestructionStageCtx = {
@@ -11,6 +12,7 @@ export type DestructionStageCtx = {
     readonly fileProviderResolver?: FileProviderResolver;
     readonly searchAdapter?: SearchAdapter;
     readonly escapeHatchAuditSink?: EscapeHatchAuditSink;
+    readonly escapeHatchAuditLog?: Logger;
     readonly actor?: string;
     readonly deadlineAt: number;
 };

package/dist/tenant-lifecycle/stages.js

@@ -2,6 +2,7 @@ import { selectMany } from "@cosmicdrift/kumiko-framework/bun-db";
 import { configuredPiiSubjectKms, subjectIdToKey, } from "@cosmicdrift/kumiko-framework/crypto";
 import { createEventStoreExecutor, createTenantDb, } from "@cosmicdrift/kumiko-framework/db";
 import { createSystemUser, EXT_EXTERNAL_RESOURCE, EXT_INFRA_RESOURCE, EXT_SEARCH_ADAPTER, EXT_STORAGE_PROVIDER, EXT_TENANT_DATA, extensionUsageEscapeHatchReason, isTenantDataExtensionHooks, isTenantResourceExtensionHooks, } from "@cosmicdrift/kumiko-framework/engine";
+import { createFallbackLogger } from "@cosmicdrift/kumiko-framework/logging";
 import { createEscapeHatchReporter, UNATTRIBUTED_ACTOR, } from "@cosmicdrift/kumiko-framework/pipeline";
 import { purgeSearchDocumentsForSubject, } from "@cosmicdrift/kumiko-framework/search";
 import { getTemporal } from "@cosmicdrift/kumiko-framework/time";
@@ -51,6 +52,7 @@ async function runTenantDataHooks(ctx) {
             tenantId: ctx.tenantId,
             actor: ctx.actor ?? UNATTRIBUTED_ACTOR,
             sink: ctx.escapeHatchAuditSink,
+            log: ctx.escapeHatchAuditLog ?? createFallbackLogger("tenant-lifecycle"),
         });
         const hookCtx = {
             db: createTenantDb(ctx.db, ctx.tenantId, "tenant", undefined, undefined, undefined, {

package/dist/tier-engine/handlers/set-tenant-tier.write.js

@@ -1,7 +1,8 @@
 import { fetchOne } from "@cosmicdrift/kumiko-framework/bun-db";
-import { buildEntityTable, createEventStoreExecutor, createTenantDb, } from "@cosmicdrift/kumiko-framework/db";
+import { buildEntityTable, createEventStoreExecutor } from "@cosmicdrift/kumiko-framework/db";
 import { defineWriteHandler } from "@cosmicdrift/kumiko-framework/engine";
 import * as z from "zod";
+import { requireForTenant } from "../../shared/index.js";
 import { tierAssignmentAggregateId } from "../aggregate-id.js";
 import { TierAssignmentSources } from "../constants.js";
 import { tierAssignmentEntity } from "../entity.js";
@@ -9,13 +10,8 @@ import { tierAssignmentEntity } from "../entity.js";
 // Billing. Cross-tenant, daher SystemAdmin-only (kein TenantAdmin: sonst
 // Gratis-Self-Upgrade).
 //
-// **Cross-tenant-Mechanik:** ein "system"-mode TenantDb auf den Ziel-Tenant legt
-// KEINEN Tenant-Filter an (tenant-db.ts:141 — mode==="system" überspringt ihn);
-// der executor-user wird ebenfalls auf den Ziel-Tenant gestellt, sonst landet das
-// Event im Stream des Admins (Memory feedback_event_store_tenant_consistency).
-// Das set.write-"override-user"-Muster trägt NICHT für beliebige Tenants — es
-// funktioniert nur für SYSTEM_TENANT_ID (immer im IN-Filter). Dies ist das
-// auto-default-Hook-Muster (feature.ts), generalisiert auf einen Request-Handler.
+// Cross-tenant mechanics: ctx.forTenant(tenantId) yields a tenant-mode db bound to the target plus
+// the streamTenantId, so the event lands in the target's stream with the operator as actor.
 //
 // `source: TierAssignmentSources.manual` marks the grant so the billing sync skips it.
 // Upsert: one aggregate per tenant (deterministic aggregate id).
@@ -31,7 +27,6 @@ const tierAssignmentTable = buildEntityTable("tier-assignment", tierAssignmentEn
 const executor = createEventStoreExecutor(tierAssignmentTable, tierAssignmentEntity, {
     entityName: "tier-assignment",
 });
-const SET_TENANT_TIER_REASON = "SystemAdmin assigns the tier of the tenant named in the payload";
 export function createSetTenantTierWrite(opts = {}) {
     return defineWriteHandler({
         name: "set-tenant-tier",
@@ -46,10 +41,6 @@ export function createSetTenantTierWrite(opts = {}) {
         }),
         access: { roles: ["SystemAdmin"] },
         agent: { risk: "high" },
-        escapeHatch: {
-            grants: ["unsafeRaw"],
-            reason: SET_TENANT_TIER_REASON,
-        },
         handler: async (event, ctx) => {
             // Without a commit sink (unit harness) there is no transaction to wait for.
             const afterCommit = (tenantId, tier) => {
@@ -60,9 +51,7 @@ export function createSetTenantTierWrite(opts = {}) {
                     opts.onAssigned?.(tenantId, tier);
             };
             const tenantId = event.payload.tenantId; // @cast-boundary engine-bridge
-            const rawDb = ctx.db.unsafeRaw();
-            const tdb = createTenantDb(rawDb, tenantId, "system");
-            const systemUser = { ...event.user, tenantId };
+            const { db: tdb, streamTenantId } = requireForTenant(ctx, tenantId);
             const tier = event.payload.tier;
             const existing = await fetchOne(tdb, tierAssignmentTable, { tenantId });
             if (existing) {
@@ -70,7 +59,7 @@ export function createSetTenantTierWrite(opts = {}) {
                     id: existing.id,
                     version: existing.version,
                     changes: { tier, source: TierAssignmentSources.manual },
-                }, systemUser, tdb);
+                }, event.user, tdb, { streamTenantId });
                 if (!result.isSuccess)
                     return result;
                 afterCommit(tenantId, tier);
@@ -81,7 +70,7 @@ export function createSetTenantTierWrite(opts = {}) {
                 tier,
                 source: TierAssignmentSources.manual,
                 tenantId,
-            }, systemUser, tdb);
+            }, event.user, tdb, { streamTenantId });
             if (!result.isSuccess)
                 return result;
             afterCommit(tenantId, tier);

package/dist/user-data-rights/feature.js

@@ -477,6 +477,7 @@ export function createUserDataRightsFeature(opts = {}) {
                         appExportDownloadUrl: opts.appExportDownloadUrl,
                     }),
                     escapeHatchAuditSink: ctx._escapeHatchAuditSink,
+                    escapeHatchAuditLog: ctx.log,
                     actor: ctx.systemUser.id,
                     metrics: exportMetrics,
                 });
@@ -541,6 +542,7 @@ export function createUserDataRightsFeature(opts = {}) {
                     }),
                     ...(sendDeletionExecutedEmail && { sendDeletionExecutedEmail }),
                     escapeHatchAuditSink: ctx._escapeHatchAuditSink,
+                    escapeHatchAuditLog: ctx.log,
                     actor: ctx.systemUser.id,
                 });
                 // Persist each incomplete report on the job-run log (#1572). The write

package/dist/user-data-rights/run-export-jobs.d.ts

@@ -1,3 +1,4 @@
+import type { Logger } from "@cosmicdrift/kumiko-framework/logging";
 import type { DbConnection } from "@cosmicdrift/kumiko-framework/db";
 import type { EscapeHatchAuditSink, Registry, TenantId } from "@cosmicdrift/kumiko-framework/engine";
 import { type FileStorageProvider } from "@cosmicdrift/kumiko-framework/files";
@@ -75,6 +76,7 @@ export interface RunExportJobsArgs {
      *  Callback durch. Required wenn sendExportReadyEmail gesetzt. */
     readonly appExportDownloadUrl?: string;
     readonly escapeHatchAuditSink?: EscapeHatchAuditSink;
+    readonly escapeHatchAuditLog?: Logger;
     readonly actor?: string;
     /**
      * Reports EXPORT_CLEANUP_BACKLOG_AGE_METRIC after the storage-cleanup

package/dist/user-data-rights/run-export-jobs.js

@@ -106,6 +106,7 @@ export async function runExportJobs(args) {
             now,
             job,
             escapeHatchAuditSink: args.escapeHatchAuditSink,
+            escapeHatchAuditLog: args.escapeHatchAuditLog,
             actor: args.actor,
         });
         if (outcome.kind === "done") {
@@ -230,6 +231,7 @@ async function processJob(args) {
             userId: job.userId,
             now,
             escapeHatchAuditSink: args.escapeHatchAuditSink,
+            escapeHatchAuditLog: args.escapeHatchAuditLog,
             actor: args.actor,
         });
         const profile = await resolveProfileForTenant({

package/dist/user-data-rights/run-forget-cleanup.d.ts

@@ -1,3 +1,4 @@
+import { type Logger } from "@cosmicdrift/kumiko-framework/logging";
 import { type KmsAdapter } from "@cosmicdrift/kumiko-framework/crypto";
 import { type DbRunner } from "@cosmicdrift/kumiko-framework/db";
 import { type EscapeHatchAuditSink, type Registry, type TenantId, type TenantUserModel, type UserDataDeleteStrategy, type UserDataStorageProvider } from "@cosmicdrift/kumiko-framework/engine";
@@ -69,6 +70,7 @@ export interface RunForgetCleanupArgs {
      */
     readonly tenantModel?: TenantUserModel;
     readonly escapeHatchAuditSink?: EscapeHatchAuditSink;
+    readonly escapeHatchAuditLog?: Logger;
     readonly actor?: string;
 }
 export interface ForgetCleanupError {

package/dist/user-data-rights/run-forget-cleanup.js

@@ -1,3 +1,4 @@
+import { createFallbackLogger } from "@cosmicdrift/kumiko-framework/logging";
 // Forget-Cleanup-Runner (S2.U5b) — pure-Function Pipeline.
 //
 // After the grace period (S2.U5a sets gracePeriodEnd) this runner iterates
@@ -51,6 +52,7 @@ function buildHookDb(db, tenantId, entry, args) {
         tenantId,
         actor: args.actor ?? UNATTRIBUTED_ACTOR,
         sink: args.escapeHatchAuditSink,
+        log: args.escapeHatchAuditLog ?? createFallbackLogger("user-data-rights"),
     });
     return createTenantDb(db, tenantId, "tenant", undefined, undefined, undefined, {
         unsafeRaw: entry.escapeHatchReason !== undefined ? { reason: entry.escapeHatchReason } : undefined,
@@ -117,6 +119,7 @@ export async function runForgetCleanup(args) {
             kms,
             searchAdapter: args.searchAdapter,
             escapeHatchAuditSink: args.escapeHatchAuditSink,
+            escapeHatchAuditLog: args.escapeHatchAuditLog,
             actor: args.actor,
         });
         hookCallsAttempted += userResult.hookCallsAttempted;
@@ -235,6 +238,7 @@ async function processUser(args) {
                     const hookResult = await entry.deleteHook({
                         db: buildHookDb(tx, tenantId, entry, {
                             escapeHatchAuditSink: args.escapeHatchAuditSink,
+                            escapeHatchAuditLog: args.escapeHatchAuditLog,
                             actor: args.actor,
                         }),
                         registry,

package/dist/user-data-rights/run-user-export.d.ts

@@ -1,3 +1,4 @@
+import { type Logger } from "@cosmicdrift/kumiko-framework/logging";
 import type { DbRunner } from "@cosmicdrift/kumiko-framework/db";
 import { type EscapeHatchAuditSink, type Registry, type TenantId, type UserDataExportSnippet } from "@cosmicdrift/kumiko-framework/engine";
 import type { getTemporal } from "@cosmicdrift/kumiko-framework/time";
@@ -8,6 +9,7 @@ export interface RunUserExportArgs {
     readonly userId: string;
     readonly now: Instant;
     readonly escapeHatchAuditSink?: EscapeHatchAuditSink;
+    readonly escapeHatchAuditLog?: Logger;
     readonly actor?: string;
 }
 export interface UserExportFileRef {

package/dist/user-data-rights/run-user-export.js

@@ -1,3 +1,4 @@
+import { createFallbackLogger } from "@cosmicdrift/kumiko-framework/logging";
 // User-Data-Export-Pipeline (S2.U3) — DSGVO Art. 15 (Auskunft) +
 // Art. 20 (Datenportabilität).
 //
@@ -32,6 +33,7 @@ function buildHookDb(db, tenantId, entry, args) {
         tenantId,
         actor: args.actor ?? UNATTRIBUTED_ACTOR,
         sink: args.escapeHatchAuditSink,
+        log: args.escapeHatchAuditLog ?? createFallbackLogger("user-data-rights"),
     });
     return createTenantDb(db, tenantId, "tenant", undefined, undefined, undefined, {
         unsafeRaw: entry.escapeHatchReason !== undefined ? { reason: entry.escapeHatchReason } : undefined,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cosmicdrift/kumiko-bundled-features",
-  "version": "0.354.1",
+  "version": "0.356.0",
   "description": "Built-in features — tenant, user, auth, delivery. The stuff you'd rewrite anyway, already typed.",
   "license": "BUSL-1.1",
   "author": "Marc Frost <marc@cosmicdriftgamestudio.com>",
@@ -516,12 +516,12 @@
     }
   },
   "dependencies": {
-    "@cosmicdrift/kumiko-dispatcher-live": "0.354.1",
-    "@cosmicdrift/kumiko-framework": "0.354.1",
-    "@cosmicdrift/kumiko-headless": "0.354.1",
-    "@cosmicdrift/kumiko-renderer": "0.354.1",
-    "@cosmicdrift/kumiko-renderer-web": "0.354.1",
-    "@cosmicdrift/kumiko-types": "0.354.1",
+    "@cosmicdrift/kumiko-dispatcher-live": "0.356.0",
+    "@cosmicdrift/kumiko-framework": "0.356.0",
+    "@cosmicdrift/kumiko-headless": "0.356.0",
+    "@cosmicdrift/kumiko-renderer": "0.356.0",
+    "@cosmicdrift/kumiko-renderer-web": "0.356.0",
+    "@cosmicdrift/kumiko-types": "0.356.0",
     "@mollie/api-client": "^4.5.0",
     "@node-rs/argon2": "^2.0.2",
     "@types/mailparser": "^3.4.6",
@@ -1050,8 +1050,8 @@
   ],
   "devDependencies": {
     "@testing-library/user-event": "^14.6.1",
-    "@cosmicdrift/kumiko-locale-de": "0.354.1",
-    "@cosmicdrift/kumiko-locale-es": "0.354.1",
+    "@cosmicdrift/kumiko-locale-de": "0.356.0",
+    "@cosmicdrift/kumiko-locale-es": "0.356.0",
     "jsqr": "^1.4.0"
   }
 }