@cosmicdrift/kumiko-bundled-features 0.181.0 → 0.182.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cosmicdrift/kumiko-bundled-features",
-  "version": "0.181.0",
+  "version": "0.182.1",
   "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>",
@@ -121,12 +121,12 @@
     "./step-dispatcher": "./src/step-dispatcher/index.ts"
   },
   "dependencies": {
-    "@cosmicdrift/kumiko-dispatcher-live": "0.181.0",
-    "@cosmicdrift/kumiko-framework": "0.181.0",
-    "@cosmicdrift/kumiko-headless": "0.181.0",
-    "@cosmicdrift/kumiko-renderer": "0.181.0",
-    "@cosmicdrift/kumiko-renderer-web": "0.181.0",
-    "@cosmicdrift/kumiko-types": "0.181.0",
+    "@cosmicdrift/kumiko-dispatcher-live": "0.182.1",
+    "@cosmicdrift/kumiko-framework": "0.182.1",
+    "@cosmicdrift/kumiko-headless": "0.182.1",
+    "@cosmicdrift/kumiko-renderer": "0.182.1",
+    "@cosmicdrift/kumiko-renderer-web": "0.182.1",
+    "@cosmicdrift/kumiko-types": "0.182.1",
     "@mollie/api-client": "^4.5.0",
     "imapflow": "^1.3.3",
     "mailparser": "^3.9.8",

package/src/auth-mfa/__tests__/enable-confirm-preauth.integration.test.ts

@@ -185,6 +185,26 @@ describe("POST /auth/mfa/preauth-confirm", () => {
     expect(revokedForUserIds).toContain(body.user.id);
   });
 
+  test("a stored user timezone survives the preauth-confirm login (fw#1760)", async () => {
+    const email = "tz-preauth@example.com";
+    const { preauthSetupToken, userId } = await loginBlockedByEnforcement(email);
+    await asRawClient(stack.db).unsafe(
+      `UPDATE "${userTable.tableName}" SET timezone = $1 WHERE id = $2`,
+      ["Asia/Tokyo", userId],
+    );
+    const { setupToken, secret } = await startEnrollment(preauthSetupToken, email);
+
+    const res = await stack.http.raw("POST", "/api/auth/mfa/preauth-confirm", {
+      setupToken,
+      code: currentTotpCode(secret),
+    });
+
+    expect(res.status).toBe(200);
+    const body = await res.json();
+    const payload = JSON.parse(Buffer.from(body.token.split(".")[1], "base64url").toString());
+    expect(payload.timezone).toBe("Asia/Tokyo");
+  });
+
   test("wrong TOTP code → invalid_totp_code, no enrollment persisted", async () => {
     const email = "wrongcode@example.com";
     const { preauthSetupToken, userId } = await loginBlockedByEnforcement(email);

package/src/auth-mfa/handlers/enable-confirm-preauth.write.ts

@@ -9,7 +9,7 @@ import { InternalError, writeFailure } from "@cosmicdrift/kumiko-framework/error
 import { parseRoles } from "@cosmicdrift/kumiko-framework/utils";
 import { Temporal } from "temporal-polyfill";
 import { z } from "zod";
-import { burnToken } from "../../shared";
+import { burnToken, sessionTimezoneField } from "../../shared";
 import { USER_STATUS, UserQueries } from "../../user";
 import { base32Decode } from "../base32";
 import { MFA_VERIFY_LOCKOUT_MINUTES, MFA_VERIFY_MAX_ATTEMPTS } from "../constants";
@@ -134,7 +134,7 @@ export function createEnableConfirmPreauthHandler(opts: EnableConfirmPreauthOpti
       const systemUser = createSystemUser(tenantId, ["SystemAdmin"]);
       const userRow = (await ctx.queryAs(systemUser, UserQueries.findForAuth, {
         id: userId,
-      })) as { roles?: string | null; status?: string } | null; // @cast-boundary engine-payload
+      })) as { roles?: string | null; status?: string; timezone?: string | null } | null; // @cast-boundary engine-payload
 
       if (!userRow) return invalidSetupToken();
       if (
@@ -179,7 +179,16 @@ export function createEnableConfirmPreauthHandler(opts: EnableConfirmPreauthOpti
       // verify.write.ts.
       const mergedRoles = buildSessionRoles(globalRoles, membership.roles);
 
-      const baseSession: SessionUser = { id: userId, tenantId, roles: mergedRoles };
+      const baseSession: SessionUser = {
+        id: userId,
+        tenantId,
+        roles: mergedRoles,
+        // This endpoint logs the user in directly (fw#1760), so a stored
+        // timezone must survive the preauth-MFA-enrollment login just like
+        // a plain password login does — same helper as verify.write.ts /
+        // invite-accept-with-login.write.ts (#1759).
+        ...sessionTimezoneField(userRow?.timezone),
+      };
       const claims = await ctx.resolveAuthClaims(baseSession);
       const session: SessionUser =
         Object.keys(claims).length > 0 ? { ...baseSession, claims } : baseSession;

package/src/tags/__tests__/tags.integration.test.ts

@@ -307,19 +307,28 @@ describe("tags integration — idempotency", () => {
     expect(rows[0]?.["tagId"]).toBe(tagId);
   });
 
+  // 20 iterations, fresh (tag, entity) per run: this race has two distinct
+  // windows (create()-vs-create() unique-violation, and the narrower
+  // detail()-miss/restore()-hits window fixed alongside kumiko-framework#1778)
+  // that each fire in only a fraction of attempts — a single run isn't a
+  // reliable regression guard for either.
   test("two concurrent first-time assigns of the same (tag, entity) both succeed — one row", async () => {
-    // Both requests read `existing === null` before either write lands, so
-    // both fall through to create(); the loser's create() version_conflicts.
-    // The handler must converge that into success instead of surfacing a 409
-    // for what is, from the caller's perspective, an idempotent operation.
-    const tagId = await createTag("racy");
-    const [a, b] = await Promise.all([
-      assign(tagId, "credit", "credit-race"),
-      assign(tagId, "credit", "credit-race"),
-    ]);
-    expect(a).toBeDefined();
-    expect(b).toBeDefined();
-    expect(await countAssignments(admin.tenantId)).toBe(1);
+    for (let i = 0; i < 20; i++) {
+      // Both requests read `existing === null` before either write lands, so
+      // both fall through to create(); the loser's create() version_conflicts.
+      // The handler must converge that into success instead of surfacing a 409
+      // for what is, from the caller's perspective, an idempotent operation.
+      const tagId = await createTag(`racy-${i}`);
+      const entityId = `credit-race-${i}`;
+      const [a, b] = await Promise.all([
+        assign(tagId, "credit", entityId),
+        assign(tagId, "credit", entityId),
+      ]);
+      expect(a).toBeDefined();
+      expect(b).toBeDefined();
+      const rows = await listAssignments({ field: "entityId", op: "eq", value: entityId });
+      expect(rows).toHaveLength(1);
+    }
   });
 });
 

package/src/tags/handlers/assign-tag.write.ts

@@ -42,6 +42,14 @@ export function createAssignTagHandler(access: AccessRule = DEFAULT_TAG_ACCESS):
 
       const restored = await tagAssignmentExecutor.restore({ id }, event.user, ctx.db);
       if (restored.isSuccess) return { isSuccess: true as const, data: { id } };
+      // A concurrent first-time assign can also land here: the other caller's
+      // create() already wrote an active row between our `existing` read
+      // above and this restore() call, so restore() correctly refuses with
+      // "not_deleted" — but the desired end state is already true. Converge
+      // like the create() race below instead of surfacing a spurious error.
+      if ((restored.error.details as { reason?: string } | undefined)?.reason === "not_deleted") {
+        return { isSuccess: true as const, data: { id } };
+      }
       if (restored.error.code !== "not_found") return restored;
 
       const tag = await tagExecutor.detail({ id: payload.tagId }, event.user, ctx.db);

package/src/template-resolver/web/client-plugin.tsx

@@ -18,12 +18,17 @@ import type {
   TreeNode,
 } from "@cosmicdrift/kumiko-framework/engine";
 import {
+  CONTENT_EDITOR_ELEMENT_ID,
+  ContentPreview,
+  type FeatureSchema,
+  useAppFeatures,
+  useContentEditor,
   useDispatcher,
   usePrimitives,
   useQuery,
   useTranslation,
 } from "@cosmicdrift/kumiko-renderer";
-import type { ClientFeatureDefinition } from "@cosmicdrift/kumiko-renderer-web";
+import { type ClientFeatureDefinition, PlainContentEditor } from "@cosmicdrift/kumiko-renderer-web";
 import { type FormEvent, type ReactNode, useEffect, useState } from "react";
 import {
   collectionHandlerName,
@@ -197,6 +202,46 @@ function makeTreeProvider(tenantIdOverride?: string, collectionId?: string): Tre
   };
 }
 
+// contentFormat lives on the collection the node came from, not on the
+// entity — a node without a collectionId (the hand-wired text-block tree)
+// has none, useContentEditor then falls back to "plain" on its own.
+function findContentFormat(
+  features: readonly FeatureSchema[],
+  collectionId?: string,
+): string | undefined {
+  if (collectionId === undefined) return undefined;
+  for (const feature of features) {
+    const match = feature.contentCollections?.find((c) => c.id === collectionId);
+    if (match !== undefined) return match.contentFormat;
+  }
+  return undefined;
+}
+
+// Same lookup as findContentFormat, for the collection's fixed variable
+// names (ContentCollectionDefinition.variableSchema) — the chip bar's data
+// source. A node without a collectionId gets no chips: the hand-wired
+// text-block tree has no collection to declare variables on.
+function findVariableSchema(
+  features: readonly FeatureSchema[],
+  collectionId?: string,
+): readonly string[] {
+  return Object.keys(findVariableExamples(features, collectionId));
+}
+
+// Same lookup, for the example values the Preview substitutes in for
+// `{{name}}` — the values half of the same variableSchema map.
+function findVariableExamples(
+  features: readonly FeatureSchema[],
+  collectionId?: string,
+): Readonly<Record<string, string>> {
+  if (collectionId === undefined) return {};
+  for (const feature of features) {
+    const match = feature.contentCollections?.find((c) => c.id === collectionId);
+    if (match !== undefined) return match.variableSchema ?? {};
+  }
+  return {};
+}
+
 // Edit form: loads the current values via by-slug, lets TenantAdmin and
 // SystemAdmin edit title + content, dispatches set on submit. Other users see
 // the form read-only with a hint banner — write permission stays opinionated
@@ -240,6 +285,11 @@ function TextBlockEditor({
   const dispatcher = useDispatcher();
   const user = useShellUser();
   const t = useTranslation();
+  const features = useAppFeatures();
+  const contentFormat = findContentFormat(features, collectionId);
+  const variables = findVariableSchema(features, collectionId);
+  const variableExamples = findVariableExamples(features, collectionId);
+  const ContentEditor = useContentEditor(contentFormat);
   const canWrite =
     user?.roles.includes("TenantAdmin") === true || user?.roles.includes("SystemAdmin") === true;
 
@@ -263,6 +313,7 @@ function TextBlockEditor({
 
   const [title, setTitle] = useState("");
   const [content, setContent] = useState("");
+  const [previewing, setPreviewing] = useState(false);
   const [submitting, setSubmitting] = useState(false);
   const [saveError, setSaveError] = useState<string | null>(null);
   const [savedMsg, setSavedMsg] = useState<string | null>(null);
@@ -351,16 +402,34 @@ function TextBlockEditor({
           required
         />
       </Field>
-      <Field id="text-block-content" label={t("template-resolver.editor.contentLabel")}>
-        <Input
-          kind="textarea"
-          id="text-block-content"
-          name="text-block-content"
-          value={content}
-          onChange={setContent}
-          disabled={disabled}
-          rows={14}
-        />
+      <Field
+        id={CONTENT_EDITOR_ELEMENT_ID}
+        label={t("template-resolver.editor.contentLabel")}
+        labelAppendix={
+          <Button
+            type="button"
+            variant="secondary"
+            size="sm"
+            onClick={() => setPreviewing((p) => !p)}
+          >
+            {previewing ? t("kumiko.contentEditor.editMode") : t("kumiko.contentEditor.preview")}
+          </Button>
+        }
+      >
+        {previewing ? (
+          <ContentPreview
+            content={content}
+            variables={variableExamples}
+            contentFormat={contentFormat}
+          />
+        ) : (
+          <ContentEditor
+            value={content}
+            onChange={setContent}
+            variables={variables}
+            readOnly={disabled}
+          />
+        )}
       </Field>
       {saveError !== null && <Banner variant="error">{saveError}</Banner>}
       {savedMsg !== null && <Banner variant="info">{savedMsg}</Banner>}
@@ -406,6 +475,17 @@ export function textBlocksClient(opts?: {
     resolvers: {
       "template-resolver:edit": TextBlockEditor,
     },
+    // The default for every "plain" collection (ai-prompt, mail-html without
+    // an explicit rich override) — an app-registered "plain" editor on
+    // another clientFeature still wins, last-wins same as columnRenderers.
+    contentEditors: {
+      plain: PlainContentEditor,
+      // ponytail: same textarea+chips as "plain" — markdown is stored as
+      // text either way. Shares PlainContentEditor's fixed-DOM-id ceiling
+      // (see its own file comment); swap for a live-preview widget or a
+      // forwarded-ref variant if a collection actually needs one.
+      markdown: PlainContentEditor,
+    },
     translations: defaultTranslations,
   };
 }