@almadar/std 16.217.0 → 16.218.0

package/dist/behaviors/query.js

@@ -886,6 +886,8 @@ __export(functions_exports, {
   stdNotificationPreferences: () => stdNotificationPreferences,
   stdNotificationPreferencesNotificationPreferencesOrbital: () => stdNotificationPreferencesNotificationPreferencesOrbital,
   stdNotificationPreferencesPage: () => stdNotificationPreferencesPage,
+  stdNotificationPreferencesPreferenceCreateTrait: () => stdNotificationPreferencesPreferenceCreateTrait,
+  stdNotificationPreferencesPreferenceEditTrait: () => stdNotificationPreferencesPreferenceEditTrait,
   stdNotificationPreferencesPreferenceGateTrait: () => stdNotificationPreferencesPreferenceGateTrait,
   stdNotificationPreferencesPreferencesManageTrait: () => stdNotificationPreferencesPreferencesManageTrait,
   stdNotifyOnEvent: () => stdNotifyOnEvent,
@@ -914,14 +916,15 @@ __export(functions_exports, {
   stdPatrolHazardPage: () => stdPatrolHazardPage,
   stdPatrolHazardTrait: () => stdPatrolHazardTrait,
   stdPermissionMatrix: () => stdPermissionMatrix,
-  stdPermissionMatrixBackButtonTrait: () => stdPermissionMatrixBackButtonTrait,
   stdPermissionMatrixErrorAlertTrait: () => stdPermissionMatrixErrorAlertTrait,
   stdPermissionMatrixErrorSpinnerTrait: () => stdPermissionMatrixErrorSpinnerTrait,
   stdPermissionMatrixGrantDividerTrait: () => stdPermissionMatrixGrantDividerTrait,
   stdPermissionMatrixLoadingSpinnerTrait: () => stdPermissionMatrixLoadingSpinnerTrait,
   stdPermissionMatrixLoadingTextTrait: () => stdPermissionMatrixLoadingTextTrait,
-  stdPermissionMatrixNewGrantButtonTrait: () => stdPermissionMatrixNewGrantButtonTrait,
   stdPermissionMatrixPage: () => stdPermissionMatrixPage,
+  stdPermissionMatrixPermissionGrantCreateTrait: () => stdPermissionMatrixPermissionGrantCreateTrait,
+  stdPermissionMatrixPermissionGrantEditTrait: () => stdPermissionMatrixPermissionGrantEditTrait,
+  stdPermissionMatrixPermissionGrantPersistorTrait: () => stdPermissionMatrixPermissionGrantPersistorTrait,
   stdPermissionMatrixPermissionGrantQueryTrait: () => stdPermissionMatrixPermissionGrantQueryTrait,
   stdPermissionMatrixPermissionMatrixAdminTrait: () => stdPermissionMatrixPermissionMatrixAdminTrait,
   stdPermissionMatrixPermissionMatrixOrbital: () => stdPermissionMatrixPermissionMatrixOrbital,
@@ -32143,7 +32146,7 @@ function stdDataImportDataImportOrbital(params = {}) {
         ],
         "emits": [
           {
-            "description": "import_batches persist-create success \u2014 the payload carries the created row's id, captured onto the trait entity so staged rows can reference batchId",
+            "description": "import_batches persist-create success \u2014 rebinds @entity.id to the server-issued id, the fallback for when the host didn't mint a client-side batchId on UPLOAD_CSV",
             "event": "BATCH_CREATED",
             "payloadSchema": [
               {
@@ -32160,7 +32163,7 @@ function stdDataImportDataImportOrbital(params = {}) {
             "tier": "secondary"
           },
           {
-            "description": "Any import_batches / import_rows persist failure \u2014 lands the run in failed, never a silent swallow",
+            "description": "Any import_batches / import_rows persist failure \u2014 the batch row is updated to failed and IMPORT_FAILED emitted, never a silent swallow; the trait stays put so the user can retry or discard",
             "event": "IMPORT_PERSIST_FAILED",
             "payloadSchema": [
               {
@@ -32233,10 +32236,14 @@ function stdDataImportDataImportOrbital(params = {}) {
               "name": "Initialize"
             },
             {
-              "description": "Starts an import run for a CSV file upload. The host's file UI (e.g. a sibling std-import menu) only announces the upload \u2014 parsing is host work and arrives as STAGE_ROWS.",
+              "description": "Starts an import run for a CSV file upload. batchId is the client-minted batch id (idempotent upload \u2014 the host generates it so a retry never double-creates a batch); when omitted, the server-issued id is bound on BATCH_CREATED instead. The host's file UI (e.g. a sibling std-import menu) only announces the upload \u2014 parsing is host work and arrives as STAGE_ROWS.",
               "key": "UPLOAD_CSV",
               "name": "Upload Csv",
               "payloadSchema": [
+                {
+                  "name": "batchId",
+                  "type": "string"
+                },
                 {
                   "name": "sourceName",
                   "type": "string"
@@ -32246,7 +32253,7 @@ function stdDataImportDataImportOrbital(params = {}) {
               "tier": "domain"
             },
             {
-              "description": "import_batches persist-create success \u2014 the payload carries the created row's id, captured onto the trait entity so staged rows can reference batchId",
+              "description": "import_batches persist-create success \u2014 rebinds @entity.id to the server-issued id, the fallback for when the host didn't mint a client-side batchId on UPLOAD_CSV",
               "key": "BATCH_CREATED",
               "name": "Batch Created",
               "payloadSchema": [
@@ -32276,7 +32283,7 @@ function stdDataImportDataImportOrbital(params = {}) {
               "tier": "internal"
             },
             {
-              "description": "Any import_batches / import_rows persist failure \u2014 lands the run in failed, never a silent swallow",
+              "description": "Any import_batches / import_rows persist failure \u2014 the batch row is updated to failed and IMPORT_FAILED emitted, never a silent swallow; the trait stays put so the user can retry or discard",
               "key": "IMPORT_PERSIST_FAILED",
               "name": "Import Persist Failed",
               "payloadSchema": [
@@ -32412,6 +32419,11 @@ function stdDataImportDataImportOrbital(params = {}) {
             },
             {
               "effects": [
+                [
+                  "set",
+                  "@entity.id",
+                  "@payload.batchId"
+                ],
                 [
                   "set",
                   "@entity.sourceName",
@@ -32455,6 +32467,7 @@ function stdDataImportDataImportOrbital(params = {}) {
                   {
                     "createdAt": "@entity.createdAt",
                     "errorCount": 0,
+                    "id": "@entity.id",
                     "mappingJson": "@entity.mappingJson",
                     "rowCount": 0,
                     "sourceName": "@entity.sourceName",
@@ -32642,12 +32655,12 @@ function stdDataImportDataImportOrbital(params = {}) {
               "event": "STAGE_ROWS",
               "from": "uploaded",
               "guard": [
-                "=",
+                "<",
                 [
                   "array/len",
                   "@payload.rows"
                 ],
-                0
+                1
               ],
               "to": "failed"
             },
@@ -32693,7 +32706,7 @@ function stdDataImportDataImportOrbital(params = {}) {
               ],
               "event": "IMPORT_PERSIST_FAILED",
               "from": "uploaded",
-              "to": "failed"
+              "to": "uploaded"
             },
             {
               "effects": [
@@ -32803,7 +32816,7 @@ function stdDataImportDataImportOrbital(params = {}) {
               ],
               "event": "IMPORT_PERSIST_FAILED",
               "from": "staged",
-              "to": "failed"
+              "to": "staged"
             },
             {
               "effects": [
@@ -44961,10 +44974,14 @@ function stdGlobalSearchGlobalSearchOrbital(params = {}) {
             "tier": "secondary"
           },
           {
-            "description": "Internal sentinel draining the module queue, one MODULE_SEARCH_REQUESTED per pass",
+            "description": "Internal sentinel draining the module queue, one MODULE_SEARCH_REQUESTED per pass; `remaining` is the queue length after the last seed/drop",
             "event": "FAN_OUT_STEP",
-            "payloadSchema": [],
-            "scope": "internal",
+            "payloadSchema": [
+              {
+                "name": "remaining",
+                "type": "number"
+              }
+            ],
             "tier": "internal"
           }
         ],
@@ -45025,10 +45042,15 @@ function stdGlobalSearchGlobalSearchOrbital(params = {}) {
               "tier": "essential"
             },
             {
-              "description": "Internal sentinel draining the module queue, one MODULE_SEARCH_REQUESTED per pass",
+              "description": "Internal sentinel draining the module queue, one MODULE_SEARCH_REQUESTED per pass; `remaining` is the queue length after the last seed/drop",
               "key": "FAN_OUT_STEP",
               "name": "Fan Out Step",
-              "payloadSchema": [],
+              "payloadSchema": [
+                {
+                  "name": "remaining",
+                  "type": "number"
+                }
+              ],
               "tier": "internal"
             },
             {
@@ -45287,9 +45309,25 @@ function stdGlobalSearchGlobalSearchOrbital(params = {}) {
                   ]
                 ],
                 [
-                  "emit",
-                  "FAN_OUT_STEP",
-                  {}
+                  "when",
+                  [
+                    ">",
+                    [
+                      "array/len",
+                      "@entity.pendingModules"
+                    ],
+                    0
+                  ],
+                  [
+                    "emit",
+                    "FAN_OUT_STEP",
+                    {
+                      "remaining": [
+                        "array/len",
+                        "@entity.pendingModules"
+                      ]
+                    }
+                  ]
                 ],
                 [
                   "render-ui",
@@ -45455,9 +45493,25 @@ function stdGlobalSearchGlobalSearchOrbital(params = {}) {
                   ]
                 ],
                 [
-                  "emit",
-                  "FAN_OUT_STEP",
-                  {}
+                  "when",
+                  [
+                    ">",
+                    [
+                      "array/len",
+                      "@entity.pendingModules"
+                    ],
+                    0
+                  ],
+                  [
+                    "emit",
+                    "FAN_OUT_STEP",
+                    {
+                      "remaining": [
+                        "array/len",
+                        "@entity.pendingModules"
+                      ]
+                    }
+                  ]
                 ]
               ],
               "event": "SEARCH",
@@ -45498,35 +45552,52 @@ function stdGlobalSearchGlobalSearchOrbital(params = {}) {
                   ]
                 ],
                 [
-                  "emit",
-                  "FAN_OUT_STEP",
-                  {}
+                  "when",
+                  [
+                    "=",
+                    [
+                      "array/len",
+                      "@entity.pendingModules"
+                    ],
+                    0
+                  ],
+                  [
+                    "set",
+                    "@entity.fanOutDone",
+                    true
+                  ]
+                ],
+                [
+                  "when",
+                  [
+                    ">",
+                    [
+                      "array/len",
+                      "@entity.pendingModules"
+                    ],
+                    0
+                  ],
+                  [
+                    "emit",
+                    "FAN_OUT_STEP",
+                    {
+                      "remaining": [
+                        "array/len",
+                        "@entity.pendingModules"
+                      ]
+                    }
+                  ]
                 ]
               ],
               "event": "FAN_OUT_STEP",
               "from": "searching",
               "guard": [
                 ">",
-                [
-                  "array/len",
-                  "@entity.pendingModules"
-                ],
+                "@payload.remaining",
                 0
               ],
               "to": "searching"
             },
-            {
-              "effects": [
-                [
-                  "set",
-                  "@entity.fanOutDone",
-                  true
-                ]
-              ],
-              "event": "FAN_OUT_STEP",
-              "from": "searching",
-              "to": "searching"
-            },
             {
               "effects": [
                 [
@@ -67012,6 +67083,32 @@ function stdNotificationPreferencesPreferencesManageTrait(params) {
     ...params.config !== void 0 ? { config: params.config } : {}
   });
 }
+function stdNotificationPreferencesPreferenceCreateTrait(params) {
+  return makeTraitRef({
+    from: BEHAVIOR_PATH127,
+    ref: `${ALIAS127}.traits.PreferenceCreate`,
+    linkedEntity: params.entityName,
+    ...params.traitName !== void 0 ? { name: params.traitName } : {},
+    ...params.events !== void 0 ? { events: params.events } : {},
+    ...params.effects !== void 0 ? { effects: params.effects } : {},
+    ...params.listens !== void 0 ? { listens: params.listens } : {},
+    ...params.emitsScope !== void 0 ? { emitsScope: params.emitsScope } : {},
+    ...params.config !== void 0 ? { config: params.config } : {}
+  });
+}
+function stdNotificationPreferencesPreferenceEditTrait(params) {
+  return makeTraitRef({
+    from: BEHAVIOR_PATH127,
+    ref: `${ALIAS127}.traits.PreferenceEdit`,
+    linkedEntity: params.entityName,
+    ...params.traitName !== void 0 ? { name: params.traitName } : {},
+    ...params.events !== void 0 ? { events: params.events } : {},
+    ...params.effects !== void 0 ? { effects: params.effects } : {},
+    ...params.listens !== void 0 ? { listens: params.listens } : {},
+    ...params.emitsScope !== void 0 ? { emitsScope: params.emitsScope } : {},
+    ...params.config !== void 0 ? { config: params.config } : {}
+  });
+}
 function stdNotificationPreferencesPreferenceGateTrait(params) {
   return makeTraitRef({
     from: BEHAVIOR_PATH127,
@@ -67045,6 +67142,8 @@ function stdNotificationPreferences(params) {
     entity,
     traits: [
       stdNotificationPreferencesPreferencesManageTrait(params),
+      stdNotificationPreferencesPreferenceCreateTrait(params),
+      stdNotificationPreferencesPreferenceEditTrait(params),
       stdNotificationPreferencesPreferenceGateTrait(params)
     ],
     pages: [
@@ -67056,7 +67155,12 @@ function stdNotificationPreferencesNotificationPreferencesOrbital(params = {}) {
   const collectionName = params.collection ?? (params.entityName ? `${params.entityName.toLowerCase()}s` : "notification_preferences");
   const built = makeOrbitalWithUses({
     name: "NotificationPreferencesOrbital",
-    uses: [],
+    uses: [
+      {
+        "as": "Modal",
+        "from": "std/behaviors/std-modal"
+      }
+    ],
     entity: {
       name: "NotificationPreference",
       collection: collectionName,
@@ -67222,47 +67326,19 @@ function stdNotificationPreferencesNotificationPreferencesOrbital(params = {}) {
             "resource": "main"
           },
           {
-            "kind": "set",
-            "resource": "@entity.channel"
-          },
-          {
-            "kind": "set",
-            "resource": "@entity.createdAt"
-          },
-          {
-            "kind": "set",
-            "resource": "@entity.eventKey"
-          },
-          {
-            "kind": "set",
-            "resource": "@entity.id"
-          },
-          {
-            "kind": "set",
-            "resource": "@entity.mode"
-          },
-          {
-            "kind": "set",
-            "resource": "@entity.personId"
-          },
-          {
-            "kind": "set",
-            "resource": "@entity.quietHours"
-          },
-          {
-            "kind": "set",
-            "resource": "@entity.updatedAt"
+            "kind": "render-ui",
+            "resource": "toast"
           }
         ],
         "emits": [
           {
-            "description": "Opens the blank preference form.",
-            "event": "NEW",
-            "synonyms": "add, create, new preference",
-            "tier": "presentation"
+            "description": "Opens the blank preference modal.",
+            "event": "CREATE",
+            "synonyms": "add, new, insert",
+            "tier": "domain"
           },
           {
-            "description": "Opens a preference row in the edit form.",
+            "description": "Opens a preference row in the edit modal.",
             "event": "EDIT",
             "payloadSchema": [
               {
@@ -67314,7 +67390,7 @@ function stdNotificationPreferencesNotificationPreferencesOrbital(params = {}) {
               }
             ],
             "synonyms": "modify, update, change",
-            "tier": "presentation"
+            "tier": "domain"
           },
           {
             "description": "Removes a preference row.",
@@ -67324,83 +67400,53 @@ function stdNotificationPreferencesNotificationPreferencesOrbital(params = {}) {
                 "name": "id",
                 "required": true,
                 "type": "string"
+              },
+              {
+                "entity": "NotificationPreference",
+                "name": "row",
+                "properties": [
+                  {
+                    "name": "id",
+                    "required": true,
+                    "type": "string"
+                  },
+                  {
+                    "name": "personId",
+                    "required": true,
+                    "type": "string"
+                  },
+                  {
+                    "name": "eventKey",
+                    "required": true,
+                    "type": "string"
+                  },
+                  {
+                    "name": "channel",
+                    "type": "string"
+                  },
+                  {
+                    "name": "mode",
+                    "type": "string"
+                  },
+                  {
+                    "name": "quietHours",
+                    "type": "string"
+                  },
+                  {
+                    "name": "createdAt",
+                    "type": "number"
+                  },
+                  {
+                    "name": "updatedAt",
+                    "type": "number"
+                  }
+                ],
+                "type": "object"
               }
             ],
             "synonyms": "remove, discard, clear",
-            "tier": "presentation"
-          },
-          {
-            "description": "Persists the preference form.",
-            "event": "SAVE",
-            "synonyms": "persist, store, commit",
             "tier": "domain"
           },
-          {
-            "description": "Aborts the preference form.",
-            "event": "CANCEL",
-            "synonyms": "abort, dismiss, undo",
-            "tier": "domain"
-          },
-          {
-            "description": "Preference form: person id changed.",
-            "event": "SET_PERSON_ID",
-            "payloadSchema": [
-              {
-                "name": "value",
-                "required": true,
-                "type": "string"
-              }
-            ],
-            "tier": "internal"
-          },
-          {
-            "description": "Preference form: event key changed.",
-            "event": "SET_EVENT_KEY",
-            "payloadSchema": [
-              {
-                "name": "value",
-                "required": true,
-                "type": "string"
-              }
-            ],
-            "tier": "internal"
-          },
-          {
-            "description": "Preference form: channel changed.",
-            "event": "SET_CHANNEL",
-            "payloadSchema": [
-              {
-                "name": "value",
-                "required": true,
-                "type": "string"
-              }
-            ],
-            "tier": "internal"
-          },
-          {
-            "description": "Preference form: delivery mode changed.",
-            "event": "SET_MODE",
-            "payloadSchema": [
-              {
-                "name": "value",
-                "required": true,
-                "type": "string"
-              }
-            ],
-            "tier": "internal"
-          },
-          {
-            "description": "Preference form: quiet-hours window changed.",
-            "event": "SET_QUIET_HOURS",
-            "payloadSchema": [
-              {
-                "name": "value",
-                "required": true,
-                "type": "string"
-              }
-            ],
-            "tier": "internal"
-          },
           {
             "description": "The preference collection finished loading.",
             "event": "PreferencesLoaded",
@@ -67511,6 +67557,24 @@ function stdNotificationPreferencesNotificationPreferencesOrbital(params = {}) {
           }
         ],
         "linkedEntity": "NotificationPreference",
+        "listens": [
+          {
+            "event": "PREFERENCE_CREATED",
+            "source": {
+              "kind": "trait",
+              "trait": "PreferenceCreate"
+            },
+            "triggers": "DO_CREATE"
+          },
+          {
+            "event": "PREFERENCE_UPDATED",
+            "source": {
+              "kind": "trait",
+              "trait": "PreferenceEdit"
+            },
+            "triggers": "DO_UPDATE"
+          }
+        ],
         "name": "PreferencesManage",
         "scope": "collection",
         "stateMachine": {
@@ -67588,16 +67652,9 @@ function stdNotificationPreferencesNotificationPreferencesOrbital(params = {}) {
               "tier": "internal"
             },
             {
-              "description": "Opens the blank preference form.",
-              "key": "NEW",
-              "name": "New",
-              "synonyms": "add, create, new preference",
-              "tier": "presentation"
-            },
-            {
-              "description": "Opens a preference row in the edit form.",
-              "key": "EDIT",
-              "name": "Edit",
+              "description": "Removes a preference row.",
+              "key": "DELETE",
+              "name": "Delete",
               "payloadSchema": [
                 {
                   "name": "id",
@@ -67647,22 +67704,112 @@ function stdNotificationPreferencesNotificationPreferencesOrbital(params = {}) {
                   "type": "object"
                 }
               ],
-              "synonyms": "modify, update, change",
-              "tier": "presentation"
+              "synonyms": "remove, discard, clear",
+              "tier": "domain"
             },
             {
-              "description": "Removes a preference row.",
-              "key": "DELETE",
-              "name": "Delete",
+              "description": "Create persist requested; the modal's SAVE payload carries the full form row.",
+              "key": "DO_CREATE",
+              "name": "Do Create",
               "payloadSchema": [
                 {
-                  "name": "id",
+                  "entity": "NotificationPreference",
+                  "name": "data",
+                  "properties": [
+                    {
+                      "name": "id",
+                      "required": true,
+                      "type": "string"
+                    },
+                    {
+                      "name": "personId",
+                      "required": true,
+                      "type": "string"
+                    },
+                    {
+                      "name": "eventKey",
+                      "required": true,
+                      "type": "string"
+                    },
+                    {
+                      "name": "channel",
+                      "type": "string"
+                    },
+                    {
+                      "name": "mode",
+                      "type": "string"
+                    },
+                    {
+                      "name": "quietHours",
+                      "type": "string"
+                    },
+                    {
+                      "name": "createdAt",
+                      "type": "number"
+                    },
+                    {
+                      "name": "updatedAt",
+                      "type": "number"
+                    }
+                  ],
                   "required": true,
-                  "type": "string"
+                  "type": "object"
                 }
               ],
-              "synonyms": "remove, discard, clear",
-              "tier": "presentation"
+              "synonyms": "add, new, insert",
+              "tier": "internal"
+            },
+            {
+              "description": "Update persist requested; the modal's SAVE payload carries the full form row.",
+              "key": "DO_UPDATE",
+              "name": "Do Update",
+              "payloadSchema": [
+                {
+                  "entity": "NotificationPreference",
+                  "name": "data",
+                  "properties": [
+                    {
+                      "name": "id",
+                      "required": true,
+                      "type": "string"
+                    },
+                    {
+                      "name": "personId",
+                      "required": true,
+                      "type": "string"
+                    },
+                    {
+                      "name": "eventKey",
+                      "required": true,
+                      "type": "string"
+                    },
+                    {
+                      "name": "channel",
+                      "type": "string"
+                    },
+                    {
+                      "name": "mode",
+                      "type": "string"
+                    },
+                    {
+                      "name": "quietHours",
+                      "type": "string"
+                    },
+                    {
+                      "name": "createdAt",
+                      "type": "number"
+                    },
+                    {
+                      "name": "updatedAt",
+                      "type": "number"
+                    }
+                  ],
+                  "required": true,
+                  "type": "object"
+                }
+              ],
+              "synonyms": "modified, changed, refreshed",
+              "tier": "internal"
             },
             {
               "description": "A preference row persisted (create or update).",
@@ -67710,82 +67857,73 @@ function stdNotificationPreferencesNotificationPreferencesOrbital(params = {}) {
               "tier": "internal"
             },
             {
-              "description": "Preference form: person id changed.",
-              "key": "SET_PERSON_ID",
-              "name": "Set Person Id",
-              "payloadSchema": [
-                {
-                  "name": "value",
-                  "required": true,
-                  "type": "string"
-                }
-              ],
-              "tier": "internal"
-            },
-            {
-              "description": "Preference form: event key changed.",
-              "key": "SET_EVENT_KEY",
-              "name": "Set Event Key",
-              "payloadSchema": [
-                {
-                  "name": "value",
-                  "required": true,
-                  "type": "string"
-                }
-              ],
-              "tier": "internal"
+              "description": "Retries loading the preference collection after a failure.",
+              "key": "RETRY",
+              "name": "Retry",
+              "synonyms": "try again, reload",
+              "tier": "presentation"
             },
             {
-              "description": "Preference form: channel changed.",
-              "key": "SET_CHANNEL",
-              "name": "Set Channel",
-              "payloadSchema": [
-                {
-                  "name": "value",
-                  "required": true,
-                  "type": "string"
-                }
-              ],
-              "tier": "internal"
+              "description": "Opens the blank preference modal.",
+              "key": "CREATE",
+              "name": "Create",
+              "synonyms": "add, new, insert",
+              "tier": "domain"
             },
             {
-              "description": "Preference form: delivery mode changed.",
-              "key": "SET_MODE",
-              "name": "Set Mode",
+              "description": "Opens a preference row in the edit modal.",
+              "key": "EDIT",
+              "name": "Edit",
               "payloadSchema": [
                 {
-                  "name": "value",
+                  "name": "id",
                   "required": true,
                   "type": "string"
-                }
-              ],
-              "tier": "internal"
-            },
-            {
-              "description": "Preference form: quiet-hours window changed.",
-              "key": "SET_QUIET_HOURS",
-              "name": "Set Quiet Hours",
-              "payloadSchema": [
+                },
                 {
-                  "name": "value",
-                  "required": true,
-                  "type": "string"
+                  "entity": "NotificationPreference",
+                  "name": "row",
+                  "properties": [
+                    {
+                      "name": "id",
+                      "required": true,
+                      "type": "string"
+                    },
+                    {
+                      "name": "personId",
+                      "required": true,
+                      "type": "string"
+                    },
+                    {
+                      "name": "eventKey",
+                      "required": true,
+                      "type": "string"
+                    },
+                    {
+                      "name": "channel",
+                      "type": "string"
+                    },
+                    {
+                      "name": "mode",
+                      "type": "string"
+                    },
+                    {
+                      "name": "quietHours",
+                      "type": "string"
+                    },
+                    {
+                      "name": "createdAt",
+                      "type": "number"
+                    },
+                    {
+                      "name": "updatedAt",
+                      "type": "number"
+                    }
+                  ],
+                  "type": "object"
                 }
               ],
-              "tier": "internal"
-            },
-            {
-              "description": "Persists the preference form.",
-              "key": "SAVE",
-              "name": "Save",
-              "synonyms": "persist, store, commit",
-              "tier": "domain"
-            },
-            {
-              "description": "Aborts the preference form.",
-              "key": "CANCEL",
-              "name": "Cancel",
-              "synonyms": "abort, dismiss, undo",
+              "synonyms": "modify, update, change",
               "tier": "domain"
             }
           ],
@@ -67797,12 +67935,6 @@ function stdNotificationPreferencesNotificationPreferencesOrbital(params = {}) {
             {
               "name": "browsing"
             },
-            {
-              "name": "creating"
-            },
-            {
-              "name": "editing"
-            },
             {
               "name": "error"
             }
@@ -67874,7 +68006,7 @@ function stdNotificationPreferencesNotificationPreferencesOrbital(params = {}) {
                             "type": "stack"
                           },
                           {
-                            "action": "NEW",
+                            "action": "CREATE",
                             "icon": "plus",
                             "label": "New preference",
                             "type": "button",
@@ -67954,9 +68086,25 @@ function stdNotificationPreferencesNotificationPreferencesOrbital(params = {}) {
                   "render-ui",
                   "main",
                   {
-                    "message": "@payload.error",
-                    "type": "alert",
-                    "variant": "error"
+                    "align": "center",
+                    "children": [
+                      {
+                        "message": "@payload.error",
+                        "type": "alert",
+                        "variant": "error"
+                      },
+                      {
+                        "action": "RETRY",
+                        "icon": "rotate-ccw",
+                        "label": "Retry",
+                        "type": "button",
+                        "variant": "primary"
+                      }
+                    ],
+                    "className": "py-12",
+                    "direction": "vertical",
+                    "gap": "md",
+                    "type": "stack"
                   }
                 ]
               ],
@@ -67980,22 +68128,8 @@ function stdNotificationPreferencesNotificationPreferencesOrbital(params = {}) {
                   "render-ui",
                   "main",
                   {
-                    "align": "center",
-                    "children": [
-                      {
-                        "type": "spinner"
-                      },
-                      {
-                        "color": "muted",
-                        "content": "Loading notification preferences\u2026",
-                        "type": "typography",
-                        "variant": "caption"
-                      }
-                    ],
-                    "className": "py-12",
-                    "direction": "vertical",
-                    "gap": "md",
-                    "type": "stack"
+                    "size": "sm",
+                    "type": "spinner"
                   }
                 ]
               ],
@@ -68006,380 +68140,162 @@ function stdNotificationPreferencesNotificationPreferencesOrbital(params = {}) {
             {
               "effects": [
                 [
-                  "set",
-                  "@entity.id",
-                  ""
-                ],
+                  "persist",
+                  "delete",
+                  "NotificationPreference",
+                  "@payload.id",
+                  {
+                    "emit": {
+                      "failure": "PreferenceSaveFailed",
+                      "success": "PreferenceDeleted"
+                    }
+                  }
+                ]
+              ],
+              "event": "DELETE",
+              "from": "browsing",
+              "to": "browsing"
+            },
+            {
+              "effects": [
                 [
-                  "set",
-                  "@entity.personId",
-                  ""
-                ],
+                  "persist",
+                  "create",
+                  "NotificationPreference",
+                  "@payload.data",
+                  {
+                    "emit": {
+                      "failure": "PreferenceSaveFailed",
+                      "success": "PreferenceSaved"
+                    }
+                  }
+                ]
+              ],
+              "event": "DO_CREATE",
+              "from": "browsing",
+              "to": "browsing"
+            },
+            {
+              "effects": [
                 [
-                  "set",
-                  "@entity.eventKey",
-                  ""
-                ],
+                  "persist",
+                  "update",
+                  "NotificationPreference",
+                  "@payload.data",
+                  {
+                    "emit": {
+                      "failure": "PreferenceSaveFailed",
+                      "success": "PreferenceSaved"
+                    }
+                  }
+                ]
+              ],
+              "event": "DO_UPDATE",
+              "from": "browsing",
+              "to": "browsing"
+            },
+            {
+              "effects": [
                 [
-                  "set",
-                  "@entity.channel",
-                  "in_app"
+                  "render-ui",
+                  "toast",
+                  {
+                    "dismissible": true,
+                    "message": "Notification preference saved",
+                    "type": "alert",
+                    "variant": "success"
+                  }
                 ],
                 [
-                  "set",
-                  "@entity.mode",
-                  "instant"
-                ],
+                  "fetch",
+                  "NotificationPreference",
+                  {
+                    "emit": {
+                      "failure": "PreferencesLoadFailed",
+                      "success": "PreferencesLoaded"
+                    }
+                  }
+                ]
+              ],
+              "event": "PreferenceSaved",
+              "from": "browsing",
+              "to": "loading"
+            },
+            {
+              "effects": [
                 [
-                  "set",
-                  "@entity.quietHours",
-                  ""
+                  "render-ui",
+                  "toast",
+                  {
+                    "dismissible": true,
+                    "message": "Notification preference removed",
+                    "type": "alert",
+                    "variant": "info"
+                  }
                 ],
                 [
-                  "set",
-                  "@entity.createdAt",
-                  0
-                ],
+                  "fetch",
+                  "NotificationPreference",
+                  {
+                    "emit": {
+                      "failure": "PreferencesLoadFailed",
+                      "success": "PreferencesLoaded"
+                    }
+                  }
+                ]
+              ],
+              "event": "PreferenceDeleted",
+              "from": "browsing",
+              "to": "loading"
+            },
+            {
+              "effects": [
                 [
-                  "set",
-                  "@entity.updatedAt",
-                  0
-                ],
+                  "render-ui",
+                  "toast",
+                  {
+                    "dismissible": true,
+                    "message": "Could not save the notification preference",
+                    "type": "alert",
+                    "variant": "warning"
+                  }
+                ]
+              ],
+              "event": "PreferenceSaveFailed",
+              "from": "browsing",
+              "to": "browsing"
+            },
+            {
+              "effects": [
                 [
                   "render-ui",
                   "main",
                   {
+                    "align": "center",
                     "children": [
                       {
-                        "children": [
-                          {
-                            "name": "plus",
-                            "size": "lg",
-                            "type": "icon"
-                          },
-                          {
-                            "content": "New notification preference",
-                            "type": "typography",
-                            "variant": "h3"
-                          }
-                        ],
-                        "direction": "horizontal",
-                        "gap": "sm",
-                        "type": "stack"
-                      },
-                      {
-                        "type": "divider"
-                      },
-                      {
-                        "action": "SET_PERSON_ID",
-                        "placeholder": "Person id",
-                        "type": "input",
-                        "value": "@entity.personId"
-                      },
-                      {
-                        "action": "SET_EVENT_KEY",
-                        "placeholder": "Event key (blank = all events)",
-                        "type": "input",
-                        "value": "@entity.eventKey"
-                      },
-                      {
-                        "action": "SET_CHANNEL",
-                        "options": [
-                          {
-                            "label": "In app",
-                            "value": "in_app"
-                          },
-                          {
-                            "label": "Email",
-                            "value": "email"
-                          },
-                          {
-                            "label": "Push",
-                            "value": "push"
-                          },
-                          {
-                            "label": "Slack",
-                            "value": "slack"
-                          }
-                        ],
-                        "placeholder": "Channel",
-                        "type": "select",
-                        "value": "@entity.channel"
-                      },
-                      {
-                        "action": "SET_MODE",
-                        "options": [
-                          {
-                            "label": "Instant",
-                            "value": "instant"
-                          },
-                          {
-                            "label": "Digest",
-                            "value": "digest"
-                          }
-                        ],
-                        "placeholder": "Mode",
-                        "type": "select",
-                        "value": "@entity.mode"
-                      },
-                      {
-                        "action": "SET_QUIET_HOURS",
-                        "placeholder": "Quiet hours (e.g. 22:00-07:00)",
-                        "type": "input",
-                        "value": "@entity.quietHours"
+                        "message": "@payload.error",
+                        "type": "alert",
+                        "variant": "error"
                       },
                       {
-                        "children": [
-                          {
-                            "action": "SAVE",
-                            "icon": "check",
-                            "label": "Save",
-                            "type": "button",
-                            "variant": "primary"
-                          },
-                          {
-                            "action": "CANCEL",
-                            "icon": "x",
-                            "label": "Cancel",
-                            "type": "button",
-                            "variant": "secondary"
-                          }
-                        ],
-                        "direction": "horizontal",
-                        "gap": "sm",
-                        "type": "stack"
+                        "action": "RETRY",
+                        "icon": "rotate-ccw",
+                        "label": "Retry",
+                        "type": "button",
+                        "variant": "primary"
                       }
                     ],
+                    "className": "py-12",
                     "direction": "vertical",
                     "gap": "md",
                     "type": "stack"
                   }
                 ]
               ],
-              "event": "NEW",
+              "event": "PreferencesLoadFailed",
               "from": "browsing",
-              "to": "creating"
-            },
-            {
-              "effects": [
-                [
-                  "set",
-                  "@entity.id",
-                  "@payload.id"
-                ],
-                [
-                  "set",
-                  "@entity.personId",
-                  [
-                    "object/get",
-                    "@payload.row",
-                    "personId"
-                  ]
-                ],
-                [
-                  "set",
-                  "@entity.eventKey",
-                  [
-                    "object/get",
-                    "@payload.row",
-                    "eventKey"
-                  ]
-                ],
-                [
-                  "set",
-                  "@entity.channel",
-                  [
-                    "object/get",
-                    "@payload.row",
-                    "channel"
-                  ]
-                ],
-                [
-                  "set",
-                  "@entity.mode",
-                  [
-                    "object/get",
-                    "@payload.row",
-                    "mode"
-                  ]
-                ],
-                [
-                  "set",
-                  "@entity.quietHours",
-                  [
-                    "object/get",
-                    "@payload.row",
-                    "quietHours"
-                  ]
-                ],
-                [
-                  "set",
-                  "@entity.createdAt",
-                  [
-                    "object/get",
-                    "@payload.row",
-                    "createdAt"
-                  ]
-                ],
-                [
-                  "set",
-                  "@entity.updatedAt",
-                  [
-                    "object/get",
-                    "@payload.row",
-                    "updatedAt"
-                  ]
-                ],
-                [
-                  "render-ui",
-                  "main",
-                  {
-                    "children": [
-                      {
-                        "children": [
-                          {
-                            "name": "pencil",
-                            "size": "lg",
-                            "type": "icon"
-                          },
-                          {
-                            "content": "Edit notification preference",
-                            "type": "typography",
-                            "variant": "h3"
-                          }
-                        ],
-                        "direction": "horizontal",
-                        "gap": "sm",
-                        "type": "stack"
-                      },
-                      {
-                        "type": "divider"
-                      },
-                      {
-                        "action": "SET_PERSON_ID",
-                        "placeholder": "Person id",
-                        "type": "input",
-                        "value": "@entity.personId"
-                      },
-                      {
-                        "action": "SET_EVENT_KEY",
-                        "placeholder": "Event key (blank = all events)",
-                        "type": "input",
-                        "value": "@entity.eventKey"
-                      },
-                      {
-                        "action": "SET_CHANNEL",
-                        "options": [
-                          {
-                            "label": "In app",
-                            "value": "in_app"
-                          },
-                          {
-                            "label": "Email",
-                            "value": "email"
-                          },
-                          {
-                            "label": "Push",
-                            "value": "push"
-                          },
-                          {
-                            "label": "Slack",
-                            "value": "slack"
-                          }
-                        ],
-                        "placeholder": "Channel",
-                        "type": "select",
-                        "value": "@entity.channel"
-                      },
-                      {
-                        "action": "SET_MODE",
-                        "options": [
-                          {
-                            "label": "Instant",
-                            "value": "instant"
-                          },
-                          {
-                            "label": "Digest",
-                            "value": "digest"
-                          }
-                        ],
-                        "placeholder": "Mode",
-                        "type": "select",
-                        "value": "@entity.mode"
-                      },
-                      {
-                        "action": "SET_QUIET_HOURS",
-                        "placeholder": "Quiet hours (e.g. 22:00-07:00)",
-                        "type": "input",
-                        "value": "@entity.quietHours"
-                      },
-                      {
-                        "children": [
-                          {
-                            "action": "SAVE",
-                            "icon": "check",
-                            "label": "Save",
-                            "type": "button",
-                            "variant": "primary"
-                          },
-                          {
-                            "action": "CANCEL",
-                            "icon": "x",
-                            "label": "Cancel",
-                            "type": "button",
-                            "variant": "secondary"
-                          }
-                        ],
-                        "direction": "horizontal",
-                        "gap": "sm",
-                        "type": "stack"
-                      }
-                    ],
-                    "direction": "vertical",
-                    "gap": "md",
-                    "type": "stack"
-                  }
-                ]
-              ],
-              "event": "EDIT",
-              "from": "browsing",
-              "to": "editing"
-            },
-            {
-              "effects": [
-                [
-                  "persist",
-                  "delete",
-                  "NotificationPreference",
-                  "@payload.id",
-                  {
-                    "emit": {
-                      "failure": "PreferenceSaveFailed",
-                      "success": "PreferenceDeleted"
-                    }
-                  }
-                ]
-              ],
-              "event": "DELETE",
-              "from": "browsing",
-              "to": "browsing"
-            },
-            {
-              "effects": [
-                [
-                  "fetch",
-                  "NotificationPreference",
-                  {
-                    "emit": {
-                      "failure": "PreferencesLoadFailed",
-                      "success": "PreferencesLoaded"
-                    }
-                  }
-                ]
-              ],
-              "event": "PreferenceSaved",
-              "from": "browsing",
-              "to": "loading"
+              "to": "error"
             },
             {
               "effects": [
@@ -68392,247 +68308,18 @@ function stdNotificationPreferencesNotificationPreferencesOrbital(params = {}) {
                       "success": "PreferencesLoaded"
                     }
                   }
-                ]
-              ],
-              "event": "PreferenceDeleted",
-              "from": "browsing",
-              "to": "loading"
-            },
-            {
-              "effects": [
-                [
-                  "render-ui",
-                  "main",
-                  {
-                    "message": "@payload.error",
-                    "type": "alert",
-                    "variant": "error"
-                  }
-                ]
-              ],
-              "event": "PreferenceSaveFailed",
-              "from": "browsing",
-              "to": "error"
-            },
-            {
-              "effects": [
+                ],
                 [
                   "render-ui",
                   "main",
                   {
-                    "message": "@payload.error",
-                    "type": "alert",
-                    "variant": "error"
-                  }
-                ]
-              ],
-              "event": "PreferencesLoadFailed",
-              "from": "browsing",
-              "to": "error"
-            },
-            {
-              "effects": [
-                [
-                  "set",
-                  "@entity.personId",
-                  "@payload.value"
-                ]
-              ],
-              "event": "SET_PERSON_ID",
-              "from": "creating",
-              "to": "creating"
-            },
-            {
-              "effects": [
-                [
-                  "set",
-                  "@entity.eventKey",
-                  "@payload.value"
-                ]
-              ],
-              "event": "SET_EVENT_KEY",
-              "from": "creating",
-              "to": "creating"
-            },
-            {
-              "effects": [
-                [
-                  "set",
-                  "@entity.channel",
-                  "@payload.value"
-                ]
-              ],
-              "event": "SET_CHANNEL",
-              "from": "creating",
-              "to": "creating"
-            },
-            {
-              "effects": [
-                [
-                  "set",
-                  "@entity.mode",
-                  "@payload.value"
-                ]
-              ],
-              "event": "SET_MODE",
-              "from": "creating",
-              "to": "creating"
-            },
-            {
-              "effects": [
-                [
-                  "set",
-                  "@entity.quietHours",
-                  "@payload.value"
-                ]
-              ],
-              "event": "SET_QUIET_HOURS",
-              "from": "creating",
-              "to": "creating"
-            },
-            {
-              "effects": [
-                [
-                  "persist",
-                  "create",
-                  "NotificationPreference",
-                  {
-                    "channel": "@entity.channel",
-                    "createdAt": "@now",
-                    "eventKey": "@entity.eventKey",
-                    "mode": "@entity.mode",
-                    "personId": "@entity.personId",
-                    "quietHours": "@entity.quietHours",
-                    "updatedAt": "@now"
-                  },
-                  {
-                    "emit": {
-                      "failure": "PreferenceSaveFailed",
-                      "success": "PreferenceSaved"
-                    }
-                  }
-                ]
-              ],
-              "event": "SAVE",
-              "from": "creating",
-              "to": "browsing"
-            },
-            {
-              "effects": [
-                [
-                  "fetch",
-                  "NotificationPreference",
-                  {
-                    "emit": {
-                      "failure": "PreferencesLoadFailed",
-                      "success": "PreferencesLoaded"
-                    }
-                  }
-                ]
-              ],
-              "event": "CANCEL",
-              "from": "creating",
-              "to": "loading"
-            },
-            {
-              "effects": [
-                [
-                  "set",
-                  "@entity.personId",
-                  "@payload.value"
-                ]
-              ],
-              "event": "SET_PERSON_ID",
-              "from": "editing",
-              "to": "editing"
-            },
-            {
-              "effects": [
-                [
-                  "set",
-                  "@entity.eventKey",
-                  "@payload.value"
-                ]
-              ],
-              "event": "SET_EVENT_KEY",
-              "from": "editing",
-              "to": "editing"
-            },
-            {
-              "effects": [
-                [
-                  "set",
-                  "@entity.channel",
-                  "@payload.value"
-                ]
-              ],
-              "event": "SET_CHANNEL",
-              "from": "editing",
-              "to": "editing"
-            },
-            {
-              "effects": [
-                [
-                  "set",
-                  "@entity.mode",
-                  "@payload.value"
-                ]
-              ],
-              "event": "SET_MODE",
-              "from": "editing",
-              "to": "editing"
-            },
-            {
-              "effects": [
-                [
-                  "set",
-                  "@entity.quietHours",
-                  "@payload.value"
-                ]
-              ],
-              "event": "SET_QUIET_HOURS",
-              "from": "editing",
-              "to": "editing"
-            },
-            {
-              "effects": [
-                [
-                  "set",
-                  "@entity.updatedAt",
-                  "@now"
-                ],
-                [
-                  "persist",
-                  "update",
-                  "NotificationPreference",
-                  "@entity",
-                  {
-                    "emit": {
-                      "failure": "PreferenceSaveFailed",
-                      "success": "PreferenceSaved"
-                    }
-                  }
-                ]
-              ],
-              "event": "SAVE",
-              "from": "editing",
-              "to": "browsing"
-            },
-            {
-              "effects": [
-                [
-                  "fetch",
-                  "NotificationPreference",
-                  {
-                    "emit": {
-                      "failure": "PreferencesLoadFailed",
-                      "success": "PreferencesLoaded"
-                    }
+                    "size": "sm",
+                    "type": "spinner"
                   }
                 ]
               ],
-              "event": "CANCEL",
-              "from": "editing",
+              "event": "INIT",
+              "from": "error",
               "to": "loading"
             },
             {
@@ -68656,13 +68343,99 @@ function stdNotificationPreferencesNotificationPreferencesOrbital(params = {}) {
                   }
                 ]
               ],
-              "event": "INIT",
+              "event": "RETRY",
               "from": "error",
               "to": "loading"
             }
           ]
         }
       },
+      makeTraitRef({
+        "config": {
+          "fields": {
+            "default": [
+              "personId",
+              "eventKey",
+              "channel",
+              "mode",
+              "quietHours"
+            ],
+            "type": "unknown"
+          },
+          "icon": {
+            "default": "plus-circle",
+            "type": "unknown"
+          },
+          "mode": {
+            "default": "create",
+            "type": "unknown"
+          },
+          "title": {
+            "default": "New notification preference",
+            "type": "unknown"
+          }
+        },
+        "events": {
+          "OPEN": "CREATE",
+          "SAVE": "PREFERENCE_CREATED"
+        },
+        "linkedEntity": "NotificationPreference",
+        "listens": [
+          {
+            "event": "CREATE",
+            "source": {
+              "kind": "trait",
+              "trait": "PreferencesManage"
+            },
+            "triggers": "CREATE"
+          }
+        ],
+        "name": "PreferenceCreate",
+        "ref": "Modal.traits.ModalRecordModal"
+      }),
+      makeTraitRef({
+        "config": {
+          "fields": {
+            "default": [
+              "personId",
+              "eventKey",
+              "channel",
+              "mode",
+              "quietHours"
+            ],
+            "type": "unknown"
+          },
+          "icon": {
+            "default": "pencil",
+            "type": "unknown"
+          },
+          "mode": {
+            "default": "edit",
+            "type": "unknown"
+          },
+          "title": {
+            "default": "Edit notification preference",
+            "type": "unknown"
+          }
+        },
+        "events": {
+          "OPEN": "EDIT",
+          "SAVE": "PREFERENCE_UPDATED"
+        },
+        "linkedEntity": "NotificationPreference",
+        "listens": [
+          {
+            "event": "EDIT",
+            "source": {
+              "kind": "trait",
+              "trait": "PreferencesManage"
+            },
+            "triggers": "EDIT"
+          }
+        ],
+        "name": "PreferenceEdit",
+        "ref": "Modal.traits.ModalRecordModal"
+      }),
       {
         "category": "lifecycle",
         "config": {
@@ -69486,6 +69259,12 @@ function stdNotificationPreferencesNotificationPreferencesOrbital(params = {}) {
           {
             "ref": "PreferencesManage"
           },
+          {
+            "ref": "PreferenceCreate"
+          },
+          {
+            "ref": "PreferenceEdit"
+          },
           {
             "ref": "PreferenceGate"
           }
@@ -69558,7 +69337,10 @@ var StdNotificationPreferencesNotificationPreferencesOrbitalManifest = {
       "description": ".lolo's native trait-composition surface 1:1: per-imported-trait config, linkedEntity, events, name, emitsScope, listens. effects is excluded (atom-owned; use listens via a sibling trait)."
     }
   ],
-  traitNames: [],
+  traitNames: [
+    "PreferenceCreate",
+    "PreferenceEdit"
+  ],
   inlineTraitNames: [
     "PreferencesManage",
     "PreferenceGate"
@@ -73119,10 +72901,10 @@ function stdPermissionMatrixPermissionMatrixTitleTrait(params) {
     ...params.config !== void 0 ? { config: params.config } : {}
   });
 }
-function stdPermissionMatrixNewGrantButtonTrait(params) {
+function stdPermissionMatrixGrantDividerTrait(params) {
   return makeTraitRef({
     from: BEHAVIOR_PATH135,
-    ref: `${ALIAS135}.traits.NewGrantButton`,
+    ref: `${ALIAS135}.traits.GrantDivider`,
     linkedEntity: params.entityName,
     ...params.traitName !== void 0 ? { name: params.traitName } : {},
     ...params.events !== void 0 ? { events: params.events } : {},
@@ -73132,10 +72914,10 @@ function stdPermissionMatrixNewGrantButtonTrait(params) {
     ...params.config !== void 0 ? { config: params.config } : {}
   });
 }
-function stdPermissionMatrixBackButtonTrait(params) {
+function stdPermissionMatrixErrorAlertTrait(params) {
   return makeTraitRef({
     from: BEHAVIOR_PATH135,
-    ref: `${ALIAS135}.traits.BackButton`,
+    ref: `${ALIAS135}.traits.ErrorAlert`,
     linkedEntity: params.entityName,
     ...params.traitName !== void 0 ? { name: params.traitName } : {},
     ...params.events !== void 0 ? { events: params.events } : {},
@@ -73145,10 +72927,10 @@ function stdPermissionMatrixBackButtonTrait(params) {
     ...params.config !== void 0 ? { config: params.config } : {}
   });
 }
-function stdPermissionMatrixGrantDividerTrait(params) {
+function stdPermissionMatrixPermissionMatrixAdminTrait(params) {
   return makeTraitRef({
     from: BEHAVIOR_PATH135,
-    ref: `${ALIAS135}.traits.GrantDivider`,
+    ref: `${ALIAS135}.traits.PermissionMatrixAdmin`,
     linkedEntity: params.entityName,
     ...params.traitName !== void 0 ? { name: params.traitName } : {},
     ...params.events !== void 0 ? { events: params.events } : {},
@@ -73158,10 +72940,10 @@ function stdPermissionMatrixGrantDividerTrait(params) {
     ...params.config !== void 0 ? { config: params.config } : {}
   });
 }
-function stdPermissionMatrixErrorAlertTrait(params) {
+function stdPermissionMatrixPermissionGrantCreateTrait(params) {
   return makeTraitRef({
     from: BEHAVIOR_PATH135,
-    ref: `${ALIAS135}.traits.ErrorAlert`,
+    ref: `${ALIAS135}.traits.PermissionGrantCreate`,
     linkedEntity: params.entityName,
     ...params.traitName !== void 0 ? { name: params.traitName } : {},
     ...params.events !== void 0 ? { events: params.events } : {},
@@ -73171,10 +72953,23 @@ function stdPermissionMatrixErrorAlertTrait(params) {
     ...params.config !== void 0 ? { config: params.config } : {}
   });
 }
-function stdPermissionMatrixPermissionMatrixAdminTrait(params) {
+function stdPermissionMatrixPermissionGrantEditTrait(params) {
   return makeTraitRef({
     from: BEHAVIOR_PATH135,
-    ref: `${ALIAS135}.traits.PermissionMatrixAdmin`,
+    ref: `${ALIAS135}.traits.PermissionGrantEdit`,
+    linkedEntity: params.entityName,
+    ...params.traitName !== void 0 ? { name: params.traitName } : {},
+    ...params.events !== void 0 ? { events: params.events } : {},
+    ...params.effects !== void 0 ? { effects: params.effects } : {},
+    ...params.listens !== void 0 ? { listens: params.listens } : {},
+    ...params.emitsScope !== void 0 ? { emitsScope: params.emitsScope } : {},
+    ...params.config !== void 0 ? { config: params.config } : {}
+  });
+}
+function stdPermissionMatrixPermissionGrantPersistorTrait(params) {
+  return makeTraitRef({
+    from: BEHAVIOR_PATH135,
+    ref: `${ALIAS135}.traits.PermissionGrantPersistor`,
     linkedEntity: params.entityName,
     ...params.traitName !== void 0 ? { name: params.traitName } : {},
     ...params.events !== void 0 ? { events: params.events } : {},
@@ -73221,11 +73016,12 @@ function stdPermissionMatrix(params) {
       stdPermissionMatrixLoadingTextTrait(params),
       stdPermissionMatrixShieldCheckIconTrait(params),
       stdPermissionMatrixPermissionMatrixTitleTrait(params),
-      stdPermissionMatrixNewGrantButtonTrait(params),
-      stdPermissionMatrixBackButtonTrait(params),
       stdPermissionMatrixGrantDividerTrait(params),
       stdPermissionMatrixErrorAlertTrait(params),
       stdPermissionMatrixPermissionMatrixAdminTrait(params),
+      stdPermissionMatrixPermissionGrantCreateTrait(params),
+      stdPermissionMatrixPermissionGrantEditTrait(params),
+      stdPermissionMatrixPermissionGrantPersistorTrait(params),
       stdPermissionMatrixPermissionGrantQueryTrait(params)
     ],
     pages: [
@@ -73238,6 +73034,10 @@ function stdPermissionMatrixPermissionMatrixOrbital(params = {}) {
   const built = makeOrbitalWithUses({
     name: "PermissionMatrixOrbital",
     uses: [
+      {
+        "as": "Modal",
+        "from": "std/behaviors/std-modal"
+      },
       {
         "as": "Spinner",
         "from": "std/behaviors/ui-spinner"
@@ -73250,10 +73050,6 @@ function stdPermissionMatrixPermissionMatrixOrbital(params = {}) {
         "as": "Icon",
         "from": "std/behaviors/ui-icon"
       },
-      {
-        "as": "Button",
-        "from": "std/behaviors/ui-button"
-      },
       {
         "as": "Divider",
         "from": "std/behaviors/ui-divider"
@@ -73397,52 +73193,6 @@ function stdPermissionMatrixPermissionMatrixOrbital(params = {}) {
         "name": "PermissionMatrixTitle",
         "ref": "Typography.traits.TypographyRender"
       }),
-      makeTraitRef({
-        "config": {
-          "action": {
-            "default": "NEW",
-            "type": "unknown"
-          },
-          "icon": {
-            "default": "plus",
-            "type": "unknown"
-          },
-          "label": {
-            "default": "New grant",
-            "type": "unknown"
-          },
-          "variant": {
-            "default": "primary",
-            "type": "unknown"
-          }
-        },
-        "linkedEntity": "PermissionGrant",
-        "name": "NewGrantButton",
-        "ref": "Button.traits.ButtonRender"
-      }),
-      makeTraitRef({
-        "config": {
-          "action": {
-            "default": "CANCEL_GRANT",
-            "type": "unknown"
-          },
-          "icon": {
-            "default": "x",
-            "type": "unknown"
-          },
-          "label": {
-            "default": "Cancel",
-            "type": "unknown"
-          },
-          "variant": {
-            "default": "ghost",
-            "type": "unknown"
-          }
-        },
-        "linkedEntity": "PermissionGrant",
-        "name": "BackButton",
-        "ref": "Button.traits.ButtonRender"
-      }),
       makeTraitRef({
         "linkedEntity": "PermissionGrant",
         "name": "GrantDivider",
@@ -73468,86 +73218,25 @@ function stdPermissionMatrixPermissionMatrixOrbital(params = {}) {
           "access"
         ],
         "category": "interaction",
-        "config": {
-          "adminRoles": {
-            "default": [],
-            "description": "Roles eligible to create, edit, or delete grants. ENFORCED by the NEW/EDIT/DELETE/CREATE_GRANT/SAVE_GRANT transition guards: a viewer whose @user.role is not listed cannot fire a mutation, from the button or from the bus. Empty = every signed-in viewer may manage grants (ungated).",
-            "items": {
-              "type": "string"
-            },
-            "label": "Who can manage grants?",
-            "synonyms": "admin roles, permission managers, who edits permissions, grant admins",
-            "tier": "policy",
-            "type": "[string]"
-          },
-          "enabled": {
-            "default": false,
-            "description": "Allow creating, editing, and deleting permission grants from this surface. Off by default.",
-            "label": "Manage role permissions",
-            "synonyms": "enable, turn on, enforce, require, activate, apply, switch on, permission matrix, role permissions, capability matrix, permission grants, access matrix, manage permissions, who can see finance, hide margins, module-level permissions",
-            "tier": "policy",
-            "type": "boolean"
-          }
-        },
         "effectRow": [
           {
             "kind": "fetch",
             "resource": "PermissionGrant"
           },
-          {
-            "kind": "persist",
-            "resource": "PermissionGrant"
-          },
           {
             "kind": "render-ui",
             "resource": "main"
-          },
-          {
-            "kind": "render-ui",
-            "resource": "modal"
-          },
-          {
-            "kind": "render-ui",
-            "resource": "toast"
-          },
-          {
-            "kind": "set",
-            "resource": "@entity.canReadFinance"
-          },
-          {
-            "kind": "set",
-            "resource": "@entity.canSeeMargins"
-          },
-          {
-            "kind": "set",
-            "resource": "@entity.canSeeOthersHours"
-          },
-          {
-            "kind": "set",
-            "resource": "@entity.id"
-          },
-          {
-            "kind": "set",
-            "resource": "@entity.module"
-          },
-          {
-            "kind": "set",
-            "resource": "@entity.role"
-          },
-          {
-            "kind": "set",
-            "resource": "@entity.workspaceId"
           }
         ],
         "emits": [
           {
-            "description": "Opens the create-grant form.",
+            "description": "Requests the create-grant form (the create modal listens).",
             "event": "NEW",
             "synonyms": "add grant, new permission, create grant",
             "tier": "domain"
           },
           {
-            "description": "Opens the edit form for a grant row.",
+            "description": "Requests the edit form for a grant row (the edit modal listens).",
             "event": "EDIT",
             "payloadSchema": [
               {
@@ -73602,7 +73291,7 @@ function stdPermissionMatrixPermissionMatrixOrbital(params = {}) {
             "tier": "domain"
           },
           {
-            "description": "Deletes a grant row (persisted; the grid refetches on success).",
+            "description": "Requests deletion of a grant row (the persistor listens; adminRoles-guarded there).",
             "event": "DELETE",
             "payloadSchema": [
               {
@@ -73656,118 +73345,6 @@ function stdPermissionMatrixPermissionMatrixOrbital(params = {}) {
             "synonyms": "remove grant, revoke permission, delete grant",
             "tier": "domain"
           },
-          {
-            "description": "The create-grant form committed; data carries the new grant's fields.",
-            "event": "CREATE_GRANT",
-            "payloadSchema": [
-              {
-                "entity": "PermissionGrant",
-                "name": "data",
-                "properties": [
-                  {
-                    "name": "id",
-                    "required": true,
-                    "type": "string"
-                  },
-                  {
-                    "name": "workspaceId",
-                    "type": "string"
-                  },
-                  {
-                    "name": "role",
-                    "required": true,
-                    "type": "string"
-                  },
-                  {
-                    "name": "module",
-                    "required": true,
-                    "type": "string"
-                  },
-                  {
-                    "name": "canReadFinance",
-                    "type": "boolean"
-                  },
-                  {
-                    "name": "canSeeOthersHours",
-                    "type": "boolean"
-                  },
-                  {
-                    "name": "canSeeMargins",
-                    "type": "boolean"
-                  },
-                  {
-                    "name": "createdAt",
-                    "type": "number"
-                  }
-                ],
-                "type": "object"
-              }
-            ],
-            "synonyms": "submit grant, confirm create",
-            "tier": "internal"
-          },
-          {
-            "description": "The edit-grant form committed; data carries the grant id + updated fields.",
-            "event": "SAVE_GRANT",
-            "payloadSchema": [
-              {
-                "entity": "PermissionGrant",
-                "name": "data",
-                "properties": [
-                  {
-                    "name": "id",
-                    "required": true,
-                    "type": "string"
-                  },
-                  {
-                    "name": "workspaceId",
-                    "type": "string"
-                  },
-                  {
-                    "name": "role",
-                    "required": true,
-                    "type": "string"
-                  },
-                  {
-                    "name": "module",
-                    "required": true,
-                    "type": "string"
-                  },
-                  {
-                    "name": "canReadFinance",
-                    "type": "boolean"
-                  },
-                  {
-                    "name": "canSeeOthersHours",
-                    "type": "boolean"
-                  },
-                  {
-                    "name": "canSeeMargins",
-                    "type": "boolean"
-                  },
-                  {
-                    "name": "createdAt",
-                    "type": "number"
-                  }
-                ],
-                "type": "object"
-              }
-            ],
-            "synonyms": "submit edit, confirm update",
-            "tier": "internal"
-          },
-          {
-            "description": "The grant form was dismissed without committing; the grid repaints.",
-            "event": "CANCEL_GRANT",
-            "synonyms": "cancel, back to matrix, dismiss form",
-            "tier": "internal"
-          },
-          {
-            "description": "Dismisses the grant form overlay (the modal shell's own X / Escape / overlay-click).",
-            "event": "CLOSE",
-            "synonyms": "dismiss, hide, close form, done",
-            "tier": "domain"
-          },
           {
             "description": "Indicates the permission-grant collection has been successfully loaded.",
             "event": "PermissionGrantLoaded",
@@ -73833,98 +73410,30 @@ function stdPermissionMatrixPermissionMatrixOrbital(params = {}) {
             ],
             "synonyms": "load error, failed load, request failure",
             "tier": "internal"
-          },
-          {
-            "description": "Signals that a permission grant has been persisted (create / update).",
-            "event": "PermissionGrantSaved",
-            "payloadSchema": [
-              {
-                "name": "value",
-                "type": "@entity"
-              }
-            ],
-            "scope": "internal",
-            "synonyms": "saved, created, updated, persisted",
-            "tier": "internal"
-          },
-          {
-            "description": "Indicates a failure to persist a permission grant.",
-            "event": "PermissionGrantSaveFailed",
-            "payloadSchema": [
-              {
-                "name": "error",
-                "type": "string"
-              },
-              {
-                "name": "code",
-                "type": "string"
-              }
-            ],
-            "synonyms": "save error, failed save, persist failure",
-            "tier": "internal"
-          },
-          {
-            "description": "Signals that a permission grant has been deleted.",
-            "event": "PermissionGrantDeleted",
-            "payloadSchema": [
-              {
-                "name": "id",
-                "type": "string"
-              },
-              {
-                "name": "deleted",
-                "type": "boolean"
-              }
-            ],
-            "synonyms": "deleted, removed, revoked",
-            "tier": "internal"
-          },
-          {
-            "description": "Indicates a failure to delete a permission grant.",
-            "event": "PermissionGrantDeleteFailed",
-            "payloadSchema": [
-              {
-                "name": "error",
-                "type": "string"
-              },
-              {
-                "name": "code",
-                "type": "string"
-              }
-            ],
-            "synonyms": "delete error, failed delete",
-            "tier": "internal"
           }
         ],
         "entityContract": {
-          "provides": [
-            "canReadFinance",
-            "canSeeMargins",
-            "canSeeOthersHours",
-            "module",
-            "role",
-            "workspaceId"
-          ],
+          "provides": [],
           "requires": []
         },
         "entityRebindable": true,
         "linkedEntity": "PermissionGrant",
         "listens": [
           {
-            "event": "NEW",
+            "event": "PermissionGrantSaved",
             "source": {
               "kind": "trait",
-              "trait": "NewGrantButton"
+              "trait": "PermissionGrantPersistor"
             },
-            "triggers": "NEW"
+            "triggers": "INIT"
           },
           {
-            "event": "CANCEL_GRANT",
+            "event": "PermissionGrantDeleted",
             "source": {
               "kind": "trait",
-              "trait": "BackButton"
+              "trait": "PermissionGrantPersistor"
             },
-            "triggers": "CANCEL_GRANT"
+            "triggers": "INIT"
           }
         ],
         "name": "PermissionMatrixAdmin",
@@ -74004,14 +73513,14 @@ function stdPermissionMatrixPermissionMatrixOrbital(params = {}) {
               "tier": "internal"
             },
             {
-              "description": "Opens the create-grant form.",
+              "description": "Requests the create-grant form (the create modal listens).",
               "key": "NEW",
               "name": "New",
               "synonyms": "add grant, new permission, create grant",
               "tier": "domain"
             },
             {
-              "description": "Opens the edit form for a grant row.",
+              "description": "Requests the edit form for a grant row (the edit modal listens).",
               "key": "EDIT",
               "name": "Edit",
               "payloadSchema": [
@@ -74067,7 +73576,7 @@ function stdPermissionMatrixPermissionMatrixOrbital(params = {}) {
               "tier": "domain"
             },
             {
-              "description": "Deletes a grant row (persisted; the grid refetches on success).",
+              "description": "Requests deletion of a grant row (the persistor listens; adminRoles-guarded there).",
               "key": "DELETE",
               "name": "Delete",
               "payloadSchema": [
@@ -74121,186 +73630,6 @@ function stdPermissionMatrixPermissionMatrixOrbital(params = {}) {
               ],
               "synonyms": "remove grant, revoke permission, delete grant",
               "tier": "domain"
-            },
-            {
-              "description": "Signals that a permission grant has been deleted.",
-              "key": "PermissionGrantDeleted",
-              "name": "PermissionGrant deleted",
-              "payloadSchema": [
-                {
-                  "name": "id",
-                  "type": "string"
-                },
-                {
-                  "name": "deleted",
-                  "type": "boolean"
-                }
-              ],
-              "synonyms": "deleted, removed, revoked",
-              "tier": "internal"
-            },
-            {
-              "description": "Indicates a failure to delete a permission grant.",
-              "key": "PermissionGrantDeleteFailed",
-              "name": "PermissionGrant delete failed",
-              "payloadSchema": [
-                {
-                  "name": "error",
-                  "type": "string"
-                },
-                {
-                  "name": "code",
-                  "type": "string"
-                }
-              ],
-              "synonyms": "delete error, failed delete",
-              "tier": "internal"
-            },
-            {
-              "description": "The create-grant form committed; data carries the new grant's fields.",
-              "key": "CREATE_GRANT",
-              "name": "Create Grant",
-              "payloadSchema": [
-                {
-                  "entity": "PermissionGrant",
-                  "name": "data",
-                  "properties": [
-                    {
-                      "name": "id",
-                      "required": true,
-                      "type": "string"
-                    },
-                    {
-                      "name": "workspaceId",
-                      "type": "string"
-                    },
-                    {
-                      "name": "role",
-                      "required": true,
-                      "type": "string"
-                    },
-                    {
-                      "name": "module",
-                      "required": true,
-                      "type": "string"
-                    },
-                    {
-                      "name": "canReadFinance",
-                      "type": "boolean"
-                    },
-                    {
-                      "name": "canSeeOthersHours",
-                      "type": "boolean"
-                    },
-                    {
-                      "name": "canSeeMargins",
-                      "type": "boolean"
-                    },
-                    {
-                      "name": "createdAt",
-                      "type": "number"
-                    }
-                  ],
-                  "type": "object"
-                }
-              ],
-              "synonyms": "submit grant, confirm create",
-              "tier": "internal"
-            },
-            {
-              "description": "The edit-grant form committed; data carries the grant id + updated fields.",
-              "key": "SAVE_GRANT",
-              "name": "Save Grant",
-              "payloadSchema": [
-                {
-                  "entity": "PermissionGrant",
-                  "name": "data",
-                  "properties": [
-                    {
-                      "name": "id",
-                      "required": true,
-                      "type": "string"
-                    },
-                    {
-                      "name": "workspaceId",
-                      "type": "string"
-                    },
-                    {
-                      "name": "role",
-                      "required": true,
-                      "type": "string"
-                    },
-                    {
-                      "name": "module",
-                      "required": true,
-                      "type": "string"
-                    },
-                    {
-                      "name": "canReadFinance",
-                      "type": "boolean"
-                    },
-                    {
-                      "name": "canSeeOthersHours",
-                      "type": "boolean"
-                    },
-                    {
-                      "name": "canSeeMargins",
-                      "type": "boolean"
-                    },
-                    {
-                      "name": "createdAt",
-                      "type": "number"
-                    }
-                  ],
-                  "type": "object"
-                }
-              ],
-              "synonyms": "submit edit, confirm update",
-              "tier": "internal"
-            },
-            {
-              "description": "The grant form was dismissed without committing; the grid repaints.",
-              "key": "CANCEL_GRANT",
-              "name": "Cancel Grant",
-              "synonyms": "cancel, back to matrix, dismiss form",
-              "tier": "internal"
-            },
-            {
-              "description": "Signals that a permission grant has been persisted (create / update).",
-              "key": "PermissionGrantSaved",
-              "name": "PermissionGrant saved",
-              "payloadSchema": [
-                {
-                  "name": "value",
-                  "type": "@entity"
-                }
-              ],
-              "synonyms": "saved, created, updated, persisted",
-              "tier": "internal"
-            },
-            {
-              "description": "Indicates a failure to persist a permission grant.",
-              "key": "PermissionGrantSaveFailed",
-              "name": "PermissionGrant save failed",
-              "payloadSchema": [
-                {
-                  "name": "error",
-                  "type": "string"
-                },
-                {
-                  "name": "code",
-                  "type": "string"
-                }
-              ],
-              "synonyms": "save error, failed save, persist failure",
-              "tier": "internal"
-            },
-            {
-              "description": "Dismisses the grant form overlay (the modal shell's own X / Escape / overlay-click).",
-              "key": "CLOSE",
-              "name": "Close",
-              "synonyms": "dismiss, hide, close form, done",
-              "tier": "domain"
             }
           ],
           "states": [
@@ -74311,9 +73640,6 @@ function stdPermissionMatrixPermissionMatrixOrbital(params = {}) {
             {
               "name": "listing"
             },
-            {
-              "name": "editing"
-            },
             {
               "name": "error"
             }
@@ -74371,7 +73697,13 @@ function stdPermissionMatrixPermissionMatrixOrbital(params = {}) {
                             "gap": "sm",
                             "type": "stack"
                           },
-                          "@trait.NewGrantButton"
+                          {
+                            "action": "NEW",
+                            "icon": "plus",
+                            "label": "New grant",
+                            "type": "button",
+                            "variant": "primary"
+                          }
                         ],
                         "direction": "horizontal",
                         "gap": "sm",
@@ -74482,218 +73814,447 @@ function stdPermissionMatrixPermissionMatrixOrbital(params = {}) {
             {
               "effects": [
                 [
-                  "render-ui",
-                  "modal",
+                  "fetch",
+                  "PermissionGrant",
                   {
-                    "children": [
-                      {
-                        "align": "center",
-                        "children": [
-                          "@trait.PermissionMatrixTitle",
-                          "@trait.BackButton"
-                        ],
-                        "direction": "horizontal",
-                        "gap": "sm",
-                        "justify": "between",
-                        "type": "stack"
-                      },
-                      "@trait.GrantDivider",
-                      {
-                        "cancelEvent": "CANCEL_GRANT",
-                        "entity": {
-                          "workspaceId": ""
-                        },
-                        "fields": [
-                          "workspaceId",
-                          "role",
-                          "module",
-                          "canReadFinance",
-                          "canSeeOthersHours",
-                          "canSeeMargins"
-                        ],
-                        "mode": "create",
-                        "submitEvent": "CREATE_GRANT",
-                        "type": "form-section"
-                      }
-                    ],
-                    "direction": "vertical",
-                    "gap": "md",
-                    "type": "stack"
+                    "emit": {
+                      "failure": "PermissionGrantLoadFailed",
+                      "success": "PermissionGrantLoaded"
+                    }
                   }
-                ]
-              ],
-              "event": "NEW",
-              "from": "listing",
-              "guard": [
-                "and",
-                "@config.enabled",
-                [
-                  "or",
-                  [
-                    "=",
-                    [
-                      "array/len",
-                      "@config.adminRoles"
-                    ],
-                    0
-                  ],
-                  [
-                    "array/includes",
-                    "@config.adminRoles",
-                    "@user.role"
-                  ]
-                ]
-              ],
-              "to": "editing"
-            },
-            {
-              "effects": [
-                [
-                  "set",
-                  "@entity.id",
-                  "@payload.id"
                 ],
                 [
                   "render-ui",
-                  "modal",
+                  "main",
                   {
+                    "align": "center",
                     "children": [
-                      {
-                        "align": "center",
-                        "children": [
-                          "@trait.PermissionMatrixTitle",
-                          "@trait.BackButton"
-                        ],
-                        "direction": "horizontal",
-                        "gap": "sm",
-                        "justify": "between",
-                        "type": "stack"
-                      },
-                      "@trait.GrantDivider",
-                      {
-                        "cancelEvent": "CANCEL_GRANT",
-                        "entity": {
-                          "id": "@payload.id"
-                        },
-                        "fields": [
-                          "workspaceId",
-                          "role",
-                          "module",
-                          "canReadFinance",
-                          "canSeeOthersHours",
-                          "canSeeMargins"
-                        ],
-                        "mode": "edit",
-                        "submitEvent": "SAVE_GRANT",
-                        "type": "form-section"
-                      }
+                      "@trait.ErrorSpinner"
                     ],
-                    "direction": "vertical",
-                    "gap": "md",
                     "type": "stack"
                   }
                 ]
               ],
-              "event": "EDIT",
-              "from": "listing",
-              "guard": [
-                "and",
-                "@config.enabled",
-                [
-                  "or",
-                  [
-                    "=",
-                    [
-                      "array/len",
-                      "@config.adminRoles"
-                    ],
-                    0
+              "event": "INIT",
+              "from": "error",
+              "to": "loading"
+            }
+          ]
+        }
+      },
+      makeTraitRef({
+        "config": {
+          "fields": {
+            "default": [
+              "workspaceId",
+              "role",
+              "module",
+              "canReadFinance",
+              "canSeeOthersHours",
+              "canSeeMargins"
+            ],
+            "type": "unknown"
+          },
+          "icon": {
+            "default": "plus-circle",
+            "type": "unknown"
+          },
+          "mode": {
+            "default": "create",
+            "type": "unknown"
+          },
+          "title": {
+            "default": "Create grant",
+            "type": "unknown"
+          }
+        },
+        "events": {
+          "OPEN": "NEW",
+          "SAVE": "GRANT_CREATED"
+        },
+        "linkedEntity": "PermissionGrant",
+        "listens": [
+          {
+            "event": "NEW",
+            "source": {
+              "kind": "trait",
+              "trait": "PermissionMatrixAdmin"
+            },
+            "triggers": "NEW"
+          }
+        ],
+        "name": "PermissionGrantCreate",
+        "ref": "Modal.traits.ModalRecordModal"
+      }),
+      makeTraitRef({
+        "config": {
+          "fields": {
+            "default": [
+              "workspaceId",
+              "role",
+              "module",
+              "canReadFinance",
+              "canSeeOthersHours",
+              "canSeeMargins"
+            ],
+            "type": "unknown"
+          },
+          "icon": {
+            "default": "pencil",
+            "type": "unknown"
+          },
+          "mode": {
+            "default": "edit",
+            "type": "unknown"
+          },
+          "title": {
+            "default": "Edit grant",
+            "type": "unknown"
+          }
+        },
+        "events": {
+          "OPEN": "EDIT",
+          "SAVE": "GRANT_UPDATED"
+        },
+        "linkedEntity": "PermissionGrant",
+        "listens": [
+          {
+            "event": "EDIT",
+            "source": {
+              "kind": "trait",
+              "trait": "PermissionMatrixAdmin"
+            },
+            "triggers": "EDIT"
+          }
+        ],
+        "name": "PermissionGrantEdit",
+        "ref": "Modal.traits.ModalRecordModal"
+      }),
+      {
+        "capabilities": [
+          "access"
+        ],
+        "category": "lifecycle",
+        "config": {
+          "adminRoles": {
+            "default": [],
+            "description": "Roles eligible to create, edit, or delete grants. ENFORCED by the DO_CREATE/DO_UPDATE/DO_DELETE transition guards: a viewer whose @user.role is not listed cannot fire a write, from the form submit or from the bus. Empty = every signed-in viewer may manage grants (ungated). Mounting the page is the opt-in \u2014 there is deliberately no separate enable flag (a default-off flag made the whole page's affordances dead on a fresh mount).",
+            "items": {
+              "type": "string"
+            },
+            "label": "Who can manage grants?",
+            "synonyms": "admin roles, permission managers, who edits permissions, grant admins, permission matrix, role permissions, capability matrix, permission grants, access matrix, manage permissions",
+            "tier": "policy",
+            "type": "[string]"
+          }
+        },
+        "effectRow": [
+          {
+            "kind": "persist",
+            "resource": "PermissionGrant"
+          },
+          {
+            "kind": "render-ui",
+            "resource": "toast"
+          }
+        ],
+        "emits": [
+          {
+            "description": "Signals that a permission grant has been persisted (create / update); carries the persisted row's id.",
+            "event": "PermissionGrantSaved",
+            "payloadSchema": [
+              {
+                "name": "id",
+                "required": true,
+                "type": "string"
+              }
+            ],
+            "scope": "external",
+            "synonyms": "saved, created, updated, persisted",
+            "tier": "domain"
+          },
+          {
+            "description": "Indicates a failure to persist a permission grant.",
+            "event": "PermissionGrantSaveFailed",
+            "payloadSchema": [
+              {
+                "name": "error",
+                "type": "string"
+              },
+              {
+                "name": "code",
+                "type": "string"
+              }
+            ],
+            "scope": "external",
+            "synonyms": "save error, failed save, persist failure",
+            "tier": "internal"
+          },
+          {
+            "description": "Signals that a permission grant has been deleted.",
+            "event": "PermissionGrantDeleted",
+            "payloadSchema": [
+              {
+                "name": "id",
+                "type": "string"
+              },
+              {
+                "name": "deleted",
+                "type": "boolean"
+              }
+            ],
+            "scope": "external",
+            "synonyms": "deleted, removed, revoked",
+            "tier": "domain"
+          },
+          {
+            "description": "Indicates a failure to delete a permission grant.",
+            "event": "PermissionGrantDeleteFailed",
+            "payloadSchema": [
+              {
+                "name": "error",
+                "type": "string"
+              },
+              {
+                "name": "code",
+                "type": "string"
+              }
+            ],
+            "scope": "external",
+            "synonyms": "delete error, failed delete",
+            "tier": "internal"
+          }
+        ],
+        "linkedEntity": "PermissionGrant",
+        "listens": [
+          {
+            "event": "GRANT_CREATED",
+            "source": {
+              "kind": "trait",
+              "trait": "PermissionGrantCreate"
+            },
+            "triggers": "DO_CREATE"
+          },
+          {
+            "event": "GRANT_UPDATED",
+            "source": {
+              "kind": "trait",
+              "trait": "PermissionGrantEdit"
+            },
+            "triggers": "DO_UPDATE"
+          },
+          {
+            "event": "DELETE",
+            "source": {
+              "kind": "trait",
+              "trait": "PermissionMatrixAdmin"
+            },
+            "triggers": "DO_DELETE"
+          }
+        ],
+        "name": "PermissionGrantPersistor",
+        "scope": "instance",
+        "stateMachine": {
+          "events": [
+            {
+              "key": "INIT",
+              "name": "Initialize"
+            },
+            {
+              "description": "Indicates a request to create a grant row.",
+              "key": "DO_CREATE",
+              "name": "Do Create",
+              "payloadSchema": [
+                {
+                  "entity": "PermissionGrant",
+                  "name": "data",
+                  "properties": [
+                    {
+                      "name": "id",
+                      "required": true,
+                      "type": "string"
+                    },
+                    {
+                      "name": "workspaceId",
+                      "type": "string"
+                    },
+                    {
+                      "name": "role",
+                      "required": true,
+                      "type": "string"
+                    },
+                    {
+                      "name": "module",
+                      "required": true,
+                      "type": "string"
+                    },
+                    {
+                      "name": "canReadFinance",
+                      "type": "boolean"
+                    },
+                    {
+                      "name": "canSeeOthersHours",
+                      "type": "boolean"
+                    },
+                    {
+                      "name": "canSeeMargins",
+                      "type": "boolean"
+                    },
+                    {
+                      "name": "createdAt",
+                      "type": "number"
+                    }
                   ],
-                  [
-                    "array/includes",
-                    "@config.adminRoles",
-                    "@user.role"
-                  ]
-                ]
+                  "required": true,
+                  "type": "object"
+                }
               ],
-              "to": "editing"
+              "synonyms": "add, new, insert",
+              "tier": "domain"
             },
             {
-              "effects": [
-                [
-                  "persist",
-                  "delete",
-                  "PermissionGrant",
-                  "@payload.id",
-                  {
-                    "emit": {
-                      "failure": "PermissionGrantDeleteFailed",
-                      "success": "PermissionGrantDeleted"
+              "description": "Indicates a grant row has been modified.",
+              "key": "DO_UPDATE",
+              "name": "Do Update",
+              "payloadSchema": [
+                {
+                  "entity": "PermissionGrant",
+                  "name": "data",
+                  "properties": [
+                    {
+                      "name": "id",
+                      "required": true,
+                      "type": "string"
+                    },
+                    {
+                      "name": "workspaceId",
+                      "type": "string"
+                    },
+                    {
+                      "name": "role",
+                      "required": true,
+                      "type": "string"
+                    },
+                    {
+                      "name": "module",
+                      "required": true,
+                      "type": "string"
+                    },
+                    {
+                      "name": "canReadFinance",
+                      "type": "boolean"
+                    },
+                    {
+                      "name": "canSeeOthersHours",
+                      "type": "boolean"
+                    },
+                    {
+                      "name": "canSeeMargins",
+                      "type": "boolean"
+                    },
+                    {
+                      "name": "createdAt",
+                      "type": "number"
                     }
-                  }
-                ]
-              ],
-              "event": "DELETE",
-              "from": "listing",
-              "guard": [
-                "and",
-                "@config.enabled",
-                [
-                  "or",
-                  [
-                    "=",
-                    [
-                      "array/len",
-                      "@config.adminRoles"
-                    ],
-                    0
                   ],
-                  [
-                    "array/includes",
-                    "@config.adminRoles",
-                    "@user.role"
-                  ]
-                ]
+                  "required": true,
+                  "type": "object"
+                }
+              ],
+              "synonyms": "modify, update, change",
+              "tier": "domain"
+            },
+            {
+              "description": "Indicates a request to delete a grant row.",
+              "key": "DO_DELETE",
+              "name": "Do Delete",
+              "payloadSchema": [
+                {
+                  "name": "id",
+                  "required": true,
+                  "type": "string"
+                }
+              ],
+              "synonyms": "remove, discard, erase",
+              "tier": "domain"
+            },
+            {
+              "description": "Indicates a failure to persist a permission grant.",
+              "key": "PermissionGrantSaveFailed",
+              "name": "PermissionGrant save failed",
+              "payloadSchema": [
+                {
+                  "name": "error",
+                  "type": "string"
+                },
+                {
+                  "name": "code",
+                  "type": "string"
+                }
+              ],
+              "synonyms": "save error, failed save, persist failure",
+              "tier": "internal"
+            },
+            {
+              "description": "Indicates a failure to delete a permission grant.",
+              "key": "PermissionGrantDeleteFailed",
+              "name": "PermissionGrant delete failed",
+              "payloadSchema": [
+                {
+                  "name": "error",
+                  "type": "string"
+                },
+                {
+                  "name": "code",
+                  "type": "string"
+                }
+              ],
+              "synonyms": "delete error, failed delete",
+              "tier": "internal"
+            },
+            {
+              "description": "Signals that a permission grant has been persisted (create / update); carries the persisted row's id.",
+              "key": "PermissionGrantSaved",
+              "name": "PermissionGrant saved",
+              "payloadSchema": [
+                {
+                  "name": "id",
+                  "required": true,
+                  "type": "string"
+                }
               ],
-              "to": "listing"
+              "synonyms": "saved, created, updated, persisted",
+              "tier": "domain"
             },
             {
-              "effects": [
-                [
-                  "fetch",
-                  "PermissionGrant",
-                  {
-                    "emit": {
-                      "failure": "PermissionGrantLoadFailed",
-                      "success": "PermissionGrantLoaded"
-                    }
-                  }
-                ]
+              "description": "Signals that a permission grant has been deleted.",
+              "key": "PermissionGrantDeleted",
+              "name": "PermissionGrant deleted",
+              "payloadSchema": [
+                {
+                  "name": "id",
+                  "type": "string"
+                },
+                {
+                  "name": "deleted",
+                  "type": "boolean"
+                }
               ],
-              "event": "PermissionGrantDeleted",
-              "from": "listing",
-              "to": "loading"
-            },
+              "synonyms": "deleted, removed, revoked",
+              "tier": "domain"
+            }
+          ],
+          "states": [
             {
-              "effects": [
-                [
-                  "render-ui",
-                  "toast",
-                  {
-                    "dismissible": true,
-                    "message": [
-                      "str/concat",
-                      "Couldn't delete the permission grant \u2014 ",
-                      "@payload.error"
-                    ],
-                    "type": "alert",
-                    "variant": "error"
-                  }
-                ]
-              ],
-              "event": "PermissionGrantDeleteFailed",
-              "from": "listing",
-              "to": "listing"
+              "isInitial": true,
+              "name": "idle"
+            }
+          ],
+          "transitions": [
+            {
+              "event": "INIT",
+              "from": "idle",
+              "to": "idle"
             },
             {
               "effects": [
@@ -74701,56 +74262,7 @@ function stdPermissionMatrixPermissionMatrixOrbital(params = {}) {
                   "persist",
                   "create",
                   "PermissionGrant",
-                  {
-                    "canReadFinance": [
-                      "object/get",
-                      "@payload.data",
-                      "canReadFinance",
-                      false
-                    ],
-                    "canSeeMargins": [
-                      "object/get",
-                      "@payload.data",
-                      "canSeeMargins",
-                      false
-                    ],
-                    "canSeeOthersHours": [
-                      "object/get",
-                      "@payload.data",
-                      "canSeeOthersHours",
-                      false
-                    ],
-                    "createdAt": [
-                      "time/now"
-                    ],
-                    "module": [
-                      "str/default",
-                      [
-                        "object/get",
-                        "@payload.data",
-                        "module"
-                      ],
-                      ""
-                    ],
-                    "role": [
-                      "str/default",
-                      [
-                        "object/get",
-                        "@payload.data",
-                        "role"
-                      ],
-                      ""
-                    ],
-                    "workspaceId": [
-                      "str/default",
-                      [
-                        "object/get",
-                        "@payload.data",
-                        "workspaceId"
-                      ],
-                      ""
-                    ]
-                  },
+                  "@payload.data",
                   {
                     "emit": {
                       "failure": "PermissionGrantSaveFailed",
@@ -74759,115 +74271,33 @@ function stdPermissionMatrixPermissionMatrixOrbital(params = {}) {
                   }
                 ]
               ],
-              "event": "CREATE_GRANT",
-              "from": "editing",
+              "event": "DO_CREATE",
+              "from": "idle",
               "guard": [
-                "and",
-                "@config.enabled",
+                "or",
                 [
-                  "or",
+                  "=",
                   [
-                    "=",
-                    [
-                      "array/len",
-                      "@config.adminRoles"
-                    ],
-                    0
+                    "array/len",
+                    "@config.adminRoles"
                   ],
-                  [
-                    "array/includes",
-                    "@config.adminRoles",
-                    "@user.role"
-                  ]
+                  0
+                ],
+                [
+                  "array/includes",
+                  "@config.adminRoles",
+                  "@user.role"
                 ]
               ],
-              "to": "editing"
+              "to": "idle"
             },
             {
               "effects": [
-                [
-                  "set",
-                  "@entity.id",
-                  [
-                    "object/get",
-                    "@payload.data",
-                    "id"
-                  ]
-                ],
-                [
-                  "set",
-                  "@entity.workspaceId",
-                  [
-                    "str/default",
-                    [
-                      "object/get",
-                      "@payload.data",
-                      "workspaceId"
-                    ],
-                    ""
-                  ]
-                ],
-                [
-                  "set",
-                  "@entity.role",
-                  [
-                    "str/default",
-                    [
-                      "object/get",
-                      "@payload.data",
-                      "role"
-                    ],
-                    ""
-                  ]
-                ],
-                [
-                  "set",
-                  "@entity.module",
-                  [
-                    "str/default",
-                    [
-                      "object/get",
-                      "@payload.data",
-                      "module"
-                    ],
-                    ""
-                  ]
-                ],
-                [
-                  "set",
-                  "@entity.canReadFinance",
-                  [
-                    "object/get",
-                    "@payload.data",
-                    "canReadFinance",
-                    false
-                  ]
-                ],
-                [
-                  "set",
-                  "@entity.canSeeOthersHours",
-                  [
-                    "object/get",
-                    "@payload.data",
-                    "canSeeOthersHours",
-                    false
-                  ]
-                ],
-                [
-                  "set",
-                  "@entity.canSeeMargins",
-                  [
-                    "object/get",
-                    "@payload.data",
-                    "canSeeMargins",
-                    false
-                  ]
-                ],
                 [
                   "persist",
                   "update",
                   "PermissionGrant",
-                  "@entity",
+                  "@payload.data",
                   {
                     "emit": {
                       "failure": "PermissionGrantSaveFailed",
@@ -74876,103 +74306,60 @@ function stdPermissionMatrixPermissionMatrixOrbital(params = {}) {
                   }
                 ]
               ],
-              "event": "SAVE_GRANT",
-              "from": "editing",
+              "event": "DO_UPDATE",
+              "from": "idle",
               "guard": [
-                "and",
-                "@config.enabled",
+                "or",
                 [
-                  "or",
+                  "=",
                   [
-                    "=",
-                    [
-                      "array/len",
-                      "@config.adminRoles"
-                    ],
-                    0
+                    "array/len",
+                    "@config.adminRoles"
                   ],
-                  [
-                    "array/includes",
-                    "@config.adminRoles",
-                    "@user.role"
-                  ]
+                  0
+                ],
+                [
+                  "array/includes",
+                  "@config.adminRoles",
+                  "@user.role"
                 ]
               ],
-              "to": "editing"
+              "to": "idle"
             },
             {
               "effects": [
                 [
-                  "render-ui",
-                  "modal",
-                  null
-                ],
-                [
-                  "render-ui",
-                  "main",
-                  {
-                    "align": "center",
-                    "children": [
-                      "@trait.LoadingSpinner",
-                      "@trait.LoadingText"
-                    ],
-                    "className": "py-12",
-                    "direction": "vertical",
-                    "gap": "md",
-                    "type": "stack"
-                  }
-                ],
-                [
-                  "fetch",
+                  "persist",
+                  "delete",
                   "PermissionGrant",
+                  "@payload.id",
                   {
                     "emit": {
-                      "failure": "PermissionGrantLoadFailed",
-                      "success": "PermissionGrantLoaded"
+                      "failure": "PermissionGrantDeleteFailed",
+                      "success": "PermissionGrantDeleted"
                     }
                   }
                 ]
               ],
-              "event": "CANCEL_GRANT",
-              "from": "editing",
-              "to": "loading"
-            },
-            {
-              "effects": [
-                [
-                  "render-ui",
-                  "modal",
-                  null
-                ],
+              "event": "DO_DELETE",
+              "from": "idle",
+              "guard": [
+                "or",
                 [
-                  "render-ui",
-                  "main",
-                  {
-                    "align": "center",
-                    "children": [
-                      "@trait.LoadingSpinner",
-                      "@trait.LoadingText"
-                    ],
-                    "className": "py-12",
-                    "direction": "vertical",
-                    "gap": "md",
-                    "type": "stack"
-                  }
+                  "=",
+                  [
+                    "array/len",
+                    "@config.adminRoles"
+                  ],
+                  0
                 ],
                 [
-                  "fetch",
-                  "PermissionGrant",
-                  {
-                    "emit": {
-                      "failure": "PermissionGrantLoadFailed",
-                      "success": "PermissionGrantLoaded"
-                    }
-                  }
+                  "array/includes",
+                  "@config.adminRoles",
+                  "@user.role"
                 ]
               ],
-              "event": "PermissionGrantSaved",
-              "from": "editing",
-              "to": "loading"
+              "to": "idle"
             },
             {
               "effects": [
@@ -74992,73 +74379,29 @@ function stdPermissionMatrixPermissionMatrixOrbital(params = {}) {
                 ]
               ],
               "event": "PermissionGrantSaveFailed",
-              "from": "editing",
-              "to": "editing"
-            },
-            {
-              "effects": [
-                [
-                  "render-ui",
-                  "modal",
-                  null
-                ],
-                [
-                  "render-ui",
-                  "main",
-                  {
-                    "align": "center",
-                    "children": [
-                      "@trait.LoadingSpinner",
-                      "@trait.LoadingText"
-                    ],
-                    "className": "py-12",
-                    "direction": "vertical",
-                    "gap": "md",
-                    "type": "stack"
-                  }
-                ],
-                [
-                  "fetch",
-                  "PermissionGrant",
-                  {
-                    "emit": {
-                      "failure": "PermissionGrantLoadFailed",
-                      "success": "PermissionGrantLoaded"
-                    }
-                  }
-                ]
-              ],
-              "event": "CLOSE",
-              "from": "editing",
-              "to": "loading"
+              "from": "idle",
+              "to": "idle"
             },
             {
               "effects": [
-                [
-                  "fetch",
-                  "PermissionGrant",
-                  {
-                    "emit": {
-                      "failure": "PermissionGrantLoadFailed",
-                      "success": "PermissionGrantLoaded"
-                    }
-                  }
-                ],
                 [
                   "render-ui",
-                  "main",
+                  "toast",
                   {
-                    "align": "center",
-                    "children": [
-                      "@trait.ErrorSpinner"
+                    "dismissible": true,
+                    "message": [
+                      "str/concat",
+                      "Couldn't delete the permission grant \u2014 ",
+                      "@payload.error"
                     ],
-                    "type": "stack"
+                    "type": "alert",
+                    "variant": "error"
                   }
                 ]
               ],
-              "event": "INIT",
-              "from": "error",
-              "to": "loading"
+              "event": "PermissionGrantDeleteFailed",
+              "from": "idle",
+              "to": "idle"
             }
           ]
         }
@@ -75510,6 +74853,15 @@ function stdPermissionMatrixPermissionMatrixOrbital(params = {}) {
           {
             "ref": "PermissionMatrixAdmin"
           },
+          {
+            "ref": "PermissionGrantCreate"
+          },
+          {
+            "ref": "PermissionGrantEdit"
+          },
+          {
+            "ref": "PermissionGrantPersistor"
+          },
           {
             "ref": "PermissionGrantQuery"
           }
@@ -75588,13 +74940,14 @@ var StdPermissionMatrixPermissionMatrixOrbitalManifest = {
     "LoadingText",
     "ShieldCheckIcon",
     "PermissionMatrixTitle",
-    "NewGrantButton",
-    "BackButton",
     "GrantDivider",
-    "ErrorAlert"
+    "ErrorAlert",
+    "PermissionGrantCreate",
+    "PermissionGrantEdit"
   ],
   inlineTraitNames: [
     "PermissionMatrixAdmin",
+    "PermissionGrantPersistor",
     "PermissionGrantQuery"
   ]
 };
@@ -87359,6 +86712,18 @@ function stdReminderSchedulerReminderSchedulerOrbital(params = {}) {
             "tier": "internal",
             "type": "string"
           },
+          "direction": {
+            "default": "future",
+            "description": "'future' (default) matches records whose dateField is still ahead, up to offsetHours out \u2014 upcoming-deadline reminders. 'past' matches records whose dateField is at least offsetHours behind now \u2014 act-after-the-fact policies. The emitted event and the dedup marker are identical either way.",
+            "label": "Scan which side of now?",
+            "synonyms": "direction, past due, overdue, after the deadline, look back, backward scan, past-window",
+            "tier": "infra",
+            "type": "string",
+            "values": [
+              "future",
+              "past"
+            ]
+          },
           "enabled": {
             "default": false,
             "description": "Automatically remind about upcoming deadlines. Off by default.",
@@ -87636,6 +87001,16 @@ function stdReminderSchedulerReminderSchedulerOrbital(params = {}) {
               ],
               "to": "idle"
             },
+            {
+              "event": "ScanRecordsLoaded",
+              "from": "idle",
+              "guard": [
+                "=",
+                "@config.enabled",
+                false
+              ],
+              "to": "idle"
+            },
             {
               "effects": [
                 [
@@ -87679,35 +87054,74 @@ function stdReminderSchedulerReminderSchedulerOrbital(params = {}) {
                         0
                       ],
                       [
-                        ">",
+                        "or",
                         [
-                          "time/parse",
+                          "and",
                           [
-                            "object/get",
-                            "@entity",
-                            "@config.dateField"
+                            "=",
+                            "@config.direction",
+                            "future"
+                          ],
+                          [
+                            ">",
+                            [
+                              "time/parse",
+                              [
+                                "object/get",
+                                "@entity",
+                                "@config.dateField"
+                              ]
+                            ],
+                            "@now"
+                          ],
+                          [
+                            "<",
+                            [
+                              "-",
+                              [
+                                "time/parse",
+                                [
+                                  "object/get",
+                                  "@entity",
+                                  "@config.dateField"
+                                ]
+                              ],
+                              "@now"
+                            ],
+                            [
+                              "*",
+                              "@config.offsetHours",
+                              36e5
+                            ]
                           ]
                         ],
-                        "@now"
-                      ],
-                      [
-                        "<",
                         [
-                          "-",
+                          "and",
                           [
-                            "time/parse",
+                            "=",
+                            "@config.direction",
+                            "past"
+                          ],
+                          [
+                            ">",
                             [
-                              "object/get",
-                              "@entity",
-                              "@config.dateField"
+                              "-",
+                              "@now",
+                              [
+                                "time/parse",
+                                [
+                                  "object/get",
+                                  "@entity",
+                                  "@config.dateField"
+                                ]
+                              ]
+                            ],
+                            [
+                              "*",
+                              "@config.offsetHours",
+                              36e5
                             ]
-                          ],
-                          "@now"
-                        ],
-                        [
-                          "*",
-                          "@config.offsetHours",
-                          36e5
+                          ]
                         ]
                       ]
                     ]
@@ -87827,35 +87241,74 @@ function stdReminderSchedulerReminderSchedulerOrbital(params = {}) {
                       0
                     ],
                     [
-                      ">",
+                      "or",
                       [
-                        "time/parse",
+                        "and",
                         [
-                          "object/get",
-                          "@entity",
-                          "@config.dateField"
+                          "=",
+                          "@config.direction",
+                          "future"
+                        ],
+                        [
+                          ">",
+                          [
+                            "time/parse",
+                            [
+                              "object/get",
+                              "@entity",
+                              "@config.dateField"
+                            ]
+                          ],
+                          "@now"
+                        ],
+                        [
+                          "<",
+                          [
+                            "-",
+                            [
+                              "time/parse",
+                              [
+                                "object/get",
+                                "@entity",
+                                "@config.dateField"
+                              ]
+                            ],
+                            "@now"
+                          ],
+                          [
+                            "*",
+                            "@config.offsetHours",
+                            36e5
+                          ]
                         ]
                       ],
-                      "@now"
-                    ],
-                    [
-                      "<",
                       [
-                        "-",
+                        "and",
+                        [
+                          "=",
+                          "@config.direction",
+                          "past"
+                        ],
                         [
-                          "time/parse",
+                          ">",
                           [
-                            "object/get",
-                            "@entity",
-                            "@config.dateField"
+                            "-",
+                            "@now",
+                            [
+                              "time/parse",
+                              [
+                                "object/get",
+                                "@entity",
+                                "@config.dateField"
+                              ]
+                            ]
+                          ],
+                          [
+                            "*",
+                            "@config.offsetHours",
+                            36e5
                           ]
-                        ],
-                        "@now"
-                      ],
-                      [
-                        "*",
-                        "@config.offsetHours",
-                        36e5
+                        ]
                       ]
                     ]
                   ]