Update

server/form_schema.py

@@ -31,7 +31,8 @@ Return ONE JSON object only (no markdown). Shape:
       "id": "stable_snake_case_id",
       "label": "Full question text shown to the user (no Q1/Q2 prefixes)",
       "type": "select" | "chips" | "number",
-      "options": ["required for select and chips: 3–12 distinct, short option strings"]
+      "options": ["required for select and chips: 3–12 distinct, short option strings"],
+      "unit": "ONLY for type number: short suffix shown next to the input (e.g. kg, lb, mm, in, %)"
     }
   ]
 }
@@ -42,7 +43,8 @@ Rules:
 - **No open-ended typing:** NEVER use type "text" or "textarea". Users must tap choices only.
 - Prefer **select** with 5–12 concise options for objectives, scope, methodology, audience, timing, risk, quality level, etc.
 - Use **chips** for 3–8 mutually exclusive options when labels are short (single choice — same as select, shown as buttons).
-- Use **number** only for true numeric values (counts, currency amounts, percentages, sizes).
+- Use **number** only for true numeric values (counts, currency amounts, percentages, sizes, weights, dimensions).
+- For **every number field**, set **"unit"** to the metric users should enter (e.g. `"kg"` for weight capacity, `"mm"` for seat depth, `"lb"` only if Imperial is explicit). Never leave unit ambiguous when the question is a measurement.
 - Every option string must be self-contained (no reliance on free-form explanations). If a case might need nuance, add an option such as "Other — see specification notes below".
 - Use stable `id` values (snake_case) — they are keys in saved data.
 - Same commodity must always get the same structure when regenerated; the app caches by commodity code, but ids and intent must stay consistent if you see similar commodities.
@@ -148,6 +150,11 @@ def _coerce_field_selectable(entry: dict[str, Any]) -> dict[str, Any]:
     elif typ == "number":
         out = {**entry, "type": "number"}
         out.pop("options", None)
+        unit = str(out.get("unit") or "").strip()
+        if unit:
+            out["unit"] = unit[:24]
+        else:
+            out.pop("unit", None)
         return out
     elif typ not in ("select", "chips"):
         typ = "select"
@@ -181,6 +188,10 @@ def _validate_and_normalize(raw: dict[str, Any]) -> dict[str, Any]:
         entry: dict[str, Any] = {"id": fid, "label": label, "type": typ}
         if typ in ("select", "chips") and isinstance(opts, list) and opts:
             entry["options"] = [str(o) for o in opts if str(o).strip()]
+        if typ == "number":
+            u = str(f.get("unit") or "").strip()
+            if u:
+                entry["unit"] = u[:24]
         fields_out.append(_coerce_field_selectable(entry))
     if len(fields_out) < 1:
         return _fallback_schema()
@@ -205,6 +216,10 @@ def _coerce_cached_schema(cached: dict[str, Any]) -> dict[str, Any]:
         opts = f.get("options")
         if typ in ("select", "chips") and isinstance(opts, list) and opts:
             entry["options"] = [str(o) for o in opts if str(o).strip()]
+        if typ == "number":
+            u = str(f.get("unit") or "").strip()
+            if u:
+                entry["unit"] = u[:24]
         fields_out.append(_coerce_field_selectable(entry))
     if len(fields_out) < 1:
         return _fallback_schema()

server/pr_lines.py

@@ -42,13 +42,18 @@ def delivery_dates(count: int, interval: str, year: int) -> list[str]:
     dates: list[date] = []
 
     if interval == "Quarterly":
-        q_ends = [(3, 31), (6, 30), (9, 30), (12, 31)]
-        i = 0
+        # Anchor at March of `year`, then Mar → Jun → Sep → Mar (next year), …
+        # Skips December quarter-ends so multi-year schedules reach Q1 of the next year
+        # (e.g. 4 deliveries in 2026: Mar, Jun, Sep 2026, then Mar 2027).
         yy = y
+        trip = (3, 6, 9)
+        i = 0
         while len(dates) < count:
-            m, d = q_ends[i % 4]
-            yy = y + i // 4
-            dates.append(date(yy, m, d))
+            if i > 0 and i % 3 == 0:
+                yy += 1
+            m = trip[i % 3]
+            last = calendar.monthrange(yy, m)[1]
+            dates.append(date(yy, m, last))
             i += 1
     elif interval == "Monthly":
         if count == 1:

src/App.tsx

@@ -133,15 +133,17 @@ export default function App() {
   }, [showFollowUpComposer]);
 
   const mergePrRows = useCallback((batch: PrRow[]) => {
+    if (!batch.length) return;
     setAccumulatedPrRows((prev) => {
-      const base = prev.length
-        ? Math.max(...prev.map((r) => r.pr_line_item))
+      const prior = [...prev];
+      const base = prior.length
+        ? Math.max(...prior.map((r) => Number(r.pr_line_item) || 0))
         : 0;
       const next = batch.map((r, i) => ({
         ...r,
         pr_line_item: base + 10 * (i + 1),
       }));
-      return [...prev, ...next];
+      return [...prior, ...next];
     });
   }, []);
 

src/api/form.ts

@@ -3,6 +3,8 @@ export type DynamicField = {
   label: string;
   type: "select" | "number" | "text" | "chips" | "textarea";
   options?: string[];
+  /** Shown beside numeric inputs (from schema or inferred from label). */
+  unit?: string;
 };
 
 export type FormSchemaResponse = {

src/components/PrLineItemsTable.tsx

@@ -16,7 +16,7 @@ export function PrLineItemsTable({ rows, className = "" }: Props) {
       <div className="border-b border-outline-variant bg-surface-container-high px-4 py-2.5 font-label-caps text-[10px] font-bold uppercase tracking-wide text-secondary">
         CLEAN PR — line items
       </div>
-      <div className="overflow-x-auto">
+      <div className="max-h-[min(70vh,560px)] overflow-auto">
         <table className="w-full min-w-[960px] table-fixed border-collapse text-left text-body-sm font-body-sm">
           <colgroup>
             <col className="w-[8%]" />

src/components/ProcurementFormBlock.tsx

@@ -19,6 +19,31 @@ const CTRL =
 const LABEL_CLASS =
   "min-h-[3rem] flex items-end text-[11px] font-bold text-secondary leading-snug";
 
+/** Unit suffix for number fields when schema omits `unit` (cached / legacy schemas). */
+function inferredNumberUnit(label: string): string | undefined {
+  const L = label.toLowerCase();
+  if (/\b(kilograms?|kg)\b/i.test(label)) return "kg";
+  if (/\b(weight|mass|load capacity|weight capacity)\b/.test(L)) return "kg";
+  if (/\b(pounds?|lbs?)\b/i.test(L)) return "lb";
+  if (
+    /\b(millimeters?|millimetres?|mm)\b/i.test(L) ||
+    /\b(seat depth|seat width|seat height)\b/.test(L)
+  )
+    return "mm";
+  if (/\b(centimeters?|centimetres?|cm)\b/i.test(L)) return "cm";
+  if (/\b(inches|inch)\b|\bin\.\b/i.test(L)) return "in";
+  if (/\b(meters?|metres?)\b/i.test(L)) return "m";
+  if (/\bpercent\b|%/i.test(L)) return "%";
+  return undefined;
+}
+
+function unitBadgeText(unit: string): string {
+  const u = unit.trim();
+  if (!u) return u;
+  // Short measurement tokens: show uppercase (kg → KG); leave longer symbols alone.
+  return u.length <= 6 ? u.toUpperCase() : u;
+}
+
 type Props = {
   commodityCode: number;
   intro: string;
@@ -69,6 +94,8 @@ export function ProcurementFormBlock({
   const [confirmBusy, setConfirmBusy] = useState(false);
   const [buildError, setBuildError] = useState<string | null>(null);
   const [justAdded, setJustAdded] = useState(false);
+  /** Enables "Add new" only after this block has successfully committed lines to the PR table. */
+  const [hasCommittedLines, setHasCommittedLines] = useState(false);
 
   useEffect(() => {
     if (!intervalChoices.length) return;
@@ -152,14 +179,31 @@ export function ProcurementFormBlock({
     }
 
     if (f.type === "number") {
+      const unit = (f.unit?.trim() || inferredNumberUnit(f.label)) ?? "";
       return (
         <FieldCell key={f.id} label={f.label}>
-          <input
-            type="number"
-            className={`${CTRL} font-bold`}
-            value={v}
-            onChange={(e) => setDyn(f.id, e.target.value)}
-          />
+          <div className="flex min-h-11 items-stretch gap-2">
+            <input
+              type="number"
+              className={`${CTRL} min-w-0 flex-1 font-bold`}
+              value={v}
+              onChange={(e) => setDyn(f.id, e.target.value)}
+              aria-describedby={unit ? `${f.id}-unit-hint` : undefined}
+            />
+            {unit ? (
+              <>
+                <span id={`${f.id}-unit-hint`} className="sr-only">
+                  Enter value in {unitBadgeText(unit)}
+                </span>
+                <span
+                  className="flex shrink-0 items-center rounded border border-outline-variant bg-surface-container-high px-3 text-xs font-bold uppercase tracking-wide text-secondary"
+                  aria-hidden
+                >
+                  {unitBadgeText(unit)}
+                </span>
+              </>
+            ) : null}
+          </div>
         </FieldCell>
       );
     }
@@ -212,7 +256,12 @@ export function ProcurementFormBlock({
         other_spec: otherSpec,
         year,
       });
+      if (!rows?.length) {
+        setBuildError("No line items were generated. Check deliveries and try again.");
+        return;
+      }
       onCommitPrLines(rows);
+      setHasCommittedLines(true);
       setJustAdded(true);
       window.setTimeout(() => setJustAdded(false), 5000);
     } catch (e) {
@@ -351,8 +400,14 @@ export function ProcurementFormBlock({
                 </button>
                 <button
                   type="button"
+                  disabled={!hasCommittedLines || confirmBusy}
+                  title={
+                    hasCommittedLines
+                      ? "Add another catalogue line to this request"
+                      : "Confirm selection first to add another line"
+                  }
                   onClick={onAddNew}
-                  className="flex flex-1 items-center justify-center gap-2 rounded-xl border border-outline-variant bg-white px-6 py-3 text-body-sm font-semibold text-secondary transition-colors hover:bg-surface-container-high"
+                  className="flex flex-1 items-center justify-center gap-2 rounded-xl border border-outline-variant bg-white px-6 py-3 text-body-sm font-semibold text-secondary transition-colors hover:bg-surface-container-high disabled:cursor-not-allowed disabled:opacity-45"
                 >
                   Add new
                   <Icon name="add" className="text-sm" />