@arcforgelabs/flow 2026.10.52 → 2026.10.53

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@arcforgelabs/flow",
-  "version": "2026.10.52",
+  "version": "2026.10.53",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@arcforgelabs/flow",
-      "version": "2026.10.52",
+      "version": "2026.10.53",
       "license": "MIT",
       "dependencies": {
         "@clerk/backend": "3.25.0",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arcforgelabs/flow",
-  "version": "2026.10.52",
+  "version": "2026.10.53",
   "description": "Invoicing, bill entry and a financial dashboard for labs, with Seazona and Xero integrations.",
   "license": "MIT",
   "repository": {

package/server/core/captures.js

@@ -3,7 +3,8 @@ import { and, desc, eq, gt, isNotNull, isNull, lt, or, sql } from 'drizzle-orm';
 import { CAPTURE_DECISIONS, captures } from '../db/schema.js';
 import { FlowError, notFound } from './errors.js';
 import { matchJobs, proposeChange, readDate } from './capture-match.js';
-import { listFields, setJobFieldValue } from './custom-fields.js';
+import { listFields, listJobFieldValues, setJobFieldValue } from './custom-fields.js';
+import { JOB_FIELDS } from '../ui/capture-fields.js';
 
 // Shown when the module is off or the keys are missing. Type it still works.
 const READER_OFF = 'reader turned off';
@@ -253,7 +254,7 @@ export async function matchCapture(db, storage, organisationId, id, { jobs, fiel
     state: 'ready',
     problem: null,
     match,
-    ...(replace ? { proposal: proposeChange(read, match, jobs) } : {}),
+    ...(replace ? { proposal: await toCustomFields(db, organisationId, proposeChange(read, match, jobs)) } : {}),
     updatedAt: sql`now()`,
   }).where(and(
     eq(captures.organisationId, organisationId),
@@ -305,14 +306,43 @@ function fieldValue(field, text) {
   }
 }
 
+const jobOf = (jobId) => {
+  const at = jobId.indexOf(':');
+  return { sourceSystem: jobId.slice(0, at), sourceJobRef: jobId.slice(at + 1) };
+};
+
+// A custom field's stored value as the sheet shows it ("from").
+function shownValue(field, value) {
+  if (value == null) return '';
+  if (field.type === 'dropdown') return field.options?.find((option) => option.id === value)?.name ?? '';
+  if (field.type === 'checkbox') return value ? 'Yes' : 'No';
+  return String(value);
+}
+
+// A read field goes to the lab's custom field of the same name ("Shade")
+// when there is one: Flow owns it, so Apply writes it. Any other field stays
+// the work system's; the sheet marks it to change there (maintainer, #357).
+async function toCustomFields(db, organisationId, proposal) {
+  if (proposal.action !== 'update') return proposal;
+  const byName = new Map((await listFields(db, organisationId)).map((field) => [field.name.trim().toLowerCase(), field]));
+  const labels = new Map(JOB_FIELDS.map((field) => [field.key, field.label.toLowerCase()]));
+  const values = proposal.jobId
+    ? new Map((await listJobFieldValues(db, organisationId, { jobs: [jobOf(proposal.jobId)] })).map((row) => [row.fieldId, row.value]))
+    : new Map();
+  const changes = proposal.changes.map((change) => {
+    const field = byName.get(labels.get(change.field));
+    return field ? { ...change, field: `custom_${field.id}`, from: shownValue(field, values.get(field.id)) } : change;
+  }).filter((change) => change.from !== change.to);
+  return { ...proposal, changes };
+}
+
 // Apply writes what Flow owns: the job's custom fields, each with its own
 // event (who, when, from and to). A field the work system owns (due date,
 // shade) stays there; the result sheet links to the job in that system.
 // Every value is checked before the first write, so a bad one writes none.
 async function applyToJob(db, organisationId, proposal, personId) {
   if (proposal?.action !== 'update' || !proposal.jobId) return;
-  const at = proposal.jobId.indexOf(':');
-  const job = { sourceSystem: proposal.jobId.slice(0, at), sourceJobRef: proposal.jobId.slice(at + 1) };
+  const job = jobOf(proposal.jobId);
   const fields = new Map((await listFields(db, organisationId)).map((field) => [`custom_${field.id}`, field]));
   const writes = proposal.changes
     .filter((change) => fields.has(change.field))

package/server/ui/captures.js

@@ -180,8 +180,14 @@ export async function renderCaptures(main, ui) {
       ? `${job.caseRef ? `Job ${job.caseRef}` : job.jobId} · ${job.clientName ?? ''}`
       : proposal.action === 'create' ? 'New job' : 'Pick a job';
 
+    // A field the work system owns: Apply leaves it; the person changes it
+    // there (until a two-way sync can send it, #357).
+    const system = proposal.action === 'update' && proposal.jobId ? proposal.jobId.split(':')[0] : null;
+    const systemName = system ? system[0].toUpperCase() + system.slice(1) : null;
+    const elsewhere = (change) => systemName && !change.field.startsWith('custom_');
     const changeRow = (change) => h('div', { class: 'fx-capture__change', 'data-unsure': change.sure != null && change.sure < SURE_LINE ? 'true' : 'false' },
-      h('span', { class: 'fx-capture__field' }, labels.get(change.field) ?? change.field),
+      h('span', { class: 'fx-capture__field' }, labels.get(change.field) ?? change.field,
+        elsewhere(change) ? h('span', { class: 'fx-capture__where', title: `Change this in ${systemName}` }, systemName) : null),
       h('span', { class: 'fx-capture__from' }, change.from || '–'),
       h('span', { class: 'fx-capture__arrow', 'aria-hidden': 'true' }, '→'),
       h('span', { class: 'fx-capture__to' }, change.to));

package/server/ui/custom-fields.js

@@ -111,7 +111,7 @@ export async function renderCustomFields(main, ui) {
   const { h, flow, toast, notice, dialog, pageHeader, me } = ui;
   const disabled = !['owner', 'admin'].includes(me?.person.role);
   const host = h('div', { class: 'fx-card fx-cfm__card' }, h('div', { class: 'fx-skeleton' }));
-  const addButton = h('button', { class: 'fx-btn fx-btn--primary fx-btn--sm', type: 'button', disabled }, 'Create custom field');
+  const addButton = h('button', { class: 'fx-btn fx-btn--primary fx-btn--sm', type: 'button', disabled, title: 'New custom field' }, lucide(h, 'plus'), 'New');
   main.append(pageHeader('Custom fields', { help: { href: DOCS, label: 'How custom fields work' } }), host);
 
   let data = null;
@@ -309,7 +309,7 @@ export async function renderCustomFields(main, ui) {
   ]);
   const filterButton = h('button', { class: 'fx-chip fx-cfm__tool fx-cfm__tool--dashed', type: 'button' });
   const filterMenu = popMenu(filterButton, (close) => [
-    item(view.archived ? 'check' : null, 'Show archived custom fields', () => { view.archived = !view.archived; close(); draw(); }, { role: 'menuitemcheckbox', checked: view.archived }),
+    item(view.archived ? 'check' : null, 'Archived', () => { view.archived = !view.archived; close(); draw(); }, { role: 'menuitemcheckbox', checked: view.archived }),
   ]);
   const toolbar = h('div', { class: 'fx-cfm__bar' }, search, typeButton, typeMenu, filterButton, filterMenu, h('span', { class: 'fx-cfm__gap' }), addButton);
   const table = h('div', { class: 'fx-cfm', role: 'table', 'aria-label': 'Custom fields' });
@@ -505,15 +505,9 @@ export async function renderCustomFields(main, ui) {
       parts.push(...group('archived', { text: 'Archived', icon: 'archive', color: 'gray' }, fields));
     }
     if (!count && (view.q || view.types.size)) parts.push(h('p', { class: 'fx-cfm__empty' }, 'No custom field matches.'));
-    if (!data.fields.length && !view.q && !view.types.size) {
-      parts.push(h('p', { class: 'fx-cfm__empty' }, 'No custom fields yet. Create one, for example Priority or Technician, to group the Jobs board by it.'));
-    }
+    else if (!count) parts.push(h('p', { class: 'fx-cfm__empty' }, 'No custom fields'));
     table.replaceChildren(...parts);
-    // The count is what the table shows, the work systems' fields too.
-    foot.replaceChildren(h('span', {}, `${count} ${count === 1 ? 'custom field' : 'custom fields'}`));
   }
-  const foot = h('div', { class: 'fx-cfm__foot' });
-  host.append(foot);
 
   async function load() {
     try {

package/server/ui/flow.css

@@ -1093,6 +1093,7 @@ th:hover > .fx-th-grip::after { background: var(--t-brd-hi); }
   min-height: 44px; padding: 4px 8px; border-bottom: 1px solid var(--fx-line-soft);
 }
 .fx-capture__field { color: var(--t-dim); }
+.fx-capture__where { display: block; font-size: 12px; color: var(--t-dim); }
 .fx-capture__from { color: var(--t-dim); text-decoration: line-through; overflow-wrap: anywhere; }
 .fx-capture__arrow { color: var(--t-dim); }
 .fx-capture__to { color: var(--t-strong); font-weight: 600; overflow-wrap: anywhere; }
@@ -1682,7 +1683,6 @@ body[data-state="loading"] .fx-loading { display: grid; justify-items: center; }
 .fx-cfm__create .fx-lucide { width: 14px; height: 14px; }
 .fx-cfm__empty { margin: 0; padding: 20px 16px; color: var(--t-dim); }
 .fx-cfm > .fx-notice { margin: 12px 16px 0; }
-.fx-cfm__foot { display: flex; justify-content: space-between; gap: 12px; padding: 12px 16px; border-top: 1px solid var(--fx-line-soft); color: var(--t-dim); font-size: 13px; }
 .fx-pop__item:disabled { opacity: .5; cursor: default; }
 .fx-pop__item[data-tone="danger"], .fx-pop__item[data-tone="danger"] .fx-pop__tick { color: var(--t-danger); }
 .fx-pop__item .fx-lucide { width: 15px; height: 15px; }
@@ -1759,6 +1759,7 @@ body[data-state="loading"] .fx-loading { display: grid; justify-items: center; }
   .fx-cfm__head, .fx-cfm__row { padding-left: 16px; }
   .fx-cfm__create { padding-left: 16px; }
   .fx-cfm__search { flex: 1 1 100%; width: auto; }
+  .fx-cfm__bar :is(.fx-cfm__search, .fx-cfm__tool, .fx-btn) { height: auto; min-height: 44px; }
   .fx-cfm__edit { display: none !important; }
   /* Custom fields uses the same phone slots as a column list: name and the
      menu on line 1, up to three facts on line 2, 56px. */