@case-framework/survey-assistant 0.2.0 → 0.2.2

package/dist/{tools-DDXaJ8Za.mjs → tools-wgLen05n.mjs}

@@ -1,7 +1,7 @@
-import { G as assistantItemTypeManifestSchema, J as SURVEY_OPERATION_KINDS, _t as surveyOperationSchema, u as surveyChangeSetSchema, vt as surveyOperationSchemasByKind } from "./protocol-7EEgcYja.mjs";
-import { a as getDeterministicCreateItemTypes, o as inspectAssistantItem, s as resolveAssistantCapabilityReference } from "./capabilities-DZ0a_o2y.mjs";
-import { A as getRawSurvey, B as resolveItemSummary, C as clampLimit, F as mapKeyIndexById, H as summarizeFocusItemNode, I as mapOutlineById, J as translationEntrySchema, K as summarizeOutlineNode, L as mapRawItemsById, M as itemConfigDetailsSchema, N as itemMatchesQuery, P as itemSummarySchema, R as normalizeText, U as summarizeItemById, V as sliceWithCursor, W as summarizeKeyIndexEntries, Y as unique, _ as buildConfigSearchText, a as SURVEY_CHANGE_CONTINUATION_MODES, b as buildItemTranslationEntries, d as normalizeSurveyChangeOperations, f as buildExpressionMutationPatches, i as SURVEY_CHANGE_CONTINUATION_DESCRIPTION, j as getRawSurveyItems, k as getKeyIndexEntries, l as createSurveyChangeSet, p as expressionMutationSchema, q as summarizeRawItem, t as auditSurvey, v as buildEmbeddedFormDetails, w as findDirectChildrenByFullKey, y as buildItemConfigDetails } from "./engine-DQrCO_ur.mjs";
-import { a as requireSurveyAssistantTurnState } from "./request-context-BDBw4-Gw.mjs";
+import { G as assistantItemTypeManifestSchema, J as SURVEY_OPERATION_KINDS, _t as surveyOperationSchema, u as surveyChangeSetSchema, vt as surveyOperationSchemasByKind } from "./protocol-DpCYmCjr.mjs";
+import { a as getDeterministicCreateItemTypes, o as inspectAssistantItem, s as resolveAssistantCapabilityReference } from "./capabilities-DKbNCnBf.mjs";
+import { A as getRawSurvey, B as resolveItemSummary, C as clampLimit, F as mapKeyIndexById, H as summarizeFocusItemNode, I as mapOutlineById, J as translationEntrySchema, K as summarizeOutlineNode, L as mapRawItemsById, M as itemConfigDetailsSchema, N as itemMatchesQuery, P as itemSummarySchema, R as normalizeText, U as summarizeItemById, V as sliceWithCursor, W as summarizeKeyIndexEntries, Y as unique, _ as buildConfigSearchText, b as buildItemTranslationEntries, d as normalizeSurveyChangeOperations, f as buildExpressionMutationPatches, j as getRawSurveyItems, k as getKeyIndexEntries, l as createSurveyChangeSet, p as expressionMutationSchema, q as summarizeRawItem, t as auditSurvey, v as buildEmbeddedFormDetails, w as findDirectChildrenByFullKey, y as buildItemConfigDetails } from "./engine-0AJrv0hI.mjs";
+import { o as requireSurveyAssistantTurnState, r as getSurveyAssistantEngineContext } from "./request-context-BBzU3VdG.mjs";
 import { n as surveyAuthoringReferenceTopics, r as surveyAuthoringReferences, t as getBuiltInItemTypeAuthoringReference } from "./authoring-references-DYuOAdVx.mjs";
 import { z } from "zod";
 import { JsonPatchError, SURVEY_EDITOR_ITEM_COLORS, encodeJsonPointerSegment, getAssetUsagesFromContent, getValueAtJsonPointer } from "@case-framework/survey-core";
@@ -59,7 +59,7 @@ const formatItemCapabilityProfile = (manifest, kind) => {
 		kind === "create-item" && requiredSurfaces.length > 0 ? `Required on creation: ${requiredSurfaces.map((surface) => surface.key).join(", ")}.` : void 0,
 		manifest.referenceTopics?.length ? `Load a dedicated reference only when needed: ${manifest.referenceTopics.join(", ")}.` : void 0
 	].filter((line) => Boolean(line));
-	if (kind === "create-item") lines.push("", "Creation scope: put the complete initial item structure, configuration, and visible translations in this create-item operation. Operations that edit an item by itemId target items already present in the immutable live snapshot; do not create an empty item and then target its new id with option or field editing operations in the same response.");
+	if (kind === "create-item") lines.push("", "Creation scope: include the initial structure, configuration, and visible translations that are already known. A later successful mutation call in the same turn may target the created id; the server adds that delta to the validated turn draft.");
 	return lines.join("\n");
 };
 const formatSurveyOperationContractReference = (kind, options = {}) => {
@@ -138,7 +138,7 @@ const surveyAuthoringReferenceTool = createTool({
 	} },
 	execute: async (inputData, context) => {
 		const contractDetail = inputData.detail ?? "compact";
-		const engineContext = context?.requestContext?.get("engineContext");
+		const engineContext = getSurveyAssistantEngineContext(context?.requestContext);
 		const itemCapability = inputData.itemType ? engineContext?.trustedCapabilities?.byItemType.get(inputData.itemType)?.manifest ?? engineContext?.capabilities.itemTypes.find((entry) => entry.itemType === inputData.itemType) : void 0;
 		if (inputData.operationKind && inputData.topic !== "assistant-operations") return {
 			ok: false,
@@ -229,23 +229,20 @@ const OPERATIONS_DESCRIPTION = [
 	"Any translations owned by an operation must be inside that same operation object. Never put translations beside the survey_change operations array.",
 	"Create items with { kind: \"create-item\", target: { parentItemId, index? }, item: { id?, key, itemType, config }, translations? }. Put respondent content in top-level translations and item settings in item.config.",
 	"Use update-item-translation with itemId, locale, contentKey, and plainText for ordinary text or content for a complete structured value. Item titles and option/field labels are translations, not item labels.",
-	"Item-editing operations target items already present in the immutable live snapshot. For a new item, put its complete initial options, fields, config, translations, and embedded expressions directly in create-item; do not create it empty and target its new id later in the response.",
+	"Use remove-survey-locale with locale to remove an existing survey language; the final remaining locale cannot be removed.",
+	"Each call adds a delta to this turn's validated draft. Later calls may target ids created by earlier successful calls in the same turn.",
 	"For an existing choice item, use add-choice-option with itemId, optional locale/index, and option: { id?, key?, label }; label is a plain string and creates its translation.",
 	"Every reorder replaces the complete inspected list: reorder-choice-options uses optionIds, reorder-form-field-groups uses groupIds, and reorder-items uses itemIds for every direct child. Include every existing entry exactly once in desired order.",
 	`Use update-item-color only with a supported swatch. ${`Allowed editor item-color swatches: ${SURVEY_EDITOR_ITEM_COLORS.join(", ")}. Use one of these exact values for update-item-color; do not wait for validation feedback to choose a swatch.`}`,
 	"Use patch-item-config with itemId and plural patches whose JSON Pointer paths are relative to that item config root.",
-	"Use update-placed-image only for an image already present in the immutable snapshot. For a new item, embed the complete image block directly in create-item translations.",
+	"Use update-placed-image only for an image placement that already exists in the live survey or validated turn draft.",
 	"When deleting referenced images and assets, include every reference-removal operation and remove-image-asset last in the same operations array.",
 	"Raw fallback is one { kind: \"survey-json-patch\", patches } operation containing all related survey-rooted edits; it must be the only operation in the call.",
-	"Keep proposals bounded; split oversized work into independent complete change calls."
+	"Keep each delta bounded; successful chunks accumulate automatically in the turn draft."
 ].join(" ");
 const inputSchema$9 = z.object({
-	intent: z.string().min(1).max(500).describe("The concrete survey change requested by the user."),
 	summary: z.string().min(1).max(500).describe("Short user-facing summary of the intended survey change."),
-	operations: z.array(z.unknown()).min(1).max(200).describe(OPERATIONS_DESCRIPTION),
-	continuationMode: z.enum(SURVEY_CHANGE_CONTINUATION_MODES).nullish().transform((value) => value ?? void 0).describe(`${SURVEY_CHANGE_CONTINUATION_DESCRIPTION} Omit this field instead of sending null.`),
-	inspectedContext: z.array(z.string().max(240)).max(20).nullish().transform((value) => value ?? void 0).describe("Optional item ids, paths, or references inspected before proposing this change."),
-	notes: z.string().max(1e3).nullish().transform((value) => value ?? void 0).describe("Optional implementation notes for validation/debugging; not shown as persisted survey content.")
+	operations: z.array(z.unknown()).min(1).max(200).describe(OPERATIONS_DESCRIPTION)
 }).strict();
 const rejectedOperationParseEvent = ({ issueText, summary, turnId }) => ({
 	protocolVersion: 1,
@@ -301,29 +298,22 @@ const describeOperationTarget = (operation) => {
 	}
 };
 const summarizeValidation = (event) => {
-	const lines = [`${event.status === "validated" ? "Validated" : "Rejected"} survey change: ${event.summary}`, `Change id: ${event.id}`];
-	if (event.operations.length > 0) lines.push(`Operations: ${event.operations.map((operation) => operation.kind).join(", ")}`);
+	const lines = [`${event.status === "validated" ? "Validated" : "Rejected"} survey change: ${event.summary}`];
 	if (event.status === "rejected") {
-		lines.push("Apply status: blocked; this candidate is not authorized.");
-		if (event.recovery?.requiredContinuationMode) lines.push(`Required recovery: resubmit the complete intended proposal with continuationMode "${event.recovery.requiredContinuationMode}". No survey change from this turn can be authorized until that replacement validates.`);
-		else if (event.recovery) lines.push(`Required recovery: resubmit the complete proposal with an explicit continuationMode (${event.recovery.allowedContinuationModes.join(" or ")}).`);
+		lines.push("Draft unchanged. Fix this same rejected target in another call; the previously validated draft is retained. An unrelated valid edit does not repair this rejection.");
 		if (event.operations.length > 0) {
 			const checklist = event.operations.slice(0, 24).map(describeOperationTarget);
 			lines.push(`Unapplied target sample (${checklist.length} of ${event.operations.length}):\n${checklist.map((target) => `- ${target}`).join("\n")}`);
 			if (event.operations.length > checklist.length) lines.push(`The sample omits ${event.operations.length - checklist.length} additional operation target(s). The original tool input is authoritative; preserve its complete requested scope when retrying.`);
 		}
 	}
-	if (event.status === "validated") {
-		lines.push("Lifecycle: this candidate is registered, not live. Do not target its new ids again in this response; successful turn completion authorizes the collector's final candidate ids for browser apply.");
-		if (event.supersedesChangeIds?.length) lines.push(`Queue: replaces ${event.supersedesChangeIds.length} earlier survey_change proposal(s) from this response.`);
-	}
-	if (event.supersedesChangeIds?.length && event.status === "rejected") lines.push(`Queue: discarded ${event.supersedesChangeIds.length} earlier candidate proposal(s); their work is not retained or authorized. Include that discarded work in the complete replacement before claiming the request is complete.`);
+	if (event.status === "validated") lines.push(`Draft updated (${event.operations.length} total operation${event.operations.length === 1 ? "" : "s"}). Later tools can inspect and edit the resulting draft state. The live editor is unchanged until successful turn completion.`);
 	if (event.validation.issues.length > 0) {
 		lines.push("Issues:");
 		for (const issue of event.validation.issues) lines.push(`- ${issue.code}: ${issue.message}`);
 		const issueCodes = new Set(event.validation.issues.map((issue) => issue.code));
-		if (issueCodes.has("missing-create-content") || issueCodes.has("missing-field-groups-wrapper") || issueCodes.has("missing-choice-options") || issueCodes.has("missing-choice-option-labels")) lines.push("Recovery hint: load the assistant-operations reference, then retry the complete create-item proposal with continuationMode \"replace\". Put visible text in top-level translations[] beside item, config inside item.config, choice options in item.config.options, and form fields inside item.config.fieldGroups[].fields. Every choice option id needs a matching top-level translation whose contentKey is options.<optionId>.label.");
-		if (issueCodes.has("too-many-operations")) lines.push("Recovery hint: keep the same inspected survey context and immediately split these edits into smaller survey_change calls. Use continuationMode \"replace\" on the first repaired chunk, then \"append\" on every later independent chunk. Do not claim that a new snapshot is needed unless a tool explicitly reported a missing snapshot.");
+		if (issueCodes.has("missing-create-content") || issueCodes.has("missing-field-groups-wrapper") || issueCodes.has("missing-choice-options") || issueCodes.has("missing-choice-option-labels")) lines.push("Recovery hint: load the assistant-operations reference, then retry only the rejected delta. Put visible text in top-level translations[] beside item, config inside item.config, choice options in item.config.options, and form fields inside item.config.fieldGroups[].fields. Every choice option id needs a matching top-level translation whose contentKey is options.<optionId>.label.");
+		if (issueCodes.has("too-many-operations")) lines.push("Recovery hint: keep the same inspected survey context and split this rejected delta into smaller survey_change calls. Each successful call extends the same turn draft.");
 	}
 	if (event.validation.warnings.length > 0) {
 		lines.push("Warnings:");
@@ -333,7 +323,7 @@ const summarizeValidation = (event) => {
 };
 const surveyChangeTool = createTool({
 	id: TOOL_ID$9,
-	description: "Validate and queue one final, bounded, undoable survey change. This is not a dry run and does not mutate the live snapshot during the response. The live snapshot is immutable: item-editing operations target existing items, while each create-item must contain that new item's complete initial config, content, options, fields, and embedded expressions. Multiple create-item operations may be ordered by dependency in one proposal. Omit continuationMode only on the first mutation call in a turn; every later mutation call must use \"append\" for independent additional work or \"replace\" for a correction. Every operation uses \"kind\".",
+	description: "Add one bounded typed-operation delta to the request-scoped survey draft. Successful calls are immediately visible to every later tool in this turn. Rejected calls leave the draft unchanged; retry the failed target. The live editor changes once after successful completion. Every operation uses \"kind\".",
 	inputSchema: inputSchema$9,
 	outputSchema: surveyChangeSetSchema,
 	mcp: { annotations: {
@@ -344,23 +334,20 @@ const surveyChangeTool = createTool({
 		openWorldHint: false
 	} },
 	execute: async (inputData, context) => {
-		const { changeCollector, turnId } = requireSurveyAssistantTurnState(context?.requestContext);
-		const snapshot = context?.requestContext?.get("engineContext");
+		const { turnDraft, turnId } = requireSurveyAssistantTurnState(context?.requestContext);
+		const snapshot = getSurveyAssistantEngineContext(context?.requestContext);
 		const defaultLocale = snapshot?.ui.selectedLocale ?? snapshot?.inspection.locales[0] ?? "en";
-		const continuationMode = inputData.continuationMode ?? void 0;
 		const operationsParse = z.array(surveyOperationSchema).safeParse(normalizeSurveyChangeOperations(inputData.operations, defaultLocale));
-		if (!operationsParse.success) return changeCollector.register(rejectedOperationParseEvent({
+		if (!operationsParse.success) return turnDraft.reject(rejectedOperationParseEvent({
 			summary: inputData.summary,
 			turnId,
 			issueText: operationsParse.error.issues.slice(0, 8).map((issue) => `${issue.path.join(".") || "operation"}: ${issue.message}`).join("; ")
-		}), { continuationMode });
-		const event = createSurveyChangeSet({
+		}));
+		return turnDraft.stage({
 			operations: operationsParse.data,
 			snapshot,
-			summary: inputData.summary,
-			turnId
+			summary: inputData.summary
 		});
-		return changeCollector.register(event, { continuationMode });
 	},
 	toModelOutput: (value) => toTextModelOutput(value, summarizeValidation)
 });
@@ -373,32 +360,20 @@ const contextActionSchema = z.object({
 	itemIds: z.array(z.string().min(1).max(240)).max(12).optional(),
 	includeRawLocations: z.boolean().optional()
 });
-const continuationModeSchema = z.enum(SURVEY_CHANGE_CONTINUATION_MODES).optional().describe(SURVEY_CHANGE_CONTINUATION_DESCRIPTION);
 const prepareActionSchema = z.object({
 	action: z.literal("prepare"),
-	intent: z.string().min(1).max(500),
 	summary: z.string().min(1).max(500),
-	mutations: z.array(expressionMutationSchema).min(1).max(40),
-	continuationMode: continuationModeSchema,
-	inspectedContext: z.array(z.string().max(240)).max(20).optional()
+	mutations: z.array(expressionMutationSchema).min(1).max(40)
 });
 const inputSchema$8 = z.object({
 	action: z.enum(["context", "prepare"]).describe("Use context to inspect expression refs; use prepare to create expression edits."),
 	reason: z.string().max(500).optional(),
 	itemIds: z.array(z.string().min(1).max(240)).max(12).optional().describe("For context: optional item ids/keys to focus existing expression locations."),
 	includeRawLocations: z.boolean().optional().describe("For context: include existing expression locations by raw item."),
-	intent: z.string().min(1).max(500).optional().describe("For prepare: requested expression edit."),
 	summary: z.string().min(1).max(500).optional().describe("For prepare: user-facing summary."),
-	mutations: z.array(z.record(z.string(), z.unknown())).min(1).max(40).optional().describe("For prepare: expression mutation objects using kebab-case kind names. Item visibility shape: { kind: \"set-item-display-condition\", itemId: \"<existing-item-id>\", expression: { type: \"function\", functionName: \"eq\", arguments: [...] } }. expression is always CASE expression JSON, never a string or expression-language snippet. Other supported kinds set/clear component display/disabled conditions, validation expressions, prefills, and template values."),
-	continuationMode: continuationModeSchema,
-	inspectedContext: z.array(z.string().max(240)).max(20).optional()
+	mutations: z.array(z.record(z.string(), z.unknown())).min(1).max(40).optional().describe("For prepare: expression mutation objects using kebab-case kind names. Item visibility shape: { kind: \"set-item-display-condition\", itemId: \"<existing-item-id>\", expression: { type: \"function\", functionName: \"eq\", arguments: [...] } }. expression is always CASE expression JSON, never a string or expression-language snippet. Other supported kinds set/clear component display/disabled conditions, validation expressions, prefills, and template values.")
 }).strict().superRefine((value, ctx) => {
 	if (value.action !== "prepare") return;
-	if (!value.intent) ctx.addIssue({
-		code: z.ZodIssueCode.custom,
-		path: ["intent"],
-		message: "Required for prepare."
-	});
 	if (!value.summary) ctx.addIssue({
 		code: z.ZodIssueCode.custom,
 		path: ["summary"],
@@ -432,6 +407,22 @@ const createIssue = ({ severity = "error", ...input }) => ({
 	severity,
 	...input
 });
+const expressionMutationTarget = (mutation) => {
+	switch (mutation.kind) {
+		case "set-item-display-condition":
+		case "clear-item-display-condition": return `expression:item:${mutation.itemId}:display`;
+		case "set-component-display-condition":
+		case "clear-component-display-condition": return `expression:item:${mutation.itemId}:component:${mutation.componentId}:display`;
+		case "set-component-disabled-condition":
+		case "clear-component-disabled-condition": return `expression:item:${mutation.itemId}:component:${mutation.componentId}:disabled`;
+		case "set-validation-expression":
+		case "clear-validation-expression": return `expression:item:${mutation.itemId}:validation:${mutation.validationKey}`;
+		case "set-prefill": return `expression:item:${mutation.itemId}:prefill:${mutation.prefill.id}`;
+		case "clear-prefill": return `expression:item:${mutation.itemId}:prefill:${mutation.prefillId}`;
+		case "set-template-value":
+		case "clear-template-value": return `expression:template:${mutation.templateKey}`;
+	}
+};
 const buildResponseSlotTypes = (snapshot) => snapshot.responseSlotTypes;
 const rejectedEvent = ({ issues, summary, turnId, warnings = [] }) => ({
 	protocolVersion: 1,
@@ -449,14 +440,9 @@ const rejectedEvent = ({ issues, summary, turnId, warnings = [] }) => ({
 	createdAt: (/* @__PURE__ */ new Date()).toISOString()
 });
 const summarizeDraftEvent = (event) => {
-	const lines = [`${event.status === "validated" ? "Validated" : "Rejected"} expression change: ${event.summary}`, `Change id: ${event.id}`];
-	if (event.operations.length > 0) lines.push(`Operations: ${event.operations.map((operation) => operation.kind).join(", ")}`);
-	if (event.status === "rejected") {
-		lines.push("Apply status: blocked; this candidate is not authorized.");
-		if (event.recovery?.requiredContinuationMode) lines.push(`Required recovery: resubmit the complete intended proposal with continuationMode "${event.recovery.requiredContinuationMode}". No survey change from this turn can be authorized until that replacement validates.`);
-		else if (event.recovery) lines.push(`Required recovery: resubmit the complete proposal with an explicit continuationMode (${event.recovery.allowedContinuationModes.join(" or ")}).`);
-	}
-	if (event.supersedesChangeIds?.length) lines.push(event.status === "validated" ? `Queue: replaces ${event.supersedesChangeIds.length} earlier candidate proposal(s) from this response.` : `Queue: discarded ${event.supersedesChangeIds.length} earlier candidate proposal(s); their work is not retained or authorized.`);
+	const lines = [`${event.status === "validated" ? "Validated" : "Rejected"} expression change: ${event.summary}`];
+	if (event.status === "validated") lines.push(`Draft updated (${event.operations.length} total operation${event.operations.length === 1 ? "" : "s"}). The expression is immediately visible to later tools in this turn.`);
+	if (event.status === "rejected") lines.push("Draft unchanged. Fix this same expression target; the previously validated draft is retained. An unrelated valid edit does not repair this rejection.");
 	if (event.validation.issues.length > 0) {
 		lines.push("Issues:");
 		for (const issue of event.validation.issues) lines.push(`- ${issue.code}: ${issue.message}`);
@@ -518,7 +504,7 @@ const buildContextOutput = (snapshot, input) => {
 };
 const surveyExpressionTool = createTool({
 	id: TOOL_ID$8,
-	description: "Inspect response refs or queue expression edits for CASE survey items already present in the live snapshot. Covers display and disabled conditions, validations, prefills, and template values. Newly proposed items are not visible until the response ends; embed their expressions in the same survey_change call that creates them. For prepare, omit continuationMode only on the first mutation call in a turn; every later mutation call must use \"append\" or \"replace\".",
+	description: "Inspect response refs or add general expression edits to the request-scoped survey draft. Successful mutation calls are immediately visible to later tools; rejected calls leave the draft unchanged. Covers display and disabled conditions, validations, prefills, and template values.",
 	inputSchema: inputSchema$8,
 	outputSchema: outputSchema$7,
 	mcp: { annotations: {
@@ -531,7 +517,7 @@ const surveyExpressionTool = createTool({
 	execute: async (inputData, context) => {
 		const input = inputData;
 		const requestContext = context?.requestContext;
-		const snapshot = context?.requestContext?.get("engineContext");
+		const snapshot = getSurveyAssistantEngineContext(requestContext);
 		if (!snapshot) {
 			if (input.action === "context") return {
 				ok: false,
@@ -540,24 +526,24 @@ const surveyExpressionTool = createTool({
 				listOrdering: { responseSlots: "Set-like; unavailable because no live snapshot was provided." },
 				responseSlots: []
 			};
-			const { changeCollector, turnId } = requireSurveyAssistantTurnState(requestContext);
-			return changeCollector.register(rejectedEvent({
+			const { turnDraft, turnId } = requireSurveyAssistantTurnState(requestContext);
+			return turnDraft.reject(rejectedEvent({
 				summary: input.summary ?? "Expression change",
 				turnId,
 				issues: [createIssue({
 					code: "missing-snapshot",
 					message: "No live editor snapshot is available for expression work."
 				})]
-			}), { continuationMode: input.continuationMode });
+			}));
 		}
 		if (input.action === "context") {
 			const contextParse = contextActionSchema.safeParse(inputData);
 			return buildContextOutput(snapshot, contextParse.success ? contextParse.data : input);
 		}
-		const { changeCollector, turnId } = requireSurveyAssistantTurnState(requestContext);
-		const register = (event) => changeCollector.register(event, { continuationMode: input.continuationMode });
+		const { turnDraft, turnId } = requireSurveyAssistantTurnState(requestContext);
+		const reject = (event, addressedTargets = []) => turnDraft.reject(event, addressedTargets);
 		const prepareParse = prepareActionSchema.safeParse(inputData);
-		if (!prepareParse.success) return register(rejectedEvent({
+		if (!prepareParse.success) return reject(rejectedEvent({
 			summary: input.summary ?? "Expression change",
 			turnId,
 			issues: [createIssue({
@@ -566,6 +552,7 @@ const surveyExpressionTool = createTool({
 			})]
 		}));
 		const prepareInput = prepareParse.data;
+		const addressedTargets = [...new Set(prepareInput.mutations.map(expressionMutationTarget))];
 		const issues = [];
 		const patches = [];
 		const responseSlotTypes = buildResponseSlotTypes(snapshot);
@@ -581,13 +568,13 @@ const surveyExpressionTool = createTool({
 		});
 		const errors = issues.filter((issue) => issue.severity === "error");
 		const warnings = issues.filter((issue) => issue.severity === "warning");
-		if (errors.length > 0) return register(rejectedEvent({
+		if (errors.length > 0) return reject(rejectedEvent({
 			summary: prepareInput.summary,
 			turnId,
 			issues: errors,
 			warnings
-		}));
-		if (patches.length === 0) return register(rejectedEvent({
+		}), addressedTargets);
+		if (patches.length === 0) return reject(rejectedEvent({
 			summary: prepareInput.summary,
 			turnId,
 			issues: [createIssue({
@@ -595,23 +582,24 @@ const surveyExpressionTool = createTool({
 				message: "No expression patches were produced. Check whether the requested locations already match the target state."
 			})],
 			warnings
-		}));
-		const event = createSurveyChangeSet({
-			operations: [{
-				kind: "survey-json-patch",
-				patches
-			}],
+		}), addressedTargets);
+		const operation = {
+			kind: "survey-json-patch",
+			patches
+		};
+		const event = turnDraft.stage({
+			addressedTargets,
+			operations: [operation],
 			snapshot,
-			summary: prepareInput.summary,
-			turnId
+			summary: prepareInput.summary
 		});
-		return register({
+		return {
 			...event,
 			validation: {
 				...event.validation,
 				warnings: [...event.validation.warnings, ...warnings]
 			}
-		});
+		};
 	},
 	toModelOutput: (value) => toTextModelOutput(value, (output) => "action" in output && output.action === "context" ? output.modelSummary : summarizeDraftEvent(output))
 });
@@ -938,7 +926,7 @@ const surveyGetCurrentContextTool = createTool({
 			limit: inputData.limit ?? 12,
 			outlineMode: inputData.outlineMode ?? "full"
 		};
-		const snapshot = context?.requestContext?.get("engineContext");
+		const snapshot = getSurveyAssistantEngineContext(context?.requestContext);
 		if (!snapshot) return {
 			ok: false,
 			reason: "No live editor snapshot was provided with this assistant turn.",
@@ -1079,7 +1067,7 @@ const surveyGetItemDetailsTool = createTool({
 			includeItemConfig: inputData.includeItemConfig ?? true,
 			childrenLimit: inputData.childrenLimit ?? DEFAULT_CHILDREN_LIMIT
 		};
-		const snapshot = context?.requestContext?.get("engineContext");
+		const snapshot = getSurveyAssistantEngineContext(context?.requestContext);
 		if (!snapshot) return {
 			ok: false,
 			reason: "No live editor snapshot was provided with this assistant turn."
@@ -1345,7 +1333,7 @@ const surveyGetRawSurveyTool = createTool({
 			...inputData,
 			valueCharacterLimit: inputData.valueCharacterLimit ?? DEFAULT_VALUE_CHARACTER_LIMIT
 		};
-		const snapshot = context?.requestContext?.get("engineContext");
+		const snapshot = getSurveyAssistantEngineContext(context?.requestContext);
 		if (!snapshot) return {
 			ok: false,
 			reason: "No live editor snapshot was provided with this assistant turn."
@@ -1569,7 +1557,7 @@ const surveySearchItemsTool = createTool({
 			...inputData,
 			limit: inputData.limit ?? 12
 		};
-		const snapshot = context?.requestContext?.get("engineContext");
+		const snapshot = getSurveyAssistantEngineContext(context?.requestContext);
 		if (!snapshot) return {
 			ok: false,
 			reason: "No live editor snapshot was provided with this assistant turn.",
@@ -1606,23 +1594,24 @@ const outlineModeSchema = z.enum([
 	"children"
 ]);
 const optionalInput = (schema) => z.preprocess((value) => value === null ? void 0 : value, schema.optional());
+const optionalArrayInput = (schema) => z.preprocess((value) => value === null || Array.isArray(value) && value.length === 0 ? void 0 : value, schema.optional());
 const optionalNonBlankString = (maxLength) => z.preprocess((value) => value === null || typeof value === "string" && value.trim().length === 0 ? void 0 : value, z.string().min(1).max(maxLength).optional());
 const inputSchema$3 = z.object({
 	action: inspectActionSchema.describe("The survey information to inspect."),
 	reason: optionalInput(z.string().max(500)).describe("Short reason this inspection is needed."),
-	scopes: optionalInput(z.array(z.enum([
+	scopes: optionalArrayInput(z.array(z.enum([
 		"summary",
 		"selected-item",
 		"outline",
 		"response-slots",
 		"ui-context",
 		"history"
-	])).min(1).max(6)).describe("For current-context: context sections to inspect."),
+	])).min(1).max(6)).describe("For current-context: context sections to inspect. Empty means omitted."),
 	query: optionalNonBlankString(180).describe("For search-items: text to search across survey content. For assets: optional asset id, filename, name, ALT text, or media type filter. For current-context outline: optional key/fullKey/label filter."),
 	itemRef: optionalNonBlankString(240).describe("For current-context outline, item-details, or raw-json: item id, key, fullKey, visible label, or \"selected\"."),
 	cursor: optionalNonBlankString(240).describe("For current-context/search-items pagination: numeric cursor from a previous result."),
 	outlineMode: optionalInput(outlineModeSchema).describe("For current-context outline: \"full\" pages all survey items, \"focused\" returns the selected/focused neighborhood, and \"children\" returns direct children of itemRef."),
-	paths: optionalInput(z.array(z.string().min(1).max(500)).min(1).max(20)).describe("For raw-json: exact JSON Pointer paths to inspect."),
+	paths: optionalArrayInput(z.array(z.string().min(1).max(500)).min(1).max(20)).describe("For raw-json: exact JSON Pointer paths to inspect. Empty means omitted."),
 	includeChildren: optionalInput(z.boolean()).describe("For item-details: include direct survey-tree children."),
 	includeItemConfig: optionalInput(z.boolean()).describe("For item-details: include choice/form/internal item config details."),
 	limit: optionalInput(z.number().int().min(1).max(50)).describe("Maximum list rows to return.")
@@ -1728,7 +1717,7 @@ const listAssets = (input, snapshot) => {
 };
 const surveyInspectTool = createTool({
 	id: TOOL_ID$3,
-	description: "Inspect current survey state through one compact interface: current context, item search, item details, image assets with explicit asset IDs and usages, or focused raw JSON. Use this before making changes when the answer depends on the live editor state.",
+	description: "Inspect the current request-scoped survey draft through one compact interface: current context, item search, item details, image assets with explicit asset IDs and usages, or focused raw JSON. At turn start the draft equals the live snapshot; successful same-turn edits appear immediately.",
 	inputSchema: inputSchema$3,
 	outputSchema: outputSchema$2,
 	mcp: { annotations: {
@@ -1740,12 +1729,12 @@ const surveyInspectTool = createTool({
 	} },
 	execute: async (inputData, context) => {
 		const input = inputData;
-		const snapshot = context?.requestContext?.get("engineContext");
+		const snapshot = getSurveyAssistantEngineContext(context?.requestContext);
 		if (!snapshot) return {
 			ok: false,
 			action: input.action,
-			reason: "No live editor snapshot was provided with this assistant turn.",
-			modelSummary: "No live editor snapshot is available for this turn."
+			reason: "No editor snapshot was provided with this assistant turn.",
+			modelSummary: "No survey draft is available for this turn."
 		};
 		if (input.action === "current-context") {
 			const result = unwrapToolOutput(await runTool(surveyGetCurrentContextTool, {
@@ -1886,7 +1875,7 @@ const surveyAuditTool = createTool({
 		openWorldHint: false
 	} },
 	execute: async (input, context) => {
-		const snapshot = context?.requestContext?.get("engineContext");
+		const snapshot = getSurveyAssistantEngineContext(context?.requestContext);
 		if (!snapshot) return {
 			ok: false,
 			reason: "No live editor snapshot is available for this turn."
@@ -1912,7 +1901,6 @@ const inputSchema = z.object({
 	name: z.string().max(500).nullable().optional(),
 	filename: z.string().max(500).nullable().optional(),
 	alt: z.string().max(2e3).nullable().optional(),
-	continuationMode: z.enum(SURVEY_CHANGE_CONTINUATION_MODES).optional().describe("Required after any earlier mutation candidate in the turn. Use \"append\" to keep earlier candidates, including an imported asset; use \"replace\" only when resubmitting the complete intended proposal."),
 	summary: z.string().min(1).max(500)
 }).strict();
 const slug = (value) => value.toLowerCase().replace(/\.[^.]+$/, "").replace(/[^a-z0-9_-]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 100) || "image";
@@ -1944,14 +1932,14 @@ const describeAssetOperation = (operation) => {
 	}
 };
 const summarizeAssetChange = (event) => {
-	const lines = [`${event.status === "validated" ? "Validated" : "Rejected"} survey asset change: ${event.summary}`, `Change id: ${event.id}`];
-	if (event.operations.length > 0) lines.push(`Operations: ${event.operations.map(describeAssetOperation).join(", ")}`);
+	const lines = [`${event.status === "validated" ? "Validated" : "Rejected"} survey asset change: ${event.summary}`];
 	if (event.status === "validated") {
-		lines.push("Lifecycle: this candidate is registered, not live. The embedded image bytes remain available to the application and were omitted from model context.");
+		lines.push(`Draft updated (${event.operations.length} total operation${event.operations.length === 1 ? "" : "s"}); the live editor remains unchanged until turn completion. Embedded image bytes remain available to the application and were omitted from model context.`);
 		const importedAssetIds = event.operations.filter((operation) => operation.kind === "set-image-asset").map((operation) => operation.assetId);
 		if (importedAssetIds.length > 0) {
+			lines.push(`Imported: ${event.operations.filter((operation) => operation.kind === "set-image-asset").map(describeAssetOperation).join(", ")}`);
 			lines.push(`Asset id to reference: ${importedAssetIds.join(", ")}`);
-			lines.push("Required continuation: pass continuationMode \"append\" on every following mutation that should keep this asset import. To use the image in a NEW item, create that item in one survey_change call and put the image block directly in create-item.translations[].content; do not create placeholder text and do not call update-placed-image for an item that is not in the immutable snapshot. For an existing rich-text image placement, use update-placed-image. If a later proposal is rejected, re-import the attachment with continuationMode \"replace\", then append one corrected dependent survey_change; never replace the turn with only the asset reference.");
+			lines.push("The asset is now available to later mutation calls in this turn. To use it in a new item, reference it from that item's create-item translation. If a later delta is rejected, fix only that delta; this import remains in the draft.");
 			lines.push(`New info-item image source: { "type": "asset", "assetId": "${importedAssetIds[0]}" }. Embed it in a richText image block inside the create-item translation content.`);
 			lines.push(`New info-item translation example: { "locale": "<selected-locale>", "contentKey": "content", "content": { "type": "richText", "version": 1, "doc": { "type": "doc", "blocks": [{ "type": "image", "source": { "type": "asset", "assetId": "${importedAssetIds[0]}" }, "alt": "<meaningful description>" }] } } }.`);
 		}
@@ -1980,7 +1968,7 @@ const redactAssetChangeForTranscript = (event) => ({
 });
 const surveyAssetTool = createTool({
 	id: TOOL_ID,
-	description: "Import an attached image into survey assets without asking the model to copy base64, or update/remove an existing image asset. The result is an undoable candidate change, not a live asset. After importing, pass continuationMode \"append\" to the dependent mutation so the import and references are authorized together. For a new item, embed the asset image block directly in create-item.translations[].content in that one dependent call; update-placed-image is only for an image placement that already exists in the immutable snapshot. This tool refuses to remove a currently referenced asset. To delete references and their asset together, use one survey_change candidate with reference-removal operations first and remove-image-asset last.",
+	description: "Import an attached image into the request-scoped survey draft, or update/remove an image asset. Successful calls accumulate automatically. Later mutations may reference an imported asset id. To delete references and an asset atomically, use one survey_change delta with reference removals first and remove-image-asset last.",
 	inputSchema,
 	outputSchema: surveyChangeSetSchema,
 	mcp: { annotations: {
@@ -1992,8 +1980,8 @@ const surveyAssetTool = createTool({
 	} },
 	execute: async (input, context) => {
 		const requestContext = context?.requestContext;
-		const { changeCollector, turnId } = requireSurveyAssistantTurnState(requestContext);
-		const snapshot = requestContext?.get("engineContext");
+		const { turnDraft, turnId } = requireSurveyAssistantTurnState(requestContext);
+		const snapshot = getSurveyAssistantEngineContext(requestContext);
 		let operation;
 		if (input.action === "import-attachment") {
 			if (!input.documentId) throw new Error("import-attachment requires documentId.");
@@ -2006,7 +1994,8 @@ const surveyAssetTool = createTool({
 			const base = input.assetId ?? slug(manifest.name);
 			let assetId = base;
 			let suffix = 2;
-			while (snapshot?.survey.assets?.[assetId]) assetId = `${base}-${suffix++}`;
+			const stagedAssetIds = new Set(turnDraft.draftOperations.flatMap((draftOperation) => draftOperation.kind === "set-image-asset" ? [draftOperation.assetId] : []));
+			while (snapshot?.survey.assets?.[assetId] || stagedAssetIds.has(assetId)) assetId = `${base}-${suffix++}`;
 			operation = {
 				kind: "set-image-asset",
 				assetId,
@@ -2060,14 +2049,19 @@ const surveyAssetTool = createTool({
 					issues: [...event.validation.issues, {
 						severity: "error",
 						code: "image-asset-still-referenced",
-						message: `Image asset "${operation.assetId}" is still referenced by ${referenceLabels.slice(0, 3).join(", ")}. Prepare one survey_change candidate containing every reference-removal operation first and remove-image-asset last. If replacing earlier candidates in this turn, that combined candidate must use continuationMode "replace".`,
+						message: `Image asset "${operation.assetId}" is still referenced by ${referenceLabels.slice(0, 3).join(", ")}. Prepare one survey_change delta containing every reference-removal operation first and remove-image-asset last.`,
 						operationIndex: 0
 					}],
 					normalizedOperations: []
 				}
 			});
+			if (event.status === "rejected") return turnDraft.reject(event, [`asset:${operation.assetId}`]);
 		}
-		return changeCollector.register(event, { continuationMode: input.continuationMode });
+		return turnDraft.stage({
+			operations: [operation],
+			snapshot,
+			summary: input.summary
+		});
 	},
 	transform: { transcript: { output: ({ output }) => output ? redactAssetChangeForTranscript(getToolOutput(output)) : output } },
 	toModelOutput: (value) => toTextModelOutput(value, summarizeAssetChange)
@@ -2095,4 +2089,4 @@ const surveyAssistantTools = Object.freeze({
 //#endregion
 export { surveyAuditTool as i, surveyAssistantTools as n, surveyAssetTool as r, SURVEY_ASSISTANT_TOOL_IDS as t };
 
-//# sourceMappingURL=tools-DDXaJ8Za.mjs.map
+//# sourceMappingURL=tools-wgLen05n.mjs.map