@mieweb/ui 0.11.0-dev.33 → 0.11.0-dev.34

package/dist/esheet.js

@@ -1,23 +1,23 @@
 import './chunk-GADJASST.js';
-import { parseEncounterMdy, DEFAULT_ENCOUNTER_VISIT_DEFINITION, createEncounterFormDefinition, ENCOUNTER_DOCUMENT_FIELD_ID, encounterDocumentResponse, createEncounterSnapshot, updateEncounterDocumentBody, getEncounterSectionFieldId, getEncounterMdyFields, getEncounterSectionFieldIds, getEncounterDocumentBody, renderEncounterMdy, validateEncounterVitals, validateEncounterPlan, validateEncounterConditions, validAssessmentItem, isEncounterDate, validateEncounterAllergyValue, validateEncounterMedicationValue, validateEncounterAssessment, validateEncounterResponses, getEncounterFieldId, validateEncounterDefinition } from './chunk-QNJEDBIN.js';
-export { DEFAULT_ENCOUNTER_VISIT_DEFINITION, ENCOUNTER_DOCUMENT_FIELD_ID, EXAMPLE_ENCOUNTER_VISIT_RESPONSES, createEncounterFormDefinition, createEncounterMdy, createEncounterSnapshot, encounterDocumentResponse, getEncounterConcerns, getEncounterDocumentBody, getEncounterFieldId, getEncounterMdyFields, getEncounterSectionFieldId, getEncounterSectionFieldIds, parseEncounterAssessment, parseEncounterConditions, parseEncounterMdy, parseEncounterPlan, parseEncounterVitals, refreshEncounterMdyLinks, renderEncounterMdy, updateEncounterDocumentBody, validAssessmentItem, validateEncounterAllergyValue, validateEncounterAssessment, validateEncounterConditions, validateEncounterDefinition, validateEncounterMedicationValue, validateEncounterPlan, validateEncounterResponses, validateEncounterVitals } from './chunk-QNJEDBIN.js';
-import { useCodeLookupConfig, CodeLookupContext, Assessment, ConditionEditor, ALLERGY_TYPE_LABELS, lookupToMedicationFields, doseFormToQuantityUnit, DateRangePicker, parseSig, normalizeConditionCodingSystem, MedicationReconciliation, AllergyManager } from './chunk-PYAK7XXD.js';
-import { ProblemList, currentAssertion } from './chunk-KSQQBFDQ.js';
+import { parseEncounterMdy, DEFAULT_ENCOUNTER_VISIT_DEFINITION, createEncounterFormDefinition, ENCOUNTER_DOCUMENT_FIELD_ID, encounterDocumentResponse, createEncounterSnapshot, updateEncounterDocumentBody, getEncounterSectionFieldId, getEncounterMdyFields, getEncounterSectionFieldIds, getEncounterDocumentBody, renderEncounterMdy, validateEncounterVitals, validateEncounterPlan, validateEncounterConditions, validAssessmentItem, isEncounterDate, validateEncounterAllergyValue, validateEncounterMedicationValue, validateEncounterAssessment, validateEncounterResponses, getEncounterFieldId, validateEncounterDefinition } from './chunk-X5HLVACK.js';
+export { DEFAULT_ENCOUNTER_VISIT_DEFINITION, ENCOUNTER_DOCUMENT_FIELD_ID, EXAMPLE_ENCOUNTER_VISIT_RESPONSES, createEncounterFormDefinition, createEncounterMdy, createEncounterSnapshot, encounterDocumentResponse, getEncounterConcerns, getEncounterDocumentBody, getEncounterFieldId, getEncounterMdyFields, getEncounterSectionFieldId, getEncounterSectionFieldIds, parseEncounterAssessment, parseEncounterConditions, parseEncounterMdy, parseEncounterPlan, parseEncounterVitals, refreshEncounterMdyLinks, renderEncounterMdy, updateEncounterDocumentBody, validAssessmentItem, validateEncounterAllergyValue, validateEncounterAssessment, validateEncounterConditions, validateEncounterDefinition, validateEncounterMedicationValue, validateEncounterPlan, validateEncounterResponses, validateEncounterVitals } from './chunk-X5HLVACK.js';
+import { useCodeLookupConfig, CodeLookupContext, Assessment, ConditionEditor, AllergyManager, MedicationReconciliation, normalizeConditionCodingSystem } from './chunk-NW6D6AFL.js';
+import { ProblemList, currentAssertion } from './chunk-SPGP252Q.js';
 import './chunk-YFWDS6MX.js';
 import { ButtonGroup } from './chunk-BBLEGF5L.js';
-import { RadioGroup, Radio } from './chunk-EPSB4WTL.js';
-import { Label } from './chunk-I3WGZPI6.js';
+import './chunk-EPSB4WTL.js';
+import './chunk-I3WGZPI6.js';
 import { DateInput } from './chunk-I6Y2KLTZ.js';
-import { TextAreaRich, Textarea } from './chunk-NAQMIFUF.js';
-import './chunk-WEGKY2LY.js';
+import { TextAreaRich } from './chunk-4SUEBKTY.js';
+import './chunk-EWPNM6OO.js';
 import { MessagesProvider, useMessages } from './chunk-5YOT4DVH.js';
 import './chunk-OQWZYKJM.js';
 import { Select } from './chunk-VCI2Y7ST.js';
 import './chunk-AMYFRY7K.js';
 import './chunk-OYUIEJPN.js';
 import './chunk-QYSUYB3S.js';
-import { Checkbox } from './chunk-753Z3NXL.js';
-import './chunk-TWQSMUE6.js';
+import './chunk-753Z3NXL.js';
+import './chunk-VMEVLBI3.js';
 import './chunk-6NZXWKUE.js';
 import { Input, RequiredMark } from './chunk-3IMM2PM4.js';
 import './chunk-YUMOM3KE.js';
@@ -27,7 +27,7 @@ import './chunk-4SMSH4OY.js';
 import { useEscapeKey } from './chunk-T4ME7QCT.js';
 import './chunk-62ZOA6PX.js';
 import './chunk-WSNMQQ4P.js';
-import { dateToDisplayFormat, displayFormatToDateString } from './chunk-RC2YMOMS.js';
+import './chunk-RC2YMOMS.js';
 import './chunk-ERLPVXOV.js';
 import './chunk-VSQF22GL.js';
 import './chunk-BKSPDTX4.js';
@@ -41,7 +41,7 @@ import './chunk-F4N67NAF.js';
 import { cn } from './chunk-TQONQSJO.js';
 import './chunk-PX6F3LHL.js';
 import * as React11 from 'react';
-import { Save, X, Trash2, Plus } from 'lucide-react';
+import { Save, Trash2, Plus } from 'lucide-react';
 import { EsheetRenderer } from '@esheet/renderer';
 export { EsheetRenderer } from '@esheet/renderer';
 import DOMPurify from 'dompurify';
@@ -658,103 +658,6 @@ function EncounterVitalsField({
     }
   );
 }
-function FreeClinicalEntry({
-  placeholder,
-  translate,
-  onFreeText
-}) {
-  const [text, setText] = React11.useState("");
-  return /* @__PURE__ */ jsxs("div", { className: "flex min-w-0 flex-wrap gap-2", children: [
-    /* @__PURE__ */ jsx(
-      Input,
-      {
-        "aria-label": translate("Clinical entry"),
-        placeholder,
-        value: text,
-        onChange: (event) => setText(event.target.value)
-      }
-    ),
-    /* @__PURE__ */ jsx(
-      Button,
-      {
-        type: "button",
-        disabled: !text.trim(),
-        onClick: () => {
-          onFreeText?.(text.trim());
-          setText("");
-        },
-        children: translate("Add")
-      }
-    )
-  ] });
-}
-function codedOrderSearch(config, requireCoding = true, translate = (message) => message) {
-  const CodedOrderSearch = ({
-    domains,
-    preferDomains,
-    preferCodetypes,
-    billableOnly,
-    placeholder,
-    onPick,
-    onFreeText
-  }) => {
-    if (!config)
-      return /* @__PURE__ */ jsx(
-        FreeClinicalEntry,
-        {
-          placeholder,
-          translate,
-          onFreeText
-        }
-      );
-    const Lookup = config.component;
-    const allowedDomains = domains;
-    return /* @__PURE__ */ jsx(
-      Lookup,
-      {
-        indexUrl: config.indexUrl,
-        locale: config.locale,
-        domains: allowedDomains,
-        preferDomains,
-        preferCodetypes,
-        billableOnly,
-        bare: true,
-        clearOnSelect: true,
-        placeholder,
-        onFreeText: requireCoding ? void 0 : onFreeText,
-        onSelect: (result) => {
-          if (!result.fullid?.trim() || !result.codetype?.trim() || !result.fullcode?.trim() || !result.label?.trim() || allowedDomains !== void 0 && !allowedDomains.includes(result.domain))
-            return;
-          onPick({
-            fullid: result.fullid,
-            label: result.label,
-            codetype: result.codetype,
-            fullcode: result.fullcode
-          });
-        }
-      }
-    );
-  };
-  return CodedOrderSearch;
-}
-var clinicalAssessmentClasses = "rounded-none border-0 bg-transparent shadow-none [&_.border-dashed]:rounded-none [&_.border-dashed]:border-0 [&_.border-dashed]:bg-transparent [&_.border-dashed]:p-0 [&_.min-w-64]:min-w-0 [&_[data-slot=assessment-problem]]:rounded-none [&_[data-slot=assessment-problem]]:border-0 [&_[data-slot=assessment-problem]]:px-0 [&_[data-slot=assessment-problem]>ul]:ms-0 [&_[data-slot=assessment-problem]>ul]:border-0 [&_[data-slot=assessment-problem]>ul]:ps-4 [&_button]:min-h-11 [&_button]:min-w-11 [&_input]:min-h-11 [&_select]:min-h-11 [&>[data-slot=card-content]]:p-0 [&>[data-slot=card-content]>section]:border-0 [&>[data-slot=card-content]>section]:bg-transparent [&>[data-slot=card-content]>section]:px-0";
-var clinicalEntryCardClasses = "bg-muted/40 min-w-0 space-y-3 rounded-lg p-3";
-function ClinicalAddButton({
-  label,
-  onClick
-}) {
-  return /* @__PURE__ */ jsx(
-    Button,
-    {
-      type: "button",
-      variant: "ghost",
-      leftIcon: /* @__PURE__ */ jsx(Plus, { "aria-hidden": "true" }),
-      className: "text-primary-800 hover:bg-primary-50 hover:text-primary-900 active:bg-primary-100 dark:text-primary-400 dark:hover:bg-primary-950 dark:hover:text-primary-200 min-h-11",
-      onClick,
-      children: label
-    }
-  );
-}
 function InvalidClinicalAnswer({
   label,
   answer
@@ -908,9 +811,6 @@ function matchingConditionCode(concern, picked) {
     )
   );
 }
-function clinicalRequiresCoding(field) {
-  return field.definition._sourceData?.encounterRequireCoding ?? true;
-}
 function clinicalAnswerResponse(response, answer) {
   const next = { ...response, answer, _ai: false };
   delete next.selected;
@@ -924,37 +824,6 @@ function useEncounterAssertionDate(field) {
   }, [hostDate]);
   return { date, setDate, valid: isEncounterDate(date) };
 }
-function EncounterAssertionDateInput({
-  date,
-  setDate
-}) {
-  const m = useMessages();
-  const id = React11.useId();
-  const [display, setDisplay] = React11.useState(() => dateToDisplayFormat(date));
-  React11.useEffect(() => {
-    setDisplay(
-      (current) => displayFormatToDateString(current) === date ? current : dateToDisplayFormat(date)
-    );
-  }, [date]);
-  return /* @__PURE__ */ jsxs("div", { className: "flex min-w-0 flex-col gap-1", children: [
-    /* @__PURE__ */ jsx("label", { htmlFor: id, className: "text-sm font-medium", children: m("Assertion date") }),
-    /* @__PURE__ */ jsx(
-      DateInput,
-      {
-        id,
-        value: display,
-        onChange: (value) => {
-          setDisplay(value);
-          setDate(displayFormatToDateString(value));
-        },
-        showCalendar: true,
-        width: "fixed",
-        className: "min-h-11"
-      }
-    ),
-    !isEncounterDate(date) && /* @__PURE__ */ jsx("span", { className: "text-muted-foreground text-sm", children: m("Enter the encounter date before adding or changing a diagnosis.") })
-  ] });
-}
 function readAssessment(answer, externalConcerns) {
   if (!answer) return { value: { concerns: [], items: [], orders: [] } };
   try {
@@ -967,7 +836,7 @@ function readAssessment(answer, externalConcerns) {
   } catch {
     return {
       value: { concerns: [], items: [], orders: [] },
-      error: "The saved assessment answer could not be read. The original answer is retained below; correct it through the visit data before editing."
+      error: "unreadable"
     };
   }
 }
@@ -988,11 +857,9 @@ function EncounterAssessmentField({
   onResponse
 }) {
   const m = useMessages();
-  const requireCoding = clinicalRequiresCoding(field);
   const assertionDate = useEncounterAssertionDate(field);
   const currentDate = React11.useRef(assertionDate);
   currentDate.current = assertionDate;
-  const codeLookup = useCodeLookupConfig();
   const state = useClinicalFormState(form);
   const externalConcerns = React11.useMemo(
     () => getExternalEncounterConditions(state),
@@ -1017,10 +884,6 @@ function EncounterAssessmentField({
   currentValue.current = value;
   const canEdit = React11.useRef(!readOnly);
   canEdit.current = !readOnly;
-  const renderSearch = React11.useMemo(
-    () => codeLookup || !requireCoding ? codedOrderSearch(codeLookup, requireCoding, m) : void 0,
-    [codeLookup, requireCoding, m]
-  );
   const definition = field.definition;
   const commit = (update) => {
     if (!canEdit.current || form.getState().readOnly || form.getState().disposed)
@@ -1035,124 +898,92 @@ function EncounterAssessmentField({
     );
   };
   if (error) {
-    return /* @__PURE__ */ jsx(
-      "section",
+    return /* @__PURE__ */ jsx(InvalidClinicalAnswer, { label: "assessment", answer: response?.answer });
+  }
+  return /* @__PURE__ */ jsxs("section", { className: "space-y-2", children: [
+    /* @__PURE__ */ jsx(
+      Assessment,
       {
+        concerns,
+        items: value.items,
+        orders: value.orders,
         "aria-label": definition.question ?? m("Assessment and plan"),
-        className: "space-y-3",
-        children: /* @__PURE__ */ jsxs(
-          "div",
-          {
-            role: "alert",
-            className: "border-destructive text-destructive rounded-lg border p-3",
-            children: [
-              /* @__PURE__ */ jsx("p", { children: m(error) }),
-              /* @__PURE__ */ jsx(
-                "pre",
+        readOnly,
+        addFormLabel: "Add assessment or order",
+        onAddAssessment: !assertionDate.valid ? void 0 : (pick) => {
+          if (!currentDate.current.valid) return;
+          const existingConcern = pick.code ? concerns.find(
+            (concern) => matchingConditionCode(concern, pick.code)
+          ) : void 0;
+          const existingAssertion = existingConcern && currentAssertion(existingConcern);
+          if (existingConcern && existingAssertion) {
+            commit((next) => ({
+              ...next,
+              items: [
+                ...next.items.filter(
+                  (item) => item.concernId !== existingConcern.concernId
+                ),
                 {
-                  tabIndex: 0,
-                  "aria-label": m("Original assessment answer"),
-                  className: "mt-2 max-h-48 overflow-auto text-xs break-all whitespace-pre-wrap",
-                  children: response?.answer
+                  concernId: existingConcern.concernId,
+                  assertionId: existingAssertion.id
                 }
-              )
-            ]
+              ]
+            }));
+            return;
           }
-        )
-      }
-    );
-  }
-  return /* @__PURE__ */ jsx("section", { className: "space-y-2", children: /* @__PURE__ */ jsx(
-    Assessment,
-    {
-      concerns,
-      items: value.items,
-      orders: value.orders,
-      title: null,
-      addFormStart: !readOnly && /* @__PURE__ */ jsx(EncounterAssertionDateInput, { ...assertionDate }),
-      "aria-label": definition.question ?? m("Assessment and plan"),
-      className: "rounded-none border-0 bg-transparent shadow-none [&_.border-dashed]:rounded-none [&_.border-dashed]:border-0 [&_.border-dashed]:bg-transparent [&_.border-dashed]:p-0 [&_.min-w-64]:min-w-0 [&_[data-slot=assessment-problem]]:rounded-none [&_[data-slot=assessment-problem]]:border-0 [&_[data-slot=assessment-problem]]:px-0 [&_[data-slot=assessment-problem]>ul]:ms-0 [&_[data-slot=assessment-problem]>ul]:border-0 [&_[data-slot=assessment-problem]>ul]:ps-4 [&_button]:min-h-11 [&_button]:min-w-11 [&_input]:min-h-11 [&_select]:min-h-11 [&>[data-slot=card-content]]:p-0 [&>[data-slot=card-content]>section]:border-0 [&>[data-slot=card-content]>section]:bg-transparent [&>[data-slot=card-content]>section]:px-0",
-      readOnly,
-      defaultAddMode: "problem",
-      addFormLabel: "Add assessment or order",
-      renderOrderSearch: renderSearch,
-      onAddAssessment: (codeLookup || !requireCoding) && assertionDate.valid ? (pick) => {
-        if (!currentDate.current.valid || requireCoding && !pick.code)
-          return;
-        const existingConcern = pick.code ? concerns.find(
-          (concern) => matchingConditionCode(concern, pick.code)
-        ) : void 0;
-        const existingAssertion = existingConcern && currentAssertion(existingConcern);
-        if (existingConcern && existingAssertion) {
+          const concernId = globalThis.crypto.randomUUID();
+          const assertionId = globalThis.crypto.randomUUID();
           commit((next) => ({
             ...next,
-            items: [
-              ...next.items.filter(
-                (item) => item.concernId !== existingConcern.concernId
-              ),
+            concerns: [
+              ...next.concerns,
               {
-                concernId: existingConcern.concernId,
-                assertionId: existingAssertion.id
+                concernId,
+                clinicalStatus: "active",
+                source: "manuallyAdded",
+                assertions: [
+                  {
+                    id: assertionId,
+                    date: currentDate.current.date,
+                    text: pick.label,
+                    verificationStatus: "unconfirmed",
+                    coding: pick.code ? [
+                      {
+                        system: pick.code.codetype,
+                        code: pick.code.fullcode,
+                        display: pick.label
+                      }
+                    ] : void 0
+                  }
+                ]
               }
-            ]
+            ],
+            items: [...next.items, { concernId, assertionId }]
           }));
-          return;
-        }
-        const concernId = globalThis.crypto.randomUUID();
-        const assertionId = globalThis.crypto.randomUUID();
-        commit((next) => ({
-          ...next,
-          concerns: [
-            ...next.concerns,
-            {
-              concernId,
-              clinicalStatus: "active",
-              source: "manuallyAdded",
-              assertions: [
-                {
-                  id: assertionId,
-                  date: currentDate.current.date,
-                  text: pick.label,
-                  verificationStatus: "unconfirmed",
-                  coding: pick.code ? [
-                    {
-                      system: pick.code.codetype,
-                      code: pick.code.fullcode,
-                      display: pick.label
-                    }
-                  ] : void 0
-                }
-              ]
-            }
-          ],
-          items: [...next.items, { concernId, assertionId }]
-        }));
-      } : void 0,
-      onRemoveAssessment: (item) => {
-        const wasLocal = currentValue.current.concerns.some(
-          (concern) => concern.concernId === item.concernId
-        );
-        commit((next) => ({
-          ...next,
-          // Removing the row also drops its local concern record — nothing
-          // else can reference it once the orders below are unlinked, and an
-          // orphaned uncoded concern would block Save with no visible repair.
-          concerns: next.concerns.filter(
-            (concern) => concern.concernId !== item.concernId
-          ),
-          items: next.items.filter(
-            (candidate) => candidate.concernId !== item.concernId
-          ),
-          orders: next.orders.map(
-            (order) => order.concernId === item.concernId ? { ...order, concernId: void 0 } : order
-          )
-        }));
-        if (wasLocal && canEdit.current)
-          repairEncounterConcernReferences(form.getState(), item.concernId);
-      },
-      onAddOrder: codeLookup || !requireCoding ? (item, order) => {
-        if (requireCoding && !order.code) return;
-        commit((next) => ({
+        },
+        onRemoveAssessment: (item) => {
+          const wasLocal = currentValue.current.concerns.some(
+            (concern) => concern.concernId === item.concernId
+          );
+          commit((next) => ({
+            ...next,
+            // Removing the row also drops its local concern record — nothing
+            // else can reference it once the orders below are unlinked, and an
+            // orphaned uncoded concern would block Save with no visible repair.
+            concerns: next.concerns.filter(
+              (concern) => concern.concernId !== item.concernId
+            ),
+            items: next.items.filter(
+              (candidate) => candidate.concernId !== item.concernId
+            ),
+            orders: next.orders.map(
+              (order) => order.concernId === item.concernId ? { ...order, concernId: void 0 } : order
+            )
+          }));
+          if (wasLocal && canEdit.current)
+            repairEncounterConcernReferences(form.getState(), item.concernId);
+        },
+        onAddOrder: (item, order) => commit((next) => ({
           ...next,
           orders: [
             ...next.orders,
@@ -1162,36 +993,39 @@ function EncounterAssessmentField({
               concernId: item?.concernId
             }
           ]
-        }));
-      } : void 0,
-      onEditOrder: (order, changes) => commit((next) => ({
-        ...next,
-        orders: next.orders.map(
-          (candidate) => candidate.orderId === order.orderId ? { ...candidate, ...changes } : candidate
-        )
-      })),
-      onRemoveOrder: (order) => commit((next) => ({
-        ...next,
-        orders: next.orders.filter(
-          (candidate) => candidate.orderId !== order.orderId
-        )
-      })),
-      onLinkOrder: (order, concernId) => commit((next) => ({
-        ...next,
-        orders: next.orders.map(
-          (candidate) => candidate.orderId === order.orderId ? { ...candidate, concernId } : candidate
-        )
-      })),
-      onReorderItems: (ids) => commit((next) => ({
-        ...next,
-        items: reorder(next.items, ids, (item) => item.concernId)
-      })),
-      onReorderOrders: (ids) => commit((next) => ({
-        ...next,
-        orders: reorder(next.orders, ids, (order) => order.orderId)
-      }))
-    }
-  ) });
+        })),
+        onEditOrder: (order, changes) => commit((next) => ({
+          ...next,
+          orders: next.orders.map(
+            (candidate) => candidate.orderId === order.orderId ? { ...candidate, ...changes } : candidate
+          )
+        })),
+        onRemoveOrder: (order) => commit((next) => ({
+          ...next,
+          orders: next.orders.filter(
+            (candidate) => candidate.orderId !== order.orderId
+          )
+        })),
+        onLinkOrder: (order, concernId) => commit((next) => ({
+          ...next,
+          orders: next.orders.map(
+            (candidate) => candidate.orderId === order.orderId ? { ...candidate, concernId } : candidate
+          )
+        })),
+        onReorderItems: (ids) => commit((next) => ({
+          ...next,
+          items: reorder(next.items, ids, (item) => item.concernId)
+        })),
+        onReorderOrders: (ids) => commit((next) => ({
+          ...next,
+          orders: reorder(next.orders, ids, (order) => order.orderId)
+        }))
+      }
+    ),
+    !readOnly && !assertionDate.valid && /* @__PURE__ */ jsx("p", { className: "text-muted-foreground text-xs", children: m(
+      "No encounter date \u2014 new diagnoses are disabled; orders can still be added."
+    ) })
+  ] });
 }
 
 // src/esheet-fields/narrativeFindings.ts
@@ -1580,250 +1414,6 @@ function readValue(answer) {
     };
   }
 }
-function parseAnswerDate(value) {
-  const match = /^(\d{4})-(\d{2})-(\d{2})$/.exec(value ?? "");
-  return match ? new Date(Number(match[1]), Number(match[2]) - 1, Number(match[3])) : null;
-}
-function toAnswerDate(date) {
-  if (!date) return void 0;
-  const pad = (part) => String(part).padStart(2, "0");
-  return `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())}`;
-}
-function MedicationCard({
-  index,
-  medication,
-  readOnly,
-  requireCoding,
-  codeLookup,
-  onPatch,
-  onRemove
-}) {
-  const m = useMessages();
-  const id = React11.useId();
-  const Lookup = codeLookup?.component;
-  const text = (value) => value.trim() && value;
-  return /* @__PURE__ */ jsxs("fieldset", { className: clinicalEntryCardClasses, children: [
-    /* @__PURE__ */ jsx("legend", { className: "sr-only", children: m("Medication {number}", { number: index }) }),
-    /* @__PURE__ */ jsxs("div", { className: "flex items-center justify-between gap-2", children: [
-      /* @__PURE__ */ jsx("h4", { className: "font-semibold", children: m("Medication {number}", { number: index }) }),
-      !readOnly && /* @__PURE__ */ jsx(
-        Button,
-        {
-          type: "button",
-          variant: "ghost",
-          size: "icon",
-          className: "shrink-0",
-          "aria-label": m("Remove medication {number}", { number: index }),
-          onClick: onRemove,
-          children: /* @__PURE__ */ jsx(Trash2, { className: "h-4 w-4", "aria-hidden": "true" })
-        }
-      )
-    ] }),
-    !readOnly && Lookup && codeLookup ? /* @__PURE__ */ jsxs("div", { className: "space-y-1.5", children: [
-      /* @__PURE__ */ jsx(
-        Lookup,
-        {
-          indexUrl: codeLookup.indexUrl,
-          locale: codeLookup.locale,
-          domains: ["med"],
-          bare: true,
-          clearOnSelect: false,
-          initialQuery: medication.name || void 0,
-          initialSearch: false,
-          "aria-label": m("Medication"),
-          placeholder: m("Search RxNorm / FDB \u2014 e.g. lisinopril"),
-          onSelect: (pick) => {
-            if (requireCoding && (!pick.codetype.trim() || !pick.fullcode.trim()))
-              return;
-            onPatch(lookupToMedicationFields(pick));
-          },
-          onFreeText: requireCoding ? void 0 : (name) => {
-            if (name.trim()) onPatch({ name, code: void 0 });
-          }
-        }
-      ),
-      /* @__PURE__ */ jsx("p", { className: "text-muted-foreground text-xs", children: medication.code ? m("Coded: {system} {code}", {
-        system: medication.code.system,
-        code: medication.code.code
-      }) : medication.name ? m('Uncoded free text: "{name}" \u2014 pick a result to code it', {
-        name: medication.name
-      }) : requireCoding ? m("Pick a catalog result to code the medication") : m(
-        "Pick a result to code the medication, or press Enter for free text"
-      ) })
-    ] }) : /* @__PURE__ */ jsx(
-      Input,
-      {
-        label: m("Medication"),
-        className: "min-h-11",
-        value: medication.name,
-        readOnly: readOnly || requireCoding,
-        onChange: (event) => {
-          if (event.target.value.trim())
-            onPatch({ name: event.target.value, code: void 0 });
-        }
-      }
-    ),
-    /* @__PURE__ */ jsxs("div", { className: "grid grid-cols-1 gap-3 sm:grid-cols-3", children: [
-      /* @__PURE__ */ jsx(
-        Input,
-        {
-          label: m("Strength"),
-          className: "min-h-11",
-          value: medication.strength ?? "",
-          readOnly,
-          onChange: (event) => onPatch({ strength: text(event.target.value) || void 0 })
-        }
-      ),
-      /* @__PURE__ */ jsx(
-        Input,
-        {
-          label: m("Dose form"),
-          className: "min-h-11",
-          value: medication.doseForm ?? "",
-          readOnly,
-          onChange: (event) => (
-            // Quantity unit follows the dose form (tablet → tablet,
-            // solution → milliliter, …)
-            onPatch({
-              doseForm: event.target.value || void 0,
-              quantityUnit: doseFormToQuantityUnit(event.target.value)
-            })
-          )
-        }
-      ),
-      /* @__PURE__ */ jsx(
-        Input,
-        {
-          label: medication.quantityUnit ? `${m("Quantity")} (${medication.quantityUnit}s)` : m("Quantity"),
-          className: "min-h-11",
-          inputMode: "decimal",
-          value: medication.quantity ?? "",
-          readOnly,
-          onChange: (event) => onPatch({ quantity: text(event.target.value) || void 0 })
-        }
-      )
-    ] }),
-    /* @__PURE__ */ jsxs("div", { className: "grid grid-cols-1 gap-3 sm:grid-cols-3", children: [
-      /* @__PURE__ */ jsx(
-        Input,
-        {
-          label: m("Days supply"),
-          className: "min-h-11",
-          inputMode: "numeric",
-          value: medication.daysSupply ?? "",
-          readOnly,
-          onChange: (event) => onPatch({ daysSupply: text(event.target.value) || void 0 })
-        }
-      ),
-      /* @__PURE__ */ jsx(
-        Input,
-        {
-          label: m("Refills"),
-          className: "min-h-11",
-          inputMode: "numeric",
-          value: medication.refills ?? "",
-          readOnly,
-          onChange: (event) => onPatch({ refills: text(event.target.value) || void 0 })
-        }
-      ),
-      readOnly ? /* @__PURE__ */ jsx(
-        Input,
-        {
-          label: m("Start \u2013 end date"),
-          className: "min-h-11",
-          value: [medication.startDate, medication.endDate].filter(Boolean).join(" \u2013 "),
-          readOnly: true
-        }
-      ) : /* @__PURE__ */ jsxs("div", { className: "min-w-0 space-y-1.5", children: [
-        /* @__PURE__ */ jsx("span", { className: "text-foreground block text-sm font-medium", children: m("Start \u2013 end date") }),
-        /* @__PURE__ */ jsx(
-          DateRangePicker,
-          {
-            className: "w-full [&_[data-slot=date-range-trigger]]:min-h-11 [&_[data-slot=date-range-trigger]]:w-full",
-            variant: "responsive",
-            showPresets: false,
-            placeholder: m("Start \u2013 end date"),
-            value: {
-              start: parseAnswerDate(medication.startDate),
-              end: parseAnswerDate(medication.endDate)
-            },
-            onChange: (range) => onPatch({
-              startDate: toAnswerDate(range.start),
-              endDate: toAnswerDate(range.end)
-            })
-          }
-        )
-      ] })
-    ] }),
-    /* @__PURE__ */ jsxs(
-      RadioGroup,
-      {
-        name: `${id}-substitution`,
-        label: m("Substitution"),
-        value: medication.substitution ?? "0",
-        onValueChange: (value) => {
-          if (!readOnly) onPatch({ substitution: value });
-        },
-        orientation: "horizontal",
-        size: "sm",
-        disabled: readOnly,
-        children: [
-          /* @__PURE__ */ jsx(Radio, { value: "0", label: m("Substitution permitted") }),
-          /* @__PURE__ */ jsx(Radio, { value: "1", label: m("Dispense as written (DAW)") })
-        ]
-      }
-    ),
-    /* @__PURE__ */ jsxs("div", { className: "space-y-1.5", children: [
-      /* @__PURE__ */ jsx(Label, { htmlFor: `${id}-sig`, children: m("Sig (patient directions)") }),
-      /* @__PURE__ */ jsx(
-        Textarea,
-        {
-          id: `${id}-sig`,
-          rows: 2,
-          value: medication.sig ?? "",
-          readOnly,
-          onChange: (event) => {
-            const sig = event.target.value;
-            const { route, frequency, prn } = parseSig(sig);
-            onPatch({ sig, route, frequency, prn: prn || void 0 });
-          }
-        }
-      ),
-      /* @__PURE__ */ jsx("p", { className: "text-muted-foreground text-xs", "aria-live": "polite", children: medication.route || medication.frequency || medication.prn ? /* @__PURE__ */ jsxs(Fragment, { children: [
-        m("Derived:"),
-        " ",
-        [
-          medication.route && m("route {route}", { route: medication.route }),
-          medication.frequency && m(medication.frequency.toLowerCase()),
-          medication.prn && m("PRN (as needed)")
-        ].filter(Boolean).join(" \xB7 ")
-      ] }) : m("Route, frequency, and PRN are derived from the directions") })
-    ] }),
-    /* @__PURE__ */ jsx(
-      Input,
-      {
-        label: m("Indication"),
-        className: "min-h-11",
-        value: medication.indication ?? "",
-        readOnly,
-        onChange: (event) => onPatch({ indication: text(event.target.value) || void 0 })
-      }
-    ),
-    /* @__PURE__ */ jsxs("div", { className: "space-y-1.5", children: [
-      /* @__PURE__ */ jsx(Label, { htmlFor: `${id}-pharmacy-notes`, children: m("Pharmacy notes") }),
-      /* @__PURE__ */ jsx(
-        Textarea,
-        {
-          id: `${id}-pharmacy-notes`,
-          rows: 2,
-          value: medication.pharmacyNotes ?? "",
-          readOnly,
-          onChange: (event) => onPatch({ pharmacyNotes: event.target.value || void 0 })
-        }
-      )
-    ] })
-  ] });
-}
 function EncounterMedicationField({
   field,
   form,
@@ -1837,24 +1427,16 @@ function EncounterMedicationField({
     () => readValue(response?.answer),
     [response?.answer]
   );
-  const m = useMessages();
-  const requireCoding = clinicalRequiresCoding(field);
-  const codeLookup = useCodeLookupConfig();
   const state = useClinicalFormState(form);
-  const [draft, setDraft] = React11.useState(null);
   const readOnly = !(isPreview && isEnabled) || Boolean(isReadOnly) || state.readOnly || state.disposed || Boolean(error);
   const canEdit = React11.useRef(!readOnly);
   canEdit.current = !readOnly;
   const currentValue = React11.useRef(value);
   currentValue.current = value;
-  const definition = field.definition;
-  const commit = (update) => {
+  const commit = (medications) => {
     if (!canEdit.current || form.getState().readOnly || form.getState().disposed)
       return;
-    const next = {
-      ...currentValue.current,
-      medications: update(currentValue.current)
-    };
+    const next = { ...currentValue.current, medications };
     currentValue.current = next;
     onResponse(
       clinicalAnswerResponse(
@@ -1863,77 +1445,15 @@ function EncounterMedicationField({
       )
     );
   };
-  const patchMedication = (medication, patch) => {
-    if (draft && medication.id === draft.id) {
-      const next = { ...draft, ...patch };
-      if (next.name.trim()) {
-        setDraft(null);
-        commit((current) => [...current.medications, next]);
-      } else setDraft(next);
-    } else {
-      commit(
-        (current) => current.medications.map(
-          (candidate) => candidate.id === medication.id ? { ...candidate, ...patch } : candidate
-        )
-      );
-    }
-  };
-  const cards = !readOnly && draft ? [...value.medications, draft] : value.medications;
+  if (error)
+    return /* @__PURE__ */ jsx(InvalidClinicalAnswer, { label: "medication", answer: response?.answer });
   return /* @__PURE__ */ jsx(
-    "section",
+    MedicationReconciliation,
     {
-      "aria-label": definition.question ?? m("Presenting medications"),
-      className: "min-w-0 space-y-3",
-      children: error ? /* @__PURE__ */ jsxs("div", { role: "alert", className: "text-destructive space-y-2 text-sm", children: [
-        /* @__PURE__ */ jsx("p", { children: m(error) }),
-        /* @__PURE__ */ jsx(
-          "pre",
-          {
-            tabIndex: 0,
-            "aria-label": m("Original medication answer"),
-            className: "max-h-48 overflow-auto text-xs break-all whitespace-pre-wrap",
-            children: response?.answer
-          }
-        )
-      ] }) : /* @__PURE__ */ jsxs(Fragment, { children: [
-        !readOnly && requireCoding && !codeLookup && /* @__PURE__ */ jsx("p", { className: "text-muted-foreground text-sm", children: m(
-          "Connect a medication terminology catalog to add coded medications."
-        ) }),
-        requireCoding && value.medications.some((medication) => !medication.code) && /* @__PURE__ */ jsx("p", { className: "text-muted-foreground text-sm", children: m(
-          "Imported medications without a code are retained. Pick a catalog result to code them."
-        ) }),
-        readOnly && value.medications.length === 0 && /* @__PURE__ */ jsx("p", { className: "text-muted-foreground text-sm", children: m("No medications recorded.") }),
-        cards.map((medication, index) => /* @__PURE__ */ jsx(
-          MedicationCard,
-          {
-            index: index + 1,
-            medication,
-            readOnly,
-            requireCoding,
-            codeLookup,
-            onPatch: (patch) => patchMedication(medication, patch),
-            onRemove: () => {
-              if (draft && medication.id === draft.id) setDraft(null);
-              else
-                commit(
-                  (current) => current.medications.filter(({ id }) => id !== medication.id)
-                );
-            }
-          },
-          medication.id
-        )),
-        !readOnly && !draft && (codeLookup || !requireCoding) && /* @__PURE__ */ jsx(
-          ClinicalAddButton,
-          {
-            label: cards.length > 0 ? m("Add another medication") : m("Add medication"),
-            onClick: () => setDraft({
-              id: globalThis.crypto.randomUUID(),
-              name: "",
-              status: "unreconciled"
-            })
-          }
-        )
-      ] })
+      medications: value.medications,
+      onChange: commit,
+      inlineAddSearch: true,
+      readOnly
     }
   );
 }
@@ -1950,201 +1470,6 @@ function readValue2(answer) {
     };
   }
 }
-function AllergyCard({
-  index,
-  allergy,
-  readOnly,
-  requireCoding,
-  codeLookup,
-  onPatch,
-  onRemove
-}) {
-  const m = useMessages();
-  const id = React11.useId();
-  const Lookup = codeLookup?.component;
-  const isDrug = (allergy.type ?? "drug") === "drug";
-  const text = (value) => value.trim() && value;
-  return /* @__PURE__ */ jsxs("fieldset", { className: clinicalEntryCardClasses, children: [
-    /* @__PURE__ */ jsx("legend", { className: "sr-only", children: m("Allergy {number}", { number: index }) }),
-    /* @__PURE__ */ jsxs("div", { className: "flex items-center justify-between gap-2", children: [
-      /* @__PURE__ */ jsx("h4", { className: "font-semibold", children: m("Allergy {number}", { number: index }) }),
-      !readOnly && /* @__PURE__ */ jsx(
-        Button,
-        {
-          type: "button",
-          variant: "ghost",
-          size: "icon",
-          className: "shrink-0",
-          "aria-label": m("Remove allergy {number}", { number: index }),
-          onClick: onRemove,
-          children: /* @__PURE__ */ jsx(Trash2, { className: "h-4 w-4", "aria-hidden": "true" })
-        }
-      )
-    ] }),
-    /* @__PURE__ */ jsxs("div", { className: "grid grid-cols-1 gap-3 sm:grid-cols-3", children: [
-      readOnly ? /* @__PURE__ */ jsx(
-        Input,
-        {
-          label: m("Type"),
-          className: "min-h-11",
-          value: m(ALLERGY_TYPE_LABELS[allergy.type ?? "drug"]),
-          readOnly: true
-        }
-      ) : /* @__PURE__ */ jsx(
-        Select,
-        {
-          label: m("Type"),
-          className: "[&_[data-slot=select-trigger]]:min-h-11",
-          options: Object.keys(ALLERGY_TYPE_LABELS).map(
-            (type) => ({ value: type, label: m(ALLERGY_TYPE_LABELS[type]) })
-          ),
-          value: allergy.type ?? "drug",
-          onValueChange: (next) => {
-            const type = next;
-            onPatch({
-              type,
-              ...type !== (allergy.type ?? "drug") && { code: void 0 }
-            });
-          }
-        }
-      ),
-      /* @__PURE__ */ jsx("div", { className: "min-w-0 sm:col-span-2", children: !readOnly && Lookup && codeLookup && (isDrug || requireCoding) ? /* @__PURE__ */ jsxs("div", { className: "space-y-1.5", children: [
-        /* @__PURE__ */ jsx("span", { className: "text-foreground block text-sm font-medium", children: m("Allergen") }),
-        /* @__PURE__ */ jsx(
-          Lookup,
-          {
-            indexUrl: codeLookup.indexUrl,
-            locale: codeLookup.locale,
-            domains: isDrug ? ["med"] : ["condition"],
-            searchCodetypes: isDrug ? void 0 : ["SNOMED US"],
-            bare: true,
-            clearOnSelect: false,
-            initialQuery: allergy.allergen || void 0,
-            initialSearch: false,
-            "aria-label": m("Allergen"),
-            placeholder: isDrug ? m("Search drug allergens \u2014 e.g. penicillin") : m("Search SNOMED allergen substances"),
-            onSelect: (pick) => {
-              if (requireCoding && (!pick.codetype.trim() || !pick.fullcode.trim()))
-                return;
-              onPatch({
-                allergen: pick.label,
-                code: {
-                  system: pick.codetype,
-                  code: pick.fullcode,
-                  display: pick.label
-                }
-              });
-            },
-            onFreeText: requireCoding ? void 0 : (allergen) => {
-              if (allergen.trim())
-                onPatch({ allergen, code: void 0 });
-            }
-          }
-        ),
-        /* @__PURE__ */ jsx("p", { className: "text-muted-foreground text-xs", children: allergy.code ? m("Coded: {system} {code}", {
-          system: allergy.code.system,
-          code: allergy.code.code
-        }) : allergy.allergen ? m(
-          'Uncoded free text: "{name}" \u2014 pick a result to code it',
-          { name: allergy.allergen }
-        ) : requireCoding ? m("Pick a catalog result to code the allergen") : m(
-          "Pick a result to code the allergen, or press Enter for free text"
-        ) })
-      ] }) : /* @__PURE__ */ jsx(
-        Input,
-        {
-          label: m("Allergen"),
-          className: "min-h-11",
-          value: allergy.allergen,
-          readOnly: readOnly || requireCoding,
-          onChange: (event) => {
-            if (event.target.value.trim())
-              onPatch({ allergen: event.target.value, code: void 0 });
-          }
-        }
-      ) })
-    ] }),
-    /* @__PURE__ */ jsxs("div", { className: "grid grid-cols-1 gap-3 sm:grid-cols-2", children: [
-      /* @__PURE__ */ jsx(
-        Input,
-        {
-          label: m("Reaction"),
-          className: "min-h-11",
-          value: allergy.reaction ?? "",
-          readOnly,
-          onChange: (event) => onPatch({ reaction: text(event.target.value) || void 0 })
-        }
-      ),
-      /* @__PURE__ */ jsx(
-        DateInput,
-        {
-          label: m("Onset date"),
-          className: "min-h-11",
-          value: allergy.onsetDate ?? "",
-          onChange: (next) => {
-            if (!readOnly) onPatch({ onsetDate: next || void 0 });
-          }
-        }
-      )
-    ] }),
-    /* @__PURE__ */ jsxs("div", { className: "grid grid-cols-1 gap-3 sm:grid-cols-2", children: [
-      /* @__PURE__ */ jsxs(
-        RadioGroup,
-        {
-          name: `${id}-kind`,
-          label: m("Mechanism"),
-          description: m(
-            "A true immune-mediated allergy, or a non-immune intolerance (e.g. GI upset)"
-          ),
-          value: allergy.kind ?? "allergy",
-          onValueChange: (next) => {
-            if (!readOnly) onPatch({ kind: next });
-          },
-          orientation: "horizontal",
-          size: "sm",
-          disabled: readOnly,
-          children: [
-            /* @__PURE__ */ jsx(Radio, { value: "allergy", label: m("Allergy") }),
-            /* @__PURE__ */ jsx(Radio, { value: "intolerance", label: m("Intolerance") })
-          ]
-        }
-      ),
-      /* @__PURE__ */ jsxs(
-        RadioGroup,
-        {
-          name: `${id}-severity`,
-          label: m("Severity"),
-          value: allergy.severity ?? "",
-          onValueChange: (next) => {
-            if (!readOnly)
-              onPatch({ severity: next || void 0 });
-          },
-          orientation: "horizontal",
-          size: "sm",
-          disabled: readOnly,
-          children: [
-            /* @__PURE__ */ jsx(Radio, { value: "mild", label: m("Mild") }),
-            /* @__PURE__ */ jsx(Radio, { value: "moderate", label: m("Moderate") }),
-            /* @__PURE__ */ jsx(Radio, { value: "severe", label: m("Severe") })
-          ]
-        }
-      )
-    ] }),
-    /* @__PURE__ */ jsxs("div", { className: "space-y-1.5", children: [
-      /* @__PURE__ */ jsx(Label, { htmlFor: `${id}-note`, children: m("Note") }),
-      /* @__PURE__ */ jsx(
-        Textarea,
-        {
-          id: `${id}-note`,
-          rows: 2,
-          value: allergy.note ?? "",
-          readOnly,
-          onChange: (event) => onPatch({ note: event.target.value || void 0 })
-        }
-      )
-    ] })
-  ] });
-}
 function EncounterAllergyField({
   field,
   form,
@@ -2158,17 +1483,12 @@ function EncounterAllergyField({
     () => readValue2(response?.answer),
     [response?.answer]
   );
-  const m = useMessages();
-  const requireCoding = clinicalRequiresCoding(field);
-  const codeLookup = useCodeLookupConfig();
   const state = useClinicalFormState(form);
-  const [draft, setDraft] = React11.useState(null);
   const readOnly = !(isPreview && isEnabled) || Boolean(isReadOnly) || state.readOnly || state.disposed || Boolean(error);
   const canEdit = React11.useRef(!readOnly);
   canEdit.current = !readOnly;
   const currentValue = React11.useRef(value);
   currentValue.current = value;
-  const definition = field.definition;
   const commitValue = (update) => {
     if (!canEdit.current || form.getState().readOnly || form.getState().disposed)
       return;
@@ -2181,97 +1501,25 @@ function EncounterAllergyField({
       )
     );
   };
-  const commit = (update) => commitValue((current) => {
-    const allergies = update(current);
-    return {
-      ...current,
-      allergies,
-      // Any recorded allergy clears the no-known-allergies flag.
-      noKnownAllergies: allergies.length > 0 ? void 0 : current.noKnownAllergies
-    };
-  });
-  const patchAllergy = (allergy, patch) => {
-    if (draft && allergy.id === draft.id) {
-      const next = { ...draft, ...patch };
-      if (next.allergen.trim()) {
-        setDraft(null);
-        commit((current) => [...current.allergies, next]);
-      } else setDraft(next);
-    } else {
-      commit(
-        (current) => current.allergies.map(
-          (candidate) => candidate.id === allergy.id ? { ...candidate, ...patch } : candidate
-        )
-      );
-    }
-  };
-  const cards = !readOnly && draft ? [...value.allergies, draft] : value.allergies;
+  if (error)
+    return /* @__PURE__ */ jsx(InvalidClinicalAnswer, { label: "allergy", answer: response?.answer });
   return /* @__PURE__ */ jsx(
-    "section",
+    AllergyManager,
     {
-      "aria-label": definition.question ?? m("Allergies and intolerances"),
-      className: "min-w-0 space-y-3",
-      children: error ? /* @__PURE__ */ jsxs("div", { role: "alert", className: "text-destructive space-y-2 text-sm", children: [
-        /* @__PURE__ */ jsx("p", { children: m(error) }),
-        /* @__PURE__ */ jsx(
-          "pre",
-          {
-            tabIndex: 0,
-            "aria-label": m("Original allergy answer"),
-            className: "max-h-48 overflow-auto text-xs break-all whitespace-pre-wrap",
-            children: response?.answer
-          }
-        )
-      ] }) : /* @__PURE__ */ jsxs(Fragment, { children: [
-        !readOnly && requireCoding && !codeLookup && /* @__PURE__ */ jsx("p", { className: "text-muted-foreground text-sm", children: m(
-          "Connect an allergen terminology catalog to add coded allergies."
-        ) }),
-        requireCoding && value.allergies.some((allergy) => !allergy.code) && /* @__PURE__ */ jsx("p", { className: "text-muted-foreground text-sm", children: m(
-          "Imported allergies without a code are retained. Pick a catalog result to code them."
-        ) }),
-        readOnly && value.allergies.length === 0 && /* @__PURE__ */ jsx("p", { className: "text-muted-foreground text-sm", children: value.noKnownAllergies ? m("No known allergies (NKA).") : m("No allergies recorded.") }),
-        cards.map((allergy, index) => /* @__PURE__ */ jsx(
-          AllergyCard,
-          {
-            index: index + 1,
-            allergy,
-            readOnly,
-            requireCoding,
-            codeLookup,
-            onPatch: (patch) => patchAllergy(allergy, patch),
-            onRemove: () => {
-              if (draft && allergy.id === draft.id) setDraft(null);
-              else
-                commit(
-                  (current) => current.allergies.filter(({ id }) => id !== allergy.id)
-                );
-            }
-          },
-          allergy.id
-        )),
-        !readOnly && value.allergies.length === 0 && !draft && /* @__PURE__ */ jsx(
-          Checkbox,
-          {
-            label: m("No known allergies (NKA)"),
-            checked: value.noKnownAllergies ?? false,
-            onChange: (event) => commitValue((current) => ({
-              ...current,
-              noKnownAllergies: event.target.checked
-            }))
-          }
-        ),
-        !readOnly && !draft && (codeLookup || !requireCoding) && /* @__PURE__ */ jsx(
-          ClinicalAddButton,
-          {
-            label: cards.length > 0 ? m("Add another allergy") : m("Add allergy"),
-            onClick: () => setDraft({
-              id: globalThis.crypto.randomUUID(),
-              allergen: "",
-              type: "drug"
-            })
-          }
-        )
-      ] })
+      allergies: value.allergies,
+      onChange: (allergies) => commitValue((current) => ({
+        ...current,
+        allergies,
+        // Any recorded allergy clears the no-known-allergies flag.
+        noKnownAllergies: allergies.length > 0 ? void 0 : current.noKnownAllergies
+      })),
+      noKnownAllergies: value.noKnownAllergies ?? false,
+      onNoKnownAllergiesChange: (noKnownAllergies) => commitValue((current) => ({
+        ...current,
+        noKnownAllergies: current.allergies.length > 0 ? void 0 : noKnownAllergies
+      })),
+      inlineAddSearch: true,
+      readOnly
     }
   );
 }
@@ -2300,14 +1548,11 @@ function EncounterConditionsField({
     [response?.answer]
   );
   const m = useMessages();
-  const requireCoding = clinicalRequiresCoding(field);
+  const codeLookup = useCodeLookupConfig();
   const assertionDate = useEncounterAssertionDate(field);
   const currentDate = React11.useRef(assertionDate);
   currentDate.current = assertionDate;
-  const [adding, setAdding] = React11.useState(false);
-  const [manualEditing, setManualEditing] = React11.useState(false);
   const state = useClinicalFormState(form);
-  const codeLookup = useCodeLookupConfig();
   const readOnly = !(isPreview && isEnabled) || Boolean(isReadOnly) || state.readOnly || state.disposed || !value;
   const currentValue = React11.useRef(value);
   const currentResponse = React11.useRef(response);
@@ -2315,211 +1560,210 @@ function EncounterConditionsField({
   const canEdit = React11.useRef(!readOnly);
   currentValue.current = value;
   canEdit.current = !readOnly;
-  const [editing, setEditing] = React11.useState(
-    null
-  );
-  const definition = field.definition;
-  const label = definition.question ?? m("Conditions");
+  const [editor, setEditor] = React11.useState(null);
   const commit = (update) => {
     if (!canEdit.current || form.getState().readOnly || form.getState().disposed || !currentValue.current)
       return;
+    const next = update(currentValue.current);
+    currentValue.current = next;
     onResponse(
       clinicalAnswerResponse(
         form.getState().responses[field.definition.id] ?? currentResponse.current,
-        JSON.stringify(update(currentValue.current))
+        JSON.stringify(next)
       )
     );
   };
-  const recordAssertion = (draft, pick) => {
-    if (!currentDate.current.valid || requireCoding && !draft.coding?.length)
-      return;
+  const saveAssertion = (concernId, draft) => {
+    if (!currentDate.current.valid) return;
+    const assertion = {
+      ...draft,
+      id: globalThis.crypto.randomUUID(),
+      date: currentDate.current.date
+    };
     commit((next) => {
-      const assertion = {
-        ...draft,
-        id: globalThis.crypto.randomUUID(),
-        date: currentDate.current.date
-      };
-      if (editing)
+      if (!concernId)
         return {
           ...next,
-          concerns: next.concerns.map(
-            (concern) => concern.concernId === editing.concernId ? {
-              ...concern,
-              assertions: [
-                ...concern.assertions,
-                {
-                  ...assertion,
-                  changeType: draft.changeType ?? "refinement",
-                  supersedes: currentAssertion(concern)?.id
-                }
-              ]
-            } : concern
-          )
+          concerns: [
+            ...next.concerns,
+            {
+              concernId: globalThis.crypto.randomUUID(),
+              clinicalStatus: "active",
+              source: "manuallyAdded",
+              assertions: [assertion]
+            }
+          ]
         };
-      if (pick && next.concerns.some((concern) => matchingConditionCode(concern, pick)))
-        return next;
       return {
         ...next,
-        concerns: [
-          ...next.concerns,
-          {
-            concernId: globalThis.crypto.randomUUID(),
-            clinicalStatus: "active",
-            source: "manuallyAdded",
-            assertions: [assertion]
-          }
-        ]
+        concerns: next.concerns.map((concern) => {
+          if (concern.concernId !== concernId) return concern;
+          const prior = currentAssertion(concern);
+          const assertions = draft.changeType === "revision" && prior ? concern.assertions.map(
+            (candidate) => candidate.id === prior.id ? { ...candidate, verificationStatus: "refuted" } : candidate
+          ) : concern.assertions;
+          return {
+            ...concern,
+            assertions: [
+              ...assertions,
+              { ...assertion, supersedes: prior?.id }
+            ]
+          };
+        })
       };
     });
-    if (canEdit.current) {
-      setEditing(null);
-      setManualEditing(false);
-    }
   };
   if (!value)
-    return /* @__PURE__ */ jsx(InvalidClinicalAnswer, { label, answer: response?.answer });
-  const editingConcern = editing ? value.concerns.find(({ concernId }) => concernId === editing.concernId) : void 0;
-  const Lookup = codeLookup?.component;
-  const problemList = /* @__PURE__ */ jsx(
-    ProblemList,
+    return /* @__PURE__ */ jsx(InvalidClinicalAnswer, { label: "condition", answer: response?.answer });
+  const editorConcern = editor?.concernId ? value.concerns.find(({ concernId }) => concernId === editor.concernId) : void 0;
+  const canAssert = assertionDate.valid;
+  const addSearch = codeLookup && !readOnly && canAssert ? /* @__PURE__ */ jsx(
+    codeLookup.component,
     {
-      concerns: value.concerns,
-      title: null,
-      readOnly,
-      actions: [
-        ...assertionDate.valid && (codeLookup || !requireCoding) ? ["refine"] : [],
-        "remove"
-      ],
-      inlineActions: true,
-      className: "rounded-none border-0 bg-transparent shadow-none [&_[data-slot=clinical-list-heading]]:hidden [&_button]:min-h-11 [&_button]:min-w-11 [&>[data-slot=card-content]]:space-y-2 [&>[data-slot=card-content]]:p-0",
-      onAction: (concern, action) => {
-        if (readOnly) return;
-        if (action === "remove") {
-          setEditing(
-            (current) => current?.concernId === concern.concernId ? null : current
-          );
-          commit((next) => ({
-            ...next,
-            concerns: next.concerns.filter(
-              (candidate) => candidate.concernId !== concern.concernId
-            )
-          }));
-          if (canEdit.current)
-            repairEncounterConcernReferences(
-              form.getState(),
-              concern.concernId
-            );
-        } else if (action === "refine") {
-          setEditing({ concernId: concern.concernId });
-          if (!codeLookup) setManualEditing(true);
-        }
+      indexUrl: codeLookup.indexUrl,
+      locale: codeLookup.locale,
+      domains: ["condition"],
+      preferCodetypes: ["ICD10"],
+      bare: true,
+      clearOnSelect: true,
+      placeholder: m("Search conditions to add"),
+      onSelect: (result) => {
+        const coded = result.codetype.trim() && result.fullcode.trim();
+        if (coded && (currentValue.current ?? value).concerns.some(
+          (concern) => matchingConditionCode(concern, result)
+        ))
+          return;
+        saveAssertion(void 0, {
+          text: result.label,
+          verificationStatus: "unconfirmed",
+          ...coded ? {
+            coding: [
+              {
+                system: result.codetype,
+                code: result.fullcode,
+                display: result.label,
+                primary: true
+              }
+            ]
+          } : {}
+        });
       },
-      onReorder: (ids) => commit((next) => ({
-        ...next,
-        concerns: reorderClinicalEntries(
-          next.concerns,
-          ids,
-          ({ concernId }) => concernId
-        )
-      }))
+      onFreeText: (text) => saveAssertion(void 0, {
+        text,
+        verificationStatus: "unconfirmed"
+      })
     }
-  );
-  return /* @__PURE__ */ jsxs("section", { "aria-label": label, className: "min-w-0 space-y-2", children: [
-    !readOnly && (adding || editingConcern || value.concerns.length > 0) && /* @__PURE__ */ jsxs("div", { className: clinicalEntryCardClasses, children: [
-      /* @__PURE__ */ jsxs("div", { className: "flex items-center justify-between gap-2", children: [
-        /* @__PURE__ */ jsx("h4", { className: "min-w-0 font-semibold break-words", children: editingConcern ? /* @__PURE__ */ jsxs(Fragment, { children: [
-          m("Refine"),
-          " ",
-          currentAssertion(editingConcern)?.text
-        ] }) : m("Add condition") }),
-        (editingConcern || value.concerns.length === 0) && /* @__PURE__ */ jsx(
-          Button,
-          {
-            type: "button",
-            variant: "ghost",
-            size: "icon",
-            className: "shrink-0",
-            "aria-label": m("Cancel"),
-            onClick: () => {
-              setEditing(null);
-              setAdding(false);
-              setManualEditing(false);
-            },
-            children: /* @__PURE__ */ jsx(X, { className: "h-4 w-4", "aria-hidden": "true" })
+  ) : void 0;
+  return /* @__PURE__ */ jsxs(Fragment, { children: [
+    /* @__PURE__ */ jsx(
+      ProblemList,
+      {
+        concerns: value.concerns,
+        readOnly,
+        actions: canAssert ? ["observe", "refine", "revise", "relate", "resolve", "remove"] : ["relate", "resolve", "remove"],
+        onAction: (concern, action) => {
+          if (action === "remove") {
+            setEditor(null);
+            commit((next) => ({
+              ...next,
+              concerns: next.concerns.filter(
+                (candidate) => candidate.concernId !== concern.concernId
+              )
+            }));
+            if (canEdit.current)
+              repairEncounterConcernReferences(
+                form.getState(),
+                concern.concernId
+              );
+          } else if (action === "resolve") {
+            commit((next) => ({
+              ...next,
+              concerns: next.concerns.map(
+                (candidate) => candidate.concernId === concern.concernId ? { ...candidate, clinicalStatus: "resolved" } : candidate
+              )
+            }));
+          } else if (action === "observe" || action === "refine" || action === "revise" || action === "relate") {
+            setEditor({ mode: action, concernId: concern.concernId });
           }
-        )
-      ] }),
-      /* @__PURE__ */ jsxs("div", { className: "flex min-w-0 flex-col gap-3 sm:flex-row sm:flex-wrap sm:items-end", children: [
-        /* @__PURE__ */ jsx(EncounterAssertionDateInput, { ...assertionDate }),
-        assertionDate.valid && Lookup && codeLookup && /* @__PURE__ */ jsx("div", { className: "min-w-0 flex-1 sm:basis-56", children: /* @__PURE__ */ jsx(
-          Lookup,
-          {
-            indexUrl: codeLookup.indexUrl,
-            locale: codeLookup.locale,
-            domains: ["condition"],
-            preferCodetypes: ["ICD10"],
-            bare: true,
-            clearOnSelect: true,
-            initialQuery: editingConcern ? currentAssertion(editingConcern)?.text : "",
-            "aria-label": editingConcern ? m("Recode condition") : m("Add condition"),
-            placeholder: editingConcern ? m("Search replacement diagnosis\u2026") : m("Search conditions\u2026"),
-            onSelect: (pick) => {
-              if (!pick.fullid?.trim() || !pick.codetype?.trim() || !pick.fullcode?.trim() || !pick.label?.trim() || pick.domain !== "condition")
-                return;
-              recordAssertion(
-                {
-                  text: pick.label,
-                  verificationStatus: "unconfirmed",
-                  coding: [
+        },
+        addSearch,
+        onAddProblem: addSearch || !canAssert ? void 0 : (text) => saveAssertion(void 0, {
+          text,
+          verificationStatus: "unconfirmed"
+        }),
+        onAdd: canAssert ? () => setEditor({ mode: "add" }) : void 0,
+        onReorder: (ids) => commit((next) => ({
+          ...next,
+          concerns: reorderClinicalEntries(
+            next.concerns,
+            ids,
+            ({ concernId }) => concernId
+          )
+        }))
+      }
+    ),
+    /* @__PURE__ */ jsx(
+      ConditionEditor,
+      {
+        mode: editor?.mode ?? "add",
+        open: editor !== null,
+        onOpenChange: (open) => {
+          if (!open) setEditor(null);
+        },
+        concern: editor?.mode === "add" ? void 0 : editorConcern,
+        relatableConcerns: value.concerns.filter(
+          ({ concernId }) => concernId !== editor?.concernId
+        ),
+        onSave: (draft) => {
+          saveAssertion(
+            editor?.mode === "add" ? void 0 : editor?.concernId,
+            draft
+          );
+          setEditor(null);
+        },
+        onRelate: (relationship) => {
+          const target = editor?.concernId;
+          if (target)
+            commit((next) => ({
+              ...next,
+              concerns: next.concerns.map(
+                (concern) => concern.concernId === target ? {
+                  ...concern,
+                  relationships: [
+                    ...concern.relationships ?? [],
+                    relationship
+                  ]
+                } : concern
+              )
+            }));
+          setEditor(null);
+        },
+        onAddObservation: (text) => {
+          const target = editor?.concernId;
+          if (target && currentDate.current.valid)
+            commit((next) => ({
+              ...next,
+              concerns: next.concerns.map(
+                (concern) => concern.concernId === target ? {
+                  ...concern,
+                  observations: [
+                    ...concern.observations ?? [],
                     {
-                      system: pick.codetype,
-                      code: pick.fullcode,
-                      display: pick.label,
-                      primary: true
+                      id: globalThis.crypto.randomUUID(),
+                      date: currentDate.current.date,
+                      text
                     }
                   ]
-                },
-                pick
-              );
-            }
-          },
-          editing ? editing.concernId : "add"
-        ) })
-      ] }),
-      assertionDate.valid && !requireCoding && /* @__PURE__ */ jsxs(Fragment, { children: [
-        /* @__PURE__ */ jsx(
-          Button,
-          {
-            type: "button",
-            onClick: () => {
-              setManualEditing(true);
-            },
-            children: m("Other\u2026")
-          }
-        ),
-        /* @__PURE__ */ jsx(
-          ConditionEditor,
-          {
-            mode: editing ? "refine" : "add",
-            open: manualEditing,
-            onOpenChange: setManualEditing,
-            concern: editingConcern,
-            renderCodeSearch: false,
-            onSave: (draft) => recordAssertion(draft)
-          }
-        )
-      ] }),
-      value.concerns.length > 0 && problemList
-    ] }),
-    !readOnly && !adding && !editingConcern && value.concerns.length === 0 && (codeLookup || !requireCoding) && /* @__PURE__ */ jsx(
-      ClinicalAddButton,
-      {
-        label: m("Add condition"),
-        onClick: () => setAdding(true)
+                } : concern
+              )
+            }));
+          setEditor(null);
+        }
       }
     ),
-    !readOnly && requireCoding && !codeLookup && /* @__PURE__ */ jsx("p", { className: "text-muted-foreground text-sm", children: m("Coded condition search is unavailable.") }),
-    readOnly && problemList
+    !readOnly && !canAssert && /* @__PURE__ */ jsx("p", { className: "text-muted-foreground mt-2 text-xs", children: m(
+      "No encounter date \u2014 conditions cannot be added or revised until the visit provides one."
+    ) })
   ] });
 }
 function readPlan(answer) {
@@ -2588,9 +1832,7 @@ function EncounterPlanField({
     [response?.answer]
   );
   const m = useMessages();
-  const requireCoding = clinicalRequiresCoding(field);
   const state = useClinicalFormState(form);
-  const codeLookup = useCodeLookupConfig();
   const readOnly = !(isPreview && isEnabled) || Boolean(isReadOnly) || state.readOnly || state.disposed || !value;
   const currentValue = React11.useRef(value);
   const currentResponse = React11.useRef(response);
@@ -2616,71 +1858,58 @@ function EncounterPlanField({
       )
     );
   };
-  const renderSearch = React11.useMemo(
-    () => codeLookup || !requireCoding ? codedOrderSearch(codeLookup, requireCoding, m) : void 0,
-    [codeLookup, requireCoding, m]
-  );
   if (!value)
     return /* @__PURE__ */ jsx(InvalidClinicalAnswer, { label, answer: response?.answer });
-  return /* @__PURE__ */ jsxs("section", { "aria-label": label, className: "min-w-0 space-y-2", children: [
-    /* @__PURE__ */ jsx(
-      Assessment,
-      {
-        concerns,
-        items,
-        orders: value.orders,
-        title: null,
-        className: clinicalAssessmentClasses,
-        readOnly,
-        rowActions: codeLookup || !requireCoding ? ["add-order"] : [],
-        addModes: ["order"],
-        addFormLabel: "Add plan order",
-        defaultAddMode: "order",
-        renderOrderSearch: renderSearch,
-        onAddOrder: codeLookup || !requireCoding ? (item, order) => {
-          if (requireCoding && !order.code) return;
-          commit((next) => ({
-            ...next,
-            orders: [
-              ...next.orders,
-              {
-                ...order,
-                orderId: globalThis.crypto.randomUUID(),
-                concernId: item?.concernId
-              }
-            ]
-          }));
-        } : void 0,
-        onEditOrder: (order, changes) => commit((next) => ({
-          ...next,
-          orders: next.orders.map(
-            (candidate) => candidate.orderId === order.orderId ? { ...candidate, ...changes } : candidate
-          )
-        })),
-        onRemoveOrder: (order) => commit((next) => ({
-          ...next,
-          orders: next.orders.filter(
-            (candidate) => candidate.orderId !== order.orderId
-          )
-        })),
-        onLinkOrder: (order, concernId) => commit((next) => ({
-          ...next,
-          orders: next.orders.map(
-            (candidate) => candidate.orderId === order.orderId ? { ...candidate, concernId } : candidate
-          )
-        })),
-        onReorderOrders: (ids) => commit((next) => ({
-          ...next,
-          orders: reorderClinicalEntries(
-            next.orders,
-            ids,
-            ({ orderId }) => orderId
-          )
-        }))
-      }
-    ),
-    !readOnly && requireCoding && !codeLookup && /* @__PURE__ */ jsx("p", { className: "text-muted-foreground text-sm", children: m("Coded order search is unavailable.") })
-  ] });
+  return /* @__PURE__ */ jsx("section", { "aria-label": label, className: "min-w-0 space-y-2", children: /* @__PURE__ */ jsx(
+    Assessment,
+    {
+      concerns,
+      items,
+      orders: value.orders,
+      title: label,
+      readOnly,
+      rowActions: ["add-order"],
+      addModes: ["order"],
+      addFormLabel: "Add plan order",
+      onAddOrder: (item, order) => commit((next) => ({
+        ...next,
+        orders: [
+          ...next.orders,
+          {
+            ...order,
+            orderId: globalThis.crypto.randomUUID(),
+            concernId: item?.concernId
+          }
+        ]
+      })),
+      onEditOrder: (order, changes) => commit((next) => ({
+        ...next,
+        orders: next.orders.map(
+          (candidate) => candidate.orderId === order.orderId ? { ...candidate, ...changes } : candidate
+        )
+      })),
+      onRemoveOrder: (order) => commit((next) => ({
+        ...next,
+        orders: next.orders.filter(
+          (candidate) => candidate.orderId !== order.orderId
+        )
+      })),
+      onLinkOrder: (order, concernId) => commit((next) => ({
+        ...next,
+        orders: next.orders.map(
+          (candidate) => candidate.orderId === order.orderId ? { ...candidate, concernId } : candidate
+        )
+      })),
+      onReorderOrders: (ids) => commit((next) => ({
+        ...next,
+        orders: reorderClinicalEntries(
+          next.orders,
+          ids,
+          ({ orderId }) => orderId
+        )
+      }))
+    }
+  ) });
 }
 
 // src/components/EncounterVisit/fields.ts