@case-framework/survey-assistant 0.7.0 → 0.8.0

package/dist/{engine-Bo85Oyj0.mjs → engine-nXoCWYpQ.mjs}

@@ -1,86 +1,116 @@
-import { At as surveyContentSchema, I as rawSurveyDocumentSchema, f as surveyChangeSetSchema, l as surveyAssistantTurnFinalSchema, yt as surveyOperationSchema } from "./protocol-BhzQbx81.mjs";
+import { At as surveyContentSchema, R as rawSurveyDocumentSchema, bt as surveyOperationSchema, f as surveyChangeSetSchema, l as surveyAssistantTurnFinalSchema } from "./protocol-CF4Bh_Ch.mjs";
 import { stableStringify } from "./digest.mjs";
-import { n as assertSurveyAssistantCapabilities } from "./capabilities-1KNnNO1_.mjs";
+import { n as assertSurveyAssistantCapabilities } from "./capabilities-DCMA71PP.mjs";
 import { z } from "zod";
-import { ContentType, Expression, ExpressionType, FunctionExpressionNames, JsonPatchError, ReservedSurveyItemTypes, SurveyItemTranslations, SurveyTranslations, ValueReference, ValueReferenceMethod, ValueType, analyzeSurveyExpressionReferences, applyJsonPatch, findIntroducedExpressionReferenceDiagnosticsIncludingAdvisories, generateId, getContentPlainText, isBlockingSurveyExpressionReferenceDiagnostic, isContentEmpty, parseJsonPointer, structuredCloneMethod } from "@case-framework/survey-core";
-import { getFormAuthoringMode, getFormAuthoringMode as getFormAuthoringMode$1, hasSingleFormField, isCompatibleSimpleFieldUpsert, isCompatibleSimpleFieldUpsert as isCompatibleSimpleFieldUpsert$1, isValidSimpleFormConfig, isValidSimpleFormConfig as isValidSimpleFormConfig$1, normalizeFormAuthoringConfig, normalizeFormAuthoringConfig as normalizeFormAuthoringConfig$1, transitionFormAuthoringMode, transitionFormAuthoringMode as transitionFormAuthoringMode$1 } from "@case-framework/survey-items/form";
-import { getChoiceOptionLabelContentKey, normalizeChoiceOptionKey } from "@case-framework/survey-items/choice";
-//#region src/engine/context.ts
-const isRecord$7 = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
-const asString$1 = (value) => typeof value === "string" && value.trim().length > 0 ? value.trim() : void 0;
-const asArray$1 = (value) => Array.isArray(value) ? value : [];
-const getChildIds = (item) => {
-	return asArray$1((isRecord$7(item.config) ? item.config : void 0)?.items).filter((entry) => typeof entry === "string");
-};
-const getFieldValueType = (field) => {
-	switch (field.type) {
-		case "number":
-		case "slider": return ValueType.number;
-		case "datepicker": return ValueType.date;
-		case "switch": return ValueType.boolean;
-		default: return ValueType.string;
+import { ActiveResponsePlan, ContentType, DATE_FUNCTION_SIGNATURES, Expression, ExpressionType, FunctionExpressionNames, JsonPatchError, ReservedSurveyItemTypes, Survey, SurveyItemCore, SurveyItemTranslations, SurveyTranslations, ValueReference, ValueType, analyzeSurveyExpressionReferences, applyJsonPatch, findIntroducedExpressionReferenceDiagnosticsIncludingAdvisories, generateId, getContentPlainText, getDefaultProjectionIssues, isBlockingSurveyExpressionReferenceDiagnostic, isContentEmpty, parseJsonPointer, structuredCloneMethod, suggestResponseVariableName } from "@case-framework/survey-core";
+import { ChoiceItemCore, getChoiceOptionLabelContentKey, normalizeChoiceOptionKey } from "@case-framework/survey-items/choice";
+import { FormItemCore, getFormAuthoringMode, getFormAuthoringMode as getFormAuthoringMode$1, hasSingleFormField, isCompatibleSimpleFieldUpsert, isCompatibleSimpleFieldUpsert as isCompatibleSimpleFieldUpsert$1, isValidSimpleFormConfig, isValidSimpleFormConfig as isValidSimpleFormConfig$1, normalizeFormAuthoringConfig, normalizeFormAuthoringConfig as normalizeFormAuthoringConfig$1, normalizeFormItemConfig, transitionFormAuthoringMode, transitionFormAuthoringMode as transitionFormAuthoringMode$1 } from "@case-framework/survey-items/form";
+import { ConsentItemCore } from "@case-framework/survey-items/consent";
+import { ChoiceMatrixCore, getChoiceMatrixTranslationKeys, normalizeChoiceMatrixConfig } from "@case-framework/survey-items/choice-matrix";
+import { FormMatrixCore, cleanFormMatrixTranslations, normalizeFormMatrixConfig } from "@case-framework/survey-items/form-matrix";
+import { allocateCopiedResponseNames, previewResponseSettings } from "@case-framework/survey-core/editor";
+//#region src/engine/survey-model.ts
+/** A detached core view using trusted, server-safe slot declarations. No editor state. */
+function createAssistantSurvey(raw, capabilities) {
+	const registry = {
+		choiceItem: ChoiceItemCore,
+		formItem: FormItemCore,
+		consentItem: ConsentItemCore,
+		choiceMatrix: ChoiceMatrixCore,
+		formMatrix: FormMatrixCore
+	};
+	for (const [itemType, adapter] of capabilities?.byItemType ?? []) if (adapter.itemCore) registry[itemType] = adapter.itemCore;
+	for (const item of raw.surveyItems) {
+		if (registry[item.itemType]) continue;
+		const adapter = capabilities?.byItemType.get(item.itemType);
+		registry[item.itemType] = class extends SurveyItemCore {
+			type = item.itemType;
+			parseConfig(config) {
+				return config;
+			}
+			isInteractive() {
+				return this.getResponseSlotDefinitions().length > 0;
+			}
+			getResponseSlotDefinitions() {
+				const current = {
+					...this.rawItem,
+					config: this.config
+				};
+				if (adapter?.deriveResponseSlotDefinitions) return adapter.deriveResponseSlotDefinitions(current);
+				return Object.entries(adapter?.deriveResponseSlots?.(current) ?? {}).map(([slotId, valueType]) => ({
+					slotId,
+					variableName: slotId,
+					valueType
+				}));
+			}
+		};
 	}
-};
-const addResponseSlot = (lookup, itemId, slotId, valueType) => {
-	lookup[`${itemId}...${ValueReferenceMethod.get}...${slotId}`] = valueType;
-	lookup[`${itemId}...${ValueReferenceMethod.isDefined}...${slotId}`] = ValueType.boolean;
-};
-const addFormResponseSlots = ({ config, itemId, lookup, slotPrefix }) => {
-	if (!isRecord$7(config)) return;
-	for (const group of asArray$1(config.fieldGroups).filter(isRecord$7)) for (const field of asArray$1(group.fields).filter(isRecord$7)) {
-		const key = asString$1(field.key);
-		if (!key) continue;
-		addResponseSlot(lookup, itemId, slotPrefix ? `${slotPrefix}.${key}` : key, getFieldValueType(field));
+	return Survey.fromJson(raw, registry);
+}
+function getAssistantVisibilityIssues(survey) {
+	try {
+		new ActiveResponsePlan(survey);
+		return [];
+	} catch (error) {
+		return [{
+			severity: "error",
+			code: "invalid-survey-visibility",
+			message: error instanceof Error ? error.message : String(error)
+		}];
 	}
-};
-const deriveResponseSlotTypes = (survey, trustedCapabilities) => {
-	const lookup = {};
-	for (const item of survey.surveyItems) {
-		const deriveResponseSlots = trustedCapabilities?.byItemType.get(item.itemType)?.deriveResponseSlots;
-		if (deriveResponseSlots) {
-			for (const [slotId, valueType] of Object.entries(deriveResponseSlots(item))) addResponseSlot(lookup, item.id, slotId, valueType);
-			continue;
-		}
-		if (item.itemType === "choiceItem") {
-			const config = isRecord$7(item.config) ? item.config : {};
-			const slotId = asString$1(config.id) ?? item.id;
-			addResponseSlot(lookup, item.id, slotId, config.maxSelection === 1 ? ValueType.reference : ValueType.referenceArray);
-			for (const option of asArray$1(config.options).filter(isRecord$7)) {
-				const optionId = asString$1(option.id);
-				if (optionId && option.embeddedForm) addFormResponseSlots({
-					config: option.embeddedForm,
-					itemId: item.id,
-					lookup,
-					slotPrefix: `embedded.${optionId}`
-				});
-			}
-		} else if (item.itemType === "formItem") addFormResponseSlots({
-			config: item.config,
-			itemId: item.id,
-			lookup
-		});
+}
+function getAssistantResponseSchemaIssues(raw, capabilities) {
+	try {
+		if (raw.surveyItems.some((item) => "key" in item)) throw new Error("Item keys are not supported by survey schema version 2.");
+		const survey = createAssistantSurvey(raw, capabilities);
+		return [
+			...getAssistantVisibilityIssues(survey),
+			...survey.getResponseSlotRegistry().diagnostics.map((issue) => ({
+				severity: "error",
+				code: issue.code,
+				message: issue.message,
+				itemId: issue.itemId
+			})),
+			...getDefaultProjectionIssues(survey).map((message) => ({
+				severity: "error",
+				code: "invalid-response-export",
+				message
+			}))
+		];
+	} catch (error) {
+		return [{
+			severity: "error",
+			code: "invalid-response-schema",
+			message: error instanceof Error ? error.message : String(error)
+		}];
 	}
-	return lookup;
+}
+//#endregion
+//#region src/engine/context.ts
+const isRecord$6 = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
+const asArray$1 = (value) => Array.isArray(value) ? value : [];
+const getChildIds = (item) => {
+	const config = isRecord$6(item.config) ? item.config : void 0;
+	return asArray$1(config?.items).filter((entry) => typeof entry === "string");
 };
+const deriveResponseSlotTypes = (survey, trustedCapabilities) => Object.fromEntries(createAssistantSurvey(survey, trustedCapabilities).getExpressionResponseSlots().map((slot) => [slot.ref, slot.valueType]));
 const buildDerivedContext = (snapshot, trustedCapabilities, requestedFocusItemId) => {
 	const rawItems = snapshot.survey.surveyItems;
 	const itemsById = new Map(rawItems.map((item) => [item.id, item]));
 	const parentById = /* @__PURE__ */ new Map();
 	for (const item of rawItems) for (const childId of getChildIds(item)) if (itemsById.has(childId) && !parentById.has(childId)) parentById.set(childId, item.id);
-	const fullKeyCache = /* @__PURE__ */ new Map();
-	const getFullKey = (itemId, stack = /* @__PURE__ */ new Set()) => {
-		const cached = fullKeyCache.get(itemId);
-		if (cached) return cached;
-		const item = itemsById.get(itemId);
-		if (!item) return itemId;
-		if (stack.has(itemId)) return item.key;
-		const parentId = parentById.get(itemId);
-		if (!parentId) return item.key;
-		stack.add(itemId);
-		const fullKey = `${getFullKey(parentId, stack)}.${item.key}`;
-		stack.delete(itemId);
-		fullKeyCache.set(itemId, fullKey);
-		return fullKey;
+	const model = createAssistantSurvey(snapshot.survey, trustedCapabilities);
+	const name = (id) => model.resolveItemEditorName(id, snapshot.ui.selectedLocale);
+	const getNamePath = (id) => {
+		const names = [name(id)];
+		const seen = /* @__PURE__ */ new Set([id]);
+		let parent = parentById.get(id);
+		while (parent && !seen.has(parent)) {
+			seen.add(parent);
+			names.unshift(name(parent));
+			parent = parentById.get(parent);
+		}
+		return names;
 	};
 	const outline = [];
 	const visited = /* @__PURE__ */ new Set();
@@ -94,23 +124,23 @@ const buildDerivedContext = (snapshot, trustedCapabilities, requestedFocusItemId
 			parentId: parentById.get(itemId),
 			depth,
 			itemType: item.itemType,
-			key: item.key,
-			fullKey: getFullKey(itemId),
+			editorName: name(item.id),
+			breadcrumb: getNamePath(itemId).join(" / "),
 			itemLabel: item.metadata?.itemLabel,
 			childCount: getChildIds(item).length
 		});
 		for (const childId of getChildIds(item)) visit(childId, depth + 1);
 	};
-	const explicitRoot = rawItems.find((item) => isRecord$7(item.config) && item.config.isRoot === true);
+	const explicitRoot = rawItems.find((item) => isRecord$6(item.config) && item.config.isRoot === true);
 	if (explicitRoot) visit(explicitRoot.id, 0);
 	for (const item of [...rawItems].sort((left, right) => left.id.localeCompare(right.id))) if (!visited.has(item.id)) visit(item.id, 0);
-	const keyIndex = outline.map((node) => ({
+	const itemIndex = outline.map((node) => ({
 		itemId: node.itemId,
 		itemType: node.itemType,
-		key: node.key,
-		fullKey: node.fullKey,
+		editorName: node.editorName,
+		breadcrumb: node.breadcrumb,
 		itemLabel: node.itemLabel,
-		path: node.fullKey.split(".")
+		path: getNamePath(node.itemId)
 	}));
 	const translations = new SurveyTranslations(snapshot.survey.translations);
 	const buildFocusNode = (itemId, budget) => {
@@ -125,10 +155,10 @@ const buildDerivedContext = (snapshot, trustedCapabilities, requestedFocusItemId
 		return {
 			itemId,
 			itemType: item.itemType,
-			itemKey: item.key,
-			fullKey: getFullKey(itemId),
+			editorName: name(item.id),
+			breadcrumb: getNamePath(itemId).join(" / "),
 			itemLabel: item.metadata?.itemLabel,
-			siblingKeys: rawItems.filter((candidate) => candidate.id !== itemId && parentById.get(candidate.id) === parentById.get(itemId)).map((candidate) => candidate.key),
+			siblingNames: rawItems.filter((candidate) => candidate.id !== itemId && parentById.get(candidate.id) === parentById.get(itemId)).map((candidate) => name(candidate.id)),
 			translations: translationSnippets,
 			descendants: getChildIds(item).filter((childId) => itemsById.has(childId) && budget.remaining > 0).map((childId) => buildFocusNode(childId, budget))
 		};
@@ -158,21 +188,22 @@ const buildDerivedContext = (snapshot, trustedCapabilities, requestedFocusItemId
 		focusItem = buildFocusNode(focusItemId, budget);
 		focusItemTreeTruncated = budget.remaining === 0;
 	}
-	const responseSlotTypes = deriveResponseSlotTypes(snapshot.survey, trustedCapabilities);
+	const responseSlotTypes = Object.fromEntries(model.getExpressionResponseSlots().map((slot) => [slot.ref, slot.valueType]));
 	const locales = [snapshot.ui.selectedLocale, ...Object.keys(snapshot.survey.translations ?? {}).filter((locale) => locale !== snapshot.ui.selectedLocale)].filter((locale, index, values) => locale.length > 0 && values.indexOf(locale) === index);
 	return {
 		inspection: {
-			surveyKey: explicitRoot?.key,
+			surveyKey: snapshot.survey.metadata?.surveyKey,
 			locales,
 			itemCount: rawItems.filter((item) => item.id !== explicitRoot?.id).length,
 			outline,
 			focus,
 			focusItem,
-			keyIndex,
-			responseSlots: Object.keys(responseSlotTypes),
+			itemIndex,
+			responseSlots: model.getResponseSlotRegistry().definitions.map((slot) => slot.slotId),
 			focusItemTreeTruncated
 		},
-		responseSlotTypes
+		responseSlotTypes,
+		responseVariables: model.getResponseSlotRegistry().definitions
 	};
 };
 const createSurveyAssistantEngineContext = (document, trustedCapabilities, options) => {
@@ -181,7 +212,7 @@ const createSurveyAssistantEngineContext = (document, trustedCapabilities, optio
 		trustedCapabilities,
 		versionDigest: document.version.capabilityDigest
 	});
-	const { inspection, responseSlotTypes } = buildDerivedContext(document, trustedCapabilities, options?.focusItemId);
+	const { inspection, responseSlotTypes, responseVariables } = buildDerivedContext(document, trustedCapabilities, options?.focusItemId);
 	return {
 		document,
 		version: document.version,
@@ -189,6 +220,7 @@ const createSurveyAssistantEngineContext = (document, trustedCapabilities, optio
 		ui: document.ui,
 		capabilities: document.capabilities,
 		responseSlotTypes,
+		responseVariables,
 		inspection,
 		trustedCapabilities
 	};
@@ -219,7 +251,7 @@ const validateArgumentCount = ({ actual, expected, functionName, issues, operati
 const inferExpressionReturnType = (expression, responseSlotTypes) => {
 	if (!expression) return;
 	if (expression.type === ExpressionType.Const) return expression.value?.type;
-	if (expression.type === ExpressionType.ResponseVariable) return responseSlotTypes[expression.variableRef];
+	if (expression.type === ExpressionType.ResponseVariable) return responseSlotTypes[new ValueReference(expression.variableRef).toString()];
 	if (expression.type === ExpressionType.ContextVariable) {
 		if (expression.contextType === "locale") return ValueType.string;
 		return expression.asType;
@@ -236,7 +268,17 @@ const inferExpressionReturnType = (expression, responseSlotTypes) => {
 		case FunctionExpressionNames.in_range:
 		case FunctionExpressionNames.list_contains:
 		case FunctionExpressionNames.str_eq:
-		case FunctionExpressionNames.date_eq: return ValueType.boolean;
+		case FunctionExpressionNames.date_eq:
+		case FunctionExpressionNames.date_gt:
+		case FunctionExpressionNames.date_gte:
+		case FunctionExpressionNames.date_lt:
+		case FunctionExpressionNames.date_lte: return ValueType.boolean;
+		case FunctionExpressionNames.date_add_days:
+		case FunctionExpressionNames.date_add_months:
+		case FunctionExpressionNames.date_add_years:
+		case FunctionExpressionNames.date_min:
+		case FunctionExpressionNames.date_max: return ValueType.date;
+		case FunctionExpressionNames.date_diff: return ValueType.number;
 		case FunctionExpressionNames.sum:
 		case FunctionExpressionNames.min:
 		case FunctionExpressionNames.max: return ValueType.number;
@@ -283,6 +325,25 @@ const validateExpressionFunctionSignatures = ({ expression, issues, operationInd
 			message: `${expression.functionName} arguments must have the same type, got ${formatValueType(argumentTypes[0])} and ${formatValueType(argumentTypes[1])}.`
 		});
 	};
+	const dateSignature = DATE_FUNCTION_SIGNATURES[expression.functionName];
+	if (dateSignature) {
+		if (dateSignature.variadic ? expression.arguments.length < 1 : expression.arguments.length !== dateSignature.args.length) addFunctionSignatureIssue({
+			issues,
+			operationIndex,
+			scope,
+			message: `${expression.functionName} has invalid argument count.`
+		});
+		argumentTypes.forEach((actual, i) => {
+			const expected = dateSignature.args[dateSignature.variadic ? 0 : i];
+			if (actual && actual !== expected) addFunctionSignatureIssue({
+				issues,
+				operationIndex,
+				scope,
+				message: `${expression.functionName} argument ${i + 1} must be ${expected}, got ${actual}.`
+			});
+		});
+		return;
+	}
 	switch (expression.functionName) {
 		case FunctionExpressionNames.and:
 		case FunctionExpressionNames.or:
@@ -459,37 +520,14 @@ const validateExpression = ({ expression, expectedReturnType, issues, operationI
 };
 //#endregion
 //#region src/engine/expression-reference-integrity.ts
-const isRecord$6 = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
-const choiceAllowedValues = (survey, ref) => {
-	let parsed;
-	try {
-		parsed = new ValueReference(ref);
-	} catch {
-		return;
-	}
-	if (parsed.name !== ValueReferenceMethod.get) return void 0;
-	const item = survey.surveyItems.find((candidate) => candidate.id === parsed.itemId);
-	if (item?.itemType !== "choiceItem" || !isRecord$6(item.config)) return void 0;
-	const slotId = typeof item.config.id === "string" ? item.config.id : item.id;
-	if (parsed.slotId !== slotId || !Array.isArray(item.config.options)) return void 0;
-	return item.config.options.flatMap((option) => isRecord$6(option) && typeof option.id === "string" ? [option.id] : []);
-};
-const deriveSurveyExpressionResponseSlots = (survey, trustedCapabilities) => Object.entries(deriveResponseSlotTypes(survey, trustedCapabilities)).flatMap(([ref, valueType]) => {
-	if (!valueType) return [];
-	const allowedReferenceValues = valueType === ValueType.reference || valueType === ValueType.referenceArray ? choiceAllowedValues(survey, ref) : void 0;
-	return [{
-		ref,
-		valueType,
-		...allowedReferenceValues ? { allowedReferenceValues } : {}
-	}];
-});
+const deriveSurveyExpressionResponseSlots = (survey, trustedCapabilities) => createAssistantSurvey(survey, trustedCapabilities).getExpressionResponseSlots();
 const analyzeSurveyAssistantExpressionReferences = (survey, trustedCapabilities) => analyzeSurveyExpressionReferences({
 	survey,
 	responseSlots: deriveSurveyExpressionResponseSlots(survey, trustedCapabilities)
 });
 const getSurveyAssistantExpressionDiagnosticGuidance = (diagnostic) => {
+	if (diagnostic.category === "display-dependency") return "Break the visibility dependency cycle using an independent controlling answer or serialized context value. Prefills do not make visibility cycles valid.";
 	if (isBlockingSurveyExpressionReferenceDiagnostic(diagnostic)) return "Repair blocking expression diagnostics using the current response slots and option ids before claiming the repair is complete.";
-	if (diagnostic.category === "display-dependency") return "Review advisory display dependency findings without automatic repair; they may be intentional when responses are populated before visibility is evaluated, including through prefills.";
 	return "Review advisory expression diagnostics without automatic repair unless the user asks or the survey clearly shows they are accidental.";
 };
 //#endregion
@@ -499,14 +537,14 @@ const MAX_LIMIT = 50;
 const itemSummarySchema = z.object({
 	itemId: z.string(),
 	itemType: z.string(),
-	key: z.string(),
-	fullKey: z.string(),
+	editorName: z.string(),
+	breadcrumb: z.string(),
 	itemLabel: z.string().optional(),
 	parentId: z.string().optional(),
 	depth: z.number().int().nonnegative().optional(),
 	childCount: z.number().int().nonnegative().optional(),
 	path: z.array(z.string()).optional(),
-	siblingKeys: z.array(z.string()).optional()
+	siblingNames: z.array(z.string()).optional()
 });
 const translationEntrySchema = z.object({
 	locale: z.string(),
@@ -516,20 +554,19 @@ const translationEntrySchema = z.object({
 const choiceOptionDetailsSchema = z.object({
 	position: z.number().int().positive().describe("One-based position in the stored option order."),
 	id: z.string(),
-	key: z.string().optional(),
+	code: z.string().optional(),
 	labelContentKey: z.string(),
 	hasDisplayCondition: z.boolean().optional(),
 	embeddedFormItemId: z.string().optional(),
 	embeddedFormFieldGroupCount: z.number().int().nonnegative().optional(),
 	embeddedFormAuthoringMode: z.enum(["simple", "custom"]).optional(),
 	embeddedFormSimpleModeValid: z.boolean().optional(),
-	embeddedFormTranslationPrefix: z.string().optional(),
-	embeddedFormResponseSlotPrefix: z.string().optional()
+	embeddedFormTranslationPrefix: z.string().optional()
 });
 const formSelectOptionDetailsSchema = z.object({
 	position: z.number().int().positive().describe("One-based position in the stored select-option order."),
 	id: z.string(),
-	value: z.string().optional(),
+	code: z.string().optional(),
 	labelContentKey: z.string()
 });
 const formFieldGroupLayoutSchema = z.object({
@@ -542,7 +579,7 @@ const formFieldGroupLayoutSchema = z.object({
 const formFieldDetailsSchema = z.object({
 	position: z.number().int().positive().describe("One-based position in this field group's stored field order."),
 	id: z.string(),
-	key: z.string(),
+	variableName: z.string(),
 	type: z.string(),
 	responseSlotId: z.string(),
 	labelContentKey: z.string(),
@@ -597,12 +634,10 @@ const asArray = (value) => Array.isArray(value) ? value : [];
 const createContentKey = (...segments) => segments.filter(Boolean).join(".");
 const getChoiceOptionLabelContentKey$1 = (optionId) => createContentKey("options", optionId, "label");
 const getChoiceEmbeddedFormTranslationPrefix = (optionId) => createContentKey("embeddedForms", optionId);
-const getChoiceEmbeddedFormResponseSlotPrefix = (optionId) => createContentKey("embedded", optionId);
 const withFormTranslationNamespace = (contentKey, translationNamespace) => translationNamespace ? createContentKey(translationNamespace, contentKey) : contentKey;
 const getFormFieldGroupContentKey = (groupId, contentKey, translationNamespace) => withFormTranslationNamespace(createContentKey("fieldGroups", groupId, contentKey), translationNamespace);
 const getFormFieldContentKey = (fieldId, contentKey, translationNamespace) => withFormTranslationNamespace(createContentKey("fields", fieldId, contentKey), translationNamespace);
 const getFormFieldOptionLabelContentKey = (fieldId, optionId, translationNamespace) => withFormTranslationNamespace(createContentKey("fields", fieldId, "options", optionId, "label"), translationNamespace);
-const getFormFieldResponseSlotId = (fieldKey, responseSlotPrefix) => responseSlotPrefix ? createContentKey(responseSlotPrefix, fieldKey) : fieldKey;
 const getRoundedPositiveInt = (value, fallback = 1) => {
 	if (typeof value !== "number" || !Number.isFinite(value)) return fallback;
 	return Math.max(1, Math.round(value));
@@ -617,9 +652,9 @@ const sliceWithCursor = (values, input) => {
 	};
 };
 const mapOutlineById = (snapshot) => new Map(snapshot.inspection.outline.map((item) => [item.itemId, item]));
-const mapKeyIndexById = (snapshot) => new Map(snapshot.inspection.keyIndex.map((item) => [item.itemId, item]));
-/** The full-survey key index, regardless of the (possibly focus-scoped) outline. */
-const getKeyIndexEntries = (snapshot) => snapshot.inspection.keyIndex;
+const mapItemIndexById = (snapshot) => new Map(snapshot.inspection.itemIndex.map((item) => [item.itemId, item]));
+/** The full-survey item index, regardless of the (possibly focus-scoped) outline. */
+const getItemIndexEntries = (snapshot) => snapshot.inspection.itemIndex;
 const getRawSurvey$1 = (snapshot) => snapshot.survey;
 const getRawSurveyItems = (snapshot) => {
 	const rawItems = getRawSurvey$1(snapshot).surveyItems;
@@ -630,8 +665,8 @@ const buildSurveyTranslations = (snapshot) => new SurveyTranslations(getRawSurve
 const summarizeRawItem = (item) => ({
 	itemId: item.id,
 	itemType: item.itemType,
-	key: item.key,
-	fullKey: item.key,
+	editorName: item.metadata?.itemLabel?.trim() || item.id,
+	breadcrumb: item.id,
 	itemLabel: item.metadata?.itemLabel
 });
 const buildItemTranslationEntries = (snapshot, itemId, input) => {
@@ -659,20 +694,20 @@ const buildItemTranslationEntries = (snapshot, itemId, input) => {
 const summarizeOutlineNode = (node) => ({
 	itemId: node.itemId,
 	itemType: node.itemType,
-	key: node.key,
-	fullKey: node.fullKey,
+	editorName: node.editorName,
+	breadcrumb: node.breadcrumb,
 	itemLabel: node.itemLabel,
 	parentId: node.parentId,
 	depth: node.depth,
 	childCount: node.childCount
 });
-const summarizeKeyIndexEntry = (entry, outlineById) => {
+const summarizeItemIndexEntry = (entry, outlineById) => {
 	const outlineNode = outlineById.get(entry.itemId);
 	return {
 		itemId: entry.itemId,
 		itemType: entry.itemType,
-		key: entry.key,
-		fullKey: entry.fullKey,
+		editorName: entry.editorName,
+		breadcrumb: entry.breadcrumb,
 		itemLabel: entry.itemLabel,
 		parentId: outlineNode?.parentId,
 		depth: outlineNode?.depth,
@@ -680,36 +715,7 @@ const summarizeKeyIndexEntry = (entry, outlineById) => {
 		path: entry.path
 	};
 };
-const getParentFullKey = (fullKey) => {
-	const segments = fullKey.split(".");
-	if (segments.length <= 1) return;
-	return segments.slice(0, -1).join(".");
-};
-const summarizeKeyIndexEntries = (entries, outlineById) => {
-	const byFullKey = new Map(entries.map((entry) => [entry.fullKey, entry]));
-	const childCountByFullKey = /* @__PURE__ */ new Map();
-	for (const entry of entries) {
-		const parentFullKey = getParentFullKey(entry.fullKey);
-		if (!parentFullKey) continue;
-		childCountByFullKey.set(parentFullKey, (childCountByFullKey.get(parentFullKey) ?? 0) + 1);
-	}
-	return entries.map((entry) => {
-		const outlineNode = outlineById.get(entry.itemId);
-		const parentFullKey = getParentFullKey(entry.fullKey);
-		const parentEntry = parentFullKey ? byFullKey.get(parentFullKey) : void 0;
-		return {
-			itemId: entry.itemId,
-			itemType: entry.itemType,
-			key: entry.key,
-			fullKey: entry.fullKey,
-			itemLabel: entry.itemLabel,
-			parentId: outlineNode?.parentId ?? parentEntry?.itemId,
-			depth: outlineNode?.depth ?? Math.max(0, entry.fullKey.split(".").length - 1),
-			childCount: outlineNode?.childCount ?? childCountByFullKey.get(entry.fullKey) ?? 0,
-			path: entry.path
-		};
-	});
-};
+const summarizeItemIndexEntries = (entries, outlineById) => entries.map((entry) => summarizeItemIndexEntry(entry, outlineById));
 const buildChoiceConfigDetails = (rawItem) => {
 	const config = isRecord$5(rawItem.config) ? rawItem.config : void 0;
 	const rawOptions = asArray(config?.options);
@@ -726,8 +732,8 @@ const buildChoiceConfigDetails = (rawItem) => {
 			id,
 			labelContentKey: getChoiceOptionLabelContentKey$1(id)
 		};
-		const key = asString(option.key);
-		if (key) details.key = key;
+		const key = asString(option.code);
+		if (key) details.code = key;
 		const hasDisplayCondition = asBoolean(option.hasDisplayCondition);
 		if (hasDisplayCondition !== void 0) details.hasDisplayCondition = hasDisplayCondition;
 		const embeddedFormItemId = asString(option.embeddedFormItemId);
@@ -737,7 +743,6 @@ const buildChoiceConfigDetails = (rawItem) => {
 			details.embeddedFormAuthoringMode = getFormAuthoringMode(embeddedForm);
 			details.embeddedFormSimpleModeValid = isValidSimpleFormConfig(embeddedForm);
 			details.embeddedFormTranslationPrefix = getChoiceEmbeddedFormTranslationPrefix(id);
-			details.embeddedFormResponseSlotPrefix = getChoiceEmbeddedFormResponseSlotPrefix(id);
 		}
 		return details;
 	}).filter((option) => Boolean(option));
@@ -755,9 +760,9 @@ const buildChoiceConfigDetails = (rawItem) => {
 		listOrdering: { choiceOptions: config?.shuffleOptions === true ? "Stored configured order; positions are one-based. Respondents see a shuffled order, so this is not a stable respondent-visible order." : "Stored configured order; positions are one-based and match respondent-visible order." }
 	};
 };
-const buildFormFieldDetails = (field, position, translationNamespace, responseSlotPrefix) => {
+const buildFormFieldDetails = (field, position, translationNamespace) => {
 	const id = asString(field.id);
-	const key = asString(field.key);
+	const key = asString(field.variableName);
 	const type = asString(field.type);
 	if (!id || !key || !type) return;
 	const controller = isRecord$5(field.controller) ? field.controller : void 0;
@@ -773,16 +778,16 @@ const buildFormFieldDetails = (field, position, translationNamespace, responseSl
 			id: optionId,
 			labelContentKey: getFormFieldOptionLabelContentKey(id, optionId, translationNamespace)
 		};
-		const value = asString(option.value);
-		if (value) details.value = value;
+		const value = asString(option.code);
+		if (value) details.code = value;
 		return details;
 	}).filter((option) => Boolean(option)) : void 0;
 	return {
 		position,
 		id,
-		key,
+		variableName: key,
 		type,
-		responseSlotId: getFormFieldResponseSlotId(key, responseSlotPrefix),
+		responseSlotId: id,
 		labelContentKey: getFormFieldContentKey(id, "label", translationNamespace),
 		descriptionContentKey: getFormFieldContentKey(id, "description", translationNamespace),
 		errorContentKey: getFormFieldContentKey(id, "error", translationNamespace),
@@ -797,7 +802,7 @@ const buildFormFieldDetails = (field, position, translationNamespace, responseSl
 		selectOptions
 	};
 };
-const buildFormConfigDetails = (rawItem, configOverride, translationNamespace, responseSlotPrefix) => {
+const buildFormConfigDetails = (rawItem, configOverride, translationNamespace) => {
 	const configCandidate = configOverride ?? rawItem.config;
 	const config = isRecord$5(configCandidate) ? configCandidate : void 0;
 	const rawGroups = asArray(config?.fieldGroups);
@@ -806,7 +811,7 @@ const buildFormConfigDetails = (rawItem, configOverride, translationNamespace, r
 		if (!isRecord$5(group)) return;
 		const id = asString(group.id);
 		if (!id) return;
-		const fields = asArray(group.fields).map((field, fieldIndex) => isRecord$5(field) ? buildFormFieldDetails(field, fieldIndex + 1, translationNamespace, responseSlotPrefix) : void 0).filter((field) => Boolean(field));
+		const fields = asArray(group.fields).map((field, fieldIndex) => isRecord$5(field) ? buildFormFieldDetails(field, fieldIndex + 1, translationNamespace) : void 0).filter((field) => Boolean(field));
 		const layout = isRecord$5(group.layout) ? group.layout : void 0;
 		return {
 			position: groupIndex + 1,
@@ -855,23 +860,24 @@ const buildItemConfigDetails = (rawItem) => {
 };
 const buildEmbeddedFormDetails = (choiceOption, embeddedForm) => {
 	if (!isRecord$5(embeddedForm)) return;
-	return buildFormConfigDetails({
+	const syntheticRawItem = {
 		id: choiceOption.embeddedFormItemId ?? choiceOption.id,
-		key: choiceOption.key ?? choiceOption.id,
+		metadata: { itemLabel: choiceOption.code ?? choiceOption.id },
 		itemType: "formItem",
 		config: embeddedForm
-	}, embeddedForm, getChoiceEmbeddedFormTranslationPrefix(choiceOption.id), getChoiceEmbeddedFormResponseSlotPrefix(choiceOption.id));
+	};
+	return buildFormConfigDetails(syntheticRawItem, embeddedForm, getChoiceEmbeddedFormTranslationPrefix(choiceOption.id));
 };
 const buildConfigSearchText = (rawItem) => {
 	const details = buildItemConfigDetails(rawItem);
 	if (!details) return [];
 	const values = [...details.summary];
-	for (const option of details.choiceOptions ?? []) values.push(option.id, option.key ?? "", option.labelContentKey, option.embeddedFormItemId ?? "", option.embeddedFormTranslationPrefix ?? "", option.embeddedFormResponseSlotPrefix ?? "");
+	for (const option of details.choiceOptions ?? []) values.push(option.id, option.code ?? "", option.labelContentKey, option.embeddedFormItemId ?? "", option.embeddedFormTranslationPrefix ?? "");
 	for (const group of details.formFieldGroups ?? []) {
 		values.push(group.id, group.titleContentKey, group.descriptionContentKey, String(group.layout.base), String(group.layout.xs), String(group.layout.sm), String(group.layout.md), String(group.layout.xl), group.hasDisplayCondition === true ? "hasDisplayCondition" : "");
 		for (const field of group.fields) {
-			values.push(field.id, field.key, field.type, field.responseSlotId, field.labelContentKey, field.descriptionContentKey, field.errorContentKey, field.placeholderContentKey ?? "", field.unitContentKey ?? "", field.checkedLabelContentKey ?? "", field.uncheckedLabelContentKey ?? "", field.controllerType ?? "", ...field.validationTypes ?? [], ...field.validationMessageContentKeys ?? []);
-			for (const option of field.selectOptions ?? []) values.push(option.id, option.value ?? "", option.labelContentKey);
+			values.push(field.id, field.variableName, field.type, field.responseSlotId, field.labelContentKey, field.descriptionContentKey, field.errorContentKey, field.placeholderContentKey ?? "", field.unitContentKey ?? "", field.checkedLabelContentKey ?? "", field.uncheckedLabelContentKey ?? "", field.controllerType ?? "", ...field.validationTypes ?? [], ...field.validationMessageContentKeys ?? []);
+			for (const option of field.selectOptions ?? []) values.push(option.id, option.code ?? "", option.labelContentKey);
 		}
 	}
 	return values.filter((value) => value.trim().length > 0);
@@ -881,53 +887,42 @@ const summarizeFocusItemNode = (node, outlineById) => {
 	return {
 		itemId: node.itemId,
 		itemType: node.itemType,
-		key: node.itemKey,
-		fullKey: node.fullKey,
+		editorName: node.editorName,
+		breadcrumb: node.breadcrumb,
 		itemLabel: node.itemLabel,
 		parentId: outlineNode?.parentId,
 		depth: outlineNode?.depth,
 		childCount: outlineNode?.childCount ?? node.descendants.length,
-		siblingKeys: node.siblingKeys
+		siblingNames: node.siblingNames
 	};
 };
 const summarizeItemById = (itemId, indexById, outlineById) => {
 	const outlineNode = outlineById.get(itemId);
 	if (outlineNode) return summarizeOutlineNode(outlineNode);
 	const indexEntry = indexById.get(itemId);
-	if (indexEntry) return summarizeKeyIndexEntry(indexEntry, outlineById);
+	if (indexEntry) return summarizeItemIndexEntry(indexEntry, outlineById);
 };
-/**
-* Resolve an item by internal itemId, or fall back to matching on `key` /
-* `fullKey`. Model-facing text (outline rows, fullKey paths) only ever shows
-* key/fullKey, not the internal itemId, so models often pass a key like
-* "info_1" where an itemId is expected — this keeps that usage working.
-*/
+/** Resolve only persistent item IDs. Search can discover names and breadcrumbs. */
 const resolveItemSummary = (identifier, indexById, outlineById) => {
-	const direct = summarizeItemById(identifier, indexById, outlineById);
-	if (direct) return direct;
-	const normalized = identifier.trim().toLowerCase();
-	if (!normalized) return;
-	for (const entry of indexById.values()) if (entry.key.toLowerCase() === normalized || entry.fullKey.toLowerCase() === normalized) return summarizeKeyIndexEntry(entry, outlineById);
-	for (const node of outlineById.values()) if (node.key.toLowerCase() === normalized || node.fullKey.toLowerCase() === normalized) return summarizeOutlineNode(node);
+	return summarizeItemById(identifier, indexById, outlineById);
 };
 const itemMatchesQuery = (item, query) => {
 	return [
 		item.itemId,
 		item.itemType,
-		item.key,
-		item.fullKey,
+		item.editorName,
+		item.breadcrumb,
 		item.itemLabel,
 		...item.path ?? [],
-		...item.siblingKeys ?? []
+		...item.siblingNames ?? []
 	].filter(Boolean).join(" ").toLowerCase().includes(query);
 };
 /**
-* Direct children of `parentFullKey` derived from the full-survey key index.
+* Direct children of `parentId` derived from the full-survey item index.
 * This works for any item, selected or not.
 */
-const findDirectChildrenByFullKey = (entries, outlineById, parentFullKey) => {
-	const prefix = `${parentFullKey}.`;
-	return entries.filter((entry) => entry.fullKey.startsWith(prefix) && !entry.fullKey.slice(prefix.length).includes(".")).map((entry) => summarizeKeyIndexEntry(entry, outlineById));
+const findDirectChildrenByParentId = (entries, outlineById, parentId) => {
+	return entries.filter((entry) => outlineById.get(entry.itemId)?.parentId === parentId).map((entry) => summarizeItemIndexEntry(entry, outlineById));
 };
 //#endregion
 //#region src/engine/expression-mutations.ts
@@ -965,7 +960,10 @@ const expressionSchema = z.lazy(() => z.discriminatedUnion("type", [
 	}),
 	z.object({
 		type: z.literal(ExpressionType.ResponseVariable),
-		variableRef: z.string().min(1),
+		variableRef: z.object({
+			slotId: z.string().min(1),
+			method: z.enum(["get", "isDefined"])
+		}).strict(),
 		editorConfig: z.record(z.string(), jsonValueSchema).optional()
 	}),
 	z.object({
@@ -1181,10 +1179,6 @@ const toJsonValue = (value) => value;
 const resolveItemId = (snapshot, itemRef) => {
 	const rawItems = getRawSurveyItems(snapshot);
 	if (new Map(rawItems.map((item) => [item.id, item])).has(itemRef)) return { itemId: itemRef };
-	const keyIndexMatch = getKeyIndexEntries(snapshot).find((entry) => entry.itemId === itemRef || entry.key === itemRef || entry.fullKey === itemRef);
-	if (keyIndexMatch) return { itemId: keyIndexMatch.itemId };
-	const rawKeyMatch = rawItems.find((item) => item.key === itemRef);
-	if (rawKeyMatch) return { itemId: rawKeyMatch.id };
 	return { issue: createIssue$1({
 		code: "item-not-found",
 		message: `Could not resolve item "${itemRef}". Inspect current context or item details first.`,
@@ -1741,7 +1735,7 @@ const RICH_TEXT_BODY_KEYS = [
 	"blocks"
 ];
 const MAX_RICH_TEXT_NORMALIZATION_ISSUES = 32;
-const INSPECTABLE_RICH_TEXT_NODE_TYPES = new Set([
+const INSPECTABLE_RICH_TEXT_NODE_TYPES = /* @__PURE__ */ new Set([
 	"paragraph",
 	"heading",
 	"bulletList",
@@ -1997,8 +1991,8 @@ const normalizeSelectControllerOptions = ({ controller, fieldId, translations })
 		options: controller.options.map((option, index) => {
 			if (!isRecord$3(option)) return option;
 			const optionLabel = getSelectOptionTranslationLabel(option);
-			const optionId = normalizeKey(getString(option.id) ?? getString(option.optionId) ?? getString(option.value) ?? (optionLabel ? normalizeKey(optionLabel) : void 0) ?? `option_${index + 1}`) || `option_${index + 1}`;
-			const value = getString(option.value) ?? optionId;
+			const optionId = getString(option.id) ?? getString(option.optionId) ?? getString(option.value) ?? (optionLabel ? normalizeKey(optionLabel) : void 0) ?? `option_${index + 1}`;
+			const code = getString(option.code) ?? optionId;
 			if (optionLabel) translations.push({
 				contentKey: `fields.${fieldId}.options.${optionId}.label`,
 				plainText: optionLabel
@@ -2006,7 +2000,7 @@ const normalizeSelectControllerOptions = ({ controller, fieldId, translations })
 			return {
 				...option,
 				id: optionId,
-				value
+				code
 			};
 		})
 	};
@@ -2020,8 +2014,7 @@ const appendOptionTranslationLabels = (translations, option, optionId, path, iss
 };
 const normalizeLooseField = (field) => {
 	if (!isRecord$3(field)) return { translations: [] };
-	const rawId = getString(field.id) ?? getString(field.fieldId) ?? getString(field.key);
-	const id = rawId ? normalizeKey(rawId) : void 0;
+	const id = getString(field.id) ?? getString(field.fieldId);
 	if (!id) return { translations: [] };
 	const rawType = getString(field.type) ?? getString(field.controlType) ?? "input";
 	const type = rawType === "text" || rawType === "email" ? "input" : rawType === "date" ? "datepicker" : rawType === "checkbox" ? "switch" : rawType;
@@ -2085,7 +2078,7 @@ const normalizeLooseField = (field) => {
 	return {
 		field: {
 			id,
-			key: getString(field.key) ?? id,
+			variableName: getString(field.variableName) ?? suggestResponseVariableName(getString(field.label) ?? id),
 			type,
 			required: field.required === true,
 			controller: normalizeSelectControllerOptions({
@@ -2114,7 +2107,7 @@ const normalizeFormFieldGroupSelectOptions = (fieldGroups) => {
 				...group,
 				fields: group.fields.map((field) => {
 					if (!isRecord$3(field)) return field;
-					const fieldId = getString(field.id) ?? getString(field.fieldId) ?? getString(field.key);
+					const fieldId = getString(field.id) ?? getString(field.fieldId);
 					const controller = isRecord$3(field.controller) ? field.controller : void 0;
 					if (!fieldId || !controller || controller.type !== "select") return field;
 					return {
@@ -2137,7 +2130,7 @@ const normalizeLooseCreateOperation = (operation, defaultLocale, path, issues) =
 	const item = { ...operation.item };
 	const translations = [...flattenLooseItemTranslations(operation.translations, `${path}.translations`, issues), ...flattenLooseItemTranslations(item.translations, `${path}.item.translations`, issues)];
 	if (!getString(item.id)) {
-		const itemId = getString(item.key) ?? getString(item.label);
+		const itemId = getString(item.label);
 		if (itemId) item.id = normalizeKey(itemId);
 	}
 	if (!isRecord$3(item.config) && isRecord$3(operation.config)) item.config = operation.config;
@@ -2150,7 +2143,7 @@ const normalizeLooseCreateOperation = (operation, defaultLocale, path, issues) =
 			...rawConfig,
 			...!Array.isArray(rawConfig.options) && looseOptions ? { options: looseOptions } : {}
 		};
-		config.id = getString(config.id) ?? getString(item.id) ?? getString(item.key);
+		config.id = getString(config.id) ?? getString(item.id);
 		config.maxSelection = normalizeChoiceMaxSelection(config);
 		config.shuffleOptions = config.shuffleOptions === true;
 		if (Array.isArray(config.options)) config.options = config.options.map((option, optionIndex) => {
@@ -2161,7 +2154,7 @@ const normalizeLooseCreateOperation = (operation, defaultLocale, path, issues) =
 			return {
 				...option,
 				id: optionId,
-				key: getString(option.key) ?? getString(option.value) ?? getString(option.optionId),
+				code: getString(option.code) ?? getString(option.value) ?? getString(option.optionId),
 				label: optionLabel
 			};
 		});
@@ -2171,7 +2164,7 @@ const normalizeLooseCreateOperation = (operation, defaultLocale, path, issues) =
 	}
 	if (item.itemType === "formItem" && isRecord$3(item.config)) {
 		const config = { ...item.config };
-		config.id = getString(config.id) ?? getString(item.id) ?? getString(item.key);
+		config.id = getString(config.id) ?? getString(item.id);
 		const looseFields = Array.isArray(config.fields) ? config.fields : [];
 		const fieldTranslations = [];
 		const normalizedLooseFields = looseFields.map((field) => {
@@ -2221,7 +2214,7 @@ const normalizeLooseCreateOperation = (operation, defaultLocale, path, issues) =
 const normalizeLooseFormTranslationOperation = (operation, path, issues) => {
 	if (!isRecord$3(operation)) return operation;
 	const operationKind = getString(operation.kind) ?? getString(operation.op);
-	if (operationKind !== "upsert-form-field-group" && operationKind !== "upsert-form-field" && operationKind !== "set-embedded-form") return operation;
+	if (operationKind !== "upsert-form-field-group" && operationKind !== "upsert-form-field" && operationKind !== "set-embedded-form" && operationKind !== "patch-item-config") return operation;
 	if (!Array.isArray(operation.translations)) return operation;
 	return {
 		...operation,
@@ -2283,11 +2276,11 @@ const getChoiceOptionsFromRawItem = (rawItem) => {
 	return rawOptions.filter(isRecord$2).map((option) => {
 		const optionId = getTrimmedString(option.id);
 		if (!optionId) return;
-		const optionKey = getTrimmedString(option.key);
+		const optionKey = getTrimmedString(option.code);
 		return {
 			...option,
 			id: optionId,
-			...optionKey ? { key: optionKey } : {}
+			...optionKey ? { code: optionKey } : {}
 		};
 	}).filter((option) => Boolean(option));
 };
@@ -2345,14 +2338,14 @@ const withFormFieldGroupsForTarget = (rawItem, fieldGroups, optionId, preserveSi
 		const config = isRecord$2(rawItem.config) ? rawItem.config : {};
 		return {
 			...rawItem,
-			config: transitionFormAuthoringMode({
+			config: normalizeFormItemConfig(transitionFormAuthoringMode({
 				config: {
 					id: rawItem.id,
 					...config
 				},
 				fieldGroups,
 				preserveSimpleMode
-			})
+			}), rawItem.id)
 		};
 	}
 	if (rawItem.itemType !== "choiceItem") return void 0;
@@ -2363,14 +2356,14 @@ const withFormFieldGroupsForTarget = (rawItem, fieldGroups, optionId, preserveSi
 	const embeddedForm = isRecord$2(option.embeddedForm) ? option.embeddedForm : {};
 	options[optionIndex] = {
 		...option,
-		embeddedForm: transitionFormAuthoringMode({
+		embeddedForm: normalizeFormItemConfig(transitionFormAuthoringMode({
 			config: {
 				id: optionId,
 				...embeddedForm
 			},
 			fieldGroups,
 			preserveSimpleMode
-		})
+		}), optionId)
 	};
 	return withChoiceOptionsOnRawItem(rawItem, options);
 };
@@ -2396,12 +2389,12 @@ const removeDraftTranslationPrefix = ({ itemId, prefix, survey }) => {
 };
 /** Request-local mutable state for canonical, already-validated transitions. */
 var SurveyOperationExecutionSession = class {
+	capabilities;
 	#survey;
 	#itemsById;
 	#parentByChildId = /* @__PURE__ */ new Map();
-	#fullKeyById = /* @__PURE__ */ new Map();
-	#outlineItemIds;
-	constructor(inputSurvey) {
+	constructor(inputSurvey, capabilities) {
+		this.capabilities = capabilities;
 		this.#survey = structuredCloneMethod(inputSurvey);
 		this.#itemsById = new Map(this.#survey.surveyItems.map((item) => [item.id, item]));
 		this.#rebuildParentIndex();
@@ -2429,14 +2422,7 @@ var SurveyOperationExecutionSession = class {
 		return descendants;
 	}
 	resolveItem(identifier) {
-		const direct = this.getItem(identifier);
-		if (direct) return direct;
-		const normalized = identifier.trim().toLowerCase();
-		if (!normalized) return void 0;
-		for (const itemId of this.#getItemIdsInOutlineOrder()) {
-			const item = this.getItem(itemId);
-			if (item.key.toLowerCase() === normalized || this.#getFullKey(itemId).toLowerCase() === normalized) return item;
-		}
+		return this.getItem(identifier);
 	}
 	resolveCreateParent(identifier) {
 		if (identifier.trim()) return this.resolveItem(identifier);
@@ -2446,42 +2432,6 @@ var SurveyOperationExecutionSession = class {
 	#rebuildParentIndex() {
 		this.#parentByChildId = /* @__PURE__ */ new Map();
 		for (const item of this.#survey.surveyItems) for (const childId of getGroupChildren(item)) if (this.#itemsById.has(childId) && !this.#parentByChildId.has(childId)) this.#parentByChildId.set(childId, item.id);
-		this.#fullKeyById = /* @__PURE__ */ new Map();
-		this.#outlineItemIds = void 0;
-	}
-	#getFullKey(itemId, stack = /* @__PURE__ */ new Set()) {
-		const cached = this.#fullKeyById.get(itemId);
-		if (cached) return cached;
-		const item = this.getItem(itemId);
-		if (!item || stack.has(itemId)) return item?.key ?? itemId;
-		const parentId = this.getParentId(itemId);
-		if (!parentId) {
-			this.#fullKeyById.set(itemId, item.key);
-			return item.key;
-		}
-		stack.add(itemId);
-		const fullKey = `${this.#getFullKey(parentId, stack)}.${item.key}`;
-		stack.delete(itemId);
-		this.#fullKeyById.set(itemId, fullKey);
-		return fullKey;
-	}
-	#getItemIdsInOutlineOrder() {
-		if (this.#outlineItemIds) return this.#outlineItemIds;
-		const ordered = [];
-		const visited = /* @__PURE__ */ new Set();
-		const visit = (itemId) => {
-			if (visited.has(itemId)) return;
-			const item = this.getItem(itemId);
-			if (!item) return;
-			visited.add(itemId);
-			ordered.push(itemId);
-			for (const childId of getGroupChildren(item)) visit(childId);
-		};
-		const root = this.#survey.surveyItems.find(isRootItem);
-		if (root) visit(root.id);
-		for (const item of [...this.#survey.surveyItems].sort((left, right) => left.id.localeCompare(right.id))) visit(item.id);
-		this.#outlineItemIds = ordered;
-		return this.#outlineItemIds;
 	}
 	hasLocale(locale) {
 		return Object.hasOwn(this.#survey.translations ?? {}, locale);
@@ -2512,11 +2462,17 @@ var SurveyOperationExecutionSession = class {
 			const previousItem = survey.surveyItems[index];
 			survey.surveyItems[index] = item;
 			this.#itemsById.set(item.id, item);
-			if (previousItem.key !== item.key) this.#fullKeyById = /* @__PURE__ */ new Map();
 			const previousChildren = getGroupChildren(previousItem);
 			const nextChildren = getGroupChildren(item);
 			if (previousChildren.length !== nextChildren.length || previousChildren.some((childId, childIndex) => childId !== nextChildren[childIndex])) this.#rebuildParentIndex();
 		};
+		if (operation.kind === "update-response-settings") {
+			const next = previewResponseSettings(createAssistantSurvey(survey, this.capabilities), operation.naming, operation.settings).survey;
+			this.#survey = next;
+			this.#itemsById = new Map(next.surveyItems.map((item) => [item.id, item]));
+			this.#rebuildParentIndex();
+			return;
+		}
 		if (operation.kind === "survey-json-patch") {
 			survey = applyJsonPatch(survey, operation.patches);
 			this.#survey = survey;
@@ -2546,12 +2502,6 @@ var SurveyOperationExecutionSession = class {
 				});
 				break;
 			}
-			case "update-item-key":
-				replaceItem({
-					...getItem(operation.itemId),
-					key: operation.key
-				});
-				break;
 			case "update-item-label": {
 				const item = getItem(operation.itemId);
 				const metadata = { ...item.metadata ?? {} };
@@ -2594,16 +2544,20 @@ var SurveyOperationExecutionSession = class {
 					const next = structuredCloneMethod(block);
 					const changes = operation.changes;
 					if (changes.source !== void 0) next.source = changes.source;
-					if (changes.alt !== void 0) if (changes.alt === null) delete next.alt;
-					else next.alt = changes.alt;
-					if (changes.caption !== void 0) if (changes.caption === null || changes.caption.length === 0) delete next.caption;
-					else next.caption = [{
-						type: "paragraph",
-						children: [{
-							type: "text",
-							text: changes.caption
-						}]
-					}];
+					if (changes.alt !== void 0) {
+						if (changes.alt === null) delete next.alt;
+						else next.alt = changes.alt;
+					}
+					if (changes.caption !== void 0) {
+						if (changes.caption === null || changes.caption.length === 0) delete next.caption;
+						else next.caption = [{
+							type: "paragraph",
+							children: [{
+								type: "text",
+								text: changes.caption
+							}]
+						}];
+					}
 					const size = { ...next.size ?? {} };
 					for (const key of [
 						"width",
@@ -2634,9 +2588,26 @@ var SurveyOperationExecutionSession = class {
 			}
 			case "patch-item-config": {
 				const item = getItem(operation.itemId);
+				const config = applyJsonPatch(item.config ?? {}, operation.patches);
 				replaceItem({
 					...item,
-					config: applyJsonPatch(item.config ?? {}, operation.patches)
+					config
+				});
+				if (item.itemType === "choiceMatrix" || item.itemType === "formMatrix") {
+					const translations = new SurveyTranslations(survey.translations);
+					const content = translations.getItemTranslations(item.id)?.clone() ?? new SurveyItemTranslations();
+					if (item.itemType === "formMatrix") cleanFormMatrixTranslations(normalizeFormMatrixConfig(item.config), normalizeFormMatrixConfig(config), content);
+					else {
+						const keys = new Set(getChoiceMatrixTranslationKeys(normalizeChoiceMatrixConfig(config)));
+						for (const key of getChoiceMatrixTranslationKeys(normalizeChoiceMatrixConfig(item.config))) if (!keys.has(key)) content.removeContentKey(key);
+					}
+					translations.setItemTranslations(item.id, content);
+					survey.translations = translations.serialize();
+				}
+				updateDraftItemTranslations({
+					itemId: item.id,
+					survey,
+					translations: operation.translations ?? []
 				});
 				break;
 			}
@@ -2645,7 +2616,7 @@ var SurveyOperationExecutionSession = class {
 				const options = getChoiceOptionsFromRawItem(item);
 				options.splice(operation.index ?? options.length, 0, {
 					id: operation.option.id,
-					...operation.option.key ? { key: operation.option.key } : {}
+					...operation.option.code ? { code: operation.option.code } : {}
 				});
 				replaceItem(withChoiceOptionsOnRawItem(item, options));
 				updateDraftItemTranslations({
@@ -2930,16 +2901,46 @@ var SurveyOperationExecutionSession = class {
 * adapters use it to decide domain results before recording them through the
 * editor's normal mutation and history APIs.
 */
-const executeSurveyOperationsOnRawSurvey = ({ operations, survey }) => {
-	const session = new SurveyOperationExecutionSession(survey);
+const executeSurveyOperationsOnRawSurvey = ({ operations, survey, capabilities }) => {
+	const session = new SurveyOperationExecutionSession(survey, capabilities);
 	for (const operation of operations) session.apply(operation);
 	return session.serialize();
 };
-/** @deprecated Prefer `executeSurveyOperationsOnRawSurvey` for new integrations. */
-const applyValidatedSurveyOperationsToDraft = executeSurveyOperationsOnRawSurvey;
+//#endregion
+//#region src/engine/reference-diagnostics.ts
+const MAX_REFERENCE_LENGTH = 256;
+const MAX_DISTANCE = 3;
+const spellingDistance = (left, right) => {
+	if (Math.abs(left.length - right.length) > MAX_DISTANCE) return Infinity;
+	let previous = Array.from({ length: right.length + 1 }, (_, index) => index);
+	for (let row = 1; row <= left.length; row++) {
+		const current = [row];
+		for (let column = 1; column <= right.length; column++) current[column] = Math.min(current[column - 1] + 1, previous[column] + 1, previous[column - 1] + (left[row - 1] === right[column - 1] ? 0 : 1));
+		if (Math.min(...current) > MAX_DISTANCE) return Infinity;
+		previous = current;
+	}
+	return previous[right.length];
+};
+const suggestExactReferences = (supplied, known) => {
+	if (supplied.length > MAX_REFERENCE_LENGTH) return [];
+	const candidates = [];
+	for (const value of new Set(known)) {
+		if (value.length > MAX_REFERENCE_LENGTH || value === supplied) continue;
+		const distance = supplied.endsWith(`.${value}`) ? 0 : spellingDistance(supplied, value);
+		if (distance <= MAX_DISTANCE) candidates.push({
+			value,
+			distance
+		});
+	}
+	candidates.sort((left, right) => left.distance - right.distance || left.value.localeCompare(right.value));
+	return candidates.filter((entry) => entry.distance === candidates[0]?.distance).slice(0, 3).map(({ value }) => value);
+};
+const formatExactReferenceSuggestions = (supplied, known, label) => {
+	const suggestions = suggestExactReferences(supplied, known);
+	return suggestions.length ? ` Similar valid ${label}: ${suggestions.map((value) => JSON.stringify(value)).join(", ")}. Confirm the intended target and copy its exact identifier.` : "";
+};
 //#endregion
 //#region src/engine/operations.ts
-const ITEM_KEY_PATTERN = /^[A-Za-z0-9_-]+$/;
 const MAX_SURVEY_ASSISTANT_OPERATIONS_PER_PROPOSAL = 200;
 const MAX_SURVEY_ASSISTANT_OPERATIONS_PER_TURN_DRAFT = 1e3;
 const CHOICE_OPTION_LABEL_CONTENT_KEY_PATTERN = /^options\.([^.]+)\.label$/;
@@ -2981,7 +2982,8 @@ const getCreateItemNestedTranslations = (item) => {
 const isSurveyJsonPatchOperation = (operation) => operation.kind === "survey-json-patch";
 const getPatchTouchedPaths = (operation) => operation.patches.flatMap((patch) => "from" in patch ? [patch.path, patch.from] : [patch.path]);
 const touchesSurveySchemaPath = (path) => {
-	return parseJsonPointer(path)[0] === "$schema";
+	const segments = parseJsonPointer(path);
+	return segments[0] === "$schema" || segments[0] === "schemaVersion";
 };
 const isTranslationContainerMutation = (patch) => patch.op !== "test";
 const validateTranslationPatchSafety = ({ operation, survey }) => {
@@ -3134,6 +3136,8 @@ const collectRequiredLocalizedContent = (survey, snapshot) => {
 	for (const item of survey.surveyItems) {
 		const manifest = manifestByItemType.get(item.itemType);
 		for (const surface of manifest?.contentSurfaces ?? []) if (surface.requiredOnCreate && !surface.pattern) addRequiredLocalizedContent(required, item.id, surface.key);
+		const adapter = snapshot.trustedCapabilities?.byItemType.get(item.itemType);
+		if (!adapter?.validateItem?.(item).some((issue) => issue.severity === "error")) for (const key of adapter?.requiredCreateContentKeys?.(item) ?? []) addRequiredLocalizedContent(required, item.id, key);
 		const config = isRecord$2(item.config) ? item.config : void 0;
 		if (item.itemType === "formItem") {
 			collectFieldLocalizedContent({
@@ -3164,17 +3168,46 @@ const hasNonEmptySurveyTranslation = (survey, { itemId, contentKey }) => Object.
 	const content = localeTranslations?.itemTranslations?.[itemId]?.[contentKey];
 	return isContent(content) && !isContentEmpty(content);
 });
+const validateIntroducedCapabilityContent = (before, after, snapshot) => {
+	const issues = [];
+	for (const item of after.surveyItems) {
+		const adapter = snapshot.trustedCapabilities?.byItemType.get(item.itemType);
+		if (!adapter?.validContentKeys || adapter.validateItem?.(item).some((issue) => issue.severity === "error")) continue;
+		const previous = before.surveyItems.find((entry) => entry.id === item.id);
+		const requiredBefore = new Set(previous ? adapter.requiredCreateContentKeys?.(previous) ?? [] : []);
+		for (const contentKey of adapter.requiredCreateContentKeys?.(item) ?? []) if (!hasNonEmptySurveyTranslation(after, {
+			itemId: item.id,
+			contentKey
+		}) && (!requiredBefore.has(contentKey) || hasNonEmptySurveyTranslation(before, {
+			itemId: item.id,
+			contentKey
+		}))) issues.push(createIssue({
+			code: "missing-item-content",
+			itemId: item.id,
+			message: `Provide a non-empty translation for "${contentKey}" in the same proposal as the configuration edit. Use the item capability's exact content keys.`
+		}));
+		const validKeys = new Set(adapter.validContentKeys(item));
+		for (const [locale, translations] of Object.entries(after.translations ?? {})) for (const [contentKey, content] of Object.entries(translations.itemTranslations?.[item.id] ?? {})) if (!validKeys.has(contentKey) && JSON.stringify(content) !== JSON.stringify(before.translations?.[locale]?.itemTranslations?.[item.id]?.[contentKey])) issues.push(createIssue({
+			code: "invalid-item-content-key",
+			itemId: item.id,
+			message: `"${contentKey}" is not a rendered content key on ${item.itemType}.${formatExactReferenceSuggestions(contentKey, validKeys, "content keys")} Inspect the item's translations/configuration for exact keys; its item-types reference describes the content-key grammar.`
+		}));
+	}
+	return issues;
+};
 const validateNewRawPatchLocalizedContent = ({ operation, originalSurvey, patchedSurvey, snapshot }) => {
+	const capabilityIssues = validateIntroducedCapabilityContent(originalSurvey, patchedSurvey, snapshot);
 	const existingRequired = collectRequiredLocalizedContent(originalSurvey, snapshot);
 	const existingMissing = new Set(Array.from(existingRequired).filter(([, binding]) => !hasNonEmptySurveyTranslation(originalSurvey, binding)).map(([identity]) => identity));
 	const missing = Array.from(collectRequiredLocalizedContent(patchedSurvey, snapshot)).filter(([identity, binding]) => {
 		if (hasNonEmptySurveyTranslation(patchedSurvey, binding)) return false;
 		return !existingMissing.has(identity);
 	}).map(([, binding]) => binding);
-	if (missing.length === 0) return [];
-	return [createIssue({
+	if (missing.length === 0) return capabilityIssues;
+	const missingPaths = missing.map(({ itemId, contentKey }) => `/translations/<locale>/itemTranslations/${itemId}/${contentKey}`);
+	return [...capabilityIssues, createIssue({
 		code: "missing-raw-patch-localized-content",
-		message: `The raw patch introduces respondent-visible content without its required translation. Add non-empty Content values in the same patches array for: ${formatBoundedDiagnosticValues(missing.map(({ itemId, contentKey }) => `/translations/<locale>/itemTranslations/${itemId}/${contentKey}`))}. Content keys use config ids exactly and are case-sensitive; for embedded fields, embeddedForms.<optionId> uses the choice option's id, not its key or embeddedForm id.`,
+		message: `The raw patch introduces respondent-visible content without its required translation. Add non-empty Content values in the same patches array for: ${formatBoundedDiagnosticValues(missingPaths)}. Content keys use config ids exactly and are case-sensitive; for embedded fields, embeddedForms.<optionId> uses the choice option's ID, not its export code or embeddedForm ID.`,
 		operationIndex: 0,
 		operationId: getOperationId(operation),
 		itemId: missing[0]?.itemId
@@ -3198,7 +3231,6 @@ const validateNewRawPatchFormLayouts = ({ operation, originalSurvey, patchedSurv
 const createStructureIssue = ({ code, message, operationId, itemId }) => createIssue({
 	code,
 	message,
-	operationIndex: 0,
 	operationId,
 	itemId
 });
@@ -3212,7 +3244,7 @@ const buildResponseSlotTypesForDraft = ({ currentItem, currentItems, snapshot })
 	return deriveResponseSlotTypes({
 		...snapshot.survey,
 		surveyItems: draftItems
-	});
+	}, snapshot.trustedCapabilities);
 };
 const isJsonExpression = (value) => isRecord$2(value) && typeof value.type === "string";
 const validateCreateItemExpressions = ({ issues, item, operationId, operationIndex, responseSlotTypes }) => {
@@ -3263,18 +3295,18 @@ const validateSurveyTreeStructure = (survey, operationId, availableItemTypes) =>
 	const issues = [];
 	if (!isRecord$2(survey)) return [createStructureIssue({
 		code: "patched-survey-not-object",
-		message: "The patched survey must be a JSON object.",
+		message: "The survey must be a JSON object.",
 		operationId
 	})];
 	if (typeof survey.$schema !== "string" || survey.$schema.trim().length === 0) issues.push(createStructureIssue({
 		code: "missing-survey-schema",
-		message: "The patched survey must keep a non-empty $schema value.",
+		message: "The survey must keep a non-empty $schema value.",
 		operationId
 	}));
 	if (!Array.isArray(survey.surveyItems) || survey.surveyItems.length === 0) {
 		issues.push(createStructureIssue({
 			code: "missing-survey-items",
-			message: "The patched survey must contain at least one survey item.",
+			message: "The survey must contain at least one survey item.",
 			operationId
 		}));
 		return issues;
@@ -3291,33 +3323,26 @@ const validateSurveyTreeStructure = (survey, operationId, availableItemTypes) =>
 			continue;
 		}
 		const itemId = getTrimmedString(item.id);
-		const itemKey = getTrimmedString(item.key);
 		const itemType = getTrimmedString(item.itemType);
-		if (!itemId || !itemKey || !itemType) {
+		if (!itemId || !itemType) {
 			issues.push(createStructureIssue({
 				code: "invalid-survey-item-identity",
-				message: `Survey item at index ${itemIndex} must have non-empty id, key, and itemType fields.`,
+				message: `Survey item at index ${itemIndex} must have non-empty id and itemType fields.`,
 				operationId,
 				itemId
 			}));
 			continue;
 		}
-		if (!availableItemTypes.has(itemType)) issues.push(createStructureIssue({
+		if (availableItemTypes && !availableItemTypes.has(itemType)) issues.push(createStructureIssue({
 			code: "unknown-item-type",
 			message: `Item "${itemId}" uses item type "${itemType}", which is not available in the current editor registry.`,
 			operationId,
 			itemId
 		}));
-		if (!ITEM_KEY_PATTERN.test(itemKey)) issues.push(createStructureIssue({
-			code: "invalid-item-key",
-			message: `Item "${itemId}" has an invalid key. Keys must contain only letters, numbers, underscores, or hyphens.`,
-			operationId,
-			itemId
-		}));
 		if (itemsById.has(itemId)) {
 			issues.push(createStructureIssue({
 				code: "duplicate-item-id",
-				message: `The patched survey contains duplicate item id "${itemId}".`,
+				message: `The survey contains duplicate item id "${itemId}".`,
 				operationId,
 				itemId
 			}));
@@ -3329,7 +3354,7 @@ const validateSurveyTreeStructure = (survey, operationId, availableItemTypes) =>
 	}
 	if (rootItems.length !== 1) issues.push(createStructureIssue({
 		code: "invalid-root-count",
-		message: rootItems.length === 0 ? "The patched survey must contain one root group item." : "The patched survey cannot contain more than one root group item.",
+		message: `The survey must contain exactly one root group item; found ${rootItems.length} (${rootItems.map((item) => item.id).sort().join(", ")}).`,
 		operationId
 	}));
 	else if (rootItems[0].itemType !== ReservedSurveyItemTypes.Group) issues.push(createStructureIssue({
@@ -3405,7 +3430,15 @@ const validateSurveyTreeStructure = (survey, operationId, availableItemTypes) =>
 		}
 	}
 	for (const item of itemsById.values()) {
-		if (isRootItem(item)) continue;
+		if (isRootItem(item)) {
+			if (parentByChildId.has(item.id)) issues.push(createStructureIssue({
+				code: "root-has-parent",
+				message: "The survey root cannot have a parent.",
+				operationId,
+				itemId: item.id
+			}));
+			continue;
+		}
 		if (!parentByChildId.has(item.id)) issues.push(createStructureIssue({
 			code: "orphan-survey-item",
 			message: `Item "${item.id}" is not reachable from any group parent.`,
@@ -3413,21 +3446,6 @@ const validateSurveyTreeStructure = (survey, operationId, availableItemTypes) =>
 			itemId: item.id
 		}));
 	}
-	for (const item of itemsById.values()) {
-		const siblingKeys = /* @__PURE__ */ new Map();
-		for (const childId of getGroupChildren(item)) {
-			const child = itemsById.get(childId);
-			if (!child) continue;
-			const conflictingChildId = siblingKeys.get(child.key);
-			if (conflictingChildId) issues.push(createStructureIssue({
-				code: "duplicate-sibling-key",
-				message: `Siblings "${conflictingChildId}" and "${childId}" both use key "${child.key}".`,
-				operationId,
-				itemId: childId
-			}));
-			siblingKeys.set(child.key, childId);
-		}
-	}
 	const rootItem = rootItems[0];
 	if (rootItem) {
 		const visiting = /* @__PURE__ */ new Set();
@@ -3436,7 +3454,7 @@ const validateSurveyTreeStructure = (survey, operationId, availableItemTypes) =>
 			if (visiting.has(itemId)) {
 				issues.push(createStructureIssue({
 					code: "survey-item-cycle",
-					message: `The patched survey contains a cycle through item "${itemId}" (${path.join(" -> ")} -> ${itemId}).`,
+					message: `The survey contains a cycle through item "${itemId}" (${path.join(" -> ")} -> ${itemId}).`,
 					operationId,
 					itemId
 				}));
@@ -3450,9 +3468,38 @@ const validateSurveyTreeStructure = (survey, operationId, availableItemTypes) =>
 			visited.add(itemId);
 		};
 		visit(rootItem.id, []);
+		for (const item of itemsById.values()) if (!visited.has(item.id)) {
+			issues.push(createStructureIssue({
+				code: "unreachable-survey-item",
+				message: `Item "${item.id}" is not reachable from the survey root.`,
+				operationId,
+				itemId: item.id
+			}));
+			visit(item.id, []);
+		}
 	}
 	return issues;
 };
+/** Preserve existing defects without accepting changed or additional violations. */
+const findIntroducedSurveyStructureIssues = ({ before, after }) => {
+	const fingerprint = (issue) => JSON.stringify([
+		issue.code,
+		issue.itemId,
+		issue.message
+	]);
+	const remaining = /* @__PURE__ */ new Map();
+	for (const issue of before) {
+		const key = fingerprint(issue);
+		remaining.set(key, (remaining.get(key) ?? 0) + 1);
+	}
+	return after.filter((issue) => {
+		const key = fingerprint(issue);
+		const count = remaining.get(key) ?? 0;
+		if (count === 0) return true;
+		remaining.set(key, count - 1);
+		return false;
+	});
+};
 const collectIntroducedExpressionIntegrityFindings = ({ after, before, operationId, operationIndex, snapshot }) => {
 	return findIntroducedExpressionReferenceDiagnosticsIncludingAdvisories({
 		before: analyzeSurveyAssistantExpressionReferences(before, snapshot.trustedCapabilities),
@@ -3574,13 +3621,22 @@ const validateSurveyJsonPatchOperation = ({ allowExpressionJsonPatches, operatio
 			operationId
 		}));
 	}
-	warnings.push(...collectIntroducedExpressionIntegrityFindings({
-		after: patchedSurvey,
-		before: snapshot.survey,
-		operationIndex: 0,
-		operationId,
-		snapshot
-	}));
+	if (issues.length === 0) try {
+		warnings.push(...collectIntroducedExpressionIntegrityFindings({
+			after: patchedSurvey,
+			before: snapshot.survey,
+			operationIndex: 0,
+			operationId,
+			snapshot
+		}));
+	} catch (error) {
+		issues.push(createIssue({
+			code: "expression-integrity-check-failed",
+			operationIndex: 0,
+			operationId,
+			message: error instanceof Error ? error.message : String(error)
+		}));
+	}
 	if (getRawItemsFromSurvey(patchedSurvey).length !== getRawSurveyItems(snapshot).length) warnings.push(createIssue({
 		severity: "warning",
 		code: "raw-patch-changed-item-count",
@@ -3588,6 +3644,8 @@ const validateSurveyJsonPatchOperation = ({ allowExpressionJsonPatches, operatio
 		operationIndex: 0,
 		operationId
 	}));
+	const previousResponseIssues = new Set(getAssistantResponseSchemaIssues(snapshot.survey, snapshot.trustedCapabilities).map((issue) => JSON.stringify(issue)));
+	issues.push(...getAssistantResponseSchemaIssues(patchedSurvey, snapshot.trustedCapabilities).filter((issue) => issue.code === "invalid-survey-visibility" || !previousResponseIssues.has(JSON.stringify(issue))));
 	return {
 		valid: issues.length === 0,
 		issues,
@@ -3605,6 +3663,7 @@ const createIssue = ({ severity = "error", ...input }) => ({
 });
 const getOperationId = (operation) => operation.id;
 const isSurveyLevelOperation = (operation) => [
+	"update-response-settings",
 	"update-survey-metadata",
 	"update-survey-pagination",
 	"update-survey-translation",
@@ -3624,6 +3683,7 @@ const getOperationTarget = (operation) => {
 		case "remove-form-field":
 		case "move-form-field": return operation.target.itemId;
 		case "reorder-items": return operation.parentItemId;
+		case "update-response-settings":
 		case "update-survey-metadata":
 		case "update-survey-pagination":
 		case "update-survey-translation":
@@ -3635,7 +3695,7 @@ const getOperationTarget = (operation) => {
 		default: return operation.itemId;
 	}
 };
-const KNOWN_CHOICE_OPTION_INPUT_KEYS = new Set([
+const KNOWN_CHOICE_OPTION_INPUT_KEYS = /* @__PURE__ */ new Set([
 	"id",
 	"optionId",
 	"label",
@@ -3643,7 +3703,7 @@ const KNOWN_CHOICE_OPTION_INPUT_KEYS = new Set([
 	"title",
 	"name",
 	"value",
-	"key",
+	"code",
 	"hasDisplayCondition",
 	"embeddedFormItemId",
 	"embeddedForm"
@@ -3698,18 +3758,7 @@ const getItemTranslationText = ({ contentKey, getContent, itemId, locale }) => {
 	return content ? getContentPlainText(content).trim() : void 0;
 };
 const resolveChoiceOption = ({ getContent, itemId, locale, optionRef, options }) => {
-	const normalizedRef = optionRef.trim();
-	const normalizedSearchText = normalizedRef.toLowerCase();
-	for (const option of options) if (option.id === normalizedRef || option.key === normalizedRef) return option;
-	const labelMatches = options.filter((option) => {
-		return getItemTranslationText({
-			contentKey: getChoiceOptionLabelContentKey(option.id),
-			getContent,
-			itemId,
-			locale
-		})?.toLowerCase() === normalizedSearchText;
-	});
-	return labelMatches.length === 1 ? labelMatches[0] : void 0;
+	return options.find((option) => option.id === optionRef);
 };
 const createChoiceOptionsConflictIssue = ({ code, itemId, message, operationId, operationIndex }) => createIssue({
 	code,
@@ -3740,7 +3789,7 @@ const normalizeChoiceOptionInput = ({ defaultLocale, option, usedIds }) => {
 			},
 			option: {
 				id: optionId,
-				...optionKey ? { key: optionKey } : {}
+				...optionKey ? { code: optionKey } : {}
 			}
 		};
 	}
@@ -3751,9 +3800,11 @@ const normalizeChoiceOptionInput = ({ defaultLocale, option, usedIds }) => {
 		"title",
 		"name"
 	]);
-	const optionId = ensureUniqueId(getFirstStringProperty(option, ["id", "optionId"]) ?? getFirstStringProperty(option, ["value", "key"]) ?? label, usedIds);
-	const keyCandidate = getFirstStringProperty(option, ["key", "value"]) ?? label;
-	const optionKey = keyCandidate ? normalizeChoiceOptionKey(keyCandidate) : void 0;
+	const idCandidate = getFirstStringProperty(option, ["id", "optionId"]) ?? getFirstStringProperty(option, ["value", "key"]) ?? label;
+	const optionId = getTrimmedString(option.id) ?? ensureUniqueId(idCandidate, usedIds);
+	usedIds.add(optionId);
+	const keyCandidate = getFirstStringProperty(option, ["code"]) ?? label;
+	const optionKey = getTrimmedString(option.code) ?? (keyCandidate ? normalizeChoiceOptionKey(keyCandidate) : void 0);
 	const embeddedFormItemId = getTrimmedString(option.embeddedFormItemId);
 	const unrecognizedKeys = getUnrecognizedChoiceOptionKeys(option);
 	return {
@@ -3764,7 +3815,7 @@ const normalizeChoiceOptionInput = ({ defaultLocale, option, usedIds }) => {
 		} : void 0,
 		option: {
 			id: optionId,
-			...optionKey ? { key: optionKey } : {},
+			...optionKey ? { code: optionKey } : {},
 			...option.hasDisplayCondition === true ? { hasDisplayCondition: true } : {},
 			...embeddedFormItemId ? { embeddedFormItemId } : {},
 			...isRecord$2(option.embeddedForm) ? { embeddedForm: option.embeddedForm } : {}
@@ -3819,7 +3870,7 @@ const normalizeChoiceItemCreateOperation = (operation, defaultLocale) => {
 		usedIds.add(optionId);
 		normalizedOptions.push({
 			id: optionId,
-			key: normalizeChoiceOptionKey(labelText)
+			code: normalizeChoiceOptionKey(labelText)
 		});
 	}
 	return {
@@ -3984,7 +4035,8 @@ const findNestedFieldsArrayPath = (value, path, depth) => {
 	if (Array.isArray(value.fields) && value.fields.length > 0) return path ? `${path}.fields` : "fields";
 	for (const [key, nested] of Object.entries(value)) {
 		if (key === "fields" || !isRecord$2(nested)) continue;
-		const found = findNestedFieldsArrayPath(nested, path ? `${path}.${key}` : key, depth + 1);
+		const nestedPath = path ? `${path}.${key}` : key;
+		const found = findNestedFieldsArrayPath(nested, nestedPath, depth + 1);
 		if (found) return found;
 	}
 };
@@ -4155,7 +4207,6 @@ const normalizeOperation = (operation, resolvedItemId) => {
 				item: {
 					...item,
 					id: operation.item.id?.trim(),
-					key: operation.item.key.trim(),
 					itemType: operation.item.itemType.trim()
 				},
 				translations: translations.map((translation) => ({
@@ -4165,11 +4216,6 @@ const normalizeOperation = (operation, resolvedItemId) => {
 				}))
 			};
 		}
-		case "update-item-key": return {
-			...operation,
-			itemId: resolvedItemId,
-			key: operation.key.trim()
-		};
 		case "update-item-label": return {
 			...operation,
 			itemId: resolvedItemId,
@@ -4204,7 +4250,12 @@ const normalizeOperation = (operation, resolvedItemId) => {
 		};
 		case "patch-item-config": return {
 			...operation,
-			itemId: resolvedItemId
+			itemId: resolvedItemId,
+			...operation.translations ? { translations: operation.translations.map((translation) => ({
+				...translation,
+				locale: translation.locale.trim(),
+				contentKey: translation.contentKey.trim()
+			})) } : {}
 		};
 		case "upsert-form-field-group":
 		case "remove-form-field-group":
@@ -4232,7 +4283,7 @@ const normalizeOperation = (operation, resolvedItemId) => {
 			option: {
 				...operation.option,
 				id: operation.option.id?.trim(),
-				key: operation.option.key?.trim(),
+				code: operation.option.code?.trim(),
 				label: operation.option.label.trim()
 			}
 		};
@@ -4271,6 +4322,7 @@ const normalizeOperation = (operation, resolvedItemId) => {
 			parentItemId: resolvedItemId,
 			itemIds: operation.itemIds.map((itemId) => itemId.trim())
 		};
+		case "update-response-settings":
 		case "update-survey-metadata":
 		case "update-survey-pagination":
 		case "set-image-asset":
@@ -4295,20 +4347,6 @@ const createEmptyValidationResult = (issue, operations) => ({
 	warnings: [],
 	normalizedOperations: operations
 });
-const getSiblingKeyConflict = ({ deletedItemIds, getItemById, getParentId, itemId, key }) => {
-	const parentId = getParentId(itemId);
-	if (!parentId) return;
-	for (const siblingId of getGroupChildren(getItemById(parentId))) {
-		if (siblingId === itemId || deletedItemIds.has(siblingId)) continue;
-		if (getItemById(siblingId)?.key === key) return siblingId;
-	}
-};
-const getKeyConflictInParent = ({ deletedItemIds, getItemById, key, parentId }) => {
-	for (const siblingId of getGroupChildren(getItemById(parentId))) {
-		if (deletedItemIds.has(siblingId)) continue;
-		if (getItemById(siblingId)?.key === key) return siblingId;
-	}
-};
 const buildSurveyDocumentVersion = (snapshot) => ({ ...snapshot.version });
 const resolveEngineContext = (snapshot) => "document" in snapshot ? snapshot : createSurveyAssistantEngineContext(snapshot);
 const validateSurveyOperations = ({ allowExpressionJsonPatches = false, maxOperations = 200, operations, snapshot: snapshotInput }) => {
@@ -4341,14 +4379,14 @@ const validateSurveyOperations = ({ allowExpressionJsonPatches = false, maxOpera
 	}
 	const turnStartItemsById = mapRawItemsById(snapshot);
 	const outlineById = mapOutlineById(snapshot);
-	const indexById = mapKeyIndexById(snapshot);
+	const indexById = mapItemIndexById(snapshot);
 	const itemTypeManifestByType = new Map(snapshot.capabilities.itemTypes.map((entry) => [entry.itemType, entry]));
 	const deterministicCreateItemTypes = new Set(snapshot.capabilities.itemTypes.filter((entry) => entry.create === "deterministic").map((entry) => entry.itemType));
 	const issues = [];
 	const warnings = [];
 	const normalizedOperations = [];
 	const deletedItemIds = /* @__PURE__ */ new Set();
-	const executionSession = new SurveyOperationExecutionSession(snapshot.survey);
+	const executionSession = new SurveyOperationExecutionSession(snapshot.survey, snapshot.trustedCapabilities);
 	const getCurrentItemTranslationContent = (itemId, locale, contentKey) => executionSession.getItemTranslationContent(itemId, locale, contentKey);
 	const hasCurrentNonEmptyItemTranslation = (itemId, contentKey) => executionSession.hasNonEmptyItemTranslation(itemId, contentKey);
 	const introducedLocaleWarnings = /* @__PURE__ */ new Set();
@@ -4377,7 +4415,7 @@ const validateSurveyOperations = ({ allowExpressionJsonPatches = false, maxOpera
 			} catch (error) {
 				transitionFailed = true;
 				issues.push(createIssue({
-					code: "expression-integrity-check-failed",
+					code: "operation-apply-failed",
 					message: `The accepted operation could not be applied to prospective survey state: ${error instanceof Error ? error.message : String(error)}`,
 					operationIndex,
 					operationId
@@ -4404,7 +4442,7 @@ const validateSurveyOperations = ({ allowExpressionJsonPatches = false, maxOpera
 			if (!parent) {
 				issues.push(createIssue({
 					code: "target-parent-not-found",
-					message: normalized.target.parentItemId.length > 0 ? `No parent group matching "${normalized.target.parentItemId}" was found.` : "No root group parent could be inferred for this create-item operation.",
+					message: normalized.target.parentItemId.length > 0 ? `No parent group matching "${normalized.target.parentItemId}" was found. Available parent group IDs: ${formatBoundedDiagnosticValues(executionSession.getItems().filter((entry) => entry.itemType === ReservedSurveyItemTypes.Group).map((entry) => JSON.stringify(entry.id)))}. Use the exact ID, not its editor name or the survey key.` : "No root group parent could be inferred for this create-item operation.",
 					operationIndex,
 					operationId
 				}));
@@ -4441,16 +4479,6 @@ const validateSurveyOperations = ({ allowExpressionJsonPatches = false, maxOpera
 				}));
 				return;
 			}
-			if (!ITEM_KEY_PATTERN.test(normalized.item.key)) {
-				issues.push(createIssue({
-					code: "invalid-item-key",
-					message: "Item keys must contain only letters, numbers, underscores, or hyphens.",
-					operationIndex,
-					operationId,
-					itemId
-				}));
-				return;
-			}
 			if (normalized.item.itemType === "root" || isRecord$2(normalized.item.config) && normalized.item.config.isRoot === true) {
 				issues.push(createIssue({
 					code: "cannot-create-root",
@@ -4471,22 +4499,6 @@ const validateSurveyOperations = ({ allowExpressionJsonPatches = false, maxOpera
 				}));
 				return;
 			}
-			const conflictId = getKeyConflictInParent({
-				deletedItemIds,
-				getItemById: (candidateId) => executionSession.getItem(candidateId),
-				key: normalized.item.key,
-				parentId: parent.itemId
-			});
-			if (conflictId) {
-				issues.push(createIssue({
-					code: "duplicate-sibling-key",
-					message: `The key "${normalized.item.key}" is already used by sibling item "${conflictId}".`,
-					operationIndex,
-					operationId,
-					itemId
-				}));
-				return;
-			}
 			if (normalized.target.index !== void 0) {
 				const maximumUsefulIndex = getGroupChildren(parent.rawItem).length;
 				if (normalized.target.index > maximumUsefulIndex) warnings.push(createIssue({
@@ -4560,8 +4572,32 @@ const validateSurveyOperations = ({ allowExpressionJsonPatches = false, maxOpera
 				id: itemId
 			};
 			const trustedCapability = snapshot.trustedCapabilities?.byItemType.get(normalizedItem.itemType);
-			if (trustedCapability?.normalizeCreate) normalizedItem = trustedCapability.normalizeCreate(normalizedItem);
-			if (normalizedItem.id !== itemId || normalizedItem.itemType !== normalized.item.itemType || normalizedItem.key !== normalized.item.key) issues.push(createIssue({
+			try {
+				if ("key" in normalizedItem) throw new Error("Item keys were removed. Use metadata.itemLabel for editor names and response-variable naming for coding.");
+				if (normalized.presetId) {
+					if (!trustedCapability?.materializePreset) throw new Error(`Item type "${normalizedItem.itemType}" has no server-supported creation presets.`);
+					const preset = trustedCapability.materializePreset(normalized.presetId, normalized.translations?.[0]?.locale ?? snapshot.ui.selectedLocale ?? "en");
+					normalizedItem.config = {
+						...isRecord$2(preset.config) ? preset.config : {},
+						...isRecord$2(normalizedItem.config) ? normalizedItem.config : {}
+					};
+					const presetContentKeys = trustedCapability.validContentKeys ? new Set(trustedCapability.validContentKeys(normalizedItem)) : void 0;
+					const explicitKeys = new Set((normalized.translations ?? []).map((translation) => `${translation.locale}\0${translation.contentKey}`));
+					normalized.translations = [...preset.translations.filter((translation) => (!presetContentKeys || presetContentKeys.has(translation.contentKey)) && !explicitKeys.has(`${translation.locale}\0${translation.contentKey}`)), ...normalized.translations ?? []];
+					delete normalized.presetId;
+				}
+				if (trustedCapability?.normalizeCreate) normalizedItem = trustedCapability.normalizeCreate(normalizedItem);
+			} catch (error) {
+				issues.push(createIssue({
+					code: "invalid-item-config",
+					message: error instanceof Error ? error.message : String(error),
+					operationIndex,
+					operationId,
+					itemId
+				}));
+				return;
+			}
+			if (normalizedItem.id !== itemId || normalizedItem.itemType !== normalized.item.itemType) issues.push(createIssue({
 				code: "invalid-capability-normalization",
 				message: "The trusted item capability changed the new item's identity during normalization.",
 				operationIndex,
@@ -4577,17 +4613,69 @@ const validateSurveyOperations = ({ allowExpressionJsonPatches = false, maxOpera
 				};
 				(normalizedIssue.severity === "warning" ? warnings : issues).push(normalizedIssue);
 			}
-			validateCreateItemExpressions({
-				issues,
-				item: normalizedItem,
-				operationId,
+			if (issues.some((issue) => issue.operationIndex === operationIndex)) return;
+			const requiredContentKeys = trustedCapability?.requiredCreateContentKeys?.(normalizedItem) ?? [];
+			for (const contentKey of requiredContentKeys) if (!(normalized.translations ?? []).some((translation) => translation.contentKey === contentKey && (translation.plainText?.trim() || translation.content && !isContentEmpty(translation.content)))) issues.push(createIssue({
+				code: "missing-create-content",
+				message: `Provide respondent-visible content for "${contentKey}" in the create operation.`,
 				operationIndex,
-				responseSlotTypes: buildResponseSlotTypesForDraft({
-					currentItem: normalizedItem,
-					currentItems: executionSession.getItems(),
-					snapshot
-				})
-			});
+				operationId,
+				itemId
+			}));
+			if (issues.some((issue) => issue.operationIndex === operationIndex)) return;
+			try {
+				const before = createAssistantSurvey(executionSession.serialize(), snapshot.trustedCapabilities);
+				const core = createAssistantSurvey({
+					...executionSession.serialize(),
+					surveyItems: [...executionSession.getItems(), normalizedItem]
+				}, snapshot.trustedCapabilities).surveyItems.get(itemId);
+				const readPath = (value, path) => path.reduce((value, key) => value && typeof value === "object" ? value[key] : void 0, value);
+				const explicit = core.getResponseSlotDefinitions().flatMap((slot) => {
+					const path = slot.naming?.kind === "matrix" ? slot.naming.prefixPath : slot.naming?.path;
+					const value = path && readPath(normalized.item.config, path);
+					return path && typeof value === "string" ? [{
+						path,
+						value
+					}] : [];
+				});
+				allocateCopiedResponseNames(before, [core]);
+				const allocated = structuredClone(core.rawItem);
+				for (const { path, value } of explicit) {
+					const parent = readPath(allocated.config, path.slice(0, -1));
+					parent[path.at(-1)] = value;
+				}
+				normalizedItem = allocated;
+			} catch (error) {
+				issues.push(createIssue({
+					code: "invalid-response-schema",
+					message: error instanceof Error ? error.message : String(error),
+					operationIndex,
+					operationId,
+					itemId
+				}));
+				return;
+			}
+			try {
+				validateCreateItemExpressions({
+					issues,
+					item: normalizedItem,
+					operationId,
+					operationIndex,
+					responseSlotTypes: buildResponseSlotTypesForDraft({
+						currentItem: normalizedItem,
+						currentItems: executionSession.getItems(),
+						snapshot
+					})
+				});
+			} catch (error) {
+				issues.push(createIssue({
+					code: "invalid-response-schema",
+					message: error instanceof Error ? error.message : String(error),
+					operationIndex,
+					operationId,
+					itemId
+				}));
+			}
 			if (issues.some((issue) => issue.operationIndex === operationIndex)) return;
 			acceptOperation({
 				...normalized,
@@ -4603,6 +4691,40 @@ const validateSurveyOperations = ({ allowExpressionJsonPatches = false, maxOpera
 		if (isSurveyLevelOperation(operation)) {
 			const normalized = normalizeOperation(operation, "");
 			switch (normalized.kind) {
+				case "update-response-settings":
+					if (!normalized.naming.length && !normalized.settings.length) {
+						issues.push(createIssue({
+							code: "empty-response-settings",
+							message: "Supply at least one response naming or settings edit.",
+							operationIndex,
+							operationId
+						}));
+						return;
+					}
+					try {
+						const slots = createAssistantSurvey(executionSession.serialize(), snapshot.trustedCapabilities).getResponseSlotRegistry().definitions;
+						const owners = new Set(slots.filter((slot) => normalized.naming.some((edit) => "slotId" in edit ? edit.slotId === slot.slotId : edit.primitiveId === slot.primitiveId) || normalized.settings.some((edit) => edit.slotId === slot.slotId)).map((slot) => slot.itemId));
+						for (const owner of owners) {
+							const item = executionSession.getItem(owner);
+							const adapter = snapshot.trustedCapabilities?.byItemType.get(item.itemType);
+							if (!itemTypeManifestByType.get(item.itemType)?.supportedOperations.includes(normalized.kind) || adapter?.supportsOperation?.(normalized) === false) issues.push(createIssue({
+								code: "operation-not-supported-for-item-type",
+								message: `Item type "${item.itemType}" does not support response-settings edits.`,
+								operationIndex,
+								operationId,
+								itemId: owner
+							}));
+						}
+					} catch (error) {
+						issues.push(createIssue({
+							code: "invalid-response-schema",
+							message: error instanceof Error ? error.message : String(error),
+							operationIndex,
+							operationId
+						}));
+					}
+					if (issues.some((issue) => issue.operationIndex === operationIndex)) return;
+					break;
 				case "update-survey-metadata":
 					if (Object.keys(normalized.values).length === 0) {
 						issues.push(createIssue({
@@ -4669,19 +4791,15 @@ const validateSurveyOperations = ({ allowExpressionJsonPatches = false, maxOpera
 					}
 					break;
 				case "update-image-asset-metadata":
-				case "remove-image-asset":
-					if (!executionSession.hasAsset(normalized.assetId)) {
-						issues.push(createIssue({
-							code: "image-asset-not-found",
-							message: `Image asset "${normalized.assetId}" was not found.`,
-							operationIndex,
-							operationId
-						}));
-						return;
-					}
-					break;
-				case "set-image-asset":
-				case "update-survey-pagination": break;
+				case "remove-image-asset": if (!executionSession.hasAsset(normalized.assetId)) {
+					issues.push(createIssue({
+						code: "image-asset-not-found",
+						message: `Image asset "${normalized.assetId}" was not found.`,
+						operationIndex,
+						operationId
+					}));
+					return;
+				}
 			}
 			acceptOperation(normalized);
 			return;
@@ -4696,7 +4814,7 @@ const validateSurveyOperations = ({ allowExpressionJsonPatches = false, maxOpera
 		if (!item) {
 			issues.push(createIssue({
 				code: "item-not-found",
-				message: `No survey item matching "${getOperationTarget(operation)}" was found.`,
+				message: `No survey item matching "${getOperationTarget(operation)}" was found.${formatExactReferenceSuggestions(getOperationTarget(operation), executionSession.getItems().map((entry) => entry.id), "item IDs")} Inspect the current outline if the intended item is not listed.`,
 				operationIndex,
 				operationId
 			}));
@@ -4729,7 +4847,8 @@ const validateSurveyOperations = ({ allowExpressionJsonPatches = false, maxOpera
 			...rawNormalized,
 			contentKey: normalizeContentKeyForItemType(rawNormalized.contentKey, itemTypeManifestByType.get(rawItem.itemType))
 		} : rawNormalized.kind === "upsert-form-field-group" || rawNormalized.kind === "upsert-form-field" ? normalizeFormOperationTranslations(rawNormalized, rawNormalized.target.optionId) : rawNormalized.kind === "set-embedded-form" ? normalizeEmbeddedFormAuthoringMode(normalizeFormOperationTranslations(rawNormalized, rawNormalized.optionId)) : rawNormalized;
-		if (!itemTypeManifestByType.get(rawItem.itemType)?.supportedOperations.includes(normalized.kind)) {
+		const itemCapability = itemTypeManifestByType.get(rawItem.itemType);
+		if (!itemCapability?.supportedOperations.includes(normalized.kind)) {
 			issues.push(createIssue({
 				code: "operation-not-supported-for-item-type",
 				message: `Item type "${rawItem.itemType}" does not support operation "${normalized.kind}".`,
@@ -4751,45 +4870,6 @@ const validateSurveyOperations = ({ allowExpressionJsonPatches = false, maxOpera
 			return;
 		}
 		switch (normalized.kind) {
-			case "update-item-key": {
-				if (!ITEM_KEY_PATTERN.test(normalized.key)) {
-					issues.push(createIssue({
-						code: "invalid-item-key",
-						message: "Item keys must contain only letters, numbers, underscores, or hyphens.",
-						operationIndex,
-						operationId,
-						itemId: item.itemId
-					}));
-					break;
-				}
-				const conflictId = getSiblingKeyConflict({
-					deletedItemIds,
-					getItemById: (candidateId) => executionSession.getItem(candidateId),
-					getParentId: (candidateId) => executionSession.getParentId(candidateId),
-					itemId: item.itemId,
-					key: normalized.key
-				});
-				if (conflictId) {
-					issues.push(createIssue({
-						code: "duplicate-sibling-key",
-						message: `The key "${normalized.key}" is already used by sibling item "${conflictId}".`,
-						operationIndex,
-						operationId,
-						itemId: item.itemId
-					}));
-					break;
-				}
-				if (rawItem.key === normalized.key) warnings.push(createIssue({
-					severity: "warning",
-					code: "no-key-change",
-					message: `The item already has the key "${normalized.key}".`,
-					operationIndex,
-					operationId,
-					itemId: item.itemId
-				}));
-				acceptOperation(normalized);
-				break;
-			}
 			case "update-item-label":
 				if ((rawItem.metadata?.itemLabel ?? "") === normalized.itemLabel) warnings.push(createIssue({
 					severity: "warning",
@@ -4869,14 +4949,37 @@ const validateSurveyOperations = ({ allowExpressionJsonPatches = false, maxOpera
 				break;
 			}
 			case "patch-item-config": {
+				if (normalized.translations?.length && !itemCapability.supportedOperations.includes("update-item-translation")) {
+					issues.push(createIssue({
+						code: "operation-not-supported-for-item-type",
+						operationIndex,
+						operationId,
+						itemId: item.itemId,
+						message: `Item type "${rawItem.itemType}" does not permit translation edits.`
+					}));
+					break;
+				}
 				let nextConfig;
 				try {
 					nextConfig = applyJsonPatch(rawItem.config ?? {}, normalized.patches);
 				} catch (error) {
 					const patchError = error instanceof JsonPatchError ? error : void 0;
+					const failedPatch = patchError?.operationIndex === void 0 ? void 0 : normalized.patches[patchError.operationIndex];
 					issues.push(createIssue({
 						code: patchError?.code ?? "item-config-patch-failed",
-						message: error instanceof Error ? error.message : "The item config JSON Patch could not be applied.",
+						message: error instanceof Error ? `${failedPatch ? `Config patch ${patchError.operationIndex + 1} (${failedPatch.op} ${failedPatch.path}): ` : ""}${error.message}${patchError?.code === "path-not-found" && failedPatch?.op === "replace" ? " Replace requires an existing target. Use add for a new property whose parent exists, and account for earlier array edits in this patch." : ""}` : "The item config JSON Patch could not be applied.",
+						operationIndex,
+						operationId,
+						itemId: item.itemId
+					}));
+					break;
+				}
+				const previousStructure = isRecord$2(rawItem.config) ? rawItem.config : {};
+				const nextStructure = isRecord$2(nextConfig) ? nextConfig : {};
+				if (previousStructure.isRoot !== nextStructure.isRoot || JSON.stringify(previousStructure.items) !== JSON.stringify(nextStructure.items)) {
+					issues.push(createIssue({
+						code: "structural-item-config-patch",
+						message: "Item config patches cannot change root identity or group children. Use create-item, move-item, remove-item, or reorder-items; use one validated survey-json-patch for an atomic whole-survey restructuring.",
 						operationIndex,
 						operationId,
 						itemId: item.itemId
@@ -5000,10 +5103,10 @@ const validateSurveyOperations = ({ allowExpressionJsonPatches = false, maxOpera
 					issues.push(contentIssue);
 					break;
 				}
-				if (groups.flatMap((group) => group.fields).find((field) => field.id !== normalized.field.id && field.key === normalized.field.key)) {
+				if (groups.flatMap((group) => group.fields).find((field) => field.id !== normalized.field.id && field.variableName === normalized.field.variableName)) {
 					issues.push(createIssue({
 						code: "duplicate-form-field-key",
-						message: `Form field key "${normalized.field.key}" is already in use.`,
+						message: `Form variable name "${normalized.field.variableName}" is already in use.`,
 						operationIndex,
 						operationId,
 						itemId: item.itemId
@@ -5140,9 +5243,19 @@ const validateSurveyOperations = ({ allowExpressionJsonPatches = false, maxOpera
 				}
 				const options = getChoiceOptionsFromRawItem(rawItem);
 				const usedIds = new Set(options.map((option) => option.id));
-				const usedKeys = new Set(options.map((option) => option.key).filter((key) => Boolean(key)));
-				const optionId = ensureUniqueId(normalized.option.id ?? normalized.option.label, usedIds);
-				const optionKey = ensureUniqueChoiceOptionKey(normalized.option.key ?? normalized.option.label, usedKeys);
+				const usedKeys = new Set(options.map((option) => option.code).filter((key) => Boolean(key)));
+				if (normalized.option.id && usedIds.has(normalized.option.id)) {
+					issues.push(createIssue({
+						code: "duplicate-option-id",
+						message: `Option ID "${normalized.option.id}" already exists.`,
+						operationIndex,
+						operationId,
+						itemId: item.itemId
+					}));
+					break;
+				}
+				const optionId = normalized.option.id ?? ensureUniqueId(normalized.option.label, usedIds);
+				const optionKey = normalized.option.code ?? ensureUniqueChoiceOptionKey(normalized.option.label, usedKeys);
 				const insertIndex = normalized.index === void 0 ? options.length : Math.min(options.length, Math.max(0, normalized.index));
 				if (normalized.index !== void 0 && normalized.index > options.length) warnings.push(createIssue({
 					severity: "warning",
@@ -5158,7 +5271,7 @@ const validateSurveyOperations = ({ allowExpressionJsonPatches = false, maxOpera
 					index: insertIndex,
 					option: {
 						id: optionId,
-						key: optionKey,
+						code: optionKey,
 						label: normalized.option.label
 					}
 				});
@@ -5435,6 +5548,13 @@ const validateSurveyOperations = ({ allowExpressionJsonPatches = false, maxOpera
 	});
 	if (issues.length === 0) try {
 		const prospectiveSurvey = executionSession.serialize();
+		issues.push(...validateIntroducedCapabilityContent(snapshot.survey, prospectiveSurvey, snapshot));
+		issues.push(...findIntroducedSurveyStructureIssues({
+			before: validateSurveyTreeStructure(snapshot.survey),
+			after: validateSurveyTreeStructure(prospectiveSurvey)
+		}));
+		const previousResponseIssues = new Set(getAssistantResponseSchemaIssues(snapshot.survey, snapshot.trustedCapabilities).map((issue) => JSON.stringify(issue)));
+		issues.push(...getAssistantResponseSchemaIssues(prospectiveSurvey, snapshot.trustedCapabilities).filter((issue) => issue.code === "invalid-survey-visibility" || !previousResponseIssues.has(JSON.stringify(issue))));
 		warnings.push(...collectIntroducedExpressionIntegrityFindings({
 			after: prospectiveSurvey,
 			before: snapshot.survey,
@@ -5505,8 +5625,8 @@ const QUALITY_PRINCIPLES = [
 	},
 	{
 		id: "key-semantic-consistency",
-		title: "Coding-key consistency",
-		prompt: "Do item, option, and field keys follow the survey's established convention and avoid contradicting the content they currently identify? Generic, numeric, or opaque keys are acceptable when that is the survey's consistent pattern; flag descriptive keys when they have become stale or misleading, and mixed conventions when the inconsistency appears accidental."
+		title: "Variable-name and export-code consistency",
+		prompt: "Do response variable names and option export codes follow the survey's established convention and avoid contradicting the content they currently identify? Generic, numeric, or opaque keys are acceptable when that is the survey's consistent pattern; flag descriptive keys when they have become stale or misleading, and mixed conventions when the inconsistency appears accidental."
 	},
 	{
 		id: "flow",
@@ -5567,50 +5687,44 @@ const summarizeItemContent = (context, locale, item) => {
 	return {};
 };
 const collectKeyReviewEntries = (context, sourceLocale) => {
+	const model = createAssistantSurvey(context.survey, context.trustedCapabilities);
 	const entries = [];
-	const addFormFields = (item, groups, contentPrefix) => {
-		for (const group of groups) for (const field of records(group.fields)) {
-			if (typeof field.id !== "string" || typeof field.key !== "string") continue;
-			const contentKey = `${contentPrefix}fields.${field.id}.label`;
-			const content = sourceLocale ? translationText(context, sourceLocale, item.id, contentKey) : "";
-			entries.push({
-				kind: "form-field",
-				itemId: item.id,
-				itemKey: item.key,
-				key: field.key,
-				keySource: "explicit",
-				contentKey,
-				...content ? { content } : {}
-			});
-		}
-	};
-	for (const item of context.survey.surveyItems) {
+	for (const slot of model.getResponseSlotRegistry().definitions) {
+		const item = context.survey.surveyItems.find((item) => item.id === slot.itemId);
 		entries.push({
-			kind: "item",
-			itemId: item.id,
-			itemKey: item.key,
-			key: item.key,
+			kind: "response-variable",
+			slotId: slot.slotId,
+			valueType: slot.valueType,
+			computed: !!slot.computed,
+			itemId: slot.itemId,
+			itemKey: model.resolveItemEditorName(slot.itemId, sourceLocale ?? context.ui.selectedLocale),
+			key: slot.variableName,
 			keySource: "explicit",
-			...summarizeItemContent(context, sourceLocale, item)
+			...(() => {
+				const target = slot.prefillTarget;
+				const keys = target?.type === "embeddedField" ? [`embeddedForms.${target.optionId}.fields.${target.fieldId}.label`] : target?.type === "field" ? [`fields.${target.fieldId}.label`] : [slot.rowId && `${slot.rowId}.label`, slot.columnId && `${slot.columnId}.label`].filter((key) => !!key);
+				const texts = sourceLocale ? keys.map((key) => translationText(context, sourceLocale, slot.itemId, key)).filter(Boolean) : [];
+				return keys.length ? {
+					contentKey: keys.join(" + "),
+					content: texts.join(" / ")
+				} : summarizeItemContent(context, sourceLocale, item);
+			})()
 		});
-		const config = isRecord$1(item.config) ? item.config : {};
-		if (item.itemType === "choiceItem") for (const option of records(config.options)) {
-			if (typeof option.id !== "string") continue;
-			const explicitKey = typeof option.key === "string" && option.key.trim() ? option.key : null;
-			const contentKey = `options.${option.id}.label`;
-			const content = sourceLocale ? translationText(context, sourceLocale, item.id, contentKey) : "";
+		for (const [id, code] of Object.entries(slot.referenceValueKeys ?? {})) {
+			const contentKey = slot.referenceValueLabelKeys?.[id];
 			entries.push({
 				kind: "choice-option",
-				itemId: item.id,
-				itemKey: item.key,
-				key: explicitKey ?? option.id,
-				keySource: explicitKey ? "explicit" : "fallback-id",
-				contentKey,
-				...content ? { content } : {}
+				slotId: slot.slotId,
+				itemId: slot.itemId,
+				itemKey: model.resolveItemEditorName(slot.itemId, sourceLocale ?? context.ui.selectedLocale),
+				key: code || id,
+				keySource: code ? "explicit" : "fallback-id",
+				...contentKey ? {
+					contentKey,
+					content: sourceLocale ? translationText(context, sourceLocale, slot.itemId, contentKey) : ""
+				} : {}
 			});
-			if (option.embeddedForm) addFormFields(item, getGroups(item, option.id), `embeddedForms.${option.id}.`);
 		}
-		else if (item.itemType === "formItem") addFormFields(item, getGroups(item), "");
 	}
 	return entries;
 };
@@ -5673,22 +5787,6 @@ const auditSurvey = (context, options = {}) => {
 		category: "structure",
 		message: `Expected one survey root but found ${roots.length}.`
 	});
-	for (const parent of items) {
-		const siblingKeys = /* @__PURE__ */ new Map();
-		for (const childId of strings(isRecord$1(parent.config) ? parent.config.items : void 0)) {
-			const child = itemsById.get(childId);
-			if (!child) continue;
-			const existing = siblingKeys.get(child.key);
-			if (existing) add({
-				code: "duplicate-sibling-key",
-				severity: "error",
-				category: "structure",
-				itemId: child.id,
-				message: `Key "${child.key}" duplicates sibling "${existing}".`
-			});
-			siblingKeys.set(child.key, child.id);
-		}
-	}
 	const locales = context.inspection.locales;
 	const sourceLocale = options.sourceLocale ?? context.ui.selectedLocale ?? locales[0];
 	const targetLocales = options.targetLocales ?? locales.filter((locale) => locale !== sourceLocale);
@@ -5784,6 +5882,10 @@ const auditSurvey = (context, options = {}) => {
 			});
 		}
 	}
+	for (const issue of getAssistantResponseSchemaIssues(context.survey, context.trustedCapabilities)) add({
+		...issue,
+		category: "responses"
+	});
 	for (const diagnostic of analyzeSurveyAssistantExpressionReferences(context.survey, context.trustedCapabilities)) {
 		const blocking = isBlockingSurveyExpressionReferenceDiagnostic(diagnostic);
 		add({
@@ -5846,12 +5948,12 @@ const auditSurvey = (context, options = {}) => {
 //#region src/engine/mutation-recovery.ts
 const UNIDENTIFIED_MUTATION_TARGET = "unidentified-mutation";
 const SATISFIED_MUTATION_TARGET = "satisfied-mutation";
-const SATISFIED_ISSUES = new Set([
+const SATISFIED_ISSUES = /* @__PURE__ */ new Set([
 	"survey-locale-already-exists",
 	"item-already-in-target-parent",
 	"no-expression-patches"
 ]);
-const VALUE_ONLY_ISSUES = new Set([
+const VALUE_ONLY_ISSUES = /* @__PURE__ */ new Set([
 	"invalid-mutation-value",
 	"target-index-after-end",
 	"option-index-after-end",
@@ -5877,13 +5979,13 @@ const exceptionalRecoveryTarget = (kind, operationIndex, issues) => {
 	const errors = issues.filter((issue) => issue.severity === "error" && (issue.operationIndex === operationIndex || issue.operationIndex === void 0));
 	if (errors.length === 0) return void 0;
 	if (errors.every((issue) => SATISFIED_ISSUES.has(issue.code))) return SATISFIED_MUTATION_TARGET;
-	if (!errors.every((issue) => VALUE_ONLY_ISSUES.has(issue.code) || kind === "update-item-key" && ["invalid-item-key", "duplicate-sibling-key"].includes(issue.code))) return UNIDENTIFIED_MUTATION_TARGET;
+	if (!errors.every((issue) => VALUE_ONLY_ISSUES.has(issue.code))) return UNIDENTIFIED_MUTATION_TARGET;
 };
 const record = (value) => value && typeof value === "object" && !Array.isArray(value) ? value : {};
 const at = (value, path) => path.split(".").reduce((entry, key) => record(entry)[key], value);
 const identityFields = {
-	"create-item": ["target.parentItemId", "item.key"],
-	"update-item-key": ["itemId"],
+	"update-response-settings": ["naming", "settings"],
+	"create-item": ["target.parentItemId", "item.id"],
 	"update-item-label": ["itemId"],
 	"update-item-color": ["itemId"],
 	"update-item-translation": [
@@ -5958,11 +6060,9 @@ const identities = (kind, value, fields, context) => {
 		const path = optional ? field.slice(0, -1) : field;
 		let part = at(value, path);
 		if (typeof part === "string" && context && /(?:^|\.)(?:itemId|parentItemId)$/.test(path)) {
-			const identifier = part.trim().toLowerCase();
 			const direct = context.survey.surveyItems.find((item) => item.id === part);
-			const indexed = "inspection" in context ? context.inspection.keyIndex.find((entry) => entry.key.toLowerCase() === identifier || entry.fullKey.toLowerCase() === identifier) : void 0;
-			if (!direct && !indexed) return void 0;
-			part = direct?.id ?? indexed?.itemId;
+			if (!direct) return void 0;
+			part = direct.id;
 		}
 		if (part === void 0 && optional) parts.push(null);
 		else if (typeof part === "string" && part.length > 0 || path === "imageIndex" && typeof part === "number" && Number.isInteger(part) && part >= 0) parts.push(part);
@@ -5978,6 +6078,18 @@ const collectSurveyOperationRecoveryTargets = (operations, context, issues = [])
 		if (kind === "survey-json-patch" || kind === "patch-item-config") return [UNIDENTIFIED_MUTATION_TARGET];
 		const exceptional = exceptionalRecoveryTarget(kind, operationIndex, issues);
 		if (exceptional) return [exceptional];
+		if (kind === "update-response-settings") {
+			const targets = ["naming", "settings"].flatMap((surface) => Array.isArray(value[surface]) ? value[surface].map((edit) => {
+				const entry = record(edit);
+				const identity = entry.slotId ?? entry.primitiveId;
+				return typeof identity === "string" && identity.length ? JSON.stringify([
+					kind,
+					surface,
+					identity
+				]) : UNIDENTIFIED_MUTATION_TARGET;
+			}) : []);
+			return targets.length ? targets : [UNIDENTIFIED_MUTATION_TARGET];
+		}
 		const parts = identities(kind, value, identityFields[kind], context);
 		if (!parts) return [UNIDENTIFIED_MUTATION_TARGET];
 		const fields = kind === "update-survey-metadata" ? value.values : kind === "update-image-asset-metadata" ? value.metadata : kind === "update-placed-image" ? value.changes : void 0;
@@ -6036,7 +6148,7 @@ const collectMalformedSurveyOperationRecoveryTargets = (operations, context, nor
 		}
 		const value = record(operation);
 		const kind = value.kind;
-		const valueField = kind === "update-item-label" ? "itemLabel" : kind === "update-item-color" ? "color" : kind === "update-item-key" ? "key" : void 0;
+		const valueField = kind === "update-item-label" ? "itemLabel" : kind === "update-item-color" ? "color" : void 0;
 		const parts = typeof kind === "string" && Object.hasOwn(identityFields, kind) ? identities(kind, value, identityFields[kind], context) : void 0;
 		const item = context?.survey.surveyItems.find((entry) => entry.id === parts?.[1]);
 		const supported = item && context?.capabilities.itemTypes.find((entry) => entry.itemType === item.itemType)?.supportedOperations.includes(kind);
@@ -6125,10 +6237,9 @@ const collectRemovedRecoveryTargetRefinements = (targets, before, after) => {
 //#endregion
 //#region src/engine/turn-survey-draft.ts
 const createId = () => globalThis.crypto.randomUUID();
-const operationTargets = (operation) => {
+const operationTargets = (operation, context) => {
 	switch (operation.kind) {
 		case "create-item": return [`item:${operation.item.id}`];
-		case "update-item-key":
 		case "update-item-label":
 		case "update-item-color":
 		case "update-item-translation":
@@ -6152,6 +6263,10 @@ const operationTargets = (operation) => {
 		case "set-image-asset":
 		case "update-image-asset-metadata":
 		case "remove-image-asset": return [`asset:${operation.assetId}`];
+		case "update-response-settings": {
+			const targets = [...new Set(context?.responseVariables.filter((slot) => operation.naming.some((edit) => "slotId" in edit ? edit.slotId === slot.slotId : edit.primitiveId === slot.primitiveId) || operation.settings.some((edit) => edit.slotId === slot.slotId)).map((slot) => `item:${slot.itemId}`) ?? [])];
+			return targets.length ? targets : ["survey"];
+		}
 		case "update-survey-metadata":
 		case "update-survey-pagination":
 		case "update-survey-translation":
@@ -6160,7 +6275,7 @@ const operationTargets = (operation) => {
 		case "survey-json-patch": return operation.patches.map((patch) => `path:${patch.path}`);
 	}
 };
-const collectOperationTargets = (operations) => new Set(operations.flatMap(operationTargets));
+const collectOperationTargets = (operations, context) => new Set(operations.flatMap((operation) => operationTargets(operation, context)));
 const mutationRecoveryRouteByIssueCode = { "expression-patch-requires-specialized-tool": "expression" };
 const mutationRouteTarget = (route) => `mutation-route:${route}`;
 const collectExclusiveMutationRecoveryTargets = (changeSet) => {
@@ -6173,6 +6288,7 @@ const collectExclusiveMutationRecoveryTargets = (changeSet) => {
 };
 const MAX_POST_CHANGE_TARGETS = 16;
 const MAX_POST_CHANGE_ITEMS = 6;
+const MAX_POST_CHANGE_CHILDREN = 16;
 const MAX_POST_CHANGE_TRANSLATIONS = 12;
 const MAX_POST_CHANGE_RESPONSE_SLOTS = 12;
 const MAX_POST_CHANGE_TEXT_CHARS = 100;
@@ -6180,10 +6296,21 @@ const MAX_VERIFICATION_AUDIT_FINDINGS = 8;
 const MAX_VERIFICATION_MESSAGE_CHARS = 240;
 const SUBSTANTIAL_CHANGE_ITEM_COUNT = 6;
 const SUBSTANTIAL_CHANGE_OPERATION_COUNT = 12;
-const createPostChangeProjection = (context, targets) => {
-	const allTargets = [...targets];
+const createPostChangeProjection = (context, targets, before, reorderedParentIds) => {
+	const beforeItems = new Map(before?.survey.surveyItems.map((item) => [item.id, item]));
+	const previewedChildOrders = new Set(reorderedParentIds);
+	for (const item of context.survey.surveyItems) {
+		if (item.itemType !== "group") continue;
+		const previous = beforeItems.get(item.id);
+		const children = getGroupChildren(item);
+		const previousChildren = getGroupChildren(previous);
+		if (!previous || children.length !== previousChildren.length || children.some((id, index) => id !== previousChildren[index])) previewedChildOrders.add(item.id);
+	}
+	const allTargets = [.../* @__PURE__ */ new Set([...targets, ...[...previewedChildOrders].map((id) => `item:${id}`)])];
 	const requestedItemIds = allTargets.filter((target) => target.startsWith("item:")).map((target) => target.slice(5));
-	const itemEntries = requestedItemIds.map((itemId) => context.inspection.keyIndex.find((entry) => entry.itemId === itemId)).filter((entry) => entry !== void 0);
+	const itemEntries = requestedItemIds.map((itemId) => context.inspection.itemIndex.find((entry) => entry.itemId === itemId)).filter((entry) => entry !== void 0);
+	const itemsById = new Map(context.survey.surveyItems.map((item) => [item.id, item]));
+	const outlineById = new Map(context.inspection.outline.map((item) => [item.itemId, item]));
 	const surveyTranslations = new SurveyTranslations(context.survey.translations);
 	let truncated = allTargets.length > MAX_POST_CHANGE_TARGETS || itemEntries.length > MAX_POST_CHANGE_ITEMS;
 	const touchedItems = itemEntries.slice(0, MAX_POST_CHANGE_ITEMS).map((entry) => {
@@ -6199,19 +6326,43 @@ const createPostChangeProjection = (context, targets) => {
 			};
 		}));
 		const translations = allTranslations.slice(0, MAX_POST_CHANGE_TRANSLATIONS);
-		const allResponseSlots = Object.keys(context.responseSlotTypes).filter((slot) => slot.startsWith(`${entry.itemId}...`));
+		const allResponseSlots = context.responseVariables.filter((slot) => slot.itemId === entry.itemId).map((slot) => slot.slotId);
 		const responseSlots = allResponseSlots.slice(0, MAX_POST_CHANGE_RESPONSE_SLOTS);
 		if (allTranslations.length > translations.length || allResponseSlots.length > responseSlots.length || translations.some((translation) => translation.truncated)) truncated = true;
+		const parentId = outlineById.get(entry.itemId)?.parentId;
+		const parent = parentId ? itemsById.get(parentId) : void 0;
+		const siblings = parent?.itemType === "group" ? getGroupChildren(parent) : void 0;
+		const index = siblings?.indexOf(entry.itemId) ?? -1;
+		const placement = parent && siblings && index >= 0 ? {
+			parentItemId: parent.id,
+			index,
+			siblingCount: siblings.length,
+			...index > 0 ? { previousItemId: siblings[index - 1] } : {},
+			...index + 1 < siblings.length ? { nextItemId: siblings[index + 1] } : {},
+			shuffled: isRecord$2(parent.config) && parent.config.shuffleItems === true
+		} : void 0;
+		const item = itemsById.get(entry.itemId);
+		const children = previewedChildOrders.has(entry.itemId) ? getGroupChildren(item) : void 0;
+		const childOrder = children ? {
+			itemIds: children.slice(0, MAX_POST_CHANGE_CHILDREN),
+			total: children.length,
+			truncated: children.length > MAX_POST_CHANGE_CHILDREN,
+			shuffled: isRecord$2(item?.config) && item.config.shuffleItems === true
+		} : void 0;
+		if (childOrder?.truncated) truncated = true;
 		return {
 			itemId: entry.itemId,
+			...placement ? { placement } : {},
+			...childOrder ? { childOrder } : {},
 			itemType: entry.itemType,
-			key: entry.key,
-			fullKey: entry.fullKey,
+			editorName: entry.editorName,
+			breadcrumb: entry.breadcrumb,
 			...entry.itemLabel ? { itemLabel: entry.itemLabel } : {},
 			translationCount: allTranslations.length,
 			translations,
 			responseSlotCount: allResponseSlots.length,
-			responseSlots
+			responseSlots,
+			responseVariables: context.responseVariables.filter((slot) => responseSlots.includes(slot.slotId))
 		};
 	});
 	return {
@@ -6302,11 +6453,6 @@ var TurnSurveyDraft = class {
 		this.#assertOpen();
 		if (!this.#context && snapshot && "document" in snapshot && "trustedCapabilities" in snapshot) this.#context = snapshot;
 		const currentContext = this.#context ?? snapshot;
-		const targets = new Set([
-			...collectOperationTargets(operations),
-			...addressedTargets,
-			...handledMutationRoutes.map(mutationRouteTarget)
-		]);
 		const recoveryTargets = addressedTargets.length > 0 ? new Set(addressedTargets) : collectSurveyOperationRecoveryTargets(operations, currentContext);
 		const delta = createSurveyChangeSet({
 			allowExpressionJsonPatches,
@@ -6352,7 +6498,8 @@ var TurnSurveyDraft = class {
 		if (this.#context && delta.operations.length > 0) {
 			const survey = executeSurveyOperationsOnRawSurvey({
 				operations: delta.operations,
-				survey: this.#context.survey
+				survey: this.#context.survey,
+				capabilities: this.#context.trustedCapabilities
 			});
 			nextContext = createSurveyAssistantEngineContext({
 				...this.#context.document,
@@ -6367,7 +6514,11 @@ var TurnSurveyDraft = class {
 		this.#refineRecoveryTargets(removedRefinements);
 		const priorCandidate = this.#latestChangeSetId ? this.#candidates.get(this.#latestChangeSetId) : void 0;
 		const acknowledgment = delta.operations.length === 0;
-		const postChange = acknowledgment ? priorCandidate?.postChange : this.#context ? createPostChangeProjection(this.#context, targets) : void 0;
+		const postChange = acknowledgment ? priorCandidate?.postChange : this.#context ? createPostChangeProjection(this.#context, /* @__PURE__ */ new Set([
+			...collectOperationTargets(delta.operations, nextContext),
+			...addressedTargets,
+			...handledMutationRoutes.map(mutationRouteTarget)
+		]), beforeContext, delta.operations.flatMap((operation) => operation.kind === "reorder-items" ? [operation.parentItemId] : [])) : void 0;
 		const verification = acknowledgment ? priorCandidate?.verification : beforeContext && this.#context && postChange ? createChangeVerification({
 			after: this.#context,
 			before: beforeContext,
@@ -6390,7 +6541,7 @@ var TurnSurveyDraft = class {
 		});
 		this.#draftOperations = registered.operations;
 		this.#latestChangeSetId = registered.operations.length > 0 ? registered.id : void 0;
-		const resolvedTargets = new Set([...recoveryTargets, ...handledMutationRoutes.map(mutationRouteTarget)]);
+		const resolvedTargets = /* @__PURE__ */ new Set([...recoveryTargets, ...handledMutationRoutes.map(mutationRouteTarget)]);
 		for (const [changeSetId, unresolvedTargets] of this.#unresolvedCandidates) {
 			for (const target of resolvedTargets) if (target !== "unidentified-mutation" && target !== "satisfied-mutation") unresolvedTargets.delete(target);
 			if (retryOfChangeIds.includes(changeSetId)) {
@@ -6491,7 +6642,9 @@ const getCenteredNeighbors = (values, focusIndex, limit) => {
 	return values.slice(start, start + windowSize).filter((_, index) => start + index !== focusIndex);
 };
 const buildSurveyAssistantTaskContext = (snapshot, options) => {
-	const { inspection } = createSurveyAssistantEngineContext(snapshot, void 0, { focusItemId: options.focusItemId });
+	const { inspection } = createSurveyAssistantEngineContext(snapshot, options.capabilities, { focusItemId: options.focusItemId });
+	const model = createAssistantSurvey(snapshot.survey, options.capabilities);
+	const itemName = (id) => model.resolveItemEditorName(id, snapshot.ui.selectedLocale);
 	const itemsById = new Map(snapshot.survey.surveyItems.map((item) => [item.id, item]));
 	const parentById = new Map(inspection.outline.flatMap((item) => item.parentId ? [[item.itemId, item.parentId]] : []));
 	const childIdsByParent = /* @__PURE__ */ new Map();
@@ -6501,7 +6654,7 @@ const buildSurveyAssistantTaskContext = (snapshot, options) => {
 		childIds.push(item.itemId);
 		childIdsByParent.set(item.parentId, childIds);
 	}
-	const fullKeyById = new Map(inspection.keyIndex.map((item) => [item.itemId, item.fullKey]));
+	const breadcrumbById = new Map(inspection.itemIndex.map((item) => [item.itemId, item.breadcrumb]));
 	const summarizeItem = (item) => {
 		const allVisibleText = [];
 		let visibleTextValueTruncated = false;
@@ -6522,8 +6675,8 @@ const buildSurveyAssistantTaskContext = (snapshot, options) => {
 		}
 		return {
 			id: item.id,
-			key: item.key,
-			fullKey: fullKeyById.get(item.id) ?? item.key,
+			editorName: itemName(item.id),
+			breadcrumb: breadcrumbById.get(item.id) ?? itemName(item.id),
 			itemType: item.itemType,
 			itemLabel: getItemLabel(item),
 			visibleText: allVisibleText.slice(0, MAX_VISIBLE_TEXT_ENTRIES_PER_ITEM),
@@ -6531,15 +6684,26 @@ const buildSurveyAssistantTaskContext = (snapshot, options) => {
 		};
 	};
 	const rootItemId = inspection.outline.find((item) => item.depth === 0)?.itemId;
-	const rootItem = rootItemId ? itemsById.get(rootItemId) : void 0;
+	rootItemId && itemsById.get(rootItemId);
+	const slots = model.getResponseSlotRegistry().definitions;
+	const requested = options.slotIds ?? (options.focusSlotId ? [options.focusSlotId] : []);
+	const selectedSlots = slots.filter((slot) => requested.includes(slot.slotId));
+	const matrixIds = new Set(selectedSlots.filter((slot) => slot.naming?.kind === "matrix").map((slot) => slot.primitiveId));
 	const result = {
+		existingVariableNames: slots.map((slot) => slot.variableName),
+		responseVariables: slots.filter((slot) => requested.includes(slot.slotId) || matrixIds.has(slot.primitiveId)).map((slot) => ({ ...slot })),
+		responseOwners: [...new Set(slots.filter((slot) => requested.includes(slot.slotId) || matrixIds.has(slot.primitiveId)).map((slot) => slot.itemId))].map((id) => ({
+			item: summarizeItem(itemsById.get(id)),
+			configuration: itemsById.get(id).config,
+			content: snapshot.survey.translations?.[snapshot.ui.selectedLocale]?.itemTranslations?.[id] ?? {}
+		})),
 		document: {
 			revision: snapshot.version.revision,
 			contentHash: snapshot.version.contentHash,
 			capabilityDigest: snapshot.version.capabilityDigest
 		},
 		survey: {
-			key: rootItem?.key,
+			key: snapshot.survey.metadata?.surveyKey,
 			locales: inspection.locales,
 			itemCount: inspection.itemCount,
 			selectedLocale: snapshot.ui.selectedLocale
@@ -6578,7 +6742,7 @@ const buildSurveyAssistantTaskContext = (snapshot, options) => {
 			item: summarizeItem(focusItem),
 			parent: parentItem ? summarizeItem(parentItem) : void 0,
 			ancestorPath: ancestorItems.map(summarizeItem),
-			siblingKeys: siblingItems.map((item) => item.key),
+			siblingNames: siblingItems.map((item) => itemName(item.id)),
 			siblingItems: siblingItems.map(summarizeItem),
 			siblingItemCount,
 			siblingItemsTruncated: siblingItemCount > siblingItems.length,
@@ -6587,7 +6751,7 @@ const buildSurveyAssistantTaskContext = (snapshot, options) => {
 			relatedItemsTruncated: allRelatedItems.length > relatedItems.length
 		};
 	}
-	if ((options.purpose === "suggest-item-key" || options.purpose === "suggest-item-label") && focusItem) {
+	if ((options.purpose === "suggest-response-name" || options.purpose === "suggest-response-settings" || options.purpose === "suggest-item-label") && focusItem) {
 		const parentId = parentById.get(focusItem.id);
 		const siblingIds = parentId ? childIdsByParent.get(parentId) ?? [] : [];
 		const siblingPositionById = new Map(siblingIds.map((itemId, index) => [itemId, index]));
@@ -6605,18 +6769,19 @@ const buildSurveyAssistantTaskContext = (snapshot, options) => {
 			};
 			return rank[left.relationship] - rank[right.relationship] || left.siblingDistance - right.siblingDistance || left.index - right.index;
 		});
-		const allKeyExamples = rankedItems.map(({ item, relationship }) => ({
-			itemId: item.id,
-			itemType: item.itemType,
-			key: item.key,
-			relationship
+		const allKeyExamples = model.getResponseSlotRegistry().definitions.filter((slot) => !requested.includes(slot.slotId) && !matrixIds.has(slot.primitiveId)).map((slot) => ({
+			itemId: slot.itemId,
+			itemType: itemsById.get(slot.itemId).itemType,
+			key: slot.variableName,
+			slotId: slot.slotId,
+			relationship: "survey"
 		}));
 		const allLabelExamples = rankedItems.flatMap(({ item, relationship }) => {
 			const label = getItemLabel(item);
 			return label ? [{
 				itemId: item.id,
 				itemType: item.itemType,
-				key: item.key,
+				key: itemName(item.id),
 				label,
 				relationship
 			}] : [];
@@ -6677,7 +6842,7 @@ const buildSurveyAssistantTaskContext = (snapshot, options) => {
 };
 //#endregion
 //#region src/engine/task-result-cache.ts
-const DEFAULT_TTL_MS = 900 * 1e3;
+const DEFAULT_TTL_MS = 9e5;
 const DEFAULT_MAX_ENTRIES = 64;
 /** Small in-memory LRU cache for deterministic, snapshot-scoped one-shot results. */
 var SurveyAssistantTaskResultCache = class {
@@ -6718,6 +6883,6 @@ var SurveyAssistantTaskResultCache = class {
 	}
 };
 //#endregion
-export { sliceWithCursor as $, buildEmbeddedFormDetails as A, formSelectOptionDetailsSchema as B, buildExpressionMutationBatch as C, DEFAULT_LIMIT as D, expressionSchema as E, clampLimit as F, itemMatchesQuery as G, getRawSurvey$1 as H, findDirectChildrenByFullKey as I, mapOutlineById as J, itemSummarySchema as K, formFieldDetailsSchema as L, buildItemTranslationEntries as M, buildSurveyTranslations as N, MAX_LIMIT as O, choiceOptionDetailsSchema as P, resolveItemSummary as Q, formFieldGroupDetailsSchema as R, normalizeSurveyChangeOperations as S, expressionMutationSchema as T, getRawSurveyItems as U, getKeyIndexEntries as V, itemConfigDetailsSchema as W, normalizeText as X, mapRawItemsById as Y, parseCursor as Z, buildSurveyDocumentVersion as _, normalizeFormAuthoringConfig$1 as a, summarizeRawItem as at, applyValidatedSurveyOperationsToDraft as b, buildSurveyAssistantTaskContext as c, analyzeSurveyAssistantExpressionReferences as ct, collectExpressionMutationRecoveryTargets as d, inferExpressionReturnType as dt, summarizeFocusItemNode as et, collectMalformedSurveyOperationRecoveryTargets as f, validateExpression as ft, MAX_SURVEY_ASSISTANT_OPERATIONS_PER_TURN_DRAFT as g, MAX_SURVEY_ASSISTANT_OPERATIONS_PER_PROPOSAL as h, isValidSimpleFormConfig$1 as i, summarizeOutlineNode as it, buildItemConfigDetails as j, buildConfigSearchText as k, TurnSurveyDraft as l, deriveSurveyExpressionResponseSlots as lt, auditSurvey as m, deriveResponseSlotTypes as mt, hasSingleFormField as n, summarizeKeyIndexEntries as nt, transitionFormAuthoringMode$1 as o, translationEntrySchema as ot, collectSurveyOperationRecoveryTargets as p, createSurveyAssistantEngineContext as pt, mapKeyIndexById as q, isCompatibleSimpleFieldUpsert$1 as r, summarizeKeyIndexEntry as rt, SurveyAssistantTaskResultCache as s, unique as st, getFormAuthoringMode$1 as t, summarizeItemById as tt, collectExpressionMutationRecoveryRefinements as u, getSurveyAssistantExpressionDiagnosticGuidance as ut, createSurveyChangeSet as v, buildExpressionMutationPatches as w, executeSurveyOperationsOnRawSurvey as x, validateSurveyOperations as y, formFieldGroupLayoutSchema as z };
+export { parseCursor as $, MAX_LIMIT as A, formFieldGroupDetailsSchema as B, isRecord$2 as C, expressionMutationSchema as D, buildExpressionMutationPatches as E, buildSurveyTranslations as F, getRawSurveyItems as G, formSelectOptionDetailsSchema as H, choiceOptionDetailsSchema as I, itemSummarySchema as J, itemConfigDetailsSchema as K, clampLimit as L, buildEmbeddedFormDetails as M, buildItemConfigDetails as N, expressionSchema as O, buildItemTranslationEntries as P, normalizeText as Q, findDirectChildrenByParentId as R, executeSurveyOperationsOnRawSurvey as S, buildExpressionMutationBatch as T, getItemIndexEntries as U, formFieldGroupLayoutSchema as V, getRawSurvey$1 as W, mapOutlineById as X, mapItemIndexById as Y, mapRawItemsById as Z, buildSurveyDocumentVersion as _, createAssistantSurvey as _t, normalizeFormAuthoringConfig$1 as a, summarizeItemIndexEntry as at, validateSurveyOperations as b, buildSurveyAssistantTaskContext as c, translationEntrySchema as ct, collectExpressionMutationRecoveryTargets as d, deriveSurveyExpressionResponseSlots as dt, resolveItemSummary as et, collectMalformedSurveyOperationRecoveryTargets as f, getSurveyAssistantExpressionDiagnosticGuidance as ft, MAX_SURVEY_ASSISTANT_OPERATIONS_PER_TURN_DRAFT as g, deriveResponseSlotTypes as gt, MAX_SURVEY_ASSISTANT_OPERATIONS_PER_PROPOSAL as h, createSurveyAssistantEngineContext as ht, isValidSimpleFormConfig$1 as i, summarizeItemIndexEntries as it, buildConfigSearchText as j, DEFAULT_LIMIT as k, TurnSurveyDraft as l, unique as lt, auditSurvey as m, validateExpression as mt, hasSingleFormField as n, summarizeFocusItemNode as nt, transitionFormAuthoringMode$1 as o, summarizeOutlineNode as ot, collectSurveyOperationRecoveryTargets as p, inferExpressionReturnType as pt, itemMatchesQuery as q, isCompatibleSimpleFieldUpsert$1 as r, summarizeItemById as rt, SurveyAssistantTaskResultCache as s, summarizeRawItem as st, getFormAuthoringMode$1 as t, sliceWithCursor as tt, collectExpressionMutationRecoveryRefinements as u, analyzeSurveyAssistantExpressionReferences as ut, createSurveyChangeSet as v, getAssistantVisibilityIssues as vt, normalizeSurveyChangeOperations as w, validateSurveyTreeStructure as x, findIntroducedSurveyStructureIssues as y, formFieldDetailsSchema as z };
 
-//# sourceMappingURL=engine-Bo85Oyj0.mjs.map
+//# sourceMappingURL=engine-nXoCWYpQ.mjs.map