test: main's new fixtures (#25048, #25066 and the ReadableIds, person-title, keyed-text, webhook-report cases) meet a NOT NULL tenant column

- plugin-security: an organization-less permission-set catalogue row is
  legacy residue, so six suites relax only sys_permission_set to its pre-18
  shape. Driver-written seeds name the rig's organization
  (readable-ids-nested-compose, controlled-by-parent-master-object-write).
  The lean person-title engine gets the Default Organization.
- rest (stored-expression dropped fields), plugin-webhooks (auto-enqueuer
  report), plugin-approvals (reader-locale labels, keyed text): each lean
  engine gets the Default Organization. The keyed-text out-of-office
  delegation names the deals' organization, where its request opens.

No assertion changed.

Claude-Session: https://claude.ai/code/session_018EszgtA3V2KXBX5tf59Hi4
Co-authored-by: Claude <noreply@anthropic.com>

Author: claude

packages/plugins/plugin-approvals/src/approval-notification-keyed-text.integration.test.ts

@@ -50,6 +50,7 @@ import { ApprovalService } from './approval-service.js';
 import { ApprovalsServicePlugin } from './approvals-plugin.js';
 import { ApprovalsTranslations } from './translations/index.js';
 import { approvalMessages, enMessages } from './translations/messages.js';
+import { installDefaultOrganization } from './default-organization.testkit.js';
 
 const SYSTEM = { isSystem: true, positions: [], permissions: [] } as any;
 const asUser = (userId: string) => ({ userId, positions: [], permissions: [] }) as any;
@@ -124,6 +125,9 @@ async function bootEngine(users: Array<Record<string, unknown>>): Promise<Object
     engine.registry.registerObject(def as any, 'approvals-test', 'approvals-test');
   }
   await engine.syncSchemas();
+  // A real `single` install's Default Organization: the system writes below
+  // derive it (ADR-0131 D9), as a fresh NOT NULL tenant column requires (D1).
+  await installDefaultOrganization(engine);
   for (const u of users) await engine.insert('sys_user', u, { context: SYSTEM } as any);
   return engine;
 }
@@ -207,8 +211,10 @@ describe('#24978 — every approval notification carries its text as catalog key
     await open('rejected', [{ type: 'user', value: 'u_alice' }]);
     await svc.decide(ids.rejected, { decision: 'reject', actorId: 'u_alice', comment: 'Not this quarter.' }, asUser('u_alice'));
 
+    // The delegation belongs to the deals' organization, where the request it
+    // substitutes in is opened.
     await engine.insert('sys_approval_delegation', {
-      id: 'dlg_1', delegator_id: 'u_ooo', delegate_id: 'u_bob', reason: 'leave',
+      id: 'dlg_1', delegator_id: 'u_ooo', delegate_id: 'u_bob', reason: 'leave', organization_id: ORG,
       valid_from: '2026-09-01T00:00:00.000Z', valid_until: '2026-12-31T00:00:00.000Z',
       created_at: '2026-09-01T00:00:00.000Z', updated_at: '2026-09-01T00:00:00.000Z',
     }, { context: SYSTEM } as any);

packages/plugins/plugin-approvals/src/reader-locale-display-labels.integration.test.ts

@@ -57,6 +57,7 @@ import { TranslationDataSchema } from '@objectstack/spec/system';
 import type { EngineQueryOptions } from '@objectstack/spec/data';
 import type { ApprovalService } from './approval-service.js';
 import { ApprovalsServicePlugin } from './approvals-plugin.js';
+import { installDefaultOrganization } from './default-organization.testkit.js';
 
 const SYSTEM = { isSystem: true, positions: [], permissions: [] } as any;
 const reader = (userId: string, locale?: string) =>
@@ -187,6 +188,9 @@ describe('[#24863] the approvals door serves a request\'s labels in the reader\'
       engine.registry.registerObject(def as any, 'approvals-reader-locale-test', 'approvals-reader-locale-test');
     }
     await engine.syncSchemas();
+    // A real `single` install's Default Organization: the system writes below
+    // derive it (ADR-0131 D9), as a fresh NOT NULL tenant column requires (D1).
+    await installDefaultOrganization(engine);
     for (const [id, name] of [[SUBMITTER, 'Sam Submitter'], [MANAGER, 'Mona Manager'], [DIRECTOR, 'Dina Director']]) {
       await engine.insert('sys_user', { id, name, email: `${id}@example.com` }, { context: SYSTEM } as any);
     }

packages/plugins/plugin-security/src/controlled-by-parent-every-master-edit.test.ts

@@ -44,6 +44,7 @@ import { SysUserPosition } from './objects/sys-user-position.object.js';
 import { SysUserPermissionSet } from './objects/sys-user-permission-set.object.js';
 import { SecurityPlugin } from './security-plugin.js';
 import { defaultPermissionSets } from './objects/default-permission-sets.js';
+import { relaxTenantColumns } from './pre-18-tenant-column.testkit.js';
 
 const SYS = { context: { isSystem: true } } as never;
 const ORG = 'org_cbp_eme';
@@ -152,6 +153,10 @@ async function boot() {
     ],
   } as never);
   await engine.syncSchemas();
+  // The organization-less permission-set catalogue row below exists only on a
+  // store built before 18.x (ADR-0131 D1 makes a fresh tenant column NOT
+  // NULL): that table is this store's.
+  await relaxTenantColumns(engine as never, ['sys_permission_set']);
 
   const e = engine as unknown as {
     insert: (o: string, row: Record<string, unknown>, opts: never) => Promise<unknown>;

packages/plugins/plugin-security/src/controlled-by-parent-master-object-read.test.ts

@@ -44,6 +44,7 @@ import { SysUserPosition } from './objects/sys-user-position.object.js';
 import { SysUserPermissionSet } from './objects/sys-user-permission-set.object.js';
 import { SecurityPlugin } from './security-plugin.js';
 import { defaultPermissionSets } from './objects/default-permission-sets.js';
+import { relaxTenantColumns } from './pre-18-tenant-column.testkit.js';
 
 const SYS = { context: { isSystem: true } } as never;
 const ORG = 'org_cbp_mor';
@@ -154,6 +155,10 @@ async function boot() {
     ],
   } as never);
   await engine.syncSchemas();
+  // The organization-less permission-set catalogue row below exists only on a
+  // store built before 18.x (ADR-0131 D1 makes a fresh tenant column NOT
+  // NULL): that table is this store's.
+  await relaxTenantColumns(engine as never, ['sys_permission_set']);
 
   const e = engine as unknown as {
     insert: (o: string, row: Record<string, unknown>, opts: never) => Promise<unknown>;

packages/plugins/plugin-security/src/controlled-by-parent-master-object-write.test.ts

@@ -217,10 +217,14 @@ async function boot() {
   let n = 0;
   return {
     engine,
-    /** A stored detail under `master`, written as SYSTEM (seed replay skips the reference check). */
+    /**
+     * A stored detail under `master`, written as SYSTEM (seed replay skips the
+     * reference check). A driver write is not stamped, so it names the rig's
+     * organization itself.
+     */
     seedDetail: async (detail: string, master: string) => {
       const id = `${detail}_seed_${n++}`;
-      await e.getDriver(detail).create(detail, { id, note: 'seeded', master });
+      await e.getDriver(detail).create(detail, { id, note: 'seeded', master, organization_id: ORG });
       return id;
     },
     stored: async (object: string, id: string) =>

packages/plugins/plugin-security/src/controlled-by-parent-write-shape-master-edit.test.ts

@@ -44,6 +44,7 @@ import { SysUserPosition } from './objects/sys-user-position.object.js';
 import { SysUserPermissionSet } from './objects/sys-user-permission-set.object.js';
 import { SecurityPlugin } from './security-plugin.js';
 import { defaultPermissionSets } from './objects/default-permission-sets.js';
+import { relaxTenantColumns } from './pre-18-tenant-column.testkit.js';
 
 const SYS = { context: { isSystem: true } } as never;
 const ORG = 'org_cbp_wsme';
@@ -148,6 +149,10 @@ async function boot() {
     ],
   } as never);
   await engine.syncSchemas();
+  // The organization-less permission-set catalogue row below exists only on a
+  // store built before 18.x (ADR-0131 D1 makes a fresh tenant column NOT
+  // NULL): that table is this store's.
+  await relaxTenantColumns(engine as never, ['sys_permission_set']);
 
   const e = engine as unknown as {
     insert: (o: string, row: Record<string, unknown>, opts: never) => Promise<unknown>;

packages/plugins/plugin-security/src/insert-seam-judges-organization.test.ts

@@ -47,6 +47,7 @@ import { SysOrganization, SysUser, SysMember } from '@objectstack/platform-objec
 import { SysPosition, SysPermissionSet, SysPositionPermissionSet } from './__tests__/legacy-catalog-objects.testkit.js';
 import { SysUserPosition } from './objects/sys-user-position.object.js';
 import { SysUserPermissionSet } from './objects/sys-user-permission-set.object.js';
+import { relaxTenantColumns } from './pre-18-tenant-column.testkit.js';
 
 const OWN_ORG = 'org_a';
 const SISTER_ORG = 'org_c';
@@ -339,6 +340,10 @@ describe('[#24822 · ADR-0090 D10] a delegated insert by a crossing operator is
       ],
     } as never);
     await engine.syncSchemas();
+    // The organization-less permission-set catalogue row below exists only on a
+    // store built before 18.x (ADR-0131 D1 makes a fresh tenant column NOT
+    // NULL): that table is this store's.
+    await relaxTenantColumns(engine as never, ['sys_permission_set']);
     engines.push(engine);
 
     for (const id of [ORG_A, ORG_C, ORG_D]) {

packages/plugins/plugin-security/src/objects/sys-user-permission-set-person-title.test.ts

@@ -44,6 +44,7 @@ import { SysUser } from '@objectstack/platform-objects';
 import { resolveDisplayField, resolveRecordDisplayName } from '@objectstack/spec/data';
 import type { ExecutionContext } from '@objectstack/spec/kernel';
 import { SysUserPermissionSet } from './sys-user-permission-set.object.js';
+import { installDefaultOrganization } from '../default-organization.testkit.js';
 
 const SYS = { context: { isSystem: true } } as any;
 const OBJECT = 'sys_user_permission_set';
@@ -83,6 +84,9 @@ describe('sys_user_permission_set is titled by the person, not the raw user id',
     engine.registry.registerObject(SysUser as any, 'com.objectstack.test.person-title');
     engine.registry.registerObject(SysUserPermissionSet as any, 'com.objectstack.test.person-title');
     await engine.syncSchemas();
+    // A real `single` install's Default Organization: the system writes below
+    // derive it (ADR-0131 D9), as a fresh NOT NULL tenant column requires (D1).
+    await installDefaultOrganization(engine);
     // Row-level security on `sys_user` for a reader that is not SYSTEM — the
     // composition the security plugin makes (its own row scope is "own row or
     // an organization member"; here, the ids in `readable`).

packages/plugins/plugin-security/src/readable-ids-delegated-compose.test.ts

@@ -46,6 +46,7 @@ import { SysUserPosition } from './objects/sys-user-position.object.js';
 import { SysUserPermissionSet } from './objects/sys-user-permission-set.object.js';
 import { SecurityPlugin } from './security-plugin.js';
 import { defaultPermissionSets } from './objects/default-permission-sets.js';
+import { relaxTenantColumns } from './pre-18-tenant-column.testkit.js';
 
 const SYS = { context: { isSystem: true } } as never;
 const ORG = 'org_rid_del';
@@ -151,6 +152,10 @@ async function boot() {
     ],
   } as never);
   await engine.syncSchemas();
+  // The organization-less permission-set catalogue row below exists only on a
+  // store built before 18.x (ADR-0131 D1 makes a fresh tenant column NOT
+  // NULL): that table is this store's.
+  await relaxTenantColumns(engine as never, ['sys_permission_set']);
 
   const e = engine as unknown as {
     insert: (o: string, row: Record<string, unknown>, opts: never) => Promise<unknown>;

packages/plugins/plugin-security/src/readable-ids-nested-compose.test.ts

@@ -51,6 +51,7 @@ import { SysUserPosition } from './objects/sys-user-position.object.js';
 import { SysUserPermissionSet } from './objects/sys-user-permission-set.object.js';
 import { SecurityPlugin } from './security-plugin.js';
 import { defaultPermissionSets } from './objects/default-permission-sets.js';
+import { relaxTenantColumns } from './pre-18-tenant-column.testkit.js';
 
 const SYS = { context: { isSystem: true } } as never;
 const ORG = 'org_rid_nest';
@@ -194,6 +195,10 @@ async function boot() {
     ],
   } as never);
   await engine.syncSchemas();
+  // The organization-less permission-set catalogue row below exists only on a
+  // store built before 18.x (ADR-0131 D1 makes a fresh tenant column NOT
+  // NULL): that table is this store's.
+  await relaxTenantColumns(engine as never, ['sys_permission_set']);
 
   const e = engine as unknown as {
     insert: (o: string, row: Record<string, unknown>, opts: never) => Promise<unknown>;
@@ -240,12 +245,13 @@ async function boot() {
   }, SYS);
   // The parents, one per grandparent, plus one with a dangling and one with a
   // null master pointer (written through the driver: the required master is
-  // what the authoring door refuses, and these rows exist to be excluded).
+  // what the authoring door refuses, and these rows exist to be excluded). A
+  // driver write is not stamped, so it names the rig's organization itself.
   for (const [id, grand] of [
     ['p_both', 'g_both'], ['p_del_only', 'g_del_only'], ['p_caller_only', 'g_caller_only'],
     ['p_neither', 'g_neither'], ['p_shared', 'g_shared'], ['p_dangling', 'g_missing'], ['p_null', null],
   ] as const) {
-    await e.getDriver(PARENT).create(PARENT, { id, name: id, grand });
+    await e.getDriver(PARENT).create(PARENT, { id, name: id, grand, organization_id: ORG });
   }
   // The same children in both tables, so the two paths read the same rows.
   for (const child of [CHILD_CBP, CHILD_LEAF]) {
@@ -254,7 +260,7 @@ async function boot() {
       ['c_neither', 'p_neither'], ['c_shared', 'p_shared'], ['c_via_dangling', 'p_dangling'], ['c_via_null', 'p_null'],
       ['c_dangling', 'p_missing'], ['c_null', null],
     ] as const) {
-      await e.getDriver(child).create(child, { id, note: '', parent });
+      await e.getDriver(child).create(child, { id, note: '', parent, organization_id: ORG });
     }
   }