@arcforgelabs/flow 2026.11.1 → 2026.11.2

package/npm-shrinkwrap.json

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

package/package.json

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

package/server/api/invoicing.js

@@ -313,7 +313,7 @@ async function jobChangeDetail(db, organisationId, invoiceId, work) {
   const link = typeof source?.capabilities.jobLink === 'function'
     ? source.capabilities.jobLink({ sourceJobRef: change.sourceJobRef, sourceInvoiceRef: change.sourceInvoiceRef })
     : null;
-  return { ...change, contact, systemName: source?.name ?? change.sourceSystem, link: link ?? null };
+  return { ...change, contact, systemName: source?.name ?? change.sourceSystem, link: link ?? null, canRecheck: typeof source?.capabilities?.readWorkItem === 'function' };
 }
 
 // Each invoice's tab (TABS): Map(id -> tab), the ids on each tab, the
@@ -783,18 +783,35 @@ export function createInvoicingRouter({
     const source = work().find((a) => a.id === obligation.sourceSystem) ?? null;
     if (typeof source?.capabilities?.readWorkItem !== 'function') throw new FlowError('not_ready', 'the work system cannot read one job');
     // One read for each job in RECHECK_GAP_MS, whatever the clicks.
-    const last = rechecked.get(obligationId) ?? 0;
+    const last = rechecked.get(obligationId);
+    const retryAfter = (entry) => Math.max(1, Math.ceil((RECHECK_GAP_MS - (Date.now() - entry.at)) / 1000));
     let outcome = 'fresh';
-    if (Date.now() - last >= RECHECK_GAP_MS) {
-      rechecked.set(obligationId, Date.now());
-      const actor = `person:${req.person.id}`;
-      const read = (await readBeforeAct(db, organisationId, [obligation], { work: source, actor, force: true })).get(obligationId);
-      outcome = 'read';
-      if (read.outcome === 'waiting') throw new FlowError('not_ready', `${source.name} could not be read: ${read.reason ?? 'try again soon'}`);
-      await settleJobChange(db, organisationId, obligationId, { actor });
+    if (last && (last.state === 'reading' || Date.now() - last.at < RECHECK_GAP_MS)) {
+      if (last.state !== 'read') {
+        const retryAfterSeconds = retryAfter(last);
+        throw new FlowError('not_ready', last.state === 'reading'
+          ? 'No new source read. The previous recheck is still running. Wait, then recheck again.'
+          : 'No new source read. Wait ' + retryAfterSeconds + ' seconds, then recheck again. Previous error: ' + last.error,
+        { outcome: last.state === 'reading' ? 'read_in_progress' : 'cached_failed', retryAfterSeconds });
+      }
+    } else {
+      const entry = { at: Date.now(), state: 'reading', error: null };
+      rechecked.set(obligationId, entry);
+      const actor = 'person:' + req.person.id;
+      try {
+        const read = (await readBeforeAct(db, organisationId, [obligation], { work: source, actor, force: true })).get(obligationId);
+        if (read.outcome === 'waiting') throw new FlowError('not_ready', source.name + ' could not be read: ' + (read.reason ?? 'the source is unavailable') + '. Wait, then recheck again.');
+        await settleJobChange(db, organisationId, obligationId, { actor });
+        entry.state = 'read';
+        outcome = 'read';
+      } catch (error) {
+        entry.state = 'failed';
+        entry.error = error instanceof FlowError ? error.message : 'The source recheck failed. Wait, then recheck again.';
+        throw new FlowError('not_ready', entry.error, { retryAfterSeconds: retryAfter(entry) });
+      }
     }
     const invoice = obligation.invoiceId ? await invoiceDetail(db, organisationId, obligation.invoiceId, accounting(), work()) : null;
-    res.json({ ok: true, outcome, invoice });
+    res.json({ ok: true, outcome, retryAfterSeconds: retryAfter(rechecked.get(obligationId)), invoice });
   }));
 
   // A job with no invoice whose match is unclear (ledger.js). The linking

package/server/core/invoice-rules.js

@@ -197,15 +197,24 @@ function matches(condition, job, context) {
 // The reasons the enabled rules give for one job, in rule order. An empty list
 // means no rule stops its draft. `customer` is the customer's own billing
 // settings (invoicing-rules.js).
-export function ruleReasons(rules, job, { customer = {}, now = new Date() } = {}) {
-  const context = { customer, now };
-  const reasons = [];
-  for (const rule of rules) {
-    if (!rule.enabled || rule.trigger !== 'job_ready' || ['pending', 'non_chargeable'].includes(rule.action.kind)) continue;
-    if (!rule.conditions.every((c) => matches(c, job, context))) continue;
-    reasons.push(rule.action.kind === 'skip' ? `rule "${rule.name}": not drafted by rule` : `rule "${rule.name}": waits for a person`);
-  }
-  return reasons;
+const waitingRules = (rules, job, { customer = {}, now = new Date() } = {}) => rules
+  .filter((rule) => rule.enabled && rule.trigger === 'job_ready' && !['pending', 'non_chargeable'].includes(rule.action.kind))
+  .filter((rule) => rule.conditions.every((c) => matches(c, job, { customer, now })));
+const waitMessage = (rule) => rule.action.kind === 'skip'
+  ? `rule "${rule.name}": not drafted by rule` : `rule "${rule.name}": waits for a person`;
+
+// Keep the text-only reason API for draft checks, including evaluation of
+// starter rules before they are saved. Selection/text have one owner here.
+export function ruleReasons(rules, job, options) {
+  return waitingRules(rules, job, options).map(waitMessage);
+}
+
+// Pending work needs the saved rule identity, just as a Pending invoice does.
+export function ruleWait(rules, job, options) {
+  return waitingRules(rules, job, options).map((rule) => ({ code: 'rule',
+    message: waitMessage(rule), short: rule.name.slice(0, 40), rule: rule.id,
+    resolution: ruleResolution(rule),
+  }));
 }
 
 // The notes of the enabled pending rules that match one draft, as problems:
@@ -213,12 +222,17 @@ export function ruleReasons(rules, job, { customer = {}, now = new Date() } = {}
 // `reference`, the draft's Reference. A pending rule never stops a draft.
 // `fields` names the fields the rule reads, so the invoice page marks the
 // one to fix (the Reference box goes red).
+const ruleResolution = (rule) => {
+  if (!rule.id) throw new FlowError('warning_resolution_required', 'A Pending rule needs its saved rule to resolve it.');
+  return { kind: 'rule_review' };
+};
+
 export function rulePending(rules, job, { customer = {}, now = new Date() } = {}) {
   const context = { customer, now };
   return rules
     .filter((r) => r.enabled && r.trigger === 'job_ready' && r.action.kind === 'pending')
     .filter((r) => r.conditions.every((c) => matches(c, job, context)))
-    .map((r) => ({ code: 'rule', message: r.action.note, short: r.name.slice(0, 40), rule: r.id ?? null, fields: [...new Set(r.conditions.map((c) => c.field))] }));
+    .map((r) => ({ code: 'rule', message: r.action.note, short: r.name.slice(0, 40), rule: r.id ?? null, fields: [...new Set(r.conditions.map((c) => c.field))], resolution: ruleResolution(r) }));
 }
 
 // Drafts an enabled skip rule matches stay on Pending at Send (sending.js).
@@ -236,6 +250,7 @@ export function ruleSkip(rules, job, { customer = {}, now = new Date() } = {}) {
       short: r.name.slice(0, 40),
       rule: r.id ?? null,
       fields: [...new Set(r.conditions.map((c) => c.field))],
+      resolution: ruleResolution(r),
     }));
 }
 

package/server/core/job-board.js

@@ -1,6 +1,6 @@
 import { and, eq, inArray, isNull } from 'drizzle-orm';
 import { contacts, invoices, priceItems, reviewItems } from '../db/schema.js';
-import { listRules } from './invoice-rules.js';
+import { listRules, ruleWait } from './invoice-rules.js';
 import { customerBillingByContact, effectiveSettings, readInvoicingSettings, ruleBlockers } from './invoicing-rules.js';
 import { REVIEW_CHANGED, listObligations } from './ledger.js';
 import { isHistoryHeld } from './history.js';
@@ -54,8 +54,16 @@ export async function describeObligations(db, organisationId, listed, { accounti
       : views.sending.has(id) ? 'sending' : null);
   // The invoicing rules a job with no invoice waits on, for every view a
   // draft can still come from.
-  const waitingFor = (o, v) => (o.invoiceId || !['in_work', 'ready', 'pending', 'held'].includes(v)
-    ? [] : ruleBlockers(o, { ...effectiveSettings(settings, customers.get(o.contactId)), name: nameOf.get(o.contactId) ?? null }, { rules }));
+  const waiting = (o, v) => {
+    if (o.invoiceId || !['in_work', 'ready', 'pending', 'held'].includes(v)) return { waitingFor: [], waitingRules: [] };
+    const customer = { ...effectiveSettings(settings, customers.get(o.contactId)), name: nameOf.get(o.contactId) ?? null };
+    const waitingRules = ruleWait(rules, o, { customer });
+    // Keep the existing text projection for API consumers; links use identity.
+    return { waitingRules, waitingFor: [
+      ...ruleBlockers(o, customer),
+      ...waitingRules.map((problem) => problem.message),
+    ] };
+  };
   return listed.map(({ obligation: { lineFingerprint: _fingerprint, organisationId: _org, draftBasis: _basis, ...o }, view, reasons }) => ({
     ...o,
     canUseNewLines: offers.has(o.id),
@@ -66,7 +74,7 @@ export async function describeObligations(db, organisationId, listed, { accounti
     invoiceProblems: (o.invoiceId && views?.problems.get(o.invoiceId)) || [],
     view,
     reasons,
-    waitingFor: waitingFor(o, view),
+    ...waiting(o, view),
   }));
 }
 

package/server/core/ledger.js

@@ -349,7 +349,7 @@ async function compareWithDraft(tx, organisationId, obligation, facts) {
   }
   const flow = { lines: invoice.lines, contactId: invoice.contactId };
   const compare = compareThreeWays(base, facts, flow, { sent: invoiceSent(invoice, obligation) });
-  return { ...compare, base, flow, invoiceStatus: invoice.status };
+  return { ...compare, base, flow, invoiceStatus: invoice.status, invoiceTotals: { subtotalCents: invoice.subtotalCents, taxCents: invoice.taxCents, totalCents: invoice.totalCents } };
 }
 
 function changedReview(obligation, compare) {
@@ -479,17 +479,29 @@ export function diffJobLines(wasLines = [], nowLines = []) {
   return changes.sort((a, b) => a.position - b.position || (a.change === 'removed' ? -1 : 1));
 }
 
-// The open "job changed" problem of an invoice, for the invoice page, or
+// The open job-change or source-billing problem, for the invoice page, or
 // null: the job as it was when the invoice was made, as the work system has
 // it now, and whether a person can adopt the change into Flow's own draft
 // ("Adopt changes", useSourceLines). An invoice drafted before the basis was
 // kept compares with the invoice's own lines.
 export async function jobChangeFor(db, organisationId, invoiceId) {
   const [obligation] = await db.select().from(billingObligations)
-    .where(and(eq(billingObligations.organisationId, organisationId), eq(billingObligations.invoiceId, invoiceId),
-      eq(billingObligations.holdState, 'review'), eq(billingObligations.holdReason, CHANGED_REASON)));
+    .where(and(eq(billingObligations.organisationId, organisationId), eq(billingObligations.invoiceId, invoiceId)));
   if (!obligation) return null;
+  const changed = obligation.holdState === 'review' && obligation.holdReason === CHANGED_REASON;
+  const sourceProblems = sourceBillingProblems(obligation);
+  if (!changed && !sourceProblems.length) return null;
   const compare = await compareWithDraft(db, organisationId, obligation, obligation);
+  // Source review is only for Flow's draft. Issued documents keep the existing
+  // job-change/accounting comparison, never a new source-resolution action.
+  const sourceReview = sourceProblems.length && compare.invoiceStatus === 'draft' ? {
+    sourceTotals: obligation.sourceTotals ?? null,
+    reconstructed: { ...invoiceTotals(obligation.lines), ...(obligation.lines.some((line) => line.taxCode === null) ? { taxCents: null, totalCents: null } : {}) },
+    unknownTaxLines: obligation.lines.flatMap((line, index) => line.taxCode === null
+      ? [{ position: index + 1, description: line.description, itemCode: line.itemCode ?? null }] : []),
+    savedInvoice: compare.invoiceTotals,
+  } : null;
+  if (!changed && !sourceReview) return null;
   const was = obligation.draftBasis
     ?? (compare.flow ? { lines: compare.flow.lines, contactId: compare.flow.contactId, totalCents: null } : basisOf(obligation));
   return {
@@ -497,13 +509,15 @@ export async function jobChangeFor(db, organisationId, invoiceId) {
     sourceSystem: obligation.sourceSystem,
     sourceJobRef: obligation.sourceJobRef,
     sourceInvoiceRef: obligation.sourceInvoiceRef,
+    caseRef: obligation.caseRef,
+    sourceReview,
     seenAt: obligation.sourceSeenAt,
     outcome: compare.outcome,
     sent: compare.sent,
-    canAdopt: compare.outcome === 'offer',
+    canAdopt: !sourceReview && compare.outcome === 'offer',
     // "Accept change": the draft takes the work system's values, even when
     // the draft changed too. Not once the invoice has left Flow.
-    canAccept: !compare.sent && !compare.missing,
+    canAccept: !sourceReview && !compare.sent && !compare.missing,
     lines: diffJobLines(was.lines ?? [], obligation.lines ?? []),
     contact: (was.contactId ?? null) === (obligation.contactId ?? null) ? null : { was: was.contactId ?? null, now: obligation.contactId ?? null },
     total: { was: was.totalCents ?? null, now: obligation.totalCents },

package/server/core/line-mapping.js

@@ -24,8 +24,10 @@ import { FlowError, notFound } from './errors.js';
 //
 // A mapped line keeps the work system's amount and tax flag; the price item
 // gives its code, its text and, when the work system gave none, its price and
-// tax. With `linePrice: 'list'` the price item's price wins instead. A line
-// no step answers keeps no code, so the ledger holds the job.
+// tax. A closest-name guess cannot supply missing source tax; it needs an
+// explicit tax flag before mapping. With `linePrice: 'list'` the price item's
+// price wins instead. A line no step answers keeps no code, so the ledger
+// holds the job.
 
 export const STEPS = Object.freeze([
   'same_code', 'account', 'saved', 'catalog_name', 'price_alias', 'catalog_name_price', 'catalog_score', 'alias',
@@ -207,7 +209,9 @@ export function mapLine(line, context) {
         break;
       }
       case 'catalog_score': {
-        if (price === null) break;
+        // A guessed item would also supply its tax here (or in the ledger).
+        // Leave unknown tax for an exact match or a person's saved choice.
+        if (price === null || line.taxCode == null) break;
         const scored = (context.byPrice.get(price) ?? [])
           .map((item) => ({ item, score: nameScore(item, { exact, lookup, original: lineText(original) }) }))
           .sort((a, b) => b.score - a.score || a.item.name.localeCompare(b.item.name) || a.item.code.localeCompare(b.item.code));

package/server/core/sending.js

@@ -50,20 +50,24 @@ const REFUSAL_CODE = /^[a-z0-9_]{1,64}$/i;
 const SENT = new Set(['created', 'reconciled', 'existing', 'already_in_xero']);
 
 // `short` is the few words the Invoices list shows; `message` says how to fix
-// it. `extra` adds `fields` (the invoice fields to fix) and `line`.
-const problem = (code, message, short = null, extra = {}) => ({ code, message, ...(short ? { short } : {}), ...extra });
+// it. Draft warnings must name their resolution UI at the owner, not in a
+// separate warning-code inventory. The invoice page dispatches this intent.
+const problem = (code, message, short, resolution, extra = {}) => {
+  if (typeof resolution?.kind !== 'string' || !resolution.kind) throw new FlowError('warning_resolution_required', `Draft warning ${code} needs a resolution UI.`);
+  return { code, message, ...(short ? { short } : {}), ...extra, resolution };
+};
 
 // An issued invoice the accounting system refused. A refusal stored without
 // its few words (before 2026-10-28) shows "Not sent"; its message stays.
-const refusal = (sendError) => (sendError ? { short: 'Not sent', ...sendError } : problem('send_failed', 'Sending failed.', 'Not sent'));
+const refusal = (sendError) => (sendError ? { short: 'Not sent', ...sendError } : { code: 'send_failed', message: 'Sending failed.', short: 'Not sent' });
 
 // Flow's own checks of one draft. `lines` are its invoice lines.
 export function draftProblems(invoice, lines) {
   const problems = [];
-  if (!lines.length) problems.push(problem('no_lines', 'The invoice has no lines.', 'No lines'));
-  else if (invoice.totalCents <= 0) problems.push(problem('no_amount', 'The total is $0.00 or less.', 'Total $0'));
+  if (!lines.length) problems.push(problem('no_lines', 'The invoice has no lines.', 'No lines', { kind: 'invoice_edit' }));
+  else if (invoice.totalCents <= 0) problems.push(problem('no_amount', 'The total is $0.00 or less.', 'Total $0', { kind: 'invoice_edit' }));
   for (const line of lines) {
-    if (!line.priceItemId && !line.accountCode) problems.push(problem('line_no_item', `Line ${line.position} has no price item.`, `Line ${line.position}: no item`, { fields: ['line_item'], line: line.position }));
+    if (!line.priceItemId && !line.accountCode) problems.push(problem('line_no_item', `Line ${line.position} has no price item.`, `Line ${line.position}: no item`, { kind: 'invoice_edit' }, { fields: ['line_item'], line: line.position }));
   }
   return problems;
 }
@@ -118,14 +122,16 @@ async function checkDrafts(db, organisationId, drafts, accounting) {
   // draft was made, or the work system deleted it) waits for a person.
   for (const { obligation } of jobs) {
     for (const reason of sourceBillingProblems(obligation)) {
-      const found = problem('job_review', 'Check the source invoice: ' + reason + '.', 'Source tax');
+      const found = { ...problem('job_review', 'Check the source invoice: ' + reason + '.', 'Source tax', { kind: 'job_review' }), sourceBilling: true };
       problems.set(obligation.invoiceId, [...(problems.get(obligation.invoiceId) ?? []), found]);
     }
   }
   const reviewed = jobs.map((j) => j.obligation).filter((o) => o.holdState === 'review');
   for (const obligation of reviewed) {
     const { invoiceId, holdReason: reason } = obligation;
-    const found = problem('job_review', `The job needs a look before this invoice goes: ${reason ?? 'it was sent to review'}.`, reviewShort(obligation));
+    const resolution = reason === CHANGED_REASON ? { kind: 'job_review' }
+      : { kind: 'job_hold', reason: reason ?? 'the job is review' };
+    const found = problem('job_review', `The job needs a look before this invoice goes: ${reason ?? 'it was sent to review'}.`, reviewShort(obligation), resolution);
     problems.set(invoiceId, [...(problems.get(invoiceId) ?? []), found]);
   }
   if (accounting) {

package/server/ui/app.js

@@ -27,7 +27,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 { 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, 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);
@@ -336,7 +336,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, fieldError, pageHeader, listHead, listFrame, edgeFade, sectionTitle, settingRow, dialog, pickOne, iconPicker, me, holdButton, tileCard, tileSection, crumbs,
+  h, flow, toast, notice, cardRows, 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

@@ -230,6 +230,9 @@ body:is([data-state="off"], [data-state="error"], [data-state="no-access"]) .fx-
   background: var(--t-danger-bg); color: var(--t-text); font-size: 14px;
 }
 .fx-change p { margin: 0; }
+.fx-change__steps { display: grid; gap: 10px; min-width: 0; overflow-wrap: anywhere; }
+.fx-change__steps ol { display: grid; gap: 8px; margin: 0; padding-left: 20px; }
+.fx-change__steps summary { cursor: pointer; }
 .fx-change strong { color: var(--t-danger); }
 .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; }
@@ -838,7 +841,7 @@ th:hover > .fx-th-grip::after { background: var(--t-brd-hi); }
    each lane scrolls inside itself (jobs.js sets fx-main--board while the
    board shows). */
 .fx-board { --fx-lane: min(85vw, 272px); display: grid; grid-auto-flow: column; grid-auto-columns: var(--fx-lane); justify-content: start; gap: 12px; align-items: start; overflow-x: auto; overscroll-behavior-x: contain; scrollbar-width: thin; padding-bottom: 4px; }
-.fx-board__col { display: flex; flex-direction: column; gap: 8px; min-width: 0; min-height: 0; padding: 10px 6px 6px 8px; border-radius: var(--t-radius-lg); background: var(--t-s1); }
+.fx-board__col { display: flex; flex-direction: column; gap: 8px; min-width: 0; min-height: 0; padding: 10px 6px 6px 8px; border-radius: var(--t-radius-lg); background: transparent; }
 .fx-board__head { display: flex; flex: none; align-items: center; gap: 8px; min-width: 0; padding: 2px 4px 4px 2px; }
 .fx-board__sum { flex: none; margin-left: auto; color: var(--t-dim); font-size: 12px; font-variant-numeric: tabular-nums; }
 .fx-board__cards { display: grid; gap: 8px; align-content: start; min-height: 0; max-height: 70vh; padding-right: 2px; overflow-y: auto; scrollbar-width: thin; }
@@ -860,7 +863,7 @@ th:hover > .fx-th-grip::after { background: var(--t-brd-hi); }
 .fx-fade[data-edge="right"] { inset: 0 0 0 auto; width: 24px; background: linear-gradient(to left, var(--fx-fade), transparent); }
 .fx-fades[data-fade~="top"] > .fx-fade[data-edge="top"], .fx-fades[data-fade~="bottom"] > .fx-fade[data-edge="bottom"],
 .fx-fades[data-fade~="left"] > .fx-fade[data-edge="left"], .fx-fades[data-fade~="right"] > .fx-fade[data-edge="right"] { opacity: 1; }
-.fx-main--board .fx-frame__view { --fx-fade: var(--t-bg); }
+.fx-main--board .fx-frame__view { --fx-fade: var(--t-s1); }
 .fx-board__col.fx-fades { --fx-fade: var(--t-s1); }
 .fx-board__col > .fx-fade[data-edge="bottom"] { border-radius: 0 0 var(--t-radius-lg) var(--t-radius-lg); }
 .fx-frame__body .fx-panel { border: 0; border-radius: 0; box-shadow: none; overflow: visible; }
@@ -869,7 +872,8 @@ th:hover > .fx-th-grip::after { background: var(--t-brd-hi); }
 .fx-frame thead th { position: sticky; top: 0; z-index: 2; }
 .fx-frame__foot { display: flex; flex: none; align-items: center; justify-content: space-between; gap: 12px; min-height: 44px; padding: 6px 12px; border-top: 1px solid var(--fx-line); color: var(--t-dim); font-size: 13px; font-variant-numeric: tabular-nums; }
 .fx-frame__tools { display: flex; align-items: center; gap: 8px; }
-.fx-main--board .fx-frame__body { padding: 12px; background: var(--t-bg); }
+/* One work surface runs through the lanes, gaps and unused board space. */
+.fx-main--board .fx-frame__body { padding: 12px; background: var(--t-s1); }
 @media (min-width: 821px) and (min-height: 560px) {
   .fx-main--frame { height: 100vh; height: 100dvh; padding-bottom: 16px; display: flex; flex-direction: column; }
   .fx-main--frame > * { flex: none; }

package/server/ui/invoice-rules.js

@@ -47,6 +47,9 @@ export function ruleSummary(rule, meta) {
 export function rulesSection(ui, title = 'Rules') {
   const { h, flow, toast, notice, dialog, me, settingRow, iconPicker } = ui;
   const disabled = !['owner', 'admin'].includes(me?.person.role);
+  // A Pending invoice opens the exact rule responsible, using this same
+  // conditions/editor UI. Read-only users see the rule, never write controls.
+  const targetRule = new URLSearchParams(location.search).get('rule');
   const section = h('section', { class: 'fx-set' }, h('h2', { class: 'fx-set__title' }, title), h('div', { class: 'fx-skeleton' }));
   let meta;
   let rules = [];
@@ -177,13 +180,25 @@ export function rulesSection(ui, title = 'Rules') {
         if (editors.length === 1) return toast('A rule needs at least one condition.', 'danger');
         editors = editors.filter((e) => e.element !== element);
         element.remove();
+        validateAction();
         return null;
       });
       editors.push(editor);
       list.append(editor.element);
+      validateAction();
       return null;
     };
+    // Draft-only fields cannot hold work before a draft exists. Native form
+    // validation keeps this editor and its choices open instead of a refused PUT.
+    const validateAction = () => {
+      const field = editors.map((e) => meta.fields.find((f) => f.key === e.read().field)).find((f) => f?.draftOnly);
+      action.setCustomValidity(action.value !== 'pending' && field
+        ? `${field.label} checks require Pending, with a note. Choose Pending or remove that condition.` : '');
+    };
+    list.addEventListener('change', validateAction);
+    action.addEventListener('change', validateAction);
     for (const c of draft?.conditions ?? [null]) addCondition(c);
+    validateAction();
     const more = h('button', { class: 'fx-btn fx-btn--ghost fx-btn--sm', type: 'button' }, 'Add condition');
     more.addEventListener('click', () => addCondition());
 
@@ -242,16 +257,22 @@ export function rulesSection(ui, title = 'Rules') {
       open.addEventListener('click', () => edit(rule));
       controls.unshift(open);
     }
-    return row(rule.name, ruleSummary(rule, meta), controls);
+    const element = row(rule.name, ruleSummary(rule, meta), controls);
+    element.setAttribute('role', 'region');
+    element.setAttribute('aria-label', `Rule ${rule.name}`);
+    return element;
   };
 
   function draw() {
-    const add = disabled ? null : h('button', { class: 'fx-btn fx-btn--ghost fx-btn--sm', type: 'button' }, 'Add rule');
+    const shown = targetRule ? rules.filter((rule) => rule.id === targetRule) : rules;
+    const add = disabled || targetRule ? null : h('button', { class: 'fx-btn fx-btn--ghost fx-btn--sm', type: 'button' }, 'Add rule');
     add?.addEventListener('click', () => edit(null));
     section.replaceChildren(
       h('h2', { class: 'fx-set__title' }, title),
       h('p', { class: 'fx-set__hint', style: { margin: '0 0 4px' } }, 'When a rule matches, a ready job waits, is never drafted, or its draft is Pending with the rule\'s note.'),
-      ...(rules.length ? rules.map(rowOf) : [h('p', { class: 'fx-dim' }, 'No rules. Every ready job is drafted.')]),
+      ...(shown.length ? shown.map(rowOf) : [targetRule
+        ? notice('This rule is no longer available. Reopen the invoice to check its remaining problems.', 'danger')
+        : h('p', { class: 'fx-dim' }, 'No rules. Every ready job is drafted.')]),
       h('div', { class: 'fx-rule__footer' }, add,
         h('a', { class: 'fx-dim', href: DOCS, target: '_blank', rel: 'noopener' }, 'How rules work')));
   }

package/server/ui/invoicing.js

@@ -8,7 +8,7 @@
 import { alertStrip } from '/assets/ui/alerts.js';
 import { bulkBar } from '/assets/ui/bulk-bar.js';
 import { draftNote, sendModeNote } from '/assets/ui/invoice-notes.js';
-import { caseNumber } from '/assets/ui/job-board.js';
+import { caseNumber, fixes } from '/assets/ui/job-board.js';
 import { jobChangeReview } from '/assets/ui/job-change.js';
 import { cardRows, rowMenu } from '/assets/ui/kit.js';
 import { isPhone, WIDTHS } from '/assets/ui/mobile.js';
@@ -981,6 +981,20 @@ function draftView(invoice, ui, context, redraw) {
   // item. A check on something this page cannot change (the job's
   // practitioner) marks nothing; the banner says it.
   const problemList = invoice?.problems ?? [];
+  // Dispatch intents to the real editor or shared job comparison, not a
+  // parallel warning-code list. Missing data/unknown intents stay blocked.
+  // Adapter warnings retain their existing owner-specific actions.
+  const hasRuleReview = (p) => p.resolution?.kind === 'rule_review' && Boolean(p.rule);
+  const hasJobHold = (p) => p.resolution?.kind === 'job_hold' && Boolean(invoice?.job?.id)
+    && typeof p.resolution.reason === 'string' && Boolean(p.resolution.reason.trim());
+  const hasJobReview = (p) => p.resolution?.kind === 'job_review' && invoice?.jobChange
+    && Boolean(p.sourceBilling) === Boolean(invoice.jobChange.sourceReview);
+  // The source check runs first. Its Recheck reveals the ordinary job
+  // comparison once the source problem clears; that view is not missing.
+  const deferredJobReview = (p) => p.resolution?.kind === 'job_review'
+    && !p.sourceBilling && Boolean(invoice?.jobChange?.sourceReview);
+  const unavailable = problemList.filter((p) => p.resolution
+    && p.resolution.kind !== 'invoice_edit' && !hasJobReview(p) && !deferredJobReview(p) && !hasRuleReview(p) && !hasJobHold(p));
   const failed = new Set(problemList.flatMap((p) => p.fields ?? []));
   const badLines = new Set(problemList.filter((p) => p.fields?.includes('line_item')).map((p) => p.line));
   const boxes = { reference };
@@ -1146,7 +1160,7 @@ function draftView(invoice, ui, context, redraw) {
   // it and queues it, the same as Send all ready. With none, Flow issues it
   // and keeps it. A Pending draft has no send: fix its problem first.
   const to = invoice?.sendsTo ?? context.sendsTo ?? null;
-  const ready = invoice?.view === 'ready';
+  const ready = invoice?.view === 'ready' && !problemList.length;
   // A lab's rule keeps a non-chargeable draft in Flow: nothing sends or approves it.
   const nonChargeable = invoice?.view === 'non_chargeable';
   const nextNumber = `${context.organisations[0]?.invoicePrefix ?? ''}${String(context.organisations[0]?.nextInvoiceNumber ?? '').padStart(4, '0')}`;
@@ -1210,8 +1224,8 @@ function draftView(invoice, ui, context, redraw) {
   const syncIssue = () => {
     if (!issueButton) return;
     const missing = [contact ? null : 'a client', dueDate.value ? null : 'a due date'].filter(Boolean);
-    issueButton.disabled = missing.length > 0 || Boolean(invoice?.jobChange);
-    issueButton.title = invoice?.jobChange ? 'Fix the problem first.' : missing.length ? `Choose ${missing.join(' and ')} first.` : 'Gives it the next number and locks it. Nothing is sent.';
+    issueButton.disabled = missing.length > 0 || Boolean(invoice?.jobChange) || problemList.length > 0;
+    issueButton.title = invoice?.jobChange || problemList.length ? 'Fix the problem first.' : missing.length ? `Choose ${missing.join(' and ')} first.` : 'Gives it the next number and locks it. Nothing is sent.';
   };
   onContact = syncIssue;
   clientInput.addEventListener('input', syncIssue);
@@ -1236,7 +1250,7 @@ function draftView(invoice, ui, context, redraw) {
   const jobChange = invoice?.jobChange ?? null;
   // The job changed after the invoice was made: its own banner shows what
   // changed. Other problems stay one line.
-  const otherProblems = (invoice?.problems ?? []).filter((p) => !(jobChange && p.code === 'job_review'));
+  const otherProblems = problemList.filter((p) => !hasJobReview(p));
   const offer = otherProblems.find((p) => ['xero_contact_missing', 'xero_contact_ambiguous'].includes(p.code) && (p.offerLink || p.offerCreate));
   // A phone shows each problem's short name ("Client not in Xero") on one line.
   const shorts = otherProblems.every((p) => p.short) ? [...new Set(otherProblems.map((p) => p.short))].join(', ') : null;
@@ -1251,10 +1265,32 @@ function draftView(invoice, ui, context, redraw) {
       done: async () => redraw((await flow(`/api/invoicing/invoices/${invoice.id}`)).invoice),
     })
     : [];
+  // Every matching rule links to its own conditions and existing controls,
+  // including custom rules. The target enforces read-only roles itself.
+  const ruleActions = [...new Map(problemList.filter(hasRuleReview).map((p) => [p.rule, p])).values()]
+    .map((p) => h('a', { class: 'fx-btn fx-btn--sm',
+      href: `/invoicing-settings/invoices?rule=${encodeURIComponent(p.rule)}`,
+      onclick: (event) => go(event),
+    }, `Review ${p.short ?? 'rule'}`));
+  // Non-change holds use the Jobs workflow's existing instructions, not a
+  // comparison that does not exist. Reading them never releases the hold.
+  const holdSteps = fixes({ view: 'review_required', holdState: 'review',
+    reasons: [...new Set(problemList.filter(hasJobHold).map((p) => p.resolution.reason))] });
+  const holdReview = holdSteps.length ? h('section', { 'aria-label': 'Job hold review' },
+    ...holdSteps.map((step) => h('p', {}, step.todo)),
+    invoice.job.link?.url ? h('a', { class: 'fx-btn fx-btn--sm', href: invoice.job.link.url, target: '_blank', rel: 'noopener' },
+      `Open in ${invoice.job.systemName ?? 'work system'}`)
+      : h('p', {}, `The source link is unavailable. Check job ${invoice.job.sourceJobRef ?? ''} in the work system, or ask an administrator to restore its link.`),
+    h('p', {}, deleteButton
+      ? 'If this unissued draft is no longer needed, use Delete. It remains Pending while the job is in review.'
+      : 'Ask an owner or administrator to review this draft. It remains Pending while the job is in review.')) : null;
   const problems = [
+    holdReview,
     // Accepting changes the draft for the business: owners and admins only.
     jobChange ? jobChangeReview(ui, jobChange, { money: formatCents, canAccept: context.canIssue, unsaved: changed, done: redraw }) : null,
-    problemNotice ? (clientActions.length ? h('div', { class: 'fx-offer' }, problemNotice, ...clientActions) : problemNotice) : null,
+    problemList.some(deferredJobReview) ? notice('The job also changed after this invoice was made. Resolve the source amount problem first. Select Recheck, then review the remaining job changes.', 'danger') : null,
+    unavailable.length ? notice('The resolution view is unavailable. Ask an administrator to restore it, then reopen this invoice. It remains Pending.', 'danger', 'Cannot resolve.') : null,
+    problemNotice ? (clientActions.length || ruleActions.length ? h('div', { class: 'fx-offer' }, problemNotice, ...clientActions, ...ruleActions) : problemNotice) : null,
   ];
   // A red field names the banner as its reason (for a screen reader).
   const banner = problemNotice;

package/server/ui/job-board.js

@@ -126,7 +126,16 @@ function reasonFix(reason) {
 // system's) as a job fix. Flow's own invoice problems keep their words. A
 // problem an accounting system found stays on the invoice page; the job only
 // says that its invoice needs a fix.
+function ruleFix(problem) {
+  const supported = problem.resolution?.kind === 'rule_review' && Boolean(problem.rule);
+  return { label: problem.short ?? 'Stopped by a rule', text: sentence(problem.message),
+    todo: supported ? 'Review this rule and the job facts, then reopen the job to check again.' : 'The rule resolution is unavailable. Reopen this job after an administrator restores it.',
+    go: supported ? 'rule' : null, rule: problem.rule ?? null,
+  };
+}
+
 function draftFix(problem) {
+  if (problem.resolution?.kind === 'rule_review') return ruleFix(problem);
   const code = problem.code ?? '';
   const fix = (label, todo) => ({ label, text: sentence(problem.message ?? label), todo, go: 'invoice' });
   if (code === 'no_lines') return fix('No lines', 'Open the invoice and add the lines.');
@@ -141,7 +150,7 @@ function draftFix(problem) {
 // Where a fix's link goes: Flow's invoice, the job in the work system, a
 // Flow settings page, `review`: the job's Review sidecar, or `choose`: Make
 // invoice and Link invoice buttons (jobs.js draws them).
-export const GO = ['invoice', 'work', 'price-list', 'invoicing-settings', 'integrations', 'review', 'choose'];
+export const GO = ['invoice', 'work', 'price-list', 'rule', 'integrations', 'review', 'choose'];
 
 // What a person must fix on a job, in order: [{ label, text, todo, go }];
 // `todo` is null when the buttons are the instruction.
@@ -152,11 +161,7 @@ export function fixes(o) {
   if (invoiceStage(o) !== 'problem') return [];
   const found = [];
   if (PROBLEM_VIEWS.includes(o.view)) found.push(...(o.reasons ?? []).map((r) => reasonFix(r)));
-  if (o.view === 'ready') {
-    found.push(...(o.waitingFor ?? []).filter(isRule).map((r) => ({
-      label: 'Stopped by a rule', text: sentence(r), todo: 'Draft the invoice here, or change the rule under Settings, Rules.', go: 'invoicing-settings',
-    })));
-  }
+  found.push(...(o.waitingRules ?? []).map(ruleFix));
   if (o.invoiceStatus === 'void') {
     found.push({ label: 'Invoice void', text: 'The invoice for this job is void.', todo: 'Make a new invoice, or close the job.', go: 'invoice' });
   }
@@ -164,7 +169,7 @@ export function fixes(o) {
   found.push(...(o.invoiceProblems ?? []).filter((p) => !(held && p.code === 'job_review')).map((p) => draftFix(p)));
   const seen = new Set();
   return found.filter((f) => {
-    const key = `${f.label}\u0000${f.text}`;
+    const key = `${f.rule ?? ''}\u0000${f.label}\u0000${f.text}`;
     if (seen.has(key)) return false;
     seen.add(key);
     return true;

package/server/ui/job-change.js

@@ -16,6 +16,16 @@ const lineFull = (line, money) => `${lineText(line)} · ${line.quantity} × ${li
 // [{ field, was, now }] in plain words. `money` formats cents.
 export function changeRows(change, money) {
   const rows = [];
+  if (change.sourceReview) {
+    const { sourceTotals, reconstructed } = change.sourceReview;
+    return [['Subtotal', 'subtotalCents'], ['GST', 'taxCents'], ['Total', 'totalCents']].map(([field, key]) => {
+      const source = sourceTotals?.[key];
+      const flow = reconstructed[key];
+      const delta = source == null || flow == null ? null : flow - source;
+      return { field, was: source == null ? 'Not supplied' : money(source), now: flow == null ? 'Unknown' : money(flow),
+        difference: delta == null ? 'Unknown' : delta === 0 ? 'Same' : `${delta > 0 ? '+' : '−'}${money(Math.abs(delta))}`, num: true };
+    });
+  }
   if (change.contact) rows.push({ field: 'Client', was: change.contact.was ?? '—', now: change.contact.now ?? '—' });
   for (const line of change.lines ?? []) {
     const at = `Line ${line.position}`;
@@ -36,6 +46,7 @@ export function changeRows(change, money) {
 // The sentence after "Problem." One fact per sentence.
 export function changeSummary(change, rowCount) {
   const system = change.systemName ?? 'the work system';
+  if (change.sourceReview) return 'Check the source invoice amounts.';
   const count = `${rowCount} ${rowCount === 1 ? 'change' : 'changes'}.`;
   if (change.canAdopt) return `Changed in ${system}. ${count}`;
   if (change.sent) return `Changed in ${system} after sending. ${count}`;
@@ -48,44 +59,73 @@ export function jobChangeBanner(ui, change, { money, onAccept = null, onRecheck
   const { h } = ui;
   const system = change.systemName ?? 'the work system';
   const rows = changeRows(change, money);
-  const order = change.sourceInvoiceRef ? `Order #${change.sourceInvoiceRef}` : null;
+  const source = change.sourceReview;
+  const order = change.sourceInvoiceRef ? `${source ? 'Invoice' : 'Order'} #${change.sourceInvoiceRef}` : null;
   const link = change.link
     ? h('a', {
       class: 'fx-btn fx-btn--sm', href: change.link.url, target: '_blank', rel: 'noopener noreferrer',
       title: change.link.exact ? `Opens this job in ${system}.` : `Opens ${system}. Find ${order ?? 'the job'} there.`,
-    }, `Open in ${system} ↗`)
+    }, source ? (change.link.exact ? `Open job in ${system} ↗` : `Open ${system} ↗`) : `Open in ${system} ↗`)
     : null;
   const accept = change.canAccept && onAccept
     ? h('button', { class: 'fx-btn fx-btn--sm fx-btn--primary', type: 'button', 'data-action': 'accept', title: `This invoice takes the Now in ${system} column.`, onclick: onAccept }, 'Accept change')
     : null;
-  const recheck = onRecheck
+  const recheck = onRecheck && change.canRecheck !== false
     ? h('button', {
-      class: 'fx-btn fx-btn--sm fx-btn--icon fx-change__recheck', type: 'button', title: `Check ${system} again`, 'aria-label': `Check ${system} again`,
+      class: `fx-btn fx-btn--sm${source ? '' : ' fx-btn--icon fx-change__recheck'}`, type: 'button', title: `Read this job from ${system} again. Nothing is sent.`, 'aria-label': source ? 'Recheck' : `Check ${system} again`,
       onclick: async (event) => {
         const button = event.currentTarget;
         button.disabled = true;
         button.classList.add('is-busy');
-        try { await onRecheck(); } finally { button.disabled = false; button.classList.remove('is-busy'); }
+        button.setAttribute('aria-busy', 'true');
+        try { await onRecheck(); } finally { button.disabled = false; button.classList.remove('is-busy'); button.removeAttribute('aria-busy'); }
       },
-    }, h('span', { class: 'fx-lucide', style: '--icon: url(/assets/icons/refresh-cw.svg)', 'aria-hidden': 'true' }))
+    }, source ? 'Recheck' : h('span', { class: 'fx-lucide', style: '--icon: url(/assets/icons/refresh-cw.svg)', 'aria-hidden': 'true' }))
     : null;
   const body = h('tbody', {});
+  const cell = (area, label, value, num) => h('td', {
+    class: num ? 'fx-num' : '', ...(source ? { 'data-area': area, 'data-label': label } : {}),
+  }, value);
   const draw = (all) => body.replaceChildren(...(all ? rows : rows.slice(0, FIRST_ROWS)).map((row) => h('tr', {},
-    h('th', { scope: 'row' }, row.field),
-    h('td', { class: `fx-change__was${row.num ? ' fx-num' : ''}` }, row.was),
-    h('td', { class: `fx-change__now${row.num ? ' fx-num' : ''}` }, row.now))));
+    source ? cell('field', 'Amount', row.field) : h('th', { scope: 'row' }, row.field),
+    source ? cell('source', 'Source invoice', row.was, true) : h('td', { class: `fx-change__was${row.num ? ' fx-num' : ''}` }, row.was),
+    source ? cell('flow', 'Flow job lines', row.now, true) : h('td', { class: `fx-change__now${row.num ? ' fx-num' : ''}` }, row.now),
+    source ? cell('difference', 'Difference', row.difference, true) : null)));
   draw(false);
+  const table = h('table', { class: 'fx-change__table' },
+    h('thead', {}, h('tr', {}, h('th', { scope: 'col' }, source ? 'Amount' : 'Field'),
+      h('th', { scope: 'col' }, source ? 'Source invoice' : 'Was'),
+      h('th', { scope: 'col' }, source ? 'Flow job lines' : `Now in ${system}`),
+      source ? h('th', { scope: 'col' }, 'Difference') : null)), body);
+  if (source) ui.cardRows(table, { areas: ['field field', 'source flow', 'difference difference'], columns: 'repeat(2, minmax(0, 1fr))' });
+  const inFlow = (href, label) => h('a', { class: 'fx-btn fx-btn--sm', href, onclick: (event) => ui.go(event) }, label);
+  const sourceSteps = source ? h('div', { class: 'fx-change__steps' },
+    h('p', { class: 'fx-change__note' }, `Source invoice: ${change.sourceInvoiceRef ?? 'Not supplied'}.${change.caseRef ? ` Case: ${change.caseRef}.` : ''}`),
+    h('p', {}, 'Flow cannot tell which amount is wrong.'),
+    h('p', { class: 'fx-change__note' }, 'Difference = Flow job lines minus source invoice. Do not divide a source invoice total between jobs.'),
+    source.unknownTaxLines.length ? h('p', {}, `Tax is unknown on ${source.unknownTaxLines.map((line) => `line ${line.position}${line.description ? ` (${line.description})` : ''}`).join(', ')}. Flow cannot calculate GST or the total.`) : null,
+    h('ol', {},
+      h('li', {}, change.link?.exact ? `Open the job in ${system}, then check its linked invoice.` : `Open ${system}${change.link ? ' with its link' : ' separately'}. Find ${change.caseRef ? `case ${change.caseRef}` : order ?? 'the linked job'}, then check the source invoice.`),
+      h('li', {}, 'Check each price, quantity, discount and tax value against the source facts.'),
+      h('li', {}, 'Correct only facts you can verify. Do not choose tax only to remove this difference.'),
+      h('li', {}, 'If a Flow mapping is wrong, correct it in Price codes or Price list.'),
+      h('li', {}, change.canRecheck === false ? 'Ask an administrator to restore the source connection, then return here.' : 'Return here and select Recheck. Flow reads the source again. It does not send this invoice.')),
+    h('div', { class: 'fx-change__acts' }, inFlow('/invoicing-settings/price-codes', 'Price codes'), inFlow('/price-list', 'Price list')),
+    change.canRecheck === false ? h('p', {}, `Flow cannot read this job from ${system}.`) : null,
+    h('details', {}, h('summary', {}, 'Saved invoice'),
+      h('p', {}, 'These saved Flow amounts do not change when you recheck.'),
+      h('dl', { class: 'fx-facts' }, [['Subtotal', 'subtotalCents'], ['GST', 'taxCents'], ['Total', 'totalCents']].flatMap(([label, key]) => [h('dt', {}, label), h('dd', {}, money(source.savedInvoice[key]))])),
+      change.seenAt ? h('p', { class: 'fx-change__note' }, `Last source report: ${new Date(change.seenAt).toLocaleString('en-AU')}.`) : null)) : null;
   const more = rows.length > FIRST_ROWS
     ? h('button', { class: 'fx-btn fx-btn--ghost fx-btn--sm', type: 'button', onclick: (event) => { draw(true); event.currentTarget.remove(); } }, `Show all ${rows.length}`)
     : null;
-  return applyPhoneRule(h('section', { class: 'fx-change', role: 'alert' },
+  return applyPhoneRule(h('section', { class: 'fx-change', role: 'alert', 'aria-label': source ? 'Source invoice comparison' : 'Job comparison' },
     h('div', { class: 'fx-change__head' },
       h('p', {}, h('strong', {}, 'Problem.'), ' ', changeSummary(change, rows.filter((row) => row.field !== 'Total').length)),
       h('div', { class: 'fx-change__acts' }, link, accept, recheck)),
-    !change.link && order ? h('p', { class: 'fx-change__note' }, `Find ${order} in ${system} to fix it there.`) : null,
-    rows.length ? h('div', { class: 'fx-change__scroll' }, h('table', { class: 'fx-change__table' },
-      h('thead', {}, h('tr', {}, h('th', { scope: 'col' }, 'Field'), h('th', { scope: 'col' }, 'Was'), h('th', { scope: 'col' }, `Now in ${system}`))),
-      body)) : null,
+    !source && !change.link && order ? h('p', { class: 'fx-change__note' }, `Find ${order} in ${system} to fix it there.`) : null,
+    rows.length ? h('div', { class: 'fx-change__scroll' }, table) : null,
+    sourceSteps,
     more), 'jobChangeBanner');
 }
 
@@ -114,9 +154,17 @@ export function jobChangeReview(ui, change, { money, canAccept = false, unsaved
     },
     // Reads this one job from the work system again, then every check runs.
     onRecheck: async () => {
+      if (unsaved()) {
+        toast('Save or discard your changes before Recheck.', 'danger');
+        return;
+      }
       try {
         const res = await flow(`/api/invoicing/jobs/${change.jobId}/recheck`, { method: 'POST', body: '{}' });
-        toast(res.invoice?.jobChange ? `Still changed in ${system}.` : 'Fixed. It matches now.', res.invoice?.jobChange ? 'danger' : 'success');
+        const pending = Boolean(res.invoice?.jobChange || res.invoice?.problems?.length);
+        const cached = res.outcome === 'fresh';
+        toast(cached ? `No new source read. Try again in ${res.retryAfterSeconds ?? 10} seconds.`
+          : pending ? 'Still pending. Check the comparison and the remaining problems.'
+            : 'Source check complete. No invoice problem remains.', cached ? 'info' : pending ? 'danger' : 'success');
         if (res.invoice) await done(res.invoice);
       } catch (error) {
         toast(error.message, 'danger');

package/server/ui/jobs.js

@@ -1136,7 +1136,7 @@ export async function renderJobs(main, ui) {
       ? link({ href: `/invoices/${o.invoiceId}`, onclick: (event) => { close(); ui.go(event); } },
         `${o.invoiceStatus === 'draft' ? 'Draft' : 'Invoice'} ${o.invoiceNumber ?? ''}`.trim() + (stage ? ` · ${INVOICE_STAGES[stage]}` : ''))
       : choose ? h('span', { class: 'fx-task__none' }, svg(WARN_ICON), 'Needs invoice')
-        : stage ? INVOICE_STAGES[stage] : o ? 'Not ready to invoice' : 'No invoice yet';
+        : stage === 'drafted' ? 'Not drafted' : stage ? INVOICE_STAGES[stage] : o ? 'Not ready to invoice' : 'No invoice yet';
     const rest = found.filter((f) => f.go !== 'choose');
     // What to fix: one chip a problem, beside the stage, so the panel keeps
     // one layout with or without a fix. A chip is a toggle: a click opens
@@ -1181,7 +1181,7 @@ export async function renderJobs(main, ui) {
     }
     // Each fix's link: Flow's own invoice, the job in the work system, or
     // the Flow page where the fix is made (job-board.js GO).
-    function fixLink(go, tip = null) {
+    function fixLink(go, tip = null, rule = null) {
       const button = (icon, text, attrs) => h(attrs.href ? 'a' : 'button', {
         class: 'fx-btn fx-btn--sm fx-btn--primary fx-task__fixgo', title: tip, ...(attrs.href ? {} : { type: 'button' }), ...attrs,
       }, lucide(h, icon), text);
@@ -1189,7 +1189,7 @@ export async function renderJobs(main, ui) {
       if ((go === 'review' || go === 'invoice') && o?.invoiceId) return inFlow('file-text', `/invoices/${o.invoiceId}`, 'Invoice');
       if (go === 'work' && job.link?.url) return button('external-link', system, { href: job.link.url, target: '_blank', rel: 'noopener' });
       if (go === 'price-list') return inFlow('tag', '/price-list', 'Price list');
-      if (go === 'invoicing-settings') return inFlow('list-checks', '/invoicing-settings', 'Rules');
+      if (go === 'rule' && rule) return inFlow('list-checks', `/invoicing-settings/invoices?rule=${encodeURIComponent(rule)}`, 'Review rule');
       if (go === 'integrations' && ui.me?.person?.role === 'owner') return inFlow('plug', '/integrations', 'Integrations');
       return null;
     }
@@ -1230,7 +1230,7 @@ export async function renderJobs(main, ui) {
         return h('section', { class: 'fx-task__fixitem', 'aria-label': f.label }, reviewBody);
       }
       return h('section', { class: 'fx-task__fixitem', 'aria-label': f.label },
-        h('strong', {}, f.label), h('p', {}, f.text), f.todo ? h('p', { class: 'fx-dim' }, f.todo) : null, fixLink(f.go));
+        h('strong', {}, f.label), h('p', {}, f.text), f.todo ? h('p', { class: 'fx-dim' }, f.todo) : null, fixLink(f.go, null, f.rule));
     }
     const sideButton = h('button', {
       class: 'fx-btn fx-btn--ghost fx-btn--icon', type: 'button', 'aria-label': 'Side panel', title: 'Side panel', 'aria-pressed': 'false',