@cosmicdrift/kumiko-samples 0.354.1 → 0.356.0

package/packages/bundled-features/src/template-resolver/handlers/collection-list.query.ts

@@ -2,7 +2,6 @@ import { selectMany } from "@cosmicdrift/kumiko-framework/bun-db";
 import { castTenantRows } from "@cosmicdrift/kumiko-framework/db";
 import {
   type ContentCollectionDefinition,
-  crossTenantOverrideDenied,
   defineQueryHandler,
 } from "@cosmicdrift/kumiko-framework/engine";
 import * as z from "zod";
@@ -36,12 +35,6 @@ export function makeCollectionListQuery(collection: ContentCollectionDefinition)
         : `Lists the tenant-wide entries of the "${collection.id}" content collection (${collection.kind} content) with slug, locale, title and body; every caller who may reach this collection sees the same shared set.`,
     handler: async (query, ctx) => {
       const override = query.payload.tenantIdOverride;
-      const overrideDenied = crossTenantOverrideDenied(
-        query.user,
-        override,
-        "templateResolver.errors.tenantOverrideRequiresSystemAdmin",
-      );
-      if (overrideDenied) throw overrideDenied;
       const tenantId = override ?? query.user.tenantId;
       const rows = castTenantRows<CollectionEntryRow>(
         await selectMany(ctx.db, store.table, {

package/packages/bundled-features/src/template-resolver/handlers/collection-set.write.ts

@@ -1,12 +1,11 @@
 import { fetchOne } from "@cosmicdrift/kumiko-framework/bun-db";
 import {
   type ContentCollectionDefinition,
-  crossTenantOverrideDenied,
   defineWriteHandler,
   type TenantId,
 } from "@cosmicdrift/kumiko-framework/engine";
-import { writeFailure } from "@cosmicdrift/kumiko-framework/errors";
 import * as z from "zod";
+import { requireForTenant } from "../../shared/index.js";
 import {
   type CollectionEntryRow,
   collectionStore,
@@ -41,18 +40,11 @@ export function makeCollectionSetWrite(collection: ContentCollectionDefinition)
         ? `Creates or overwrites the caller's own "${collection.id}" entry at a slug and locale, live on save with no draft stage; it always writes the acting user's entry, never another user's.`
         : `Creates or overwrites the tenant-wide "${collection.id}" entry at a slug and locale, live on save with no draft stage; the change is visible to everyone who may reach this shared collection.`,
     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) as TenantId;
-      const executorUser = override !== undefined ? { ...event.user, tenantId } : event.user;
+      const { db, streamTenantId } = requireForTenant(ctx, tenantId);
       // Scoped to the acting user even under a tenant override: a SystemAdmin
       // writing into another tenant still writes their own entry, never
       // someone else's signature.
@@ -81,8 +73,9 @@ export function makeCollectionSetWrite(collection: ContentCollectionDefinition)
               folder: event.payload.folder ?? null,
             },
           },
-          executorUser,
+          event.user,
           db,
+          { streamTenantId },
         );
         if (!result.isSuccess) return result;
         return {
@@ -104,8 +97,9 @@ export function makeCollectionSetWrite(collection: ContentCollectionDefinition)
           ...store.createDefaults(tenantId),
           ...owner,
         },
-        executorUser,
+        event.user,
         db,
+        { streamTenantId },
       );
       if (!result.isSuccess) return result;
       return {

package/packages/bundled-features/src/template-resolver/handlers/set.write.ts

@@ -1,12 +1,11 @@
 import { fetchOne } from "@cosmicdrift/kumiko-framework/bun-db";
 import {
-  crossTenantOverrideDenied,
   defineWriteHandler,
   SYSTEM_TENANT_ID,
   type TenantId,
 } from "@cosmicdrift/kumiko-framework/engine";
-import { writeFailure } from "@cosmicdrift/kumiko-framework/errors";
 import * as z from "zod";
+import { requireForTenant } from "../../shared/index.js";
 import { TEMPLATE_KINDS, TEXT_BLOCK_KIND } from "../constants.js";
 import { type TemplateResourceRow, templateResourcesTable } from "../table.js";
 import { contentFormatSchema, executor, folderSchema, localeSchema, slugSchema } from "./shared.js";
@@ -50,21 +49,11 @@ export const setWrite = defineWriteHandler({
   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) as 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<TemplateResourceRow>(db, templateResourcesTable, {
@@ -106,8 +95,9 @@ export const setWrite = defineWriteHandler({
             folder: fields.folder,
           },
         },
-        executorUser,
+        event.user,
         db,
+        { streamTenantId },
       );
       if (!result.isSuccess) return result;
       return {
@@ -116,7 +106,9 @@ export const setWrite = defineWriteHandler({
       };
     }
 
-    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 {
       isSuccess: true as const,

package/packages/bundled-features/src/template-resolver/handlers/upsert-system.write.ts

@@ -4,6 +4,7 @@ import {
   SYSTEM_TENANT_ID,
   type TenantId,
 } from "@cosmicdrift/kumiko-framework/engine";
+import { requireForTenant } from "../../shared/index.js";
 import type { TemplateResourceRow } from "../table.js";
 import { templateResourcesTable } from "../table.js";
 import { executor, upsertPayloadSchema } from "./shared.js";
@@ -19,13 +20,10 @@ export const upsertSystemWrite = defineWriteHandler({
   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 as TenantId;
-    // 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<TemplateResourceRow>(db, templateResourcesTable, {
       tenantId,
@@ -53,8 +51,9 @@ export const upsertSystemWrite = defineWriteHandler({
     if (existing) {
       const result = await executor.update(
         { id: existing.id, version: existing.version, changes: fields },
-        executorUser,
+        event.user,
         db,
+        { streamTenantId },
       );
       if (!result.isSuccess) return result;
       return {
@@ -63,7 +62,9 @@ export const upsertSystemWrite = defineWriteHandler({
       };
     }
 
-    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
     // INSERT RETURNING; shape { id } ist garantiert weil PK in der

package/packages/bundled-features/src/template-resolver/handlers/upsert-tenant.write.ts

@@ -1,12 +1,12 @@
 import { fetchOne } from "@cosmicdrift/kumiko-framework/bun-db";
 import {
-  crossTenantOverrideDenied,
   defineWriteHandler,
   SYSTEM_TENANT_ID,
   type TenantId,
 } 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 type { TemplateResourceRow } from "../table.js";
 import { templateResourcesTable } from "../table.js";
 import { executor, upsertPayloadSchema } from "./shared.js";
@@ -26,14 +26,7 @@ export const upsertTenantWrite = defineWriteHandler({
   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
@@ -50,7 +43,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) as TenantId;
-    const executorUser = override !== undefined ? { ...event.user, tenantId } : event.user;
+    const { db, streamTenantId } = requireForTenant(ctx, tenantId);
 
     const existing = await fetchOne<TemplateResourceRow>(db, templateResourcesTable, {
       tenantId,
@@ -77,8 +70,9 @@ export const upsertTenantWrite = defineWriteHandler({
     if (existing) {
       const result = await executor.update(
         { id: existing.id, version: existing.version, changes: fields },
-        executorUser,
+        event.user,
         db,
+        { streamTenantId },
       );
       if (!result.isSuccess) return result;
       return {
@@ -87,7 +81,9 @@ export const upsertTenantWrite = defineWriteHandler({
       };
     }
 
-    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
     // INSERT RETURNING; shape { id } ist garantiert weil PK in der

package/packages/bundled-features/src/template-resolver/seeding.ts

@@ -51,8 +51,7 @@ async function resolveExistingForEventStoreSeed(
         `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 as EntityTableMeta, { id, tenantId });
     return null;
   }

package/packages/bundled-features/src/tenant/cancel-pending-invitation.ts

@@ -1,5 +1,5 @@
 import { createEventStoreExecutor, 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";
 // kumiko-lint-ignore cross-feature-import cancel needs invite-token-store for Redis cleanup
@@ -23,6 +23,7 @@ export async function cancelPendingInvitation(
   invitation: { readonly id: string; readonly version: number },
   actor: SessionUser,
   redis: Redis | undefined,
+  streamTenantId?: TenantId,
 ): Promise<WriteFailure | undefined> {
   const updateResult = await invitationExecutor.update(
     {
@@ -32,6 +33,7 @@ export async function cancelPendingInvitation(
     },
     actor,
     db,
+    { streamTenantId },
   );
   if (!updateResult.isSuccess) return updateResult;
 

package/packages/bundled-features/src/tenant/handlers/remove-member.write.ts

@@ -7,7 +7,9 @@ import {
 import {
   createSystemUser,
   defineWriteHandler,
+  parseTenantId,
   type SessionUser,
+  type TenantId,
   withResponseData,
 } from "@cosmicdrift/kumiko-framework/engine";
 import {
@@ -34,6 +36,7 @@ type PendingInvitationCancel = {
   readonly userId: string;
   readonly tenantId: string;
   readonly actor: SessionUser;
+  readonly streamTenantId: TenantId;
   readonly redis: Redis | undefined;
 };
 
@@ -51,7 +54,13 @@ async function cancelPendingInvitationsOfUser(
     { 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;
   }
   return undefined;
@@ -79,11 +88,15 @@ 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",
@@ -125,14 +138,15 @@ export const removeMemberWrite = defineWriteHandler({
       { id: (existing as DbRow)["id"] as string }, // @cast-boundary db-row
       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) return cancelFailure;

package/packages/bundled-features/src/tenant/handlers/update-member-roles.write.ts

@@ -6,8 +6,12 @@ import {
   createSystemUser,
   defineWriteHandler,
   findForbiddenRoleAssignment,
+  mayOverrideTenant,
   mergeAssignedRoles,
+  parseTenantId,
+  type SessionUser,
   SYSTEM_ROLE,
+  type TenantId,
   withResponseData,
 } from "@cosmicdrift/kumiko-framework/engine";
 import {
@@ -40,9 +44,14 @@ const REVOKE_ALL_SESSIONS_QN = "sessions:write:user-session:revoke-all-for-user"
 function resolveTargetTenantId(
   isSystem: boolean,
   payloadTenantId: string | undefined,
-  sessionTenantId: string | undefined,
-): string | undefined {
-  return isSystem ? (payloadTenantId ?? sessionTenantId) : sessionTenantId;
+  sessionTenantId: TenantId,
+): TenantId | undefined {
+  if (!isSystem || payloadTenantId === undefined) return sessionTenantId;
+  return parseTenantId(payloadTenantId) ?? undefined;
+}
+
+function foreignStreamTenant(user: SessionUser, targetTenantId: TenantId): TenantId | undefined {
+  return targetTenantId === user.tenantId ? undefined : targetTenantId;
 }
 
 // Editing your OWN roles keeps the current session: roles are re-derived per
@@ -50,7 +59,7 @@ function resolveTargetTenantId(
 // of that user and any foreign edit still revoke all.
 function revokeSessionsPayload(
   targetUserId: string,
-  targetTenantId: string,
+  targetTenantId: TenantId,
   actor: { readonly id: string; readonly sid?: string | undefined },
 ): { userId: string; tenantId: string; exceptSessionId?: string } {
   const payload = { userId: targetUserId, tenantId: targetTenantId };
@@ -82,7 +91,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,
@@ -185,19 +194,18 @@ export const updateMemberRolesWrite = defineWriteHandler({
       );
     }
 
-    // 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"] as string, // @cast-boundary db-row
         version: row["version"] as number, // @cast-boundary db-row
         changes: { roles: JSON.stringify(nextRoles) },
       },
-      { ...event.user, tenantId: targetTenantId },
+      event.user,
       db,
+      { streamTenantId: foreignStreamTenant(event.user, targetTenantId) },
     );
 
     return withResponseData(result, {

package/packages/bundled-features/src/tenant-lifecycle/feature.ts

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

package/packages/bundled-features/src/tenant-lifecycle/run-tenant-destroy.ts

@@ -14,6 +14,7 @@ import {
   VersionConflictError,
 } from "@cosmicdrift/kumiko-framework/event-store";
 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 { getTemporal } from "@cosmicdrift/kumiko-framework/time";
 import { tenantEntity, tenantTable } from "../tenant/index.js";
@@ -283,6 +284,7 @@ export async function runNextDestructionStage(args: {
   readonly fileProviderResolver?: FileProviderResolver;
   readonly searchAdapter?: SearchAdapter;
   readonly escapeHatchAuditSink?: EscapeHatchAuditSink;
+  readonly escapeHatchAuditLog?: Logger;
   readonly actor?: string;
 }): Promise<StageTickResult> {
   const events = await loadAggregate(args.db, args.tenantId, args.tenantId);
@@ -308,6 +310,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,
   };
@@ -410,6 +413,7 @@ export async function runTenantDestructionSweep(args: {
   readonly fileProviderResolver?: FileProviderResolver;
   readonly searchAdapter?: SearchAdapter;
   readonly escapeHatchAuditSink?: EscapeHatchAuditSink;
+  readonly escapeHatchAuditLog?: Logger;
   readonly actor?: string;
 }): Promise<{ readonly triggered: number; readonly advanced: number }> {
   const T = getTemporal();
@@ -457,6 +461,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) advanced++;

package/packages/bundled-features/src/tenant-lifecycle/stages.ts

@@ -27,6 +27,7 @@ import {
   type TenantResourceExtensionName,
 } from "@cosmicdrift/kumiko-framework/engine";
 import type { FileProviderResolver } from "@cosmicdrift/kumiko-framework/files";
+import { createFallbackLogger, type Logger } from "@cosmicdrift/kumiko-framework/logging";
 import {
   createEscapeHatchReporter,
   UNATTRIBUTED_ACTOR,
@@ -61,6 +62,7 @@ export type DestructionStageCtx = {
   // systemUser.id); runTenantDataHooks uses them to attribute+audit any
   // EXT_TENANT_DATA usage's declared escapeHatch.
   readonly escapeHatchAuditSink?: EscapeHatchAuditSink;
+  readonly escapeHatchAuditLog?: Logger;
   readonly actor?: string;
   // Epoch ms the stage must hand back by returning { done: false }.
   readonly deadlineAt: number;
@@ -136,6 +138,7 @@ async function runTenantDataHooks(ctx: DestructionStageCtx): Promise<StageRunOut
       tenantId: ctx.tenantId,
       actor: ctx.actor ?? UNATTRIBUTED_ACTOR,
       sink: ctx.escapeHatchAuditSink,
+      log: ctx.escapeHatchAuditLog ?? createFallbackLogger("tenant-lifecycle"),
     });
     const hookCtx: TenantDataHookCtx = {
       db: createTenantDb(ctx.db, ctx.tenantId, "tenant", undefined, undefined, undefined, {

package/packages/bundled-features/src/tier-engine/handlers/set-tenant-tier.write.ts

@@ -1,11 +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, type TenantId } 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 { type TierAssignmentRow, tierAssignmentEntity } from "../entity.js";
@@ -14,13 +11,8 @@ import { type TierAssignmentRow, 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).
@@ -38,8 +30,6 @@ const executor = createEventStoreExecutor(tierAssignmentTable, tierAssignmentEnt
   entityName: "tier-assignment",
 });
 
-const SET_TENANT_TIER_REASON = "SystemAdmin assigns the tier of the tenant named in the payload";
-
 export type SetTenantTierOptions = {
   /** Runs after the write commits so feature.ts can update the resolver cache
    *  and notify the other processes. Without a tierMap there is no resolver
@@ -68,10 +58,6 @@ export function createSetTenantTierWrite(opts: SetTenantTierOptions = {}) {
     }),
     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: TenantId, tier: string): void => {
@@ -80,9 +66,7 @@ export function createSetTenantTierWrite(opts: SetTenantTierOptions = {}) {
         else opts.onAssigned?.(tenantId, tier);
       };
       const tenantId = event.payload.tenantId as 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<TierAssignmentRow>(tdb, tierAssignmentTable, { tenantId });
@@ -94,8 +78,9 @@ export function createSetTenantTierWrite(opts: SetTenantTierOptions = {}) {
             version: existing.version,
             changes: { tier, source: TierAssignmentSources.manual },
           },
-          systemUser,
+          event.user,
           tdb,
+          { streamTenantId },
         );
         if (!result.isSuccess) return result;
         afterCommit(tenantId, tier);
@@ -109,8 +94,9 @@ export function createSetTenantTierWrite(opts: SetTenantTierOptions = {}) {
           source: TierAssignmentSources.manual,
           tenantId,
         },
-        systemUser,
+        event.user,
         tdb,
+        { streamTenantId },
       );
       if (!result.isSuccess) return result;
       afterCommit(tenantId, tier);

package/packages/bundled-features/src/user-data-rights/feature.ts

@@ -663,6 +663,7 @@ export function createUserDataRightsFeature(opts: UserDataRightsOptions = {}): F
             appExportDownloadUrl: opts.appExportDownloadUrl,
           }),
           escapeHatchAuditSink: ctx._escapeHatchAuditSink,
+          escapeHatchAuditLog: ctx.log,
           actor: ctx.systemUser.id,
           metrics: exportMetrics,
         });
@@ -732,6 +733,7 @@ export function createUserDataRightsFeature(opts: UserDataRightsOptions = {}): F
           }),
           ...(sendDeletionExecutedEmail && { sendDeletionExecutedEmail }),
           escapeHatchAuditSink: ctx._escapeHatchAuditSink,
+          escapeHatchAuditLog: ctx.log,
           actor: ctx.systemUser.id,
         });
 

package/packages/bundled-features/src/user-data-rights/run-export-jobs.ts

@@ -1,3 +1,4 @@
+import type { Logger } from "@cosmicdrift/kumiko-framework/logging";
 // Async Export-Job Worker (S2.U3 Atom 3b) — pure Pipeline-Function.
 //
 // Spec: docs/plans/architecture/user-data-rights.md "Async Export-Pipeline".
@@ -176,6 +177,7 @@ export interface RunExportJobsArgs {
   // fw#2914 — sourced from the owning job's ctx (_escapeHatchAuditSink,
   // systemUser.id); threaded into runUserExport's per-hook TenantDb.
   readonly escapeHatchAuditSink?: EscapeHatchAuditSink;
+  readonly escapeHatchAuditLog?: Logger;
   readonly actor?: string;
 
   /**
@@ -248,6 +250,7 @@ export async function runExportJobs(args: RunExportJobsArgs): Promise<RunExportJ
       now,
       job,
       escapeHatchAuditSink: args.escapeHatchAuditSink,
+      escapeHatchAuditLog: args.escapeHatchAuditLog,
       actor: args.actor,
     });
     if (outcome.kind === "done") {
@@ -369,6 +372,7 @@ async function processJob(args: {
   now: Instant;
   job: JobRow;
   escapeHatchAuditSink?: EscapeHatchAuditSink;
+  escapeHatchAuditLog?: Logger;
   actor?: string;
 }): Promise<ProcessOutcome> {
   const { db, registry, buildStorageProvider, now, job } = args;
@@ -415,6 +419,7 @@ async function processJob(args: {
       userId: job.userId,
       now,
       escapeHatchAuditSink: args.escapeHatchAuditSink,
+      escapeHatchAuditLog: args.escapeHatchAuditLog,
       actor: args.actor,
     });