@happyvertical/smrt-svelte 0.43.4 → 0.43.6

package/dist/components/forms/__tests__/form-with-structured-fields.fixture.svelte

@@ -1,40 +1,105 @@
 <script lang="ts">
+import {
+  type ControlInteractionRegistry,
+  Input,
+} from '@happyvertical/smrt-ui/forms';
 import AddressInput from '../AddressInput.svelte';
 import DateRangeInput from '../DateRangeInput.svelte';
 import Form from '../Form.svelte';
 import MeasurementInput from '../MeasurementInput.svelte';
+import TextInput from '../TextInput.svelte';
 
 let {
   onsubmit = undefined,
   webmcp = false,
   addressFields = ['street', 'city', 'province', 'postalCode', 'country'],
+  addressCountries = undefined,
+  addressProvinces = undefined,
   structuredRequired = true,
+  interactionRegistry = undefined,
+  fieldsetDisabled = false,
+  onmeasurementchange = undefined,
+  ondateschange = undefined,
+  onaddresschange = undefined,
+  measurementStep = undefined,
+  measurementUnits = undefined,
+  measurementLabel = 'Measurement',
+  measurementMin = undefined,
+  measurementMax = undefined,
+  minDate = undefined,
+  maxDate = undefined,
+  dateDisabled = false,
+  measurementName = 'measurement',
+  showCollidingSibling = false,
+  showExactNameCollisions = false,
+  showBaseControlCollision = false,
 }: {
   onsubmit?: (data: Record<string, unknown>) => void;
   webmcp?: boolean;
   addressFields?: Array<
     'street' | 'city' | 'province' | 'postalCode' | 'country'
   >;
+  addressCountries?: Array<{ value: string; label: string }>;
+  addressProvinces?: Array<{ value: string; label: string }>;
   structuredRequired?: boolean;
+  interactionRegistry?: ControlInteractionRegistry;
+  fieldsetDisabled?: boolean;
+  onmeasurementchange?: (value: { value: number; unit: string } | null) => void;
+  ondateschange?: (value: { startDate: string; endDate: string }) => void;
+  onaddresschange?: (value: Partial<Record<string, string>>) => void;
+  measurementStep?: number;
+  measurementUnits?: Array<'ft' | 'in' | 'm' | 'cm' | 'mm' | 'yd'>;
+  measurementLabel?: string;
+  measurementMin?: number;
+  measurementMax?: number;
+  minDate?: string;
+  maxDate?: string;
+  dateDisabled?: boolean;
+  measurementName?: string;
+  showCollidingSibling?: boolean;
+  showExactNameCollisions?: boolean;
+  showBaseControlCollision?: boolean;
 } = $props();
 </script>
 
-<Form {onsubmit} {webmcp}>
+<Form {onsubmit} {webmcp} {interactionRegistry} formId="structured-fields">
+	<fieldset disabled={fieldsetDisabled}>
 	<MeasurementInput
-		name="measurement"
-		label="Measurement"
+		name={measurementName}
+		label={measurementLabel}
 		required={structuredRequired}
+		min={measurementMin}
+		max={measurementMax}
+		step={measurementStep}
+		units={measurementUnits}
+		onchange={onmeasurementchange}
 	/>
 	<DateRangeInput
 		name="dates"
 		label="Dates"
 		required={structuredRequired}
+		{minDate}
+		{maxDate}
+		disabled={dateDisabled}
+		onchange={ondateschange}
 	/>
 	<AddressInput
 		name="address"
 		label="Address"
 		fields={addressFields}
+		countries={addressCountries}
+		provinces={addressProvinces}
 		required={structuredRequired}
-	/>
+		onchange={onaddresschange}
+		/>
+	</fieldset>
+	{#if showExactNameCollisions}
+		<TextInput name="address[city]" label="Exact address city" />
+		<TextInput name="{measurementName}_unit" label="Exact measurement unit" />
+	{/if}
+	{#if showBaseControlCollision}
+		<Input name="address[city]" data-testid="base-address-city" />
+	{/if}
+	{#if showCollidingSibling}<input name="{measurementName}_note" />{/if}
 	<button type="submit">Submit</button>
 </Form>

package/dist/components/forms/__tests__/form-with-structured-fields.fixture.svelte.d.ts

@@ -1,8 +1,40 @@
+import { type ControlInteractionRegistry } from '@happyvertical/smrt-ui/forms';
 type $$ComponentProps = {
     onsubmit?: (data: Record<string, unknown>) => void;
     webmcp?: boolean;
     addressFields?: Array<'street' | 'city' | 'province' | 'postalCode' | 'country'>;
+    addressCountries?: Array<{
+        value: string;
+        label: string;
+    }>;
+    addressProvinces?: Array<{
+        value: string;
+        label: string;
+    }>;
     structuredRequired?: boolean;
+    interactionRegistry?: ControlInteractionRegistry;
+    fieldsetDisabled?: boolean;
+    onmeasurementchange?: (value: {
+        value: number;
+        unit: string;
+    } | null) => void;
+    ondateschange?: (value: {
+        startDate: string;
+        endDate: string;
+    }) => void;
+    onaddresschange?: (value: Partial<Record<string, string>>) => void;
+    measurementStep?: number;
+    measurementUnits?: Array<'ft' | 'in' | 'm' | 'cm' | 'mm' | 'yd'>;
+    measurementLabel?: string;
+    measurementMin?: number;
+    measurementMax?: number;
+    minDate?: string;
+    maxDate?: string;
+    dateDisabled?: boolean;
+    measurementName?: string;
+    showCollidingSibling?: boolean;
+    showExactNameCollisions?: boolean;
+    showBaseControlCollision?: boolean;
 };
 declare const FormWithStructuredFields: import("svelte").Component<$$ComponentProps, {}, "">;
 type FormWithStructuredFields = ReturnType<typeof FormWithStructuredFields>;

package/dist/components/forms/__tests__/form-with-structured-fields.fixture.svelte.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"form-with-structured-fields.fixture.svelte.d.ts","sourceRoot":"","sources":["../../../../src/components/forms/__tests__/form-with-structured-fields.fixture.svelte.ts"],"names":[],"mappings":"AAQC,KAAK,gBAAgB,GAAI;IACxB,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,CAAC;IACnD,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,aAAa,CAAC,EAAE,KAAK,CACnB,QAAQ,GAAG,MAAM,GAAG,UAAU,GAAG,YAAY,GAAG,SAAS,CAC1D,CAAC;IACF,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B,CAAC;AAwBF,QAAA,MAAM,wBAAwB,sDAAwC,CAAC;AACvE,KAAK,wBAAwB,GAAG,UAAU,CAAC,OAAO,wBAAwB,CAAC,CAAC;AAC5E,eAAe,wBAAwB,CAAC"}
+{"version":3,"file":"form-with-structured-fields.fixture.svelte.d.ts","sourceRoot":"","sources":["../../../../src/components/forms/__tests__/form-with-structured-fields.fixture.svelte.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,KAAK,0BAA0B,EAEhC,MAAM,8BAA8B,CAAC;AAOrC,KAAK,gBAAgB,GAAI;IACxB,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,CAAC;IACnD,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,aAAa,CAAC,EAAE,KAAK,CACnB,QAAQ,GAAG,MAAM,GAAG,UAAU,GAAG,YAAY,GAAG,SAAS,CAC1D,CAAC;IACF,gBAAgB,CAAC,EAAE,KAAK,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC3D,gBAAgB,CAAC,EAAE,KAAK,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC3D,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,mBAAmB,CAAC,EAAE,0BAA0B,CAAC;IACjD,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,mBAAmB,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,KAAK,IAAI,CAAC;IAC9E,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;IACxE,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,KAAK,IAAI,CAAC;IACnE,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,gBAAgB,CAAC,EAAE,KAAK,CAAC,IAAI,GAAG,IAAI,GAAG,GAAG,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,CAAC,CAAC;IACjE,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,wBAAwB,CAAC,EAAE,OAAO,CAAC;CACpC,CAAC;AAuDF,QAAA,MAAM,wBAAwB,sDAAwC,CAAC;AACvE,KAAK,wBAAwB,GAAG,UAAU,CAAC,OAAO,wBAAwB,CAAC,CAAC;AAC5E,eAAe,wBAAwB,CAAC"}

package/dist/components/forms/__tests__/legacy-form-context.fixture.svelte

@@ -0,0 +1,44 @@
+<script lang="ts">
+import { createControlInteractionRegistry } from '@happyvertical/smrt-ui/forms';
+import {
+  type FieldDefinition,
+  type SMRTFormContext,
+  setFormContext,
+} from '../../../state/form-context.js';
+import TextInput from '../TextInput.svelte';
+
+let {
+  showField = true,
+  onregister,
+  onunregister,
+}: {
+  showField?: boolean;
+  onregister?: (name: string) => void;
+  onunregister?: (name: string) => void;
+} = $props();
+
+const fields = new Map<string, FieldDefinition>();
+const legacyContext: SMRTFormContext = {
+  mode: 'default',
+  registerField(field) {
+    fields.set(field.name, field);
+    onregister?.(field.name);
+  },
+  unregisterField(name) {
+    fields.delete(name);
+    onunregister?.(name);
+  },
+  getFieldSchema: () => Array.from(fields.values()),
+  isFormListening: false,
+  isExtracting: false,
+  toggleListening: () => {},
+  interactionRegistry: createControlInteractionRegistry(),
+  formId: 'legacy-context',
+};
+
+setFormContext(legacyContext);
+</script>
+
+{#if showField}
+  <TextInput name="legacy-field" label="Legacy field" />
+{/if}

package/dist/components/forms/__tests__/legacy-form-context.fixture.svelte.d.ts

@@ -0,0 +1,9 @@
+type $$ComponentProps = {
+    showField?: boolean;
+    onregister?: (name: string) => void;
+    onunregister?: (name: string) => void;
+};
+declare const LegacyFormContext: import("svelte").Component<$$ComponentProps, {}, "">;
+type LegacyFormContext = ReturnType<typeof LegacyFormContext>;
+export default LegacyFormContext;
+//# sourceMappingURL=legacy-form-context.fixture.svelte.d.ts.map

package/dist/components/forms/__tests__/legacy-form-context.fixture.svelte.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"legacy-form-context.fixture.svelte.d.ts","sourceRoot":"","sources":["../../../../src/components/forms/__tests__/legacy-form-context.fixture.svelte.ts"],"names":[],"mappings":"AAWC,KAAK,gBAAgB,GAAI;IACxB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,UAAU,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACpC,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CACvC,CAAC;AAwCF,QAAA,MAAM,iBAAiB,sDAAwC,CAAC;AAChE,KAAK,iBAAiB,GAAG,UAAU,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAC9D,eAAe,iBAAiB,CAAC"}

package/dist/components/forms/__tests__/policy-field.fixture.svelte

@@ -0,0 +1,35 @@
+<script lang="ts">
+import { onMount } from 'svelte';
+import { tryGetFormContext } from '../../../state/form-context.js';
+
+let {
+  sensitivity = 'public',
+  writable = true,
+}: {
+  sensitivity?: 'public' | 'secret';
+  writable?: boolean;
+} = $props();
+let value = $state('Ada');
+const policyLabel = 'Policy field';
+const formContext = tryGetFormContext();
+
+onMount(() => {
+  return formContext?.registerField({
+    name: 'policy',
+    type: 'text',
+    label: policyLabel,
+    get sensitivity() {
+      return sensitivity;
+    },
+    get writable() {
+      return writable;
+    },
+    setValue: (next) => {
+      value = String(next ?? '');
+    },
+    getValue: () => value,
+  });
+});
+</script>
+
+<input name="policy" aria-label={policyLabel} bind:value />

package/dist/components/forms/__tests__/policy-field.fixture.svelte.d.ts

@@ -0,0 +1,8 @@
+type $$ComponentProps = {
+    sensitivity?: 'public' | 'secret';
+    writable?: boolean;
+};
+declare const PolicyField: import("svelte").Component<$$ComponentProps, {}, "">;
+type PolicyField = ReturnType<typeof PolicyField>;
+export default PolicyField;
+//# sourceMappingURL=policy-field.fixture.svelte.d.ts.map

package/dist/components/forms/__tests__/policy-field.fixture.svelte.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"policy-field.fixture.svelte.d.ts","sourceRoot":"","sources":["../../../../src/components/forms/__tests__/policy-field.fixture.svelte.ts"],"names":[],"mappings":"AAMC,KAAK,gBAAgB,GAAI;IACxB,WAAW,CAAC,EAAE,QAAQ,GAAG,QAAQ,CAAC;IAClC,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,CAAC;AAoCF,QAAA,MAAM,WAAW,sDAAwC,CAAC;AAC1D,KAAK,WAAW,GAAG,UAAU,CAAC,OAAO,WAAW,CAAC,CAAC;AAClD,eAAe,WAAW,CAAC"}

package/dist/components/forms/prepare-field-value.d.ts

@@ -0,0 +1,5 @@
+/** Canonicalize scalar values before they enter staged rich-field review. */
+export declare function prepareTextFieldValue(value: unknown): string;
+/** Reject values which a rich field cannot synchronously canonicalize. */
+export declare function invalidStagedValue(): never;
+//# sourceMappingURL=prepare-field-value.d.ts.map

package/dist/components/forms/prepare-field-value.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"prepare-field-value.d.ts","sourceRoot":"","sources":["../../../src/components/forms/prepare-field-value.ts"],"names":[],"mappings":"AAAA,6EAA6E;AAC7E,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAU5D;AAED,0EAA0E;AAC1E,wBAAgB,kBAAkB,IAAI,KAAK,CAE1C"}

package/dist/components/forms/prepare-field-value.js

@@ -0,0 +1,15 @@
+/** Canonicalize scalar values before they enter staged rich-field review. */
+export function prepareTextFieldValue(value) {
+    if (value === null || value === undefined)
+        return '';
+    if (typeof value === 'string' ||
+        typeof value === 'number' ||
+        typeof value === 'boolean') {
+        return String(value);
+    }
+    throw new Error('staged_value_invalid');
+}
+/** Reject values which a rich field cannot synchronously canonicalize. */
+export function invalidStagedValue() {
+    throw new Error('staged_value_invalid');
+}

package/dist/state/form-context.d.ts

@@ -1,7 +1,7 @@
 /**
  * SMRT Form context for field registration and coordination
  */
-import type { ControlConstraints, ControlInteractionRegistry, ControlKind, ControlOption, ControlRuntimeState, ControlSensitivity } from '@happyvertical/smrt-ui/forms';
+import type { ControlConstraints, ControlExtensionContext, ControlInteractionRegistry, ControlKind, ControlOption, ControlRuntimeState, ControlSensitivity, ControlSubject, ControlValueValidationResult } from '@happyvertical/smrt-ui/forms';
 /**
  * Field definition for form registration
  */
@@ -18,10 +18,27 @@ export interface FieldDefinition {
     description?: string;
     /** Set the field value */
     setValue: (value: unknown) => void;
+    /** Context-aware setter for hooks that need to issue another control command. */
+    setValueWithContext?: (value: unknown, context: ControlExtensionContext) => void | Promise<void>;
     /** Get current field value */
     getValue: () => unknown;
+    /**
+     * Convert an incoming intent into the final value shown for review/applied.
+     * May throw when the value cannot be represented canonically by this field.
+     */
+    prepareValue?: (value: unknown) => unknown;
+    /** Validate/canonicalize a complete value edited in staged review. */
+    prepareReviewedValue?: (value: unknown) => unknown;
+    /**
+     * Convert a value extracted from speech into the field's canonical value.
+     * May be asynchronous for controls that support natural-language parsing.
+     */
+    prepareExtractedValue?: (value: unknown) => unknown | Promise<unknown>;
     /** Optional richer interaction metadata and capabilities. */
     controlId?: string;
+    /** Immutable token identifying the DOM subtree owned by this field. */
+    ownerToken?: string;
+    subject?: ControlSubject;
     interactionKind?: ControlKind;
     sensitivity?: ControlSensitivity;
     readable?: boolean;
@@ -31,11 +48,13 @@ export interface FieldDefinition {
     webMcpSchema?: Record<string, unknown>;
     options?: ControlOption[];
     unit?: string;
-    clear?: () => void;
+    /** Return true to affirm an accepted idempotent clear; false rejects it. */
+    clear?: ((context?: ControlExtensionContext) => void | Promise<void>) | ((context?: ControlExtensionContext) => boolean | Promise<boolean>);
     focus?: () => void;
     reveal?: () => void;
     highlight?: (durationMs?: number) => void;
-    validate?: () => boolean;
+    validate?: (context?: ControlExtensionContext) => boolean | Promise<boolean>;
+    validateValue?: (value: unknown, context?: ControlExtensionContext) => ControlValueValidationResult | Promise<ControlValueValidationResult>;
     getState?: () => ControlRuntimeState;
 }
 /**
@@ -44,9 +63,12 @@ export interface FieldDefinition {
 export interface SMRTFormContext {
     /** Current mode */
     readonly mode: 'smrt' | 'default';
-    /** Register a field with the form */
-    registerField: (field: FieldDefinition) => void;
-    /** Unregister a field */
+    /**
+     * Register a field with the form. New contexts return an identity-bound
+     * disposer; legacy void-returning contexts remain supported.
+     */
+    registerField: (field: FieldDefinition) => void | (() => void);
+    /** Legacy name-based cleanup. Prefer the disposer returned by registerField. */
     unregisterField: (name: string) => void;
     /** Get all registered fields schema (for LLM prompt) */
     getFieldSchema: () => FieldDefinition[];

package/dist/state/form-context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"form-context.d.ts","sourceRoot":"","sources":["../../src/state/form-context.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EACV,kBAAkB,EAClB,0BAA0B,EAC1B,WAAW,EACX,aAAa,EACb,mBAAmB,EACnB,kBAAkB,EACnB,MAAM,8BAA8B,CAAC;AAGtC;;GAEG;AACH,qCAAqC;AACrC,MAAM,MAAM,aAAa,GACrB,MAAM,GACN,OAAO,GACP,UAAU,GACV,QAAQ,GACR,SAAS,GACT,UAAU,GACV,WAAW,GACX,aAAa,GACb,OAAO,GACP,OAAO,GACP,QAAQ,GACR,UAAU,CAAC;AAEf,MAAM,WAAW,eAAe;IAC9B,kDAAkD;IAClD,IAAI,EAAE,MAAM,CAAC;IACb,iBAAiB;IACjB,IAAI,EAAE,aAAa,CAAC;IACpB,2BAA2B;IAC3B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,uDAAuD;IACvD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,0BAA0B;IAC1B,QAAQ,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;IACnC,8BAA8B;IAC9B,QAAQ,EAAE,MAAM,OAAO,CAAC;IACxB,6DAA6D;IAC7D,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,eAAe,CAAC,EAAE,WAAW,CAAC;IAC9B,WAAW,CAAC,EAAE,kBAAkB,CAAC;IACjC,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,WAAW,CAAC,EAAE,kBAAkB,CAAC;IACjC,mEAAmE;IACnE,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACvC,OAAO,CAAC,EAAE,aAAa,EAAE,CAAC;IAC1B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,IAAI,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,IAAI,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;IACpB,SAAS,CAAC,EAAE,CAAC,UAAU,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IAC1C,QAAQ,CAAC,EAAE,MAAM,OAAO,CAAC;IACzB,QAAQ,CAAC,EAAE,MAAM,mBAAmB,CAAC;CACtC;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,mBAAmB;IACnB,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;IAClC,qCAAqC;IACrC,aAAa,EAAE,CAAC,KAAK,EAAE,eAAe,KAAK,IAAI,CAAC;IAChD,yBAAyB;IACzB,eAAe,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACxC,wDAAwD;IACxD,cAAc,EAAE,MAAM,eAAe,EAAE,CAAC;IACxC,6CAA6C;IAC7C,QAAQ,CAAC,eAAe,EAAE,OAAO,CAAC;IAClC,+CAA+C;IAC/C,QAAQ,CAAC,YAAY,EAAE,OAAO,CAAC;IAC/B,yCAAyC;IACzC,eAAe,EAAE,MAAM,IAAI,CAAC;IAC5B,8EAA8E;IAC9E,QAAQ,CAAC,mBAAmB,EAAE,0BAA0B,CAAC;IACzD,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACzB;AAED;;GAEG;AACH,eAAO,MAAM,aAAa,eAAsB,CAAC;AAEjD;;GAEG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,eAAe,GAAG,IAAI,CAEzD;AAED;;;GAGG;AACH,wBAAgB,cAAc,IAAI,eAAe,CAUhD;AAED;;GAEG;AACH,wBAAgB,iBAAiB,IAAI,eAAe,GAAG,IAAI,CAE1D"}
+{"version":3,"file":"form-context.d.ts","sourceRoot":"","sources":["../../src/state/form-context.ts"],"names":[],"mappings":"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"}

package/dist/state/form-context.js

@@ -1,11 +1,83 @@
 /**
  * SMRT Form context for field registration and coordination
  */
-import { getContext, setContext } from 'svelte';
+import { getAllContexts, getContext, setContext } from 'svelte';
 /**
  * Context key for SMRT form
  */
 export const SMRT_FORM_KEY = Symbol('smrt-form');
+// Svelte gives every component its own context map, copying inherited values
+// into that map. Cache a facade by this map rather than by the inherited
+// context value: repeated calls from one component share ownership, while
+// descendants that inherit a facade receive their own ownership boundary.
+const callerFormContextFacades = new WeakMap();
+function createFormContextFacade(ctx) {
+    const registrations = new Map();
+    const facade = {
+        get mode() {
+            return ctx.mode;
+        },
+        registerField(field) {
+            const registeredName = field.name;
+            const registeredDisposer = ctx.registerField(field);
+            const disposeField = typeof registeredDisposer === 'function'
+                ? registeredDisposer
+                : () => ctx.unregisterField(registeredName);
+            let active = true;
+            const dispose = () => {
+                if (!active)
+                    return;
+                active = false;
+                const ownedRegistrations = registrations.get(registeredName);
+                ownedRegistrations?.delete(dispose);
+                if (ownedRegistrations?.size === 0) {
+                    registrations.delete(registeredName);
+                }
+                disposeField();
+            };
+            const ownedRegistrations = registrations.get(registeredName) ?? new Set();
+            ownedRegistrations.add(dispose);
+            registrations.set(registeredName, ownedRegistrations);
+            return dispose;
+        },
+        unregisterField(name) {
+            const ownedRegistrations = registrations.get(name);
+            const dispose = ownedRegistrations?.values().next().value;
+            dispose?.();
+        },
+        getFieldSchema: () => ctx.getFieldSchema(),
+        get isFormListening() {
+            return ctx.isFormListening;
+        },
+        get isExtracting() {
+            return ctx.isExtracting;
+        },
+        toggleListening: () => ctx.toggleListening(),
+        get interactionRegistry() {
+            return ctx.interactionRegistry;
+        },
+        get formId() {
+            return ctx.formId;
+        },
+    };
+    return facade;
+}
+function getCallerFormContext(required) {
+    const contextMap = getAllContexts();
+    const existingFacade = callerFormContextFacades.get(contextMap);
+    if (existingFacade)
+        return existingFacade;
+    const ctx = getContext(SMRT_FORM_KEY);
+    if (!ctx) {
+        if (!required)
+            return null;
+        throw new Error('Form context not found. Make sure to wrap your inputs with <SMRTForm>');
+    }
+    const facade = createFormContextFacade(ctx);
+    callerFormContextFacades.set(contextMap, facade);
+    setContext(SMRT_FORM_KEY, facade);
+    return facade;
+}
 /**
  * Set form context (used by SMRTForm)
  */
@@ -17,15 +89,11 @@ export function setFormContext(ctx) {
  * @throws If called outside of SMRTForm
  */
 export function getFormContext() {
-    const ctx = getContext(SMRT_FORM_KEY);
-    if (!ctx) {
-        throw new Error('Form context not found. Make sure to wrap your inputs with <SMRTForm>');
-    }
-    return ctx;
+    return getCallerFormContext(true);
 }
 /**
  * Try to get form context (returns null if not available)
  */
 export function tryGetFormContext() {
-    return getContext(SMRT_FORM_KEY) ?? null;
+    return getCallerFormContext(false);
 }

package/dist/web/__tests__/webmcp-composed.child.fixture.svelte

@@ -0,0 +1,62 @@
+<script lang="ts">
+import type { DataSurfaceRegistry } from '@happyvertical/smrt-ui/data';
+import {
+  type DataSurfaceDescriptor,
+  DataTable,
+} from '@happyvertical/smrt-ui/data';
+import Form from '../../components/forms/Form.svelte';
+import TextInput from '../../components/forms/TextInput.svelte';
+import { useWebMcpTool } from '../webmcp.svelte.js';
+
+let { dataSurfaceRegistry }: { dataSurfaceRegistry: DataSurfaceRegistry } =
+  $props();
+
+useWebMcpTool(() => ({
+  name: 'fixture_component_preview',
+  description:
+    'Preview the composed fixture without changing application state.',
+  inputSchema: { type: 'object', properties: {} },
+  annotations: { readOnlyHint: true, openWorldHint: false },
+  execute: () => JSON.stringify({ ok: true, source: 'bespoke-component' }),
+}));
+
+const tableDescriptor: DataSurfaceDescriptor = {
+  version: 1,
+  identity: { surfaceId: 'fixture-items', kind: 'table' },
+  schemaVersion: 1,
+  label: 'Fixture items',
+  rowKey: 'id',
+  columns: [
+    { id: 'id', label: 'ID', capabilities: ['read', 'project'] },
+    {
+      id: 'name',
+      label: 'Name',
+      capabilities: ['read', 'search', 'filter', 'sort', 'project'],
+    },
+  ],
+  query: { modes: ['rows', 'count'], projectableColumnIds: ['id', 'name'] },
+  controls: ['set-search', 'toggle-sorting'].map((id) => ({ id, label: id })),
+  actions: [],
+  limits: { maxQueryRows: 50, maxQueryBytes: 10_000, maxSelectionSize: 10 },
+};
+
+const rows = [
+  { id: 'item-1', name: 'First' },
+  { id: 'item-2', name: 'Second' },
+];
+const columns = [
+  { id: 'id', label: 'ID', accessor: 'id' },
+  { id: 'name', label: 'Name', accessor: 'name', sortable: true },
+];
+</script>
+
+<Form formId="fixture-form">
+  <TextInput name="title" label="Title" />
+</Form>
+<DataTable
+  data={rows}
+  {columns}
+  rowKey="id"
+  sortable={true}
+  dataSurface={{ registry: dataSurfaceRegistry, descriptor: tableDescriptor }}
+/>

package/dist/web/__tests__/webmcp-composed.child.fixture.svelte.d.ts

@@ -0,0 +1,8 @@
+import type { DataSurfaceRegistry } from '@happyvertical/smrt-ui/data';
+type $$ComponentProps = {
+    dataSurfaceRegistry: DataSurfaceRegistry;
+};
+declare const WebmcpComposed: import("svelte").Component<$$ComponentProps, {}, "">;
+type WebmcpComposed = ReturnType<typeof WebmcpComposed>;
+export default WebmcpComposed;
+//# sourceMappingURL=webmcp-composed.child.fixture.svelte.d.ts.map

package/dist/web/__tests__/webmcp-composed.child.fixture.svelte.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"webmcp-composed.child.fixture.svelte.d.ts","sourceRoot":"","sources":["../../../src/web/__tests__/webmcp-composed.child.fixture.svelte.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAStE,KAAK,gBAAgB,GAAI;IAAE,mBAAmB,EAAE,mBAAmB,CAAA;CAAE,CAAC;AAyDvE,QAAA,MAAM,cAAc,sDAAwC,CAAC;AAC7D,KAAK,cAAc,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAC;AACxD,eAAe,cAAc,CAAC"}

package/dist/web/__tests__/webmcp-composed.fixture.svelte

@@ -0,0 +1,52 @@
+<script lang="ts">
+import type { DataSurfaceRegistry } from '@happyvertical/smrt-ui/data';
+import type {
+  RegisterWebMcpToolsOptions,
+  WebMcpToolDefinition,
+} from '@happyvertical/smrt-web';
+import Provider from '../../Provider.svelte';
+import type { WebMcpProviderConfig } from '../webmcp-provider.js';
+import Child from './webmcp-composed.child.fixture.svelte';
+
+let {
+  dataSurfaceRegistry,
+  generatedDefinitions = [],
+  fetchFn,
+  showChild = true,
+}: {
+  dataSurfaceRegistry: DataSurfaceRegistry;
+  generatedDefinitions?: readonly WebMcpToolDefinition[];
+  fetchFn?: RegisterWebMcpToolsOptions['fetchFn'];
+  showChild?: boolean;
+} = $props();
+
+let cachedDefinitions: readonly WebMcpToolDefinition[] | undefined;
+let cachedFetchFn: RegisterWebMcpToolsOptions['fetchFn'] | undefined;
+let cachedRegistry: DataSurfaceRegistry | undefined;
+let cachedWebmcp: WebMcpProviderConfig | undefined;
+const webmcp = $derived.by(() => {
+  if (
+    cachedWebmcp &&
+    cachedDefinitions === generatedDefinitions &&
+    cachedFetchFn === fetchFn &&
+    cachedRegistry === dataSurfaceRegistry
+  ) {
+    return cachedWebmcp;
+  }
+  cachedDefinitions = generatedDefinitions;
+  cachedFetchFn = fetchFn;
+  cachedRegistry = dataSurfaceRegistry;
+  cachedWebmcp = {
+    definitions: generatedDefinitions,
+    ...(fetchFn ? { fetchFn } : {}),
+    ui: { dataSurfaceRegistry },
+  };
+  return cachedWebmcp;
+});
+</script>
+
+<Provider {webmcp}>
+  {#if showChild}
+    <Child {dataSurfaceRegistry} />
+  {/if}
+</Provider>

package/dist/web/__tests__/webmcp-composed.fixture.svelte.d.ts

@@ -0,0 +1,12 @@
+import type { DataSurfaceRegistry } from '@happyvertical/smrt-ui/data';
+import type { RegisterWebMcpToolsOptions, WebMcpToolDefinition } from '@happyvertical/smrt-web';
+type $$ComponentProps = {
+    dataSurfaceRegistry: DataSurfaceRegistry;
+    generatedDefinitions?: readonly WebMcpToolDefinition[];
+    fetchFn?: RegisterWebMcpToolsOptions['fetchFn'];
+    showChild?: boolean;
+};
+declare const WebmcpComposed: import("svelte").Component<$$ComponentProps, {}, "">;
+type WebmcpComposed = ReturnType<typeof WebmcpComposed>;
+export default WebmcpComposed;
+//# sourceMappingURL=webmcp-composed.fixture.svelte.d.ts.map

package/dist/web/__tests__/webmcp-composed.fixture.svelte.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"webmcp-composed.fixture.svelte.d.ts","sourceRoot":"","sources":["../../../src/web/__tests__/webmcp-composed.fixture.svelte.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AACvE,OAAO,KAAK,EACV,0BAA0B,EAC1B,oBAAoB,EACrB,MAAM,yBAAyB,CAAC;AAKhC,KAAK,gBAAgB,GAAI;IACxB,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,oBAAoB,CAAC,EAAE,SAAS,oBAAoB,EAAE,CAAC;IACvD,OAAO,CAAC,EAAE,0BAA0B,CAAC,SAAS,CAAC,CAAC;IAChD,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC;AAgDF,QAAA,MAAM,cAAc,sDAAwC,CAAC;AAC7D,KAAK,cAAc,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAC;AACxD,eAAe,cAAc,CAAC"}