@arcforgelabs/flow 2026.11.3 → 2026.11.5

package/server/db/migrations/meta/_journal.json

@@ -190,6 +190,20 @@
       "when": 1794019099844,
       "tag": "0026_bitter_sersi",
       "breakpoints": true
+    },
+    {
+      "idx": 27,
+      "version": "7",
+      "when": 1794454051454,
+      "tag": "0027_high_doctor_strange",
+      "breakpoints": true
+    },
+    {
+      "idx": 28,
+      "version": "7",
+      "when": 1794456064675,
+      "tag": "0028_sharp_power_pack",
+      "breakpoints": true
     }
   ]
 }

package/server/db/schema.js

@@ -715,6 +715,27 @@ export const invoiceRules = pgTable('invoice_rules', {
   check('invoice_rules_icon_valid', sql`${t.icon} is null or (length(${t.icon}) between 1 and 64 and ${t.icon} !~ '[^a-z0-9-]')`),
 ]);
 
+// A person's exception to one invoice rule for one job (docs/INVOICE_RULES.md,
+// "Exceptions"): the rule matched, and a person said this job is fine as it
+// is, with a reason. The rule then leaves that job alone, and its card counts
+// and lists each exception, so none is hidden.
+export const invoiceRuleExceptions = pgTable('invoice_rule_exceptions', {
+  id: id(),
+  organisationId: organisationId().references(() => organisations.id),
+  ruleId: uuid('rule_id').notNull().references(() => invoiceRules.id, { onDelete: 'cascade' }),
+  obligationId: uuid('obligation_id').notNull().references(() => billingObligations.id),
+  reason: text('reason').notNull(),
+  actor: text('actor').notNull(),
+  // What the exception was given for: the rule's item and the job's lines
+  // then. A change to either ends it, so a person looks again.
+  itemCode: text('item_code'),
+  lineFingerprint: text('line_fingerprint'),
+  createdAt: createdAt(),
+}, (t) => [
+  uniqueIndex('invoice_rule_exceptions_rule_job').on(t.ruleId, t.obligationId),
+  check('invoice_rule_exceptions_reason_valid', sql`length(${t.reason}) between 1 and 200`),
+]);
+
 // Automations (server/core/automations.js): Flow's routines, each on or off,
 // with its own settings. The routines are defined in code; a row holds an
 // organisation's choice. No row means the routine's default.

package/server/integrations/seazona/feed.js

@@ -217,9 +217,16 @@ export const WORK_FINISHED_DAYS = 30;
 const WORK_LIMIT = 2000;
 const FINAL_SQL = sql`coalesce(${seazonaOrders.status}, '') ~* '(shipped|delivered|cancelled|canceled|void|closed|archived|deleted)'`;
 
+// A finished order that still has no invoice stays on the board past
+// WORK_FINISHED_DAYS: its job has no Flow invoice and no accounting invoice
+// linked, and the order was not cancelled. It leaves when it is billed.
+const UNBILLED_SQL = sql`(coalesce(${seazonaOrders.status}, '') !~* '(cancelled|canceled|void|deleted)' and exists (
+  select 1 from billing_obligations o where o.source_system = 'seazona' and o.source_job_ref = ${seazonaOrders.id}
+    and o.invoice_id is null and o.accounting_ref is null))`;
+
 // The orders behind the port's listWork, for the Jobs board: every open
-// order, and each final order that changed in the last WORK_FINISHED_DAYS
-// days, newest change first. An order deleted in Seazona is never listed.
+// order, each final order that changed in the last WORK_FINISHED_DAYS
+// days, and each finished order not billed yet, newest change first. An order deleted in Seazona is never listed.
 // The client name is the Seazona client's company (or full name), else the
 // order's own company. `statuses` lists each status once, with the first time
 // Flow saw an order in it, so the board can order its columns.
@@ -228,7 +235,7 @@ export async function listWork(db, { now = Date.now(), finishedDays = WORK_FINIS
   const rows = await db.select({ order: seazonaOrders, company: seazonaClients.company, fullName: seazonaClients.fullName })
     .from(seazonaOrders)
     .leftJoin(seazonaClients, eq(seazonaClients.id, seazonaOrders.clientId))
-    .where(and(isNull(seazonaOrders.deletedInSourceAt), or(sql`not (${FINAL_SQL})`, gte(seazonaOrders.lastChangedAt, since))))
+    .where(and(isNull(seazonaOrders.deletedInSourceAt), or(sql`not (${FINAL_SQL})`, gte(seazonaOrders.lastChangedAt, since), UNBILLED_SQL)))
     .orderBy(desc(seazonaOrders.lastChangedAt), seazonaOrders.id)
     .limit(limit);
   const firstSeen = new Map();

package/server/integrations/xero/drafts.js

@@ -532,7 +532,7 @@ async function pushOne(db, runtime, client, organisationId, invoiceId, { pushedB
     });
     if (recent) {
       throw xeroError('xero_same_reference_different_amount',
-        `Xero ${recent.InvoiceNumber || 'invoice'} has the same client and reference at ${(cents(recent.Total) / 100).toFixed(2)}. Nothing was sent. Void the extra one in Xero or in Flow.`,
+        `Xero ${recent.InvoiceNumber || 'invoice'} has the same client and reference at ${(cents(recent.Total) / 100).toFixed(2)}. Nothing was sent. If that Xero invoice bills this job, press Use Xero invoice.`,
         { status: 409, details: { xero: shownXero(recent) } });
     }
   }

package/server/integrations/xero/index.js

@@ -155,7 +155,7 @@ export function createXeroAdapter({ runtime: given = null } = {}) {
       pullPayments: ({ organisationId, since }) => readPayments(database, current(), organisationId, { since: new Date(since) }),
       // Xero's invoice for one billable job, looked up live (ledger.js): the
       // `liveCheck` for draftInvoiceForObligation.
-      checkInvoice: ({ organisationId, obligation }) => xeroLiveCheck(database, current(), organisationId)(obligation),
+      checkInvoice: ({ organisationId, obligation, reference = null }) => xeroLiveCheck(database, current(), organisationId)(obligation, { reference }),
       // Xero's latest changes into the copy just before Flow drafts by rule or
       // sends (webhooks.js); no call when the copy is current.
       readChanges: ({ organisationId }) => readChangesFirst(database, current(), organisationId),

package/server/integrations/xero/ledger.js

@@ -81,7 +81,7 @@ async function several(runtime, client, found, checkedAt) {
 
 // The Xero invoice for one obligation (a row of billing_obligations), looked
 // up live. Costs 1 to 4 Xero calls.
-export async function checkInvoice(db, runtime, client, organisationId, obligation) {
+export async function checkInvoice(db, runtime, client, organisationId, obligation, { reference: draftReference = null } = {}) {
   const checkedAt = new Date(runtime.now()).toISOString();
 
   // 1. The Xero invoice Flow made from the job's Flow invoice.
@@ -132,8 +132,8 @@ export async function checkInvoice(db, runtime, client, organisationId, obligati
 
   // 4. The reference Flow would give the job's invoice, for the same
   // customer. Not exact: it refuses a draft and goes to a person.
-  const reference = obligation.caseRef ?? obligation.sourceJobRef;
-  if (reference) {
+  const references = [...new Set([obligation.caseRef ?? obligation.sourceJobRef, draftReference].filter(Boolean))];
+  if (references.length) {
     let customer = null;
     if (obligation.contactId) {
       const [contact] = await db.select({ name: flowContacts.name }).from(flowContacts)
@@ -147,8 +147,13 @@ export async function checkInvoice(db, runtime, client, organisationId, obligati
       }
     }
     // Another customer's invoice with the same reference is not this job's.
-    const found = sales(await client.findInvoicesByReference(reference))
-      .filter((inv) => !customer || inv.Contact?.ContactID === customer);
+    const byId = new Map();
+    for (const reference of references) {
+      for (const inv of sales(await client.findInvoicesByReference(reference))) {
+        if (!customer || inv.Contact?.ContactID === customer) byId.set(inv.InvoiceID, inv);
+      }
+    }
+    const found = [...byId.values()];
     if (found.length === 1) return evidenceFor(runtime, client, found[0], 'reference', checkedAt);
     if (found.length > 1) return several(runtime, client, found, checkedAt);
   }
@@ -159,9 +164,9 @@ export async function checkInvoice(db, runtime, client, organisationId, obligati
 //   draftInvoiceForObligation(db, org, id, { liveCheck: xeroLiveCheck(db, runtime, org), actor })
 // A Xero error throws, and the ledger then refuses the draft.
 export function xeroLiveCheck(db, runtime, organisationId) {
-  return (obligation) => withXeroLane('reads', async () => {
+  return (obligation, options = {}) => withXeroLane('reads', async () => {
     const { client } = await runtime.clientFor(db, organisationId);
-    return checkInvoice(db, runtime, client, organisationId, obligation);
+    return checkInvoice(db, runtime, client, organisationId, obligation, options);
   });
 }
 

package/server/integrations/xero/links.js

@@ -1,5 +1,5 @@
 import { and, eq, sql } from 'drizzle-orm';
-import { contacts, priceItems } from '../../db/schema.js';
+import { billingObligations, contacts, invoices, obligationEvents, priceItems } from '../../db/schema.js';
 import { createContact } from '../../core/directory.js';
 import { FlowError } from '../../core/errors.js';
 import { createDraftInvoice, issueInvoice } from '../../core/invoices.js';
@@ -234,6 +234,44 @@ export async function linkXeroInvoice(db, organisationId, xeroInvoiceId, { invoi
   return { xeroInvoiceId, invoiceId };
 }
 
+// "Use the Xero invoice": Send stopped a Flow invoice because Xero already
+// bills the same client and reference at another amount. The Xero invoice is
+// the real bill. In one step Flow voids its own copy (never sent to Xero),
+// makes its Flow invoice from the Xero one, and gives that to the job. A copy
+// a person voided earlier, whose job still points at it, is cleaned up the
+// same way. The
+// Flow copy's job is the job; an invoice billing more than one job is linked
+// by hand. The Xero invoice must be the same client's.
+export async function useXeroInvoice(db, organisationId, invoiceId, { xeroInvoiceId, actor }) {
+  if (!actor) throw new FlowError('invalid', 'actor is required');
+  const row = await rowFor(db, organisationId, xeroInvoiceId);
+  return db.transaction(async (tx) => {
+    const { rows: [invoice] } = await tx.execute(sql`select id, number, status, contact_id from invoices
+      where organisation_id = ${organisationId} and id = ${invoiceId} for update`);
+    if (!invoice) throw new FlowError('not_found', 'Flow invoice not found');
+    // A copy voided earlier, still holding its job, gives way the same way.
+    if (!['issued', 'void'].includes(invoice.status)) throw new FlowError('invalid', 'only an approved or void Flow invoice can give way to a Xero invoice');
+    if (row.contactId !== invoice.contact_id) throw new FlowError('invalid', 'the Xero invoice is for another client');
+    const { rows: pushed } = await tx.execute(sql`select 1 from xero_invoice_pushes where organisation_id = ${organisationId} and invoice_id = ${invoiceId} and xero_invoice_id is not null limit 1`);
+    if (pushed.length) throw new FlowError('invalid', 'Flow sent that invoice to Xero already');
+    const jobs = await tx.select({ id: billingObligations.id }).from(billingObligations)
+      .where(and(eq(billingObligations.organisationId, organisationId), eq(billingObligations.invoiceId, invoiceId)))
+      .for('update');
+    if (jobs.length > 1) throw new FlowError('invalid', 'the Flow invoice bills more than one job; link each by hand');
+    if (invoice.status === 'issued') await tx.update(invoices).set({ status: 'void', updatedAt: sql`now()` }).where(eq(invoices.id, invoiceId));
+    else if (!jobs.length) throw new FlowError('invalid', 'the void Flow invoice holds no job');
+    for (const job of jobs) {
+      await tx.update(billingObligations).set({ invoiceId: null, draftBasis: null, updatedAt: sql`now()` }).where(eq(billingObligations.id, job.id));
+      await tx.insert(obligationEvents).values({
+        createdAt: sql`clock_timestamp()`, organisationId, obligationId: job.id, kind: 'draft_deleted', actor,
+        evidence: { invoiceId, reason: 'used_xero_invoice', xeroInvoiceId, xeroNumber: row.number ?? null },
+      });
+    }
+    const made = await makeFrom(tx, organisationId, row, { jobId: jobs[0]?.id ?? null, actor });
+    return { voided: { id: invoiceId, number: invoice.number }, invoice: { id: made.invoice.id, number: made.invoice.number }, xeroInvoiceId, jobId: jobs[0]?.id ?? null };
+  });
+}
+
 // Makes Flow's own invoice from a Xero invoice in the copy, finalised on the
 // Xero invoice's date, and links the two. With `jobId`, the job gets it as its
 // invoice. The client is Flow's customer of the same name, or a new one.

package/server/integrations/xero/lookup.js

@@ -90,6 +90,7 @@ function invoiceRow(r) {
     id: r.xero_invoice_id,
     number: r.invoice_number,
     contactId: r.xero_contact_id,
+    reference: r.reference ?? null,
     status: r.status,
     // The ledger's accounting state for this invoice.
     state: ledgerState({ Status: r.status, AmountPaid: Number(r.amount_paid_cents ?? 0), AmountCredited: Number(r.amount_credited_cents ?? 0) }),
@@ -109,10 +110,11 @@ function invoiceRow(r) {
 // Flow invoices Flow sent, or one customer within a date range. Answers the
 // mirror's state with them, and the latest change time it holds.
 export async function findInvoices(db, organisationId, query = {}) {
-  const { invoiceIds = [], numbers = [], flowInvoiceIds = [], contactId = null, from = null, to = null } = query;
+  const { invoiceIds = [], numbers = [], references = [], flowInvoiceIds = [], contactId = null, from = null, to = null } = query;
   const where = [];
   if (invoiceIds.length) where.push(sql`i.xero_invoice_id = any(${ids(invoiceIds)}::text[])`);
   if (numbers.length) where.push(sql`upper(i.invoice_number) = any(${sql.param([...new Set(numbers.map((n) => String(n).toUpperCase()))])}::text[])`);
+  if (references.length) where.push(sql`upper(i.reference) = any(${sql.param([...new Set(references.map((r) => String(r).toUpperCase()))])}::text[])`);
   if (flowInvoiceIds.length) where.push(sql`p.invoice_id = any(${ids(flowInvoiceIds)}::uuid[])`);
   if (contactId) {
     where.push(sql`(i.xero_contact_id = ${contactId}

package/server/integrations/xero/routes.js

@@ -8,7 +8,7 @@ import { createCustomer, linkCustomer, matchCustomer } from './create-contact.js
 import { createXeroClient } from './client.js';
 import { describePush, listPushes, MAX_BATCH, previewDrafts, pushDrafts } from './drafts.js';
 import { recordXeroEvidence, recordXeroPayments } from './ledger.js';
-import { IMPORT_STATES, importOverview, linkXeroInvoice, makeFlowInvoice, matchXero, saveImportSettings } from './links.js';
+import { IMPORT_STATES, importOverview, linkXeroInvoice, makeFlowInvoice, matchXero, saveImportSettings, useXeroInvoice } from './links.js';
 import { queueHistoryImport, resetImport } from './import.js';
 import { MIRROR_RESOURCES, mirrorStatus, mirrorXero } from './mirror.js';
 import { accountingStatus, checkSentInvoices } from './reconcile.js';
@@ -43,6 +43,10 @@ import { messagePage as themedMessagePage } from '../../ui/page.js';
 //                                  status and any difference, from the copy
 //   POST /invoices/:invoiceId/recheck   owner or admin: reads Xero's changes,
 //                                  then checks that one invoice again (Mark resolved)
+//   POST /invoices/:invoiceId/use-xero  owner or admin: { xeroInvoiceId } Send
+//                                  stopped this invoice for a Xero invoice of the
+//                                  same client and reference: void the Flow copy
+//                                  and give its job the Xero invoice (links.js)
 //   POST /obligations/:obligationId/check   owner or admin: Xero's invoice for
 //                                  a billable job, recorded on the ledger
 //   POST /payments/sync            owner or admin: Xero payments to the ledger
@@ -65,6 +69,7 @@ import { messagePage as themedMessagePage } from '../../ui/page.js';
 export const XERO_ACTIONS = Object.freeze({
   sync: { cooldownMs: 5 * 60_000 },
   recheck: { cooldownMs: 30_000 },
+  useXero: { cooldownMs: 10_000 },
   push: { cooldownMs: 0, budget: false },
   createContact: { cooldownMs: 30_000 },
   obligationCheck: { cooldownMs: 30_000 },
@@ -355,6 +360,18 @@ export function createXeroRouter({ db, personAuth, runtime, log = console, butto
     res.json({ ok: true, resolved: !status?.finding, closed: result.closed, status });
   }));
 
+  router.post('/invoices/:invoiceId/use-xero', ...manager, act('useXero', (req) => req.params.invoiceId), handle(log, async (req, res) => {
+    const organisationId = await requireOrganisation(db, req.body?.organisationId);
+    const [invoiceId] = requireInvoiceIds([req.params.invoiceId], 'invoiceId');
+    const xeroInvoiceId = typeof req.body?.xeroInvoiceId === 'string' && UUID.test(req.body.xeroInvoiceId) ? req.body.xeroInvoiceId : null;
+    if (!xeroInvoiceId) throw new FlowError('invalid', 'xeroInvoiceId must name a Xero invoice');
+    // The Xero invoice may be newer than Flow's copy: read Xero's changes first.
+    await mirrorXero(db, runtime, organisationId, { resources: ['invoices'] });
+    const result = await useXeroInvoice(db, organisationId, invoiceId, { xeroInvoiceId, actor: `person:${req.person.id}` });
+    log.info?.(`[xero] organisation ${organisationId}: person ${req.person.id} used Xero invoice ${xeroInvoiceId} for Flow invoice ${invoiceId}`);
+    res.json({ ok: true, ...result });
+  }));
+
   router.post('/invoices/push', ...manager, act('push'), handle(log, async (req, res) => {
     const organisationId = await requireOrganisation(db, req.body?.organisationId);
     const invoiceIds = requireInvoiceIds(req.body?.invoiceIds);

package/server/ui/app.js

@@ -28,7 +28,7 @@ import { isSearchKey, openSearch } from '/assets/ui/search.js';
 import { alertStrip } from '/assets/ui/alerts.js';
 import { initialsOf, personLabel } from '/assets/ui/person.js';
 import { startTips } from '/assets/ui/tip.js';
-import { cardRows, crumbs, dialog, edgeFade, fieldError, h, holdButton, iconPicker, linksOpenWith, listFrame, listHead, notice, pageHeader, pickOne, rowMenu, sectionTitle, settingRow, tileCard, tileSection, toast } from '/assets/ui/kit.js';
+import { cardRows, copyButton, crumbs, dialog, edgeFade, fieldError, h, holdButton, iconPicker, linksOpenWith, listFrame, listHead, notice, pageHeader, pickOne, rowMenu, sectionTitle, settingRow, tileCard, tileSection, toast } from '/assets/ui/kit.js';
 import { NAV_DEFAULT, NAV_LOCKED } from '/assets/ui/nav-pins.js';
 
 const $ = (id) => document.getElementById(id);
@@ -339,7 +339,7 @@ function navigate(event) {
 // The shared pieces a view module (invoicing.js) builds with. Its `go`
 // takes a path, or a link's click event.
 const ui = () => ({
-  h, flow, toast, notice, cardRows, fieldError, pageHeader, listHead, listFrame, edgeFade, sectionTitle, settingRow, dialog, pickOne, iconPicker, me, holdButton, tileCard, tileSection, crumbs,
+  h, flow, toast, notice, cardRows, copyButton, fieldError, pageHeader, listHead, listFrame, edgeFade, sectionTitle, settingRow, dialog, pickOne, iconPicker, me, holdButton, tileCard, tileSection, crumbs,
   go: (target, options) => (typeof target === 'string' ? go(target, options) : navigate(target)),
 });
 

package/server/ui/flow.css

@@ -237,6 +237,8 @@ body:is([data-state="off"], [data-state="error"], [data-state="no-access"]) .fx-
 .fx-change__head { display: flex; flex-wrap: wrap; align-items: center; justify-content: space-between; gap: 10px 16px; }
 .fx-change__acts { display: flex; flex-wrap: wrap; gap: 8px; }
 .fx-change__note { font-size: 13px; color: var(--t-dim); }
+.fx-copy__text { width: 100%; min-height: 200px; padding: 8px 10px; font-family: ui-monospace, monospace; font-size: 12px; resize: vertical; }
+@media (max-width: 1023px) { .fx-copy { width: 44px; min-height: 44px; } }
 .fx-change__recheck { width: 30px; }
 .fx-change__recheck .fx-lucide { width: 14px; height: 14px; }
 .fx-change__recheck.is-busy .fx-lucide { animation: fx-spin 1s linear infinite; }
@@ -359,71 +361,44 @@ a.fx-link:hover, a.fx-link:focus-visible { border-color: var(--t-strong); }
   background: #fff; box-shadow: inset 0 0 0 1px var(--fx-line);
 }
 .fx-logo--icon { background: var(--t-accent-bg); color: var(--t-accent); box-shadow: none; }
-/* Home: the invoices ready to send and one Send, then the way an invoice
-   goes after Send, drawn as one line of steps (a column on a phone). */
-.fx-home { display: grid; gap: 20px; max-width: 880px; }
-.fx-home__send {
-  position: relative; overflow: hidden;
-  display: grid; justify-items: start; gap: 6px; padding: 32px;
-  border: 1px solid var(--fx-line); border-radius: var(--t-radius-lg);
-  background:
-    radial-gradient(120% 140% at 100% 0%, color-mix(in srgb, var(--t-primary) 10%, transparent), transparent 60%),
-    var(--t-paper);
-}
-.fx-home__send[data-done] {
-  grid-template-columns: auto 1fr; align-items: center; column-gap: 16px;
-  background:
-    radial-gradient(120% 140% at 100% 0%, color-mix(in srgb, var(--t-success) 12%, transparent), transparent 60%),
-    var(--t-paper);
-}
-.fx-home__send[data-done] > :not(.fx-home__done) { grid-column: 2; }
-.fx-home__done {
-  grid-row: span 2; display: grid; place-items: center; width: 52px; height: 52px; border-radius: 50%;
-  background: var(--t-success-bg); color: var(--t-success);
-}
-.fx-home__done .fx-lucide { width: 26px; height: 26px; }
-.fx-home__count {
-  display: flex; align-items: baseline; flex-wrap: wrap; gap: 4px 12px;
-  color: var(--t-strong); font: 700 72px/1 var(--t-body); font-variant-numeric: tabular-nums; letter-spacing: -0.02em;
-}
-.fx-home__count span { font: 600 20px/1.2 var(--t-body); letter-spacing: 0; color: var(--t-text); }
-.fx-home__send[data-done] .fx-home__count span { font-size: 22px; color: var(--t-strong); }
-.fx-home__sum { color: var(--t-dim); font-size: 16px; font-variant-numeric: tabular-nums; }
-.fx-home__btn { min-height: 56px; min-width: 200px; margin-top: 14px; padding: 0 32px; font-size: 17px; border-radius: 999px; }
-.fx-home__btn .fx-lucide { width: 20px; height: 20px; }
-.fx-home__note { color: var(--t-dim); font-size: 13.5px; }
-
-/* Needs you: at most three rows beside Send; each opens its page. */
-.fx-home__needs { display: grid; align-content: start; gap: 10px; }
-.fx-home__needs h2 { margin: 0; }
-.fx-home__needs ul { display: grid; gap: 8px; margin: 0; padding: 0; list-style: none; }
-.fx-home__needs a {
-  display: grid; grid-template-columns: auto 1fr auto; align-items: center; gap: 12px;
-  min-height: 64px; padding: 10px 16px; border: 1px solid var(--fx-line); border-radius: var(--t-radius-lg);
-  background: var(--t-paper); color: var(--t-text); text-decoration: none;
-  transition: border-color 140ms var(--fx-ease), transform 140ms var(--fx-ease);
-}
-.fx-home__needs a:hover, .fx-home__needs a:focus-visible { border-color: var(--t-control); transform: translateY(-1px); }
-.fx-home__dot { display: grid; place-items: center; width: 36px; height: 36px; border-radius: 50%; background: var(--fx-hover); color: var(--t-dim); }
-.fx-home__dot .fx-lucide { width: 18px; height: 18px; }
-.fx-home__needs [data-tone="danger"] .fx-home__dot { background: var(--t-danger-bg); color: var(--t-danger); }
-.fx-home__needs [data-tone="warn"] .fx-home__dot { background: var(--t-warn-bg); color: var(--t-warn); }
-.fx-home__needs [data-tone="info"] .fx-home__dot { background: var(--t-accent-bg); color: var(--t-accent); }
-.fx-home__needs [data-tone="clear"] .fx-home__dot { background: var(--t-success-bg); color: var(--t-success); }
-.fx-home__what { display: grid; font-weight: 600; color: var(--t-strong); }
-.fx-home__what small { color: var(--t-dim); font-weight: 400; font-size: 13px; font-variant-numeric: tabular-nums; }
-.fx-home__needs [data-tone="clear"] .fx-home__what { color: var(--t-dim); font-weight: 500; }
-.fx-home__n { color: var(--t-strong); font: 700 22px/1 var(--t-body); font-variant-numeric: tabular-nums; }
-.fx-home__needs [data-tone="clear"] .fx-home__n { color: var(--t-dim); font-weight: 500; }
+/* Home: a row of stat cards (label, number, total). A card with work has a
+   thin edge in its tone; a card at 0 is plain. The link covers the card;
+   Send sits above it. Four across on a desk, two on a tablet, rows on a phone. */
+.fx-home { display: grid; gap: 16px; max-width: 1040px; }
+.fx-stats { display: grid; gap: 12px; grid-template-columns: repeat(4, minmax(0, 1fr)); max-width: 1040px; }
+.fx-stat {
+  position: relative; display: grid; align-content: start; gap: 12px; padding: 18px 20px;
+  border: 1px solid var(--fx-line); border-radius: var(--t-radius-lg); background: var(--t-paper);
+  box-shadow: inset 3px 0 0 var(--fx-stat-edge, transparent); transition: border-color .15s;
+}
+.fx-stat:hover, .fx-stat:focus-within { border-color: var(--t-control); }
+.fx-stat[data-tone="accent"] { --fx-stat-edge: var(--t-accent); }
+.fx-stat[data-tone="danger"] { --fx-stat-edge: var(--t-danger); }
+.fx-stat[data-tone="warn"] { --fx-stat-edge: var(--t-warn); }
+.fx-stat[data-tone="info"] { --fx-stat-edge: var(--t-accent); }
+.fx-stat__link { display: grid; gap: 6px; color: inherit; text-decoration: none; }
+.fx-stat__link::after { content: ''; position: absolute; inset: 0; border-radius: inherit; }
+.fx-stat__link:focus-visible { outline: none; }
+.fx-stat:has(.fx-stat__link:focus-visible) { outline: 2px solid var(--t-accent); outline-offset: 2px; }
+.fx-stat__n { color: var(--t-strong); font: 600 34px/1.1 var(--t-body); font-variant-numeric: tabular-nums; }
+.fx-stat[data-tone="none"] .fx-stat__n { color: var(--t-dim); font-weight: 500; }
+.fx-stat__sum { min-height: 1.3em; color: var(--t-dim); font-size: 14px; font-variant-numeric: tabular-nums; }
+.fx-stat__act { position: relative; z-index: 1; display: grid; gap: 6px; justify-items: start; }
+.fx-stat__note { color: var(--t-dim); font-size: 13px; }
 
-@media (min-width: 1024px) {
-  .fx-home { grid-template-columns: minmax(0, 3fr) minmax(260px, 2fr); align-items: stretch; max-width: 1040px; }
-  .fx-home__send { align-content: center; }
+@media (max-width: 1023px) {
+  .fx-stats { grid-template-columns: repeat(2, minmax(0, 1fr)); }
+  .fx-stat__act .fx-btn { min-height: 44px; }
 }
 @media (max-width: 639px) {
-  .fx-home__send { padding: 24px 20px; }
-  .fx-home__count { font-size: 60px; }
-  .fx-home__btn { width: 100%; }
+  .fx-stats { grid-template-columns: 1fr; gap: 8px; }
+  .fx-stat { grid-template-columns: 1fr auto; align-items: center; padding: 12px 16px; }
+  .fx-stat__link { grid-template-columns: 1fr auto; grid-column: 1 / -1; align-items: center; min-height: 44px; }
+  .fx-stat__link .fx-label { grid-row: 1; }
+  .fx-stat__sum { grid-row: 2; grid-column: 1; min-height: 0; }
+  .fx-stat__sum:empty { display: none; }
+  .fx-stat__n { grid-row: 1 / span 2; grid-column: 2; font-size: 26px; }
+  .fx-stat__act { grid-column: 1 / -1; justify-items: stretch; }
 }
 
 .fx-tiles { display: grid; gap: 12px; }
@@ -1021,6 +996,7 @@ th:hover > .fx-th-grip::after { background: var(--t-brd-hi); }
    follows the pointer, the lane that takes it, and the "Waiting for
    Seazona" chip of a stage move the work system has not made yet. */
 .fx-job__wait { justify-self: start; margin-top: 8px; padding: 1px 8px; border: 1px dashed var(--t-accent); border-radius: 999px; color: var(--t-accent); font-size: 11.5px; font-weight: 600; }
+.fx-job__wait--warn { border-color: var(--t-warn-brd); background: var(--t-warn-bg); color: var(--t-warn); }
 .fx-job--lifted { opacity: .35; }
 .fx-job--ghost { position: fixed; top: 0; left: 0; z-index: 60; pointer-events: none; box-shadow: var(--t-shadow-lg, var(--t-shadow)); cursor: grabbing; }
 .fx-board--dragging, .fx-board--dragging .fx-job { cursor: grabbing; user-select: none; }

package/server/ui/home.js

@@ -1,9 +1,9 @@
-// Home: the page a person lands on. One job first: send the invoices that
-// are ready. The big number is the Ready tab's count, and Send sends them
-// all with the same step as the Invoices page (POST /invoices/send-ready).
-// Beside it, at most three things that need a person most days: invoices
-// that need a look, jobs and invoices to match (Reconcile), and form photos
-// to check (Capture). Each opens its page. No calls of its own to other
+// Home: the page a person lands on, a row of stat cards like an accounting
+// dashboard. Ready (with Send), Pending, To match and Forms each show their
+// count, and a total when it has one. A card with work has a thin edge in its
+// tone; a card at 0 is plain. No card says "done": the counts say it. Each card
+// opens its page. Send sends every ready invoice with the same step as the
+// Invoices page (POST /invoices/send-ready). No calls of its own to other
 // systems: every number is its page's own.
 import { formatCents, localDate } from '/assets/ui/invoicing.js';
 import { sendModeNote } from '/assets/ui/invoice-notes.js';
@@ -11,17 +11,10 @@ import { lucide } from '/assets/ui/custom-fields.js';
 
 const plural = (n, one, many) => `${n} ${n === 1 ? one : many}`;
 
-function greeting(person, now = new Date()) {
-  const hour = now.getHours();
-  const part = hour < 12 ? 'Good morning' : hour < 18 ? 'Good afternoon' : 'Good evening';
-  const first = String(person?.name ?? '').trim().split(/\s+/)[0];
-  return first ? `${part}, ${first}` : part;
-}
-
 export async function renderHome(main, ui) {
-  const { h, flow, toast, notice, pageHeader, dialog, go, me } = ui;
+  const { h, flow, toast, notice, pageHeader, dialog, go } = ui;
   const host = h('div', { class: 'fx-home' });
-  main.append(pageHeader(greeting(me?.person)), host);
+  main.append(pageHeader('Home'), host);
   const tabQuery = (tab) => `/api/invoicing/invoices?${new URLSearchParams({ status: tab, limit: '1' })}`;
 
   async function load() {
@@ -45,45 +38,43 @@ export async function renderHome(main, ui) {
     }
     if (!host.isConnected) return;
     draw(context, body, [
-      { href: '/invoices?tab=pending', icon: 'circle-alert', label: 'Need a look', tone: 'danger', count: pending.total, sum: pending.totalCents },
-      toMatch && { href: '/reconcile', icon: 'link', label: 'To match', tone: 'warn', count: (toMatch.jobs?.length ?? 0) + (toMatch.invoices?.length ?? 0) },
-      forms && { href: '/captures', icon: 'camera', label: 'Forms to check', tone: 'info', count: forms.captures.filter((c) => c.state === 'ready').length },
+      { key: 'pending', href: '/invoices?tab=pending', label: 'Pending', tone: 'danger', count: pending.total, sum: pending.totalCents },
+      { key: 'match', href: '/reconcile', label: 'Unmatched', tone: 'warn', count: toMatch ? (toMatch.jobs?.length ?? 0) + (toMatch.invoices?.length ?? 0) : null },
+      forms && { key: 'forms', href: '/captures', label: 'Forms', tone: 'info', count: forms.captures.filter((c) => c.state === 'ready').length },
     ].filter(Boolean));
   }
 
+  // One stat card. The link covers the card; Send sits above it, so the card
+  // has no button inside a link. `count: null`: the page could not be read.
+  function card({ key, href, label, tone, count, sum = null }, extra = null) {
+    const unknown = count == null;
+    return h('article', { class: 'fx-stat', 'data-tone': count ? tone : 'none', 'aria-labelledby': `home-${key}` },
+      h('a', {
+        class: 'fx-stat__link', href, onclick: open, id: `home-${key}`, title: unknown ? 'Could not load' : null,
+        'aria-label': [label, unknown ? 'could not load' : String(count), count && sum != null ? formatCents(sum) : null].filter(Boolean).join(', '),
+      },
+        h('span', { class: 'fx-label' }, label),
+        h('span', { class: 'fx-stat__n' }, unknown ? '–' : String(count)),
+        h('span', { class: 'fx-stat__sum' }, count && sum != null ? formatCents(sum) : '')),
+      extra);
+  }
+
   function draw(context, body, items) {
     const to = body.sendsTo;
-    const counts = body.counts ?? {};
-    const ready = counts.ready ?? 0;
+    const ready = body.counts?.ready ?? 0;
     const blocked = to && body.sendMode && (!body.sendMode.connected || !body.sendMode.writesAllowed);
     const canSend = context.canIssue && !blocked;
-
-    const hero = ready
-      ? h('section', { class: 'fx-home__send', 'aria-labelledby': 'home-ready' },
-        h('p', { class: 'fx-home__count', id: 'home-ready' }, String(ready),
-          h('span', {}, ready === 1 ? 'invoice ready' : 'invoices ready')),
-        h('p', { class: 'fx-home__sum' }, formatCents(body.totalCents)),
-        h('button', {
-          class: 'fx-btn fx-btn--primary fx-home__btn', type: 'button', disabled: !canSend,
-          onclick: (event) => send(to, ready, body.sendMode, event.currentTarget),
-        }, lucide(h, 'send'), h('span', {}, 'Send')),
-        context.canIssue ? null : h('p', { class: 'fx-home__note' }, 'An owner or admin sends.'),
-        blocked ? h('p', { class: 'fx-home__note' }, sendModeNote(to, body.sendMode)) : null)
-      : h('section', { class: 'fx-home__send', 'data-done': '', 'aria-labelledby': 'home-ready' },
-        h('span', { class: 'fx-home__done', 'aria-hidden': 'true' }, lucide(h, 'check')),
-        h('p', { class: 'fx-home__count', id: 'home-ready' }, h('span', {}, 'All caught up')),
-        h('p', { class: 'fx-home__sum' }, 'Nothing waits to be sent.'));
-
-    const needs = h('section', { class: 'fx-home__needs', 'aria-labelledby': 'home-needs' },
-      h('h2', { class: 'fx-label', id: 'home-needs' }, 'Needs you'),
-      h('ul', {}, items.map((item) => h('li', {},
-        h('a', { href: item.href, onclick: open, 'data-tone': item.count ? item.tone : 'clear' },
-          h('span', { class: 'fx-home__dot', 'aria-hidden': 'true' }, lucide(h, item.count ? item.icon : 'check')),
-          h('span', { class: 'fx-home__what' }, item.label,
-            item.count && item.sum ? h('small', {}, formatCents(item.sum)) : null),
-          h('span', { class: 'fx-home__n' }, String(item.count)))))));
-
-    host.replaceChildren(hero, needs);
+    // Send shows only to people who can send, and only while it can work.
+    const sendButton = ready && canSend ? h('div', { class: 'fx-stat__act' }, h('button', {
+      class: 'fx-btn fx-btn--primary', type: 'button',
+      onclick: (event) => send(to, ready, body.sendMode, event.currentTarget),
+    }, lucide(h, 'send'), h('span', {}, 'Send'))) : null;
+    host.replaceChildren(...[
+      // A broken accounting connection shows at any count, not only with Ready.
+      blocked ? notice(sendModeNote(to, body.sendMode), 'warn') : null,
+      h('section', { class: 'fx-stats', 'aria-label': 'Invoices and jobs' },
+        card({ key: 'ready', href: '/invoices?tab=ready', label: 'Ready', tone: 'accent', count: ready, sum: body.totalCents }, sendButton),
+        items.map((item) => card(item)))].filter(Boolean));
   }
 
   function open(event) {

package/server/ui/invoice-rules.js

@@ -41,7 +41,8 @@ export function ruleSummary(rule, meta) {
     return `${field.label} ${test} ${value}`;
   };
   const then = rule.action.kind === 'pending' ? `Pending: ${rule.action.note}` : ACTION_LABELS[rule.action.kind] ?? rule.action.kind;
-  return `${rule.conditions.map(part).join(' and ')} · ${then}`;
+  const excepted = rule.exceptions ? ` · ${rule.exceptions} ${rule.exceptions === 1 ? 'exception' : 'exceptions'}` : '';
+  return `${rule.conditions.map(part).join(' and ')} · ${then}${excepted}`;
 }
 
 export function rulesSection(ui, title = 'Rules') {
@@ -169,7 +170,13 @@ export function rulesSection(ui, title = 'Rules') {
       placeholder: 'Type a note',
     });
     const noteField = h('div', { class: 'fx-field' }, h('span', { class: 'fx-label' }, 'Note on the draft'), note);
-    const showNote = () => { noteField.hidden = action.value !== 'pending'; };
+    // Optional: a price list code the draft offers to add in one press.
+    const addItem = h('input', {
+      class: 'fx-input', maxlength: '40', value: draft?.action.addItem ?? '', 'aria-label': 'Item to add',
+      placeholder: 'Price list code',
+    });
+    const addField = h('div', { class: 'fx-field' }, h('span', { class: 'fx-label' }, 'Offer to add'), addItem);
+    const showNote = () => { noteField.hidden = action.value !== 'pending'; addField.hidden = action.value !== 'pending'; };
     action.addEventListener('change', showNote);
     showNote();
     let editors = [];
@@ -218,6 +225,7 @@ export function rulesSection(ui, title = 'Rules') {
         label('If all of these match', list, more),
         label('Then', action),
         noteField,
+        addField,
         remove),
       confirm: rule ? 'Save' : 'Add rule',
     });
@@ -231,7 +239,7 @@ export function rulesSection(ui, title = 'Rules') {
       name: name.value,
       icon: icon.value(),
       conditions: editors.map((e) => e.read()),
-      action: action.value === 'pending' ? { kind: 'pending', note: note.value } : { kind: action.value },
+      action: action.value === 'pending' ? { kind: 'pending', note: note.value, ...(addItem.value.trim() ? { addItem: addItem.value.trim() } : {}) } : { kind: action.value },
     };
     const body = rule
       ? await send(`/api/invoicing/rules/${rule.id}`, 'PUT', payload)