@cosmicdrift/kumiko-samples 0.367.0 → 0.369.0

package/packages/bundled-features/src/secrets/changes.json

@@ -1,4 +1,10 @@
 [
+  {
+    "version": "0.369.0",
+    "type": "fix",
+    "title": "secrets:write:set and secrets:write:delete join the request transaction",
+    "detail": "Both handlers ran on the boot database connection, so in an /api/batch a later failing command rolled back the config writes but kept the stored secret. They now run on the request transaction (escape hatch unsafeRaw, reason documented on the handler), so a batch of config and secret writes is stored as a whole or not at all."
+  },
   {
     "version": "0.365.0",
     "type": "fix",

package/packages/bundled-features/src/secrets/db/queries/read.ts

@@ -1,5 +1,5 @@
-import { asRawClient } from "@cosmicdrift/kumiko-framework/bun-db";
 import type { DbRunner } from "@cosmicdrift/kumiko-framework/db";
+import { asRawClient } from "@cosmicdrift/kumiko-framework/db";
 import type { TenantId } from "@cosmicdrift/kumiko-framework/engine";
 import type { StoredEnvelope } from "../../table.js";
 

package/packages/bundled-features/src/secrets/feature.ts

@@ -3,6 +3,7 @@ import {
   type AccessRule,
   defineFeature,
   type FeatureDefinition,
+  SYSTEM_ROLE,
 } from "@cosmicdrift/kumiko-framework/engine";
 import { InternalError } from "@cosmicdrift/kumiko-framework/errors";
 import { SETTINGS_HUB_I18N } from "@cosmicdrift/kumiko-framework/i18n";
@@ -63,6 +64,11 @@ export {
 } from "./secrets-context.js";
 export { type StoredEnvelope, type StoredMetadata, tenantSecretsTable } from "./table.js";
 
+// The settings form saves config values and secrets in one /api/batch; the secret
+// write has to join that transaction so a rejected command rolls it back too.
+export const JOIN_REQUEST_TRANSACTION_REASON =
+  "the secret write runs on the request transaction so a failing batch rolls it back together with the config writes";
+
 // AppContext carries ctx.secrets via extraContext. requireSecretsContext
 // wraps that raw context so every `.get(...)` call auto-includes the
 // current user + handler as audit metadata — feature code can't forget
@@ -72,8 +78,13 @@ export { type StoredEnvelope, type StoredMetadata, tenantSecretsTable } from "./
 // FileProviderContext-Pfade (S3-Plugin im Worker) liefern dieselben
 // zwei Felder, also reicht die schmale ctx-shape — kein voller
 // HandlerContext-Import noetig.
+// Handler contexts carry the caller as ctx.user, provider contexts set _userId (takes precedence).
 export function requireSecretsContext(
-  ctx: { readonly secrets?: SecretsContext; readonly _userId?: string | undefined },
+  ctx: {
+    readonly secrets?: SecretsContext;
+    readonly _userId?: string | undefined;
+    readonly user?: { readonly id: string };
+  },
   handlerName: string,
 ): SecretsContext {
   if (!ctx.secrets) {
@@ -83,10 +94,10 @@ export function requireSecretsContext(
         "createSecretsContext({db, masterKeyProvider, registry}) via extraContext.secrets at boot.",
     });
   }
-  const userId = ctx._userId;
+  const userId = ctx._userId ?? ctx.user?.id;
   if (!userId) {
     throw new InternalError({
-      message: `[${handlerName}] ctx._userId missing — cannot audit secret reads without a caller identity.`,
+      message: `[${handlerName}] ctx._userId missing (and no ctx.user) — cannot audit secret reads without a caller identity.`,
     });
   }
   const withAudit = (raw: SecretsContext): SecretsContext => ({
@@ -128,11 +139,20 @@ function resolveSecretsAccess(opts: SecretsFeatureOptions): AccessRule {
   return DEFAULT_SECRETS_ACCESS;
 }
 
+// Server-side system writes (dispatchSystemWrite, e.g. a wire hook migrating credentials) take the
+// same declared-key gate, value check and cache-sync announce as an admin instead of bypassing them
+// via SecretsContext.set. The system role is in-process only and never minted into a session.
+function withSystemWriter(rule: AccessRule): AccessRule {
+  if (!("roles" in rule) || rule.roles.includes(SYSTEM_ROLE)) return rule;
+  return { ...rule, roles: [SYSTEM_ROLE, ...rule.roles] };
+}
+
 export function createSecretsFeature(opts: SecretsFeatureOptions = {}): FeatureDefinition {
   const access = resolveSecretsAccess(opts);
+  const writeAccess = withSystemWriter(access);
   return defineFeature(SECRETS_FEATURE_NAME, (r) => {
     r.describe(
-      'Stores arbitrary per-tenant secrets (API keys, tokens, credentials) encrypted at rest using AES-256 with a KEK loaded from `KUMIKO_SECRETS_MASTER_KEY_V1` (and successive versions for rotation). Read a secret in handlers via `ctx.secrets.get(tenantId, handle)`, which automatically appends a `tenantSecretRead` audit event so every access is traceable. A `rotate` job re-encrypts all envelopes after a KEK version bump. The `set`/`delete`/`list` handlers share one access rule — default { roles: ["TenantAdmin"] }; adopt the host\'s role vocabulary with createSecretsFeature({ roles }) or open it to every authenticated tenant user with { access: { openToAll: { reason } } } (larger blast radius: any tenant member can then read secret previews and write/delete secrets, not just admins).',
+      'Stores arbitrary per-tenant secrets (API keys, tokens, credentials) encrypted at rest using AES-256 with a KEK loaded from `KUMIKO_SECRETS_MASTER_KEY_V1` (and successive versions for rotation). Read a secret in handlers via `ctx.secrets.get(tenantId, handle)`, which automatically appends a `tenantSecretRead` audit event so every access is traceable. A `rotate` job re-encrypts all envelopes after a KEK version bump. The `set`/`delete`/`list` handlers share one access rule — default { roles: ["TenantAdmin"] }; adopt the host\'s role vocabulary with createSecretsFeature({ roles }) or open it to every authenticated tenant user with { access: { openToAll: { reason } } } (larger blast radius: any tenant member can then read secret previews and write/delete secrets, not just admins). Server-side code writes a tenant secret with `dispatchSystemWrite({ handlerQn: "secrets:write:set", payload, tenantId })`: set and delete also admit the in-process system identity, so such writes pass the same declared-key and value checks.',
     );
     r.uiHints({
       displayLabel: "Tenant Secrets",
@@ -172,8 +192,8 @@ export function createSecretsFeature(opts: SecretsFeatureOptions = {}): FeatureD
     // The rotation job deliberately reaches for ctx.db.unsafeRaw() (raw,
     // cross-tenant) because rotation is a deployment-wide operation — no
     // feature-wide r.systemScope() needed.
-    r.writeHandler(createSetHandler(access));
-    r.writeHandler(createDeleteHandler(access));
+    r.writeHandler(createSetHandler(writeAccess));
+    r.writeHandler(createDeleteHandler(writeAccess));
     r.queryHandler(createListHandler(access));
     // Manual-only by design: ops triggers rotation after a KEK version flip.
     // BullMQ delivers to exactly one worker, so running it against a busy

package/packages/bundled-features/src/secrets/handlers/delete.write.ts

@@ -3,7 +3,7 @@ import { failNotFound } from "@cosmicdrift/kumiko-framework/errors";
 import * as z from "zod";
 import { announceSecretChange } from "../announce-secret-change.js";
 import { DEFAULT_SECRETS_ACCESS } from "../constants.js";
-import { requireSecretsContext } from "../feature.js";
+import { JOIN_REQUEST_TRANSACTION_REASON, requireSecretsContext } from "../feature.js";
 import { checkSecretKeyWrite } from "../write-gate.js";
 
 export function createDeleteHandler(access: AccessRule = DEFAULT_SECRETS_ACCESS) {
@@ -16,8 +16,11 @@ export function createDeleteHandler(access: AccessRule = DEFAULT_SECRETS_ACCESS)
       key: z.string().min(1).max(100),
     }),
     access,
+    escapeHatch: { grants: ["unsafeRaw"], reason: JOIN_REQUEST_TRANSACTION_REASON },
     handler: async (event, ctx) => {
-      const secrets = requireSecretsContext(ctx, "secrets:write:delete");
+      const secrets = requireSecretsContext(ctx, "secrets:write:delete").withRunner(
+        ctx.db.unsafeRaw(),
+      );
       const gate = checkSecretKeyWrite(ctx.registry, event.user.roles, event.payload.key, {
         allowUndeclared: true,
       });

package/packages/bundled-features/src/secrets/handlers/rotate.job.ts

@@ -17,11 +17,11 @@
 // that landed the row on the new kekVersion first surfaces here as a
 // version_conflict error (counted as "skipped", not "failed").
 
-import { selectMany } from "@cosmicdrift/kumiko-framework/bun-db";
 import {
   createEventStoreExecutor,
   createTenantDb,
   type DbConnection,
+  selectMany,
   type TenantDb,
 } from "@cosmicdrift/kumiko-framework/db";
 import type { JobContext, SessionUser, TenantId } from "@cosmicdrift/kumiko-framework/engine";
@@ -81,7 +81,7 @@ export async function rotateJob(
   function tdbFor(tenantId: TenantId): TenantDb {
     let existing = tdbCache.get(tenantId);
     if (!existing) {
-      existing = createTenantDb(db, tenantId, "system");
+      existing = createTenantDb({ db, tenantId, mode: "system" });
       tdbCache.set(tenantId, existing);
     }
     return existing;

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

@@ -2,7 +2,7 @@ import { type AccessRule, defineWriteHandler } from "@cosmicdrift/kumiko-framewo
 import * as z from "zod";
 import { announceSecretChange } from "../announce-secret-change.js";
 import { DEFAULT_SECRETS_ACCESS } from "../constants.js";
-import { requireSecretsContext } from "../feature.js";
+import { JOIN_REQUEST_TRANSACTION_REASON, requireSecretsContext } from "../feature.js";
 import { checkSecretKeyWrite, checkSecretValue } from "../write-gate.js";
 
 export function createSetHandler(access: AccessRule = DEFAULT_SECRETS_ACCESS) {
@@ -23,8 +23,11 @@ export function createSetHandler(access: AccessRule = DEFAULT_SECRETS_ACCESS) {
       hint: z.string().max(200).optional(),
     }),
     access,
+    escapeHatch: { grants: ["unsafeRaw"], reason: JOIN_REQUEST_TRANSACTION_REASON },
     handler: async (event, ctx) => {
-      const secrets = requireSecretsContext(ctx, "secrets:write:set");
+      const secrets = requireSecretsContext(ctx, "secrets:write:set").withRunner(
+        ctx.db.unsafeRaw(),
+      );
       const { key, value, redactedPreview, hint } = event.payload;
 
       // Preview-priority: explicit payload param > feature-declared redact

package/packages/bundled-features/src/secrets/secrets-context.ts

@@ -12,12 +12,13 @@
 //           read logged") now sits on the events-table instead of a
 //           dedicated audit-table.
 
-import { fetchOne, transaction } from "@cosmicdrift/kumiko-framework/bun-db";
 import {
   createEventStoreExecutor,
   createTenantDb,
   type DbConnection,
   type DbRunner,
+  fetchOne,
+  transaction,
 } from "@cosmicdrift/kumiko-framework/db";
 import type { SessionUser } from "@cosmicdrift/kumiko-framework/engine";
 import { InternalError, type WriteErrorInfo } from "@cosmicdrift/kumiko-framework/errors";
@@ -205,7 +206,7 @@ function buildSecretsContext(
         tenantId,
         roles: SYSTEM_ROLES,
       };
-      const tdb = createTenantDb(db, tenantId, "system");
+      const tdb = createTenantDb({ db, tenantId, mode: "system" });
 
       const existing = await lookup(tenantId, key);
       const commonFields = {
@@ -270,7 +271,7 @@ function buildSecretsContext(
         tenantId,
         roles: SYSTEM_ROLES,
       };
-      const tdb = createTenantDb(db, tenantId, "system");
+      const tdb = createTenantDb({ db, tenantId, mode: "system" });
       const result = await executor.delete({ id: existing.id }, actor, tdb);
       return result.isSuccess;
     },

package/packages/bundled-features/src/sessions/db/queries/cleanup.ts

@@ -1,5 +1,5 @@
-import { asRawClient } from "@cosmicdrift/kumiko-framework/bun-db";
 import type { DbConnection } from "@cosmicdrift/kumiko-framework/db";
+import { asRawClient } from "@cosmicdrift/kumiko-framework/db";
 
 export async function deleteStaleSessionsBatch(
   db: DbConnection,

package/packages/bundled-features/src/sessions/handlers/detail.query.ts

@@ -1,4 +1,4 @@
-import { fetchOne } from "@cosmicdrift/kumiko-framework/bun-db";
+import { fetchOne } from "@cosmicdrift/kumiko-framework/db";
 import { access, defineQueryHandler } from "@cosmicdrift/kumiko-framework/engine";
 import * as z from "zod";
 import { decryptStoredPii } from "../../shared/index.js";

package/packages/bundled-features/src/sessions/handlers/list.query.ts

@@ -1,4 +1,4 @@
-import { selectMany } from "@cosmicdrift/kumiko-framework/bun-db";
+import { selectMany } from "@cosmicdrift/kumiko-framework/db";
 import {
   access,
   definePagedQueryHandler,
@@ -11,7 +11,7 @@ import { userSessionTable } from "../schema/user-session.js";
 
 // `sort` arrives raw from the client's query string. selectMany's orderBy
 // has no column-existence check — an unrecognised field just gets
-// snake_cased and quoted as-is (bun-db/query.ts columnOf) — so this
+// snake_cased and quoted as-is (db/query.ts columnOf) — so this
 // allowlist is what stops a client sorting by ip/userAgent or any other
 // non-exposed column.
 const SORTABLE_COLUMNS = ["id", "userId", "createdAt", "expiresAt", "revokedAt"] as const;

package/packages/bundled-features/src/sessions/handlers/mine.query.ts

@@ -1,4 +1,4 @@
-import { selectMany } from "@cosmicdrift/kumiko-framework/bun-db";
+import { selectMany } from "@cosmicdrift/kumiko-framework/db";
 import { definePagedQueryHandler } from "@cosmicdrift/kumiko-framework/engine";
 import * as z from "zod";
 import { decryptStoredPii } from "../../shared/index.js";

package/packages/bundled-features/src/sessions/handlers/revoke-all-for-user.write.ts

@@ -1,5 +1,5 @@
 import { requestContext } from "@cosmicdrift/kumiko-framework/api";
-import { updateMany } from "@cosmicdrift/kumiko-framework/bun-db";
+import { updateMany } from "@cosmicdrift/kumiko-framework/db";
 import { access, defineWriteHandler, SYSTEM_TENANT_ID } from "@cosmicdrift/kumiko-framework/engine";
 import { UnprocessableError, writeFailure } from "@cosmicdrift/kumiko-framework/errors";
 import { append } from "@cosmicdrift/kumiko-framework/event-store";

package/packages/bundled-features/src/sessions/handlers/revoke-all-others.write.ts

@@ -1,4 +1,4 @@
-import { updateMany } from "@cosmicdrift/kumiko-framework/bun-db";
+import { updateMany } from "@cosmicdrift/kumiko-framework/db";
 import { defineWriteHandler } from "@cosmicdrift/kumiko-framework/engine";
 import { UnprocessableError, writeFailure } from "@cosmicdrift/kumiko-framework/errors";
 import { generateId } from "@cosmicdrift/kumiko-framework/utils";

package/packages/bundled-features/src/sessions/handlers/revoke.write.ts

@@ -1,4 +1,4 @@
-import { fetchOne, updateMany } from "@cosmicdrift/kumiko-framework/bun-db";
+import { fetchOne, updateMany } from "@cosmicdrift/kumiko-framework/db";
 import { defineWriteHandler } from "@cosmicdrift/kumiko-framework/engine";
 import { UnprocessableError, writeFailure } from "@cosmicdrift/kumiko-framework/errors";
 import { generateId } from "@cosmicdrift/kumiko-framework/utils";

package/packages/bundled-features/src/sessions/session-callbacks.ts

@@ -9,8 +9,8 @@ import type {
 
 export type { SessionMassRevoker } from "@cosmicdrift/kumiko-framework/api";
 
-import { fetchOne, insertOne, transaction, updateMany } from "@cosmicdrift/kumiko-framework/bun-db";
 import type { DbConnection } from "@cosmicdrift/kumiko-framework/db";
+import { fetchOne, insertOne, transaction, updateMany } from "@cosmicdrift/kumiko-framework/db";
 import type { SessionUser, TenantId } from "@cosmicdrift/kumiko-framework/engine";
 import { buildSessionRoles, SYSTEM_TENANT_ID } from "@cosmicdrift/kumiko-framework/engine";
 import { append } from "@cosmicdrift/kumiko-framework/event-store";
@@ -18,7 +18,12 @@ import { generateId, parseRoles } from "@cosmicdrift/kumiko-framework/utils";
 import { Temporal } from "@cosmicdrift/kumiko-types/temporal";
 import { encryptForDirectWrite } from "../shared/index.js";
 import { tenantMembershipsTable } from "../tenant/index.js";
-import { isPrincipalBlocked, type UserStatus, userTable } from "../user/index.js";
+import {
+  isPrincipalBlocked,
+  isPrincipalRowBlocked,
+  type UserStatus,
+  userTable,
+} from "../user/index.js";
 import {
   DEFAULT_SESSION_EXPIRY_MS,
   LAST_SEEN_REFRESH_MS,
@@ -190,16 +195,18 @@ export function createSessionCallbacks(opts: SessionCallbacksOptions): SessionCa
       // missing row is a legitimate "no tenant roles" outcome. Both branches
       // return the bare "live" string (no re-derived roles) — the middleware
       // falls back to the JWT's frozen roles claim.
-      let user: { status: UserStatus; roles: string | null } | undefined;
+      let user: { status: UserStatus; isDeleted: boolean; roles: string | null } | undefined;
       try {
-        user = await fetchOne<{ status: UserStatus; roles: string | null }>(db, userTable, {
-          id: expectedUserId,
-        });
+        user = await fetchOne<{ status: UserStatus; isDeleted: boolean; roles: string | null }>(
+          db,
+          userTable,
+          { id: expectedUserId },
+        );
       } catch {
         return "live";
       }
       if (!user) return "live";
-      if (isPrincipalBlocked(user.status)) return "blocked";
+      if (isPrincipalRowBlocked(user)) return "blocked";
 
       // Same fail-open reasoning as the userTable lookup above — a transient
       // DB error on the membership read must not lock the user out. A

package/packages/bundled-features/src/sessions/testing.ts

@@ -19,7 +19,7 @@
 
 import type { AuthRoutesConfig, SessionCreator } from "@cosmicdrift/kumiko-framework/api";
 import type { SessionUser } from "@cosmicdrift/kumiko-framework/engine";
-import type { LateBoundHolder } from "@cosmicdrift/kumiko-framework/testing";
+import type { LateBoundHolder } from "@cosmicdrift/kumiko-testing/helpers";
 import type { SessionCallbacks, SessionMassRevoker } from "./session-callbacks.js";
 
 export type BoundSessionCallbacks = {

package/packages/bundled-features/src/tags/feature.ts

@@ -130,7 +130,7 @@ function registerTags(
   r.translations({ keys: TAGS_FEATURE_I18N });
 }
 
-export const tagsFeature = defineFeature(TAGS_FEATURE_NAME, (r) =>
+const defaultTagsFeature = defineFeature(TAGS_FEATURE_NAME, (r) =>
   registerTags(r, DEFAULT_TAG_ACCESS, undefined, undefined, undefined),
 );
 
@@ -183,7 +183,7 @@ function resolveAccess(opts: TagsFeatureOptions): AccessRule {
 // Backwards-compat / options wrapper. Without options returns the module-level
 // singleton (no rebuild). access/roles/toggleable/ownership build a fresh
 // feature-definition.
-export function createTagsFeature(opts: TagsFeatureOptions = {}): typeof tagsFeature {
+export function createTagsFeature(opts: TagsFeatureOptions = {}): typeof defaultTagsFeature {
   if (
     opts.access === undefined &&
     opts.roles === undefined &&
@@ -191,7 +191,7 @@ export function createTagsFeature(opts: TagsFeatureOptions = {}): typeof tagsFea
     opts.ownership === undefined &&
     opts.parents === undefined
   ) {
-    return tagsFeature;
+    return defaultTagsFeature;
   }
   if (opts.parents !== undefined && opts.parents.length === 0) {
     throw new Error(
@@ -207,3 +207,6 @@ export function createTagsFeature(opts: TagsFeatureOptions = {}): typeof tagsFea
     registerTags(r, access, opts.toggleable, opts.ownership, opts.parents),
   );
 }
+
+/** @deprecated Use createTagsFeature(). Run `bun kumiko-upgrade --apply`. Removed in the first release after 2026-10-29. */
+export const tagsFeature = createTagsFeature();

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

@@ -2,8 +2,8 @@
 // delivery and apps import types ONLY and take the implementation from
 // ctx.templateResolver at runtime.
 
-import { selectMany } from "@cosmicdrift/kumiko-framework/bun-db";
 import type { DbRunner, TenantDb } from "@cosmicdrift/kumiko-framework/db";
+import { selectMany } from "@cosmicdrift/kumiko-framework/db";
 import type { SessionUser, TenantId } from "@cosmicdrift/kumiko-framework/engine";
 import { InternalError } from "@cosmicdrift/kumiko-framework/errors";
 import type { Temporal } from "@cosmicdrift/kumiko-types/temporal";

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

@@ -90,7 +90,6 @@ export const DEFAULT_PDF_LAYOUT_SLUG = "default";
 // The mail transport enforces no size limit of its own; 10 MiB is a common provider ceiling.
 export const MAIL_PREVIEW_MAX_BYTES = 10 * 1024 * 1024;
 
-export const TEST_MAIL_NOTIFICATION_TYPE = "template-resolver:test-mail";
 export const TEST_MAIL_SUBJECT_PREFIX = "[TEST] ";
 
 // System-Templates leben unter der canonical SYSTEM_TENANT_ID-Sentinel-UUID.

package/packages/bundled-features/src/template-resolver/handlers/bundle-import.ts

@@ -1,4 +1,4 @@
-import { fetchOne } from "@cosmicdrift/kumiko-framework/bun-db";
+import { fetchOne } from "@cosmicdrift/kumiko-framework/db";
 import type {
   BeforeTransactionResult,
   HandlerContext,

package/packages/bundled-features/src/template-resolver/handlers/by-slug.query.ts

@@ -1,4 +1,4 @@
-import { fetchOne } from "@cosmicdrift/kumiko-framework/bun-db";
+import { fetchOne } from "@cosmicdrift/kumiko-framework/db";
 import { defineQueryHandler } from "@cosmicdrift/kumiko-framework/engine";
 import * as z from "zod";
 import { TEXT_BLOCK_KIND } from "../constants.js";

package/packages/bundled-features/src/template-resolver/handlers/by-tenant.query.ts

@@ -1,5 +1,4 @@
-import { selectMany } from "@cosmicdrift/kumiko-framework/bun-db";
-import { castTenantRows } from "@cosmicdrift/kumiko-framework/db";
+import { castTenantRows, selectMany } from "@cosmicdrift/kumiko-framework/db";
 import { defineQueryHandler } from "@cosmicdrift/kumiko-framework/engine";
 import type { Temporal } from "@cosmicdrift/kumiko-types/temporal";
 import * as z from "zod";

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

@@ -1,4 +1,4 @@
-import { fetchOne } from "@cosmicdrift/kumiko-framework/bun-db";
+import { fetchOne } from "@cosmicdrift/kumiko-framework/db";
 import {
   type ContentCollectionDefinition,
   defineQueryHandler,

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

@@ -1,5 +1,4 @@
-import { selectMany } from "@cosmicdrift/kumiko-framework/bun-db";
-import { castTenantRows } from "@cosmicdrift/kumiko-framework/db";
+import { castTenantRows, selectMany } from "@cosmicdrift/kumiko-framework/db";
 import {
   type ContentCollectionDefinition,
   defineQueryHandler,

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

@@ -1,4 +1,4 @@
-import { fetchOne } from "@cosmicdrift/kumiko-framework/bun-db";
+import { fetchOne } from "@cosmicdrift/kumiko-framework/db";
 import {
   type ContentCollectionDefinition,
   defineWriteHandler,

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

@@ -1,4 +1,4 @@
-import { fetchOne } from "@cosmicdrift/kumiko-framework/bun-db";
+import { fetchOne } from "@cosmicdrift/kumiko-framework/db";
 import {
   defineWriteHandler,
   type HandlerContext,

package/packages/bundled-features/src/template-resolver/handlers/diff-to-system.query.ts

@@ -1,4 +1,4 @@
-import { fetchOne } from "@cosmicdrift/kumiko-framework/bun-db";
+import { fetchOne } from "@cosmicdrift/kumiko-framework/db";
 import { defineQueryHandler, SYSTEM_TENANT_ID } from "@cosmicdrift/kumiko-framework/engine";
 import { NotFoundError } from "@cosmicdrift/kumiko-framework/errors";
 import * as z from "zod";

package/packages/bundled-features/src/template-resolver/handlers/export-bundle.query.ts

@@ -1,5 +1,5 @@
 import { isDeepStrictEqual } from "node:util";
-import { selectMany } from "@cosmicdrift/kumiko-framework/bun-db";
+import { selectMany } from "@cosmicdrift/kumiko-framework/db";
 import { defineQueryHandler, SYSTEM_TENANT_ID } from "@cosmicdrift/kumiko-framework/engine";
 import { NotFoundError, ValidationError } from "@cosmicdrift/kumiko-framework/errors";
 import * as z from "zod";

package/packages/bundled-features/src/template-resolver/handlers/find-by-id.query.ts

@@ -1,4 +1,4 @@
-import { fetchOne } from "@cosmicdrift/kumiko-framework/bun-db";
+import { fetchOne } from "@cosmicdrift/kumiko-framework/db";
 import { defineQueryHandler } from "@cosmicdrift/kumiko-framework/engine";
 import * as z from "zod";
 import { type TemplateResourceRow, templateResourcesTable } from "../table.js";

package/packages/bundled-features/src/template-resolver/handlers/layout-source.query.ts

@@ -1,4 +1,4 @@
-import { selectMany } from "@cosmicdrift/kumiko-framework/bun-db";
+import { selectMany } from "@cosmicdrift/kumiko-framework/db";
 import { defineQueryHandler } from "@cosmicdrift/kumiko-framework/engine";
 import * as z from "zod";
 import { FALLBACK_LOCALE } from "../constants.js";

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

@@ -1,4 +1,4 @@
-import { selectMany } from "@cosmicdrift/kumiko-framework/bun-db";
+import { selectMany } from "@cosmicdrift/kumiko-framework/db";
 import { defineQueryHandler } from "@cosmicdrift/kumiko-framework/engine";
 import * as z from "zod";
 import { TEMPLATE_KINDS, TEMPLATE_STATUSES } from "../constants.js";

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

@@ -1,4 +1,4 @@
-import { selectMany } from "@cosmicdrift/kumiko-framework/bun-db";
+import { selectMany } from "@cosmicdrift/kumiko-framework/db";
 import { defineQueryHandler } from "@cosmicdrift/kumiko-framework/engine";
 import * as z from "zod";
 import { DEFAULT_MAIL_LAYOUT_SLUG, FALLBACK_LOCALE, type TemplateStatus } from "../constants.js";

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

@@ -1,4 +1,4 @@
-import { fetchOne } from "@cosmicdrift/kumiko-framework/bun-db";
+import { fetchOne } from "@cosmicdrift/kumiko-framework/db";
 import { defineWriteHandler, SYSTEM_TENANT_ID } from "@cosmicdrift/kumiko-framework/engine";
 import { NotFoundError, ValidationError, writeFailure } from "@cosmicdrift/kumiko-framework/errors";
 import * as z from "zod";

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

@@ -1,4 +1,4 @@
-import { fetchOne } from "@cosmicdrift/kumiko-framework/bun-db";
+import { fetchOne } from "@cosmicdrift/kumiko-framework/db";
 import { defineWriteHandler } from "@cosmicdrift/kumiko-framework/engine";
 import { NotFoundError, writeFailure } from "@cosmicdrift/kumiko-framework/errors";
 import * as z from "zod";

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

@@ -7,7 +7,7 @@ import {
   EMAIL_CHANNEL_NAME,
 } from "../../delivery/index.js";
 import { fileContextForTenant } from "../../file-foundation/index.js";
-import { TEST_MAIL_NOTIFICATION_TYPE, TEST_MAIL_SUBJECT_PREFIX } from "../constants.js";
+import { TEST_MAIL_SUBJECT_PREFIX } from "../constants.js";
 import { TemplateResolverErrors } from "../qualified-names.js";
 import { renderTemplatePreview } from "../template-preview.js";
 import { localeSchema, templateSlugSchema } from "./shared.js";
@@ -75,6 +75,7 @@ export const sendTestWrite = defineWriteHandler({
       sseBroker: undefined,
       tenantId: event.user.tenantId,
       secrets: ctx.secrets,
+      config: ctx.config,
       readAttachment: createEmailAttachmentReader(
         ctx.db,
         ctx.registry,
@@ -98,7 +99,8 @@ export const sendTestWrite = defineWriteHandler({
       const result = await channel.send(
         address,
         {
-          notificationType: TEST_MAIL_NOTIFICATION_TYPE,
+          // The template slug is the notification name, so the test mail takes the transport the real mail takes.
+          notificationType: event.payload.slug,
           title: subject,
           body: undefined,
           data: undefined,

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

@@ -1,4 +1,4 @@
-import { fetchOne } from "@cosmicdrift/kumiko-framework/bun-db";
+import { fetchOne } from "@cosmicdrift/kumiko-framework/db";
 import {
   defineWriteHandler,
   SYSTEM_TENANT_ID,

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

@@ -1,4 +1,4 @@
-import { fetchOne } from "@cosmicdrift/kumiko-framework/bun-db";
+import { fetchOne } from "@cosmicdrift/kumiko-framework/db";
 import {
   type HandlerContext,
   type Registry,

package/packages/bundled-features/src/template-resolver/handlers/tenant-overrides.query.ts

@@ -1,4 +1,4 @@
-import { selectMany } from "@cosmicdrift/kumiko-framework/bun-db";
+import { selectMany } from "@cosmicdrift/kumiko-framework/db";
 import { defineQueryHandler, SYSTEM_TENANT_ID } from "@cosmicdrift/kumiko-framework/engine";
 import * as z from "zod";
 import { TenantQueries } from "../../tenant/index.js";

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

@@ -1,4 +1,4 @@
-import { fetchOne } from "@cosmicdrift/kumiko-framework/bun-db";
+import { fetchOne } from "@cosmicdrift/kumiko-framework/db";
 import {
   defineWriteHandler,
   type HandlerContext,

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

@@ -1,4 +1,4 @@
-import { selectMany } from "@cosmicdrift/kumiko-framework/bun-db";
+import { selectMany } from "@cosmicdrift/kumiko-framework/db";
 import { defineQueryHandler } from "@cosmicdrift/kumiko-framework/engine";
 import * as z from "zod";
 import { TEMPLATE_KINDS } from "../constants.js";

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

@@ -1,4 +1,4 @@
-import { selectMany } from "@cosmicdrift/kumiko-framework/bun-db";
+import { selectMany } from "@cosmicdrift/kumiko-framework/db";
 import {
   defineQueryHandler,
   type HandlerContext,

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

@@ -9,12 +9,12 @@
 // Default ifExists="skip". The actor is `createSystemUser(SYSTEM_TENANT_ID)`,
 // deliberately not TestUsers (prod seeds are not test utilities).
 
-import { fetchOne } from "@cosmicdrift/kumiko-framework/bun-db";
 import {
   createTenantDb,
   type DbConnection,
   deleteMany,
   type EntityTableMeta,
+  fetchOne,
   type TenantDb,
 } from "@cosmicdrift/kumiko-framework/db";
 import {
@@ -89,7 +89,7 @@ export async function seedSystemTemplate(
 ): Promise<{ id: string }> {
   const tenantId = SYSTEM_TENANT_ID;
   const by = opts.by ?? createSystemUser(tenantId);
-  const tdb = createTenantDb(db, tenantId, "system");
+  const tdb = createTenantDb({ db, tenantId, mode: "system" });
 
   const label = `seedSystemTemplate ${opts.slug}/${opts.kind}/${opts.locale}`;
   const slug = templateSlugSchema.safeParse(opts.slug);
@@ -379,7 +379,7 @@ export async function seedTextBlock(
   opts: SeedTextBlockOptions,
 ): Promise<{ id: string }> {
   const by = opts.by ?? createSystemUser(opts.tenantId);
-  const tdb = createTenantDb(db, opts.tenantId, "system");
+  const tdb = createTenantDb({ db, tenantId: opts.tenantId, mode: "system" });
 
   const existingRow = await fetchOne<TemplateResourceRow>(db, templateResourcesTable, {
     tenantId: opts.tenantId,

package/packages/bundled-features/src/template-resolver/store-template-resource.ts

@@ -1,4 +1,4 @@
-import { fetchOne, selectMany } from "@cosmicdrift/kumiko-framework/bun-db";
+import { fetchOne, selectMany } from "@cosmicdrift/kumiko-framework/db";
 import type {
   BeforeTransactionResult,
   ConfigAccessor,

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

@@ -1,4 +1,4 @@
-import { selectMany } from "@cosmicdrift/kumiko-framework/bun-db";
+import { selectMany } from "@cosmicdrift/kumiko-framework/db";
 import type {
   HandlerContext,
   SessionUser,

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

@@ -1,4 +1,4 @@
-import { fetchOne } from "@cosmicdrift/kumiko-framework/bun-db";
+import { fetchOne } from "@cosmicdrift/kumiko-framework/db";
 import type {
   HandlerContext,
   SessionUser,