From aee9eebf163754327b1c3febb673b06f4237fed7 Mon Sep 17 00:00:00 2001
From: Alan Richardson <alan@compendiumdev.co.uk>
Date: Tue, 30 Jun 2026 10:40:18 +0100
Subject: [PATCH 1/5] Fix generator schema tab order

---
 .gitignore                                    |  2 +-
 .../generator/functional/schema-edit.spec.js  | 29 ++++++++++++
 apps/web/styles.css                           | 37 +++++++++++++++
 .../test-data/schema/schema-focus-state.js    |  2 +-
 .../schema/shared-schema-editor-controller.js | 12 ++++-
 .../schema/shared-schema-editor-ui.js         | 14 +++---
 .../support/focused-app-test-data-harness.js  |  9 +++-
 .../support/focused-generator-harness.js      |  9 +++-
 .../tests/shared/schema-focus-state.test.js   | 47 +++++++++++++++++++
 .../shared-schema-editor-controller.test.js   | 47 +++++++++++++++++++
 .../shared/shared-schema-editor-ui.test.js    | 22 +++++++++
 11 files changed, 217 insertions(+), 13 deletions(-)
 create mode 100644 packages/core-ui/src/tests/shared/schema-focus-state.test.js

diff --git a/.gitignore b/.gitignore
index 3987d62d..ed1c215b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,4 +25,4 @@ testenv/
 experiments
 experiments/*
 .codex-logs/
-.codex-dev-web.log
+.codex-dev-web*.log
diff --git a/apps/web/src/tests/browser/generator/functional/schema-edit.spec.js b/apps/web/src/tests/browser/generator/functional/schema-edit.spec.js
index f9d93d5a..0c678ea8 100644
--- a/apps/web/src/tests/browser/generator/functional/schema-edit.spec.js
+++ b/apps/web/src/tests/browser/generator/functional/schema-edit.spec.js
@@ -37,6 +37,35 @@ test.describe('Generator Schema Editing', () => {
     expectNoPageErrors(pageErrors);
   });
 
+  test('tabs through schema row fields before row action buttons', async ({ page }) => {
+    const { generatorPage, pageErrors } = await openGenerator(page);
+
+    await generatorPage.schema.setTextMode(false);
+    const row = generatorPage.schema.row(0);
+    const nameInput = row.locator('input[data-field="name"]');
+    const sourceTypeSelect = row.locator('select[data-field="sourceType"]');
+    const helpLink = row.locator('[data-field="faker-doc-link"]');
+    const valueInput = row.locator('input[data-field="value"]');
+    const dragButton = row.locator('[data-action="drag"]');
+
+    await nameInput.focus();
+    await expect(nameInput).toBeFocused();
+
+    await page.keyboard.press('Tab');
+    await expect(sourceTypeSelect).toBeFocused();
+
+    await page.keyboard.press('Tab');
+    await expect(helpLink).toBeFocused();
+
+    await page.keyboard.press('Tab');
+    await expect(valueInput).toBeFocused();
+
+    await page.keyboard.press('Tab');
+    await expect(dragButton).toBeFocused();
+
+    expectNoPageErrors(pageErrors);
+  });
+
   test('can edit as schema then edit as text', async ({ page }) => {
     const { generatorPage, pageErrors } = await openGenerator(page);
 
diff --git a/apps/web/styles.css b/apps/web/styles.css
index ea6d4502..5bbc4959 100644
--- a/apps/web/styles.css
+++ b/apps/web/styles.css
@@ -1985,10 +1985,47 @@ body.theme-dark .generator-status-text[data-severity='info'] {
 }
 
 .shared-schema-row-actions {
+  grid-column: 1;
+  grid-row: 1;
   display: flex;
   gap: 0.2rem;
 }
 
+.shared-schema-row > input[data-field='name'] {
+  grid-column: 2;
+  grid-row: 1;
+}
+
+.shared-schema-row > select[data-field='sourceType'] {
+  grid-column: 3;
+  grid-row: 1;
+}
+
+.shared-schema-row > .shared-schema-command-picker-control {
+  grid-column: 4;
+  grid-row: 1;
+}
+
+.shared-schema-row-command > .shared-schema-help-link {
+  grid-column: 5;
+  grid-row: 1;
+}
+
+.shared-schema-row-value > .shared-schema-help-link {
+  grid-column: 4;
+  grid-row: 1;
+}
+
+.shared-schema-row > .shared-schema-params-control {
+  grid-column: 6;
+  grid-row: 1;
+}
+
+.shared-schema-row > input[data-field='value'] {
+  grid-column: 5;
+  grid-row: 1;
+}
+
 .shared-schema-drag-handle {
   cursor: grab;
 }
diff --git a/packages/core-ui/js/gui_components/shared/test-data/schema/schema-focus-state.js b/packages/core-ui/js/gui_components/shared/test-data/schema/schema-focus-state.js
index dcbdc331..9e1bd34b 100644
--- a/packages/core-ui/js/gui_components/shared/test-data/schema/schema-focus-state.js
+++ b/packages/core-ui/js/gui_components/shared/test-data/schema/schema-focus-state.js
@@ -5,7 +5,7 @@ function captureActiveFieldState(documentObj) {
   const fieldName = activeElement?.getAttribute?.('data-field');
   const actionName = activeElement?.getAttribute?.('data-action');
   const rowId = activeElement?.closest?.(SHARED_SCHEMA_ROW_SELECTOR)?.getAttribute?.('data-row-id');
-  if (!rowId || (!fieldName && actionName !== 'pick-command')) {
+  if (!rowId || (!fieldName && !actionName)) {
     return null;
   }
   return {
diff --git a/packages/core-ui/js/gui_components/shared/test-data/schema/shared-schema-editor-controller.js b/packages/core-ui/js/gui_components/shared/test-data/schema/shared-schema-editor-controller.js
index 0df93e66..6294cb11 100644
--- a/packages/core-ui/js/gui_components/shared/test-data/schema/shared-schema-editor-controller.js
+++ b/packages/core-ui/js/gui_components/shared/test-data/schema/shared-schema-editor-controller.js
@@ -315,6 +315,16 @@ function createSharedSchemaEditorController({
     semanticValidationTimers.set(rowId, timerId);
   };
 
+  const scheduleFocusSettledSemanticValidationForRow = (rowId) => {
+    clearSemanticValidationTimer(rowId);
+    if (typeof timerApi?.setTimeout !== 'function') {
+      applySemanticValidationForRow(rowId);
+      return;
+    }
+    const timerId = timerApi.setTimeout(() => applySemanticValidationForRow(rowId), 0);
+    semanticValidationTimers.set(rowId, timerId);
+  };
+
   const updateTextElementFromRows = () => {
     const textElement = getTextElement();
     if (textElement) {
@@ -785,7 +795,7 @@ function createSharedSchemaEditorController({
     if (!rowId) {
       return;
     }
-    scheduleSemanticValidationForRow(rowId, { immediate: true });
+    scheduleFocusSettledSemanticValidationForRow(rowId);
   };
 
   const handleClick = async (event) => {
diff --git a/packages/core-ui/js/gui_components/shared/test-data/schema/shared-schema-editor-ui.js b/packages/core-ui/js/gui_components/shared/test-data/schema/shared-schema-editor-ui.js
index 054df237..02ec89d8 100644
--- a/packages/core-ui/js/gui_components/shared/test-data/schema/shared-schema-editor-ui.js
+++ b/packages/core-ui/js/gui_components/shared/test-data/schema/shared-schema-editor-ui.js
@@ -88,13 +88,6 @@ function renderSharedSchemaRows({
     rowElem.setAttribute('data-row-id', row.id);
     rowElem.setAttribute('data-row-index', String(index));
     rowElem.innerHTML = `
-                <div class="${SHARED_SCHEMA_ROW_ACTIONS_CLASS}">
-                    <button class="icon-button ${SHARED_SCHEMA_DRAG_HANDLE_CLASS}" type="button" data-action="drag" data-row-id="${row.id}" title="Drag field to reorder" draggable="true" aria-label="Drag field to reorder">${renderIconHtml('grip-vertical')}</button>
-                    <button class="icon-button" type="button" data-action="add" data-row-id="${row.id}" title="Add field" aria-label="Insert field after this row">${renderIconHtml('plus')}</button>
-                    <button class="icon-button" type="button" data-action="remove" data-row-id="${row.id}" title="Remove field" aria-label="Remove field">${renderIconHtml('minus')}</button>
-                    <button class="icon-button" type="button" data-action="up" data-row-id="${row.id}" title="Move up" aria-label="Move up" ${index === 0 ? 'disabled' : ''}>${renderIconHtml('arrow-up')}</button>
-                    <button class="icon-button" type="button" data-action="down" data-row-id="${row.id}" title="Move down" aria-label="Move down" ${index === schemaRows.length - 1 ? 'disabled' : ''}>${renderIconHtml('arrow-down')}</button>
-                </div>
                 <input type="text" data-field="name" class="${hasNameValidationError ? SHARED_SCHEMA_FIELD_INVALID_CLASS : ''}" placeholder="Column Name" aria-label="Column Name" value="${escapeHtml(row.name)}">
                 <select data-field="sourceType" class="${hasCommandValidationError ? SHARED_SCHEMA_FIELD_INVALID_CLASS : ''}" aria-label="Field type">
                     <option value="${SOURCE_TYPE_ENUM}" ${normalisedSourceType === SOURCE_TYPE_ENUM ? 'selected' : ''}>enum</option>
@@ -153,6 +146,13 @@ function renderSharedSchemaRows({
                     ? `<div class="${SHARED_SCHEMA_ROW_VALIDATION_CLASS}" role="status">${escapeHtml(validationMessage)}</div>`
                     : ''
                 }
+                <div class="${SHARED_SCHEMA_ROW_ACTIONS_CLASS}">
+                    <button class="icon-button ${SHARED_SCHEMA_DRAG_HANDLE_CLASS}" type="button" data-action="drag" data-row-id="${row.id}" title="Drag field to reorder" draggable="true" aria-label="Drag field to reorder">${renderIconHtml('grip-vertical')}</button>
+                    <button class="icon-button" type="button" data-action="add" data-row-id="${row.id}" title="Add field" aria-label="Insert field after this row">${renderIconHtml('plus')}</button>
+                    <button class="icon-button" type="button" data-action="remove" data-row-id="${row.id}" title="Remove field" aria-label="Remove field">${renderIconHtml('minus')}</button>
+                    <button class="icon-button" type="button" data-action="up" data-row-id="${row.id}" title="Move up" aria-label="Move up" ${index === 0 ? 'disabled' : ''}>${renderIconHtml('arrow-up')}</button>
+                    <button class="icon-button" type="button" data-action="down" data-row-id="${row.id}" title="Move down" aria-label="Move down" ${index === schemaRows.length - 1 ? 'disabled' : ''}>${renderIconHtml('arrow-down')}</button>
+                </div>
             `;
 
     const schemaHelpElement = rowElem.querySelector('[data-field="faker-doc-link"]');
diff --git a/packages/core-ui/src/tests/interaction/support/focused-app-test-data-harness.js b/packages/core-ui/src/tests/interaction/support/focused-app-test-data-harness.js
index 90061e70..62966471 100644
--- a/packages/core-ui/src/tests/interaction/support/focused-app-test-data-harness.js
+++ b/packages/core-ui/src/tests/interaction/support/focused-app-test-data-harness.js
@@ -50,8 +50,10 @@ function createFocusedAppTestDataHarness() {
     if (!element) {
       throw new Error('Target input element was not found in focused app test-data harness');
     }
-    await user.click(element);
-    await user.clear(element);
+    element.focus();
+    element.value = '';
+    fireEvent.input(element, { target: { value: '' } });
+    fireEvent.change(element, { target: { value: '' } });
     if (value) {
       if (element.type === 'number' || /[\n\\[\]{}]/.test(value)) {
         element.value = value;
@@ -62,6 +64,9 @@ function createFocusedAppTestDataHarness() {
       }
     }
     element.blur();
+    await new Promise((resolve) => {
+      setTimeout(resolve, 0);
+    });
   }
 
   async function setSelectValue(element, value) {
diff --git a/packages/core-ui/src/tests/interaction/support/focused-generator-harness.js b/packages/core-ui/src/tests/interaction/support/focused-generator-harness.js
index 53a27c99..9b936ebb 100644
--- a/packages/core-ui/src/tests/interaction/support/focused-generator-harness.js
+++ b/packages/core-ui/src/tests/interaction/support/focused-generator-harness.js
@@ -102,6 +102,9 @@ function createFocusedGeneratorHarness() {
     fireEvent.input(element, { target: { value: element.value } });
     fireEvent.change(element, { target: { value: element.value } });
     element.blur();
+    await new Promise((resolve) => {
+      setTimeout(resolve, 0);
+    });
   }
 
   function reset() {
@@ -143,7 +146,11 @@ function createFocusedGeneratorHarness() {
     await waitFor(() => expect(getRow(index)).toBeTruthy());
 
     if (row.sourceType === 'faker' || row.sourceType === 'domain') {
-      const commandSelect = getRow(index).querySelector('[data-field="command"]');
+      let commandSelect = null;
+      await waitFor(() => {
+        commandSelect = getRow(index)?.querySelector('[data-field="command"]') || null;
+        expect(commandSelect).toBeTruthy();
+      });
       await user.selectOptions(commandSelect, row.command);
       const paramsInput = within(getRow(index)).getByPlaceholderText('Params e.g. (10)');
       await setInputValue(paramsInput, row.params || '');
diff --git a/packages/core-ui/src/tests/shared/schema-focus-state.test.js b/packages/core-ui/src/tests/shared/schema-focus-state.test.js
new file mode 100644
index 00000000..d7949f78
--- /dev/null
+++ b/packages/core-ui/src/tests/shared/schema-focus-state.test.js
@@ -0,0 +1,47 @@
+import { JSDOM } from 'jsdom';
+import {
+  captureActiveFieldState,
+  restoreActiveFieldState,
+} from '../../../js/gui_components/shared/test-data/schema/schema-focus-state.js';
+
+describe('schema focus state', () => {
+  let dom;
+
+  afterEach(() => {
+    dom?.window.close();
+  });
+
+  test('captures and restores focused row action buttons after a row render', () => {
+    dom = new JSDOM(`
+      <!doctype html>
+      <html>
+        <body>
+          <div class="shared-schema-row" data-row-id="row-1">
+            <button type="button" data-action="drag">Drag</button>
+          </div>
+        </body>
+      </html>
+    `);
+    const { document } = dom.window;
+
+    document.querySelector('[data-action="drag"]').focus();
+
+    const state = captureActiveFieldState(document);
+    expect(state).toMatchObject({
+      rowId: 'row-1',
+      fieldName: null,
+      actionName: 'drag',
+    });
+
+    document.body.innerHTML = `
+      <div class="shared-schema-row" data-row-id="row-1">
+        <button type="button" data-action="drag">Drag</button>
+      </div>
+    `;
+    const nextDragButton = document.querySelector('[data-action="drag"]');
+
+    restoreActiveFieldState(document, state);
+
+    expect(document.activeElement).toBe(nextDragButton);
+  });
+});
diff --git a/packages/core-ui/src/tests/shared/shared-schema-editor-controller.test.js b/packages/core-ui/src/tests/shared/shared-schema-editor-controller.test.js
index e34ad29e..76b18e46 100644
--- a/packages/core-ui/src/tests/shared/shared-schema-editor-controller.test.js
+++ b/packages/core-ui/src/tests/shared/shared-schema-editor-controller.test.js
@@ -103,6 +103,53 @@ describe('createSharedSchemaEditorController', () => {
     expect(timerApi.clearTimeout).toHaveBeenCalledWith('timer-1');
   });
 
+  test('defers focusout validation until native tab focus can settle', () => {
+    const root = createRoot(dom.window.document);
+    const timerApi = {
+      setTimeout: jest.fn(() => 'focusout-timer'),
+      clearTimeout: jest.fn(),
+    };
+
+    const controller = createSharedSchemaEditorController({
+      documentObj: dom.window.document,
+      rootElement: root,
+      timerApi,
+      createBlankRow: () => ({
+        id: 'row-1',
+        name: '',
+        sourceType: 'literal',
+        command: 'literal',
+        value: '',
+        params: '',
+        semanticValidationIssues: [],
+      }),
+      mapRuleToRow: () => ({
+        id: 'row-1',
+        name: '',
+        sourceType: 'literal',
+        command: 'literal',
+        value: '',
+        params: '',
+        semanticValidationIssues: [],
+      }),
+      schemaTextToDataRules: jest.fn(() => ({ dataRules: [], errors: [] })),
+      dataRulesToSchemaText: jest.fn(() => ''),
+      validateSchemaRows: jest.fn((rows) => ({ rows, errors: [] })),
+      updatePairwiseButtonVisibility: jest.fn(),
+      updateHelpHints: jest.fn(),
+    });
+
+    controller.init();
+    const nameInput = root.querySelector('[data-field="name"]');
+    controller.handleFocusOut({ target: nameInput });
+
+    expect(timerApi.setTimeout).toHaveBeenLastCalledWith(expect.any(Function), 0);
+
+    controller.destroy();
+
+    expect(timerApi.clearTimeout).toHaveBeenCalledWith('focusout-timer');
+  });
+
   test('opens the params editor dialog and applies validated params back to the row', async () => {
     const root = createRoot(dom.window.document);
     const controller = createSharedSchemaEditorController({
diff --git a/packages/core-ui/src/tests/shared/shared-schema-editor-ui.test.js b/packages/core-ui/src/tests/shared/shared-schema-editor-ui.test.js
index f352f9be..5a9a875c 100644
--- a/packages/core-ui/src/tests/shared/shared-schema-editor-ui.test.js
+++ b/packages/core-ui/src/tests/shared/shared-schema-editor-ui.test.js
@@ -89,6 +89,28 @@ describe('shared schema editor ui', () => {
     expect(shadowSelect.getAttribute('tabindex')).toBe('-1');
   });
 
+  test('orders focusable row controls from editable fields to row actions', () => {
+    renderSharedSchemaRows({
+      documentObj: document,
+      rowsElement,
+      schemaRows: [{ id: '1', name: 'First', sourceType: 'regex', value: '[A-Z]{2}' }],
+      getSchemaHelpData: () => ({
+        show: true,
+        docsUrl: '/docs/regex',
+        title: 'Regex data help',
+        html: '<p>Regex help</p>',
+      }),
+      updateAllPairsButtonVisibility: () => {},
+    });
+
+    const row = rowsElement.querySelector('.shared-schema-row');
+    const focusableOrder = Array.from(row.querySelectorAll('input, select, a, button'))
+      .filter((element) => !element.disabled && !element.hidden && element.tabIndex >= 0)
+      .map((element) => element.getAttribute('data-field') || element.getAttribute('data-action'));
+
+    expect(focusableOrder).toEqual(['name', 'sourceType', 'faker-doc-link', 'value', 'drag', 'add', 'remove']);
+  });
+
   test('hides the shared schema mode help tooltip when present', () => {
     const hide = jest.fn();
     modeHelpIconElement._tippy = { hide };

From 538c9957ff7a0444d80fe0ecc12b2f6385158694 Mon Sep 17 00:00:00 2001
From: Alan Richardson <alan@compendiumdev.co.uk>
Date: Tue, 30 Jun 2026 13:39:01 +0100
Subject: [PATCH 2/5] fixed next release blog post

---
 ...026-06-12-combinatorial-grid-workflows.md} | 71 +++------------
 .../blog/2026-06-30-increments-and-helpers.md | 88 +++++++++++++++++++
 2 files changed, 102 insertions(+), 57 deletions(-)
 rename docs-src/blog/{2026-06-12-release-prep-combinatorial-grid-workflows.md => 2026-06-12-combinatorial-grid-workflows.md} (71%)
 create mode 100644 docs-src/blog/2026-06-30-increments-and-helpers.md

diff --git a/docs-src/blog/2026-06-12-release-prep-combinatorial-grid-workflows.md b/docs-src/blog/2026-06-12-combinatorial-grid-workflows.md
similarity index 71%
rename from docs-src/blog/2026-06-12-release-prep-combinatorial-grid-workflows.md
rename to docs-src/blog/2026-06-12-combinatorial-grid-workflows.md
index 9330bb24..9ba958f4 100644
--- a/docs-src/blog/2026-06-12-release-prep-combinatorial-grid-workflows.md
+++ b/docs-src/blog/2026-06-12-combinatorial-grid-workflows.md
@@ -1,39 +1,17 @@
 slug: combinatorial-grid-workflows
 authors: [alan]
-tags: [release, feature, combinatorial, schema, import, export, ux]
+tags: [release, feature, combinatorial, schema, import, export, ux, faker, api, cli, mcp]
 date: 2026-06-12T10:00
 ---
 
 The next release is centered on one theme: faster paths from existing data to realistic, constrained, exportable test sets.
 
-This release adds broader combinatorial generation, schema authoring improvements, better import/export controls, and a few high-value grid usability upgrades.
+This release adds broader combinatorial generation, schema authoring improvements, safe-by-default Faker helper controls across interfaces, better import/export controls, and a few high-value grid usability upgrades.
 
 <!-- truncate -->
 
-## 1. Auto-increment timestamps for deterministic event streams
 
-You can now generate timestamps that move forward one row at a time instead of relying on purely random dates.
-
-Example:
-
-```text
-CreatedAt
-autoIncrement.timestamp(start="2026-06-12T12:39:23Z", step=1, type="seconds")
-```
-
-That produces:
-
-- row 1: `2026-06-12T12:39:23Z`
-- row 2: `2026-06-12T12:39:24Z`
-- row 3: `2026-06-12T12:39:25Z`
-
-This is useful for audit logs, event streams, ordered API records, and any test data where time should progress predictably across generated rows.
-
-Docs:
-
-- [autoIncrement Domain](/docs/test-data/domain/autoIncrement)
-
-## 2. N-wise combinatorial generation, not just pairwise
+## 1. N-wise combinatorial generation, not just pairwise
 
 The biggest addition is that combinatorial generation now goes beyond pairwise.
 
@@ -63,7 +41,7 @@ Docs:
 
 ![N-wise combinations dialog](/img/release-198/n-wise-generation.png)
 
-## 3. Schema constraints with PICT-style `IF ... THEN ...`
+## 2. Schema constraints with PICT-style `IF ... THEN ...`
 
 Schema constraints make generated combinations more realistic by filtering out invalid rows.
 
@@ -92,7 +70,7 @@ Docs:
 
 - [Schema Definition](/docs/test-data/Schema-Definition)
 
-## 4. Grid to Enum Schema for turning existing tables into generators
+## 3. Grid to Enum Schema for turning existing tables into generators
 
 If you already have representative data in the main grid, you can now turn that grid into an enum schema automatically.
 
@@ -124,32 +102,9 @@ Docs:
 
 ![Grid to enum schema in the app](/img/release-198/grid-to-enum-schema.png)
 
-## 5. Constraint-aware auto-increment sequences for generated identifiers
-
-Schemas can now generate sequential IDs through the domain model with `autoIncrement.sequence`.
 
-Example:
-
-```text
-Filename
-autoIncrement.sequence(start=1, step=5, prefix="filename", suffix=".txt", zeropadding=3)
-```
 
-Generated values:
-
-```text
-filename001.txt
-filename0006.txt
-filename011.txt
-```
-
-This is especially useful for ticket IDs, filenames, and human-readable references because the sequence only advances when a row is accepted. If a generated row is rejected by constraints and retried, the skipped attempt does not consume the next number.
-
-Docs:
-
-- [Auto Increment Sequences](/docs/test-data/auto-increment-sequences)
-
-## 6. PICT-style inline enum definitions such as `Name: values`
+## 4. PICT-style inline enum definitions such as `Name: values`
 
 Schema text now fits more naturally with compact PICT-style authoring.
 
@@ -174,7 +129,8 @@ Docs:
 
 - [Schema Definition](/docs/test-data/Schema-Definition)
 
-## 7. Import trimming controls for cleaner amend and import workflows
+
+## 5. Import trimming controls for cleaner amend and import workflows
 
 Imported files and clipboard data can now be normalized during import.
 
@@ -197,7 +153,7 @@ Docs:
 
 ![Import trim settings](/img/release-198/import-trim-settings.png)
 
-## 8. File export settings for line endings and BOM
+## 6. File export settings for line endings and BOM
 
 Downloads now support file transport settings without changing the preview text shown in the browser.
 
@@ -214,7 +170,7 @@ Docs:
 
 ![Download encoding settings](/img/release-198/export-encoding-settings.png)
 
-## 9. Right-click context menu in the main data grid
+## 7. Right-click context menu in the main data grid
 
 The editable grid now has a right-click context menu for common grid actions.
 
@@ -224,7 +180,7 @@ Docs:
 
 - [Data Grid Editable](/docs/test-data/data-grid-editable)
 
-## 10. Always-visible total row counts in the data grid
+## 8. Always-visible total row counts in the data grid
 
 The main grid now shows total row counts, and filtered views also show how many rows remain visible.
 
@@ -251,7 +207,8 @@ Taken together, these features make the tool better at moving through the whole
 1. start with imported or hand-edited data
 2. convert it into a schema
 3. add constraints
-4. generate the right amount of combinatorial coverage
-5. export in the format and file encoding you actually need
+4. enable unsafe Faker helper expressions only when the schema is trusted
+5. generate the right amount of combinatorial coverage
+6. export in the format and file encoding you actually need
 
 The release adds more generation power, reduces setup time, and cleanup time around that generation.
diff --git a/docs-src/blog/2026-06-30-increments-and-helpers.md b/docs-src/blog/2026-06-30-increments-and-helpers.md
new file mode 100644
index 00000000..0579f933
--- /dev/null
+++ b/docs-src/blog/2026-06-30-increments-and-helpers.md
@@ -0,0 +1,88 @@
+slug: auto-increments-helpers
+authors: [alan]
+tags: [release, feature]
+date: 2026-06-30T10:00
+---
+
+This release expands the commands available in the domain model, allows more helper functions in the UI and has general UI improvements.
+
+<!-- truncate -->
+
+## 1. Auto-increment timestamps for deterministic event streams
+
+You can now generate timestamps that move forward one row at a time instead of relying on purely random dates.
+
+Example:
+
+```text
+CreatedAt
+autoIncrement.timestamp(start="2026-06-12T12:39:23Z", step=1, type="seconds")
+```
+
+That produces:
+
+- row 1: `2026-06-12T12:39:23Z`
+- row 2: `2026-06-12T12:39:24Z`
+- row 3: `2026-06-12T12:39:25Z`
+
+This is useful for audit logs, event streams, ordered API records, and any test data where time should progress predictably across generated rows.
+
+Docs:
+
+- [autoIncrement Domain](/docs/test-data/domain/autoIncrement)
+
+
+## 2. Constraint-aware auto-increment sequences for generated identifiers
+
+Schemas can now generate sequential IDs through the domain model with `autoIncrement.sequence`.
+
+Example:
+
+```text
+Filename
+autoIncrement.sequence(start=1, step=5, prefix="filename", suffix=".txt", zeropadding=3)
+```
+
+Generated values:
+
+```text
+filename001.txt
+filename0006.txt
+filename011.txt
+```
+
+This is especially useful for ticket IDs, filenames, and human-readable references because the sequence only advances when a row is accepted. If a generated row is rejected by constraints and retried, the skipped attempt does not consume the next number.
+
+Docs:
+
+- [Auto Increment Sequences](/docs/test-data/auto-increment-sequences)
+
+## 3. Allow unsafe Faker helpers from the UI when you trust the schema
+
+Faker helper commands stay safe by default. Simple literal helper calls continue to work normally, but expression-style helper arguments that execute callback-shaped schema text require an explicit opt-in.
+
+That opt-in is now available in the Web UI as **allow unsafe faker** in the Test Data Settings dialog behind the cog.
+
+Example unsafe helper:
+
+```text
+Names
+helpers.multiple(() => this.person.firstName(), { count: 3 })
+```
+
+Use this only for schemas you trust. The browser setting now matches the other integration surfaces:
+
+- Web UI: enable **allow unsafe faker** from the Test Data Settings cog.
+- REST API: pass `unsafeFakerExpressions: true` in supported generation request bodies.
+- CLI: pass `--unsafe-faker-expressions`.
+- MCP: pass `unsafeFakerExpressions: true` in the generation tool arguments.
+
+Docs:
+
+- [Faker Helpers](/docs/test-data/faker/helpers)
+- [Web UI](/docs/interfaces-and-deployment/web-ui)
+- [REST API](/docs/interfaces-and-deployment/rest-api)
+- [MCP](/docs/interfaces-and-deployment/mcp)
+- [CLI](/docs/interfaces-and-deployment/cli-node-and-bun)
+
+

From aa7450b126fd2e56ef0927c603d885e6f603cd2c Mon Sep 17 00:00:00 2001
From: Alan Richardson <alan@compendiumdev.co.uk>
Date: Tue, 30 Jun 2026 14:03:45 +0100
Subject: [PATCH 3/5] Address PR 293 review feedback

---
 apps/web/styles.css                           |  2 +
 .../support/focused-app-test-data-harness.js  | 44 ++++++++++++-------
 2 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/apps/web/styles.css b/apps/web/styles.css
index 5bbc4959..cc711a6a 100644
--- a/apps/web/styles.css
+++ b/apps/web/styles.css
@@ -2206,9 +2206,11 @@ body.theme-dark .shared-schema-row-validation {
   }
   .shared-schema-row-actions {
     grid-column: 1 / span 3;
+    grid-row: 1;
   }
   .shared-schema-row > input[data-field='name'] {
     grid-column: 1 / span 3;
+    grid-row: 2;
   }
   .shared-schema-row > select[data-field='sourceType'] {
     grid-column: 1;
diff --git a/packages/core-ui/src/tests/interaction/support/focused-app-test-data-harness.js b/packages/core-ui/src/tests/interaction/support/focused-app-test-data-harness.js
index 62966471..68e3279c 100644
--- a/packages/core-ui/src/tests/interaction/support/focused-app-test-data-harness.js
+++ b/packages/core-ui/src/tests/interaction/support/focused-app-test-data-harness.js
@@ -1,4 +1,4 @@
-import { fireEvent, waitFor, within } from '@testing-library/dom';
+import { waitFor, within } from '@testing-library/dom';
 import userEvent from '@testing-library/user-event';
 import RandExp from 'randexp';
 import { Exporter } from '@anywaydata/core/grid/exporter.js';
@@ -50,20 +50,33 @@ function createFocusedAppTestDataHarness() {
     if (!element) {
       throw new Error('Target input element was not found in focused app test-data harness');
     }
-    element.focus();
-    element.value = '';
-    fireEvent.input(element, { target: { value: '' } });
-    fireEvent.change(element, { target: { value: '' } });
-    if (value) {
-      if (element.type === 'number' || /[\n\\[\]{}]/.test(value)) {
-        element.value = value;
-        fireEvent.input(element, { target: { value } });
-        fireEvent.change(element, { target: { value } });
+
+    const nextValue = value === null || value === undefined ? '' : String(value);
+    await user.click(element);
+
+    if (element.type === 'number' && nextValue) {
+      await user.type(element, nextValue, {
+        initialSelectionStart: 0,
+        initialSelectionEnd: String(element.value || '').length,
+      });
+      await user.tab();
+      await new Promise((resolve) => {
+        setTimeout(resolve, 0);
+      });
+      return;
+    }
+
+    await user.clear(element);
+
+    if (nextValue) {
+      if (/[\n\\[\]{}]/.test(nextValue)) {
+        await user.paste(nextValue);
       } else {
-        await user.type(element, value);
+        await user.type(element, nextValue, { skipClick: true });
       }
     }
-    element.blur();
+
+    await user.tab();
     await new Promise((resolve) => {
       setTimeout(resolve, 0);
     });
@@ -73,11 +86,8 @@ function createFocusedAppTestDataHarness() {
     if (!element) {
       throw new Error('Target select element was not found in focused app test-data harness');
     }
-    element.focus();
-    element.value = value;
-    fireEvent.input(element, { target: { value } });
-    fireEvent.change(element, { target: { value } });
-    element.blur();
+    await user.selectOptions(element, value);
+    await user.tab();
   }
 
   function reset() {

From cacd797581b2dd0b946ceddd0b95e65625de481f Mon Sep 17 00:00:00 2001
From: Alan Richardson <alan@compendiumdev.co.uk>
Date: Tue, 30 Jun 2026 23:39:07 +0100
Subject: [PATCH 4/5] Address schema focus review feedback

---
 .../support/focused-app-test-data-harness.js  | 14 ++--
 .../tests/shared/schema-focus-state.test.js   | 70 ++++++++++++++++---
 2 files changed, 68 insertions(+), 16 deletions(-)

diff --git a/packages/core-ui/src/tests/interaction/support/focused-app-test-data-harness.js b/packages/core-ui/src/tests/interaction/support/focused-app-test-data-harness.js
index 68e3279c..ca0b82d0 100644
--- a/packages/core-ui/src/tests/interaction/support/focused-app-test-data-harness.js
+++ b/packages/core-ui/src/tests/interaction/support/focused-app-test-data-harness.js
@@ -46,6 +46,12 @@ function createFocusedAppTestDataHarness() {
     return getPanelRoot()?.querySelector('[data-role="schema-definition-root"]') || null;
   }
 
+  async function waitForFocusToLeave(element) {
+    await waitFor(() => {
+      expect(element.ownerDocument.activeElement).not.toBe(element);
+    });
+  }
+
   async function setInputValue(element, value) {
     if (!element) {
       throw new Error('Target input element was not found in focused app test-data harness');
@@ -60,9 +66,7 @@ function createFocusedAppTestDataHarness() {
         initialSelectionEnd: String(element.value || '').length,
       });
       await user.tab();
-      await new Promise((resolve) => {
-        setTimeout(resolve, 0);
-      });
+      await waitForFocusToLeave(element);
       return;
     }
 
@@ -77,9 +81,7 @@ function createFocusedAppTestDataHarness() {
     }
 
     await user.tab();
-    await new Promise((resolve) => {
-      setTimeout(resolve, 0);
-    });
+    await waitForFocusToLeave(element);
   }
 
   async function setSelectValue(element, value) {
diff --git a/packages/core-ui/src/tests/shared/schema-focus-state.test.js b/packages/core-ui/src/tests/shared/schema-focus-state.test.js
index d7949f78..6a06a14c 100644
--- a/packages/core-ui/src/tests/shared/schema-focus-state.test.js
+++ b/packages/core-ui/src/tests/shared/schema-focus-state.test.js
@@ -11,37 +11,87 @@ describe('schema focus state', () => {
     dom?.window.close();
   });
 
-  test('captures and restores focused row action buttons after a row render', () => {
+  function renderRowWithActions() {
+    dom.window.document.body.innerHTML = `
+      <div class="shared-schema-row shared-schema-row-invalid" data-row-id="row-1">
+        <input type="text" data-field="name" value="Name">
+        <button type="button" data-action="pick-command">Pick command</button>
+        <div class="shared-schema-row-validation" role="status">invalid row</div>
+        <div class="shared-schema-row-actions">
+          <button type="button" data-action="drag">Drag</button>
+          <button type="button" data-action="add">Add</button>
+          <button type="button" data-action="remove">Remove</button>
+          <button type="button" data-action="up">Up</button>
+          <button type="button" data-action="down">Down</button>
+        </div>
+      </div>
+    `;
+  }
+
+  test.each(['pick-command', 'drag', 'add', 'remove', 'up', 'down'])(
+    'captures and restores focused %s action buttons after a row render',
+    (actionName) => {
+      dom = new JSDOM(`
+        <!doctype html>
+        <html>
+          <body></body>
+        </html>
+      `);
+      const { document } = dom.window;
+
+      renderRowWithActions();
+
+      document.querySelector(`[data-action="${actionName}"]`).focus();
+
+      const state = captureActiveFieldState(document);
+      expect(state).toMatchObject({
+        rowId: 'row-1',
+        fieldName: null,
+        actionName,
+      });
+
+      renderRowWithActions();
+      const nextActionButton = document.querySelector(`[data-action="${actionName}"]`);
+
+      restoreActiveFieldState(document, state);
+
+      expect(document.activeElement).toBe(nextActionButton);
+    }
+  );
+
+  test('captures and restores focused row fields after a row render', () => {
     dom = new JSDOM(`
       <!doctype html>
       <html>
         <body>
-          <div class="shared-schema-row" data-row-id="row-1">
-            <button type="button" data-action="drag">Drag</button>
+          <div class="shared-schema-row shared-schema-row-invalid" data-row-id="row-1">
+            <input type="text" data-field="name" value="Name">
+            <div class="shared-schema-row-validation" role="status">invalid row</div>
           </div>
         </body>
       </html>
     `);
     const { document } = dom.window;
 
-    document.querySelector('[data-action="drag"]').focus();
+    document.querySelector('[data-field="name"]').focus();
 
     const state = captureActiveFieldState(document);
     expect(state).toMatchObject({
       rowId: 'row-1',
-      fieldName: null,
-      actionName: 'drag',
+      fieldName: 'name',
+      actionName: null,
     });
 
     document.body.innerHTML = `
-      <div class="shared-schema-row" data-row-id="row-1">
-        <button type="button" data-action="drag">Drag</button>
+      <div class="shared-schema-row shared-schema-row-invalid" data-row-id="row-1">
+        <input type="text" data-field="name" value="Name">
+        <div class="shared-schema-row-validation" role="status">invalid row</div>
       </div>
     `;
-    const nextDragButton = document.querySelector('[data-action="drag"]');
+    const nextNameInput = document.querySelector('[data-field="name"]');
 
     restoreActiveFieldState(document, state);
 
-    expect(document.activeElement).toBe(nextDragButton);
+    expect(document.activeElement).toBe(nextNameInput);
   });
 });

From 9c06fd116047e0d7cb0fed37fc49d64c066b82b1 Mon Sep 17 00:00:00 2001
From: Alan Richardson <alan@compendiumdev.co.uk>
Date: Wed, 1 Jul 2026 00:30:11 +0100
Subject: [PATCH 5/5] Address PR 293 docs and harness feedback

---
 docs-src/blog/2026-06-30-increments-and-helpers.md             | 3 ++-
 .../tests/interaction/support/focused-app-test-data-harness.js | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs-src/blog/2026-06-30-increments-and-helpers.md b/docs-src/blog/2026-06-30-increments-and-helpers.md
index 0579f933..c51746cf 100644
--- a/docs-src/blog/2026-06-30-increments-and-helpers.md
+++ b/docs-src/blog/2026-06-30-increments-and-helpers.md
@@ -1,3 +1,4 @@
+---
 slug: auto-increments-helpers
 authors: [alan]
 tags: [release, feature]
@@ -47,7 +48,7 @@ Generated values:
 
 ```text
 filename001.txt
-filename0006.txt
+filename006.txt
 filename011.txt
 ```
 
diff --git a/packages/core-ui/src/tests/interaction/support/focused-app-test-data-harness.js b/packages/core-ui/src/tests/interaction/support/focused-app-test-data-harness.js
index ca0b82d0..9f1c7c02 100644
--- a/packages/core-ui/src/tests/interaction/support/focused-app-test-data-harness.js
+++ b/packages/core-ui/src/tests/interaction/support/focused-app-test-data-harness.js
@@ -90,6 +90,7 @@ function createFocusedAppTestDataHarness() {
     }
     await user.selectOptions(element, value);
     await user.tab();
+    await waitForFocusToLeave(element);
   }
 
   function reset() {