statelyai 0.12.3 → 0.12.4

package/dist/bin.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { C as run } from "./cli-RFjHJYb3.mjs";
+import { C as run } from "./cli-_FAuSk1y.mjs";
 
 //#region src/bin.ts
 run();

package/dist/{cli-RFjHJYb3.mjs → cli-_FAuSk1y.mjs}

@@ -6877,13 +6877,13 @@ function getDefaultPathId(graph, node) {
 	if (!node.parentId) return getRootEmittedId(graph, node) ?? "(machine)";
 	const parentNode = graph.nodes.find((candidate) => candidate.id === node.parentId);
 	if (!parentNode) return node.data.key;
-	return `${getResolvedNodeId(graph, parentNode)}.${node.data.key}`;
+	return `${getDefaultPathId(graph, parentNode)}.${node.data.key}`;
 }
 function getEmittedNodeId(graph, node) {
 	const authored = getAuthoredNodeId(node);
 	if (!node.parentId) return getRootEmittedId(graph, node);
 	if (!authored) return void 0;
-	return authored === getDefaultPathId(graph, node) ? void 0 : authored;
+	return authored;
 }
 function getResolvedNodeId(graph, node) {
 	return getEmittedNodeId(graph, node) ?? getDefaultPathId(graph, node);
@@ -7059,7 +7059,7 @@ function resolveTransitionTarget(graph, sourceNode, targetNode) {
 	const keys = [];
 	let current = targetNode;
 	while (current) {
-		keys.unshift(current.data.key);
+		keys.unshift(current.data.key.replace(/\\/g, "\\\\").replace(/\./g, "\\."));
 		if (current.parentId === baseId) {
 			if (isRootSource) return `.${keys.join(".")}`;
 			return keys.join(".");
@@ -7446,8 +7446,11 @@ function tagToString(tag) {
 }
 function graphToMachineConfig(graph, options = {}) {
 	const v6 = isXStateV6Profile(graph.data.profile);
-	const { showDescriptions = true, showMeta = true, showStatelyMeta = true, inlineGuardsAsTypeRef = false, keepChooseStructured = false } = options;
-	const serializeAction = (action) => serializeActionItem(action, keepChooseStructured);
+	const { showDescriptions = true, showMeta = true, showStatelyMeta = true, inlineGuardsAsTypeRef = false, keepChooseStructured = false, timerActionsAsTypeRef = false } = options;
+	const serializeAction = (action) => timerActionsAsTypeRef && ["xstate.raise", "xstate.cancel"].includes(action.type) ? {
+		type: action.type,
+		params: action.params
+	} : serializeActionItem(action, keepChooseStructured);
 	const config = {};
 	function getNodeConfig(node) {
 		const nodeConfig = node.parentId ? {} : config;
@@ -7460,7 +7463,15 @@ function graphToMachineConfig(graph, options = {}) {
 			"choice"
 		].includes(node.data.type) ? node.data.type : void 0;
 		const tags = node.data.tags;
-		const stateMeta = showMeta ? buildMeta(node.data.meta, node.data.color, showStatelyMeta) : void 0;
+		const stateMeta = showMeta ? buildMeta({
+			...node.data.meta,
+			...node.data.assets?.length ? { "@statelyai.assets": node.data.assets.map(({ type, url, size }) => ({
+				type,
+				url,
+				...size ? { size } : {}
+			})) } : {},
+			...node.data.appearance ? { "@statelyai.appearance": node.data.appearance } : {}
+		}, node.data.color, showStatelyMeta) : void 0;
 		Object.assign(nodeConfig, {
 			id: resolvedNodeId,
 			type: nodeType === "normal" ? void 0 : nodeType ?? void 0,
@@ -7492,6 +7503,8 @@ function graphToMachineConfig(graph, options = {}) {
 		const edges = graph.edges.filter((edge) => edge.sourceId === node.id && !edge.data.temp);
 		if (edges.length > 0) {
 			const on = {};
+			const transitionOrder = /* @__PURE__ */ new Map();
+			const scxmlTransitions = [];
 			const after = {};
 			const alwaysArr = [];
 			const choiceArr = [];
@@ -7507,7 +7520,15 @@ function graphToMachineConfig(graph, options = {}) {
 					return additionalTarget ? [resolveTransitionTarget(graph, node, additionalTarget)] : [];
 				})].filter(Boolean);
 				const type = edge.data.eventType ?? "";
-				const transitionMeta = showMeta ? buildMeta(edge.data.meta, edge.data.color, showStatelyMeta) : void 0;
+				const transitionMeta = showMeta ? buildMeta({
+					...edge.data.meta,
+					...edge.data.assets?.length ? { "@statelyai.assets": edge.data.assets.map(({ type, url, size }) => ({
+						type,
+						url,
+						...size ? { size } : {}
+					})) } : {},
+					...edge.data.appearance ? { "@statelyai.appearance": edge.data.appearance } : {}
+				}, edge.data.color, showStatelyMeta) : void 0;
 				const transitionObject = {
 					...edge.data.matches ? { matches: edge.data.matches } : void 0,
 					target: edge.data.transitionType === "targetless" ? void 0 : resolvedTargets.length > 1 ? resolvedTargets : `${resolvedTarget}`,
@@ -7519,6 +7540,7 @@ function graphToMachineConfig(graph, options = {}) {
 					description: showDescriptions ? edge.data.description ?? void 0 : void 0,
 					...transitionMeta ? { meta: transitionMeta } : void 0
 				};
+				transitionOrder.set(transitionObject, transitionOrder.size);
 				const pushOn = (key) => {
 					if (!on[key]) on[key] = [];
 					on[key].push(transitionObject);
@@ -7561,7 +7583,11 @@ function graphToMachineConfig(graph, options = {}) {
 					const delayKey = getDelayKeyFromEventType(type, edge.sourceId);
 					if (!after[delayKey]) after[delayKey] = [];
 					after[delayKey].push(transitionObject);
-				} else if (type === "*") pushOn("*");
+				} else if (edge.data.meta?.["@statelyai.scxml.eventDescriptor"]) scxmlTransitions.push({
+					descriptor: type,
+					transition: transitionObject
+				});
+				else if (type === "*") pushOn("*");
 				else if (type.startsWith("xstate.done.state")) {
 					if (!onDone[type]) onDone[type] = [];
 					onDone[type].push(transitionObject);
@@ -7572,6 +7598,16 @@ function graphToMachineConfig(graph, options = {}) {
 					else pushOn(type);
 				} else pushOn(type);
 			}
+			const descriptorBase = (descriptor) => descriptor.replace(/\.\*$/, "");
+			const scxmlKeys = new Set([...Object.keys(on), ...scxmlTransitions.flatMap(({ descriptor }) => descriptor === "*" ? ["*"] : descriptorBase(descriptor) ? [descriptorBase(descriptor), `${descriptorBase(descriptor)}.*`] : [])]);
+			for (const key of scxmlKeys) {
+				const base = descriptorBase(key);
+				const matching = scxmlTransitions.filter(({ descriptor }) => {
+					const prefix = descriptorBase(descriptor);
+					return descriptor === "*" || base === prefix || base.startsWith(`${prefix}.`);
+				}).map(({ transition }) => transition);
+				on[key] = [...new Set([...on[key] ?? [], ...matching])].sort((a, b) => (transitionOrder.get(a) ?? 0) - (transitionOrder.get(b) ?? 0));
+			}
 			if (Object.keys(on).length > 0) nodeConfig.on = singleOrArrayRecord(on);
 			if (Object.keys(after).length > 0) nodeConfig.after = singleOrArrayRecord(after);
 			if (alwaysArr.length > 0) nodeConfig.always = singleOrArray(alwaysArr);
@@ -8543,6 +8579,10 @@ function transitionFromValue(value, actions) {
 	}
 	if (!value || typeof value !== "object" || Array.isArray(value)) return actions.length ? { actions } : null;
 	const record = { ...value };
+	if ((Array.isArray(record.target) ? record.target : [record.target]).some(isCodeExpression)) record.meta = {
+		...record.meta,
+		[XSTATE_V6_UNRESOLVED_TARGET_META]: true
+	};
 	if (actions.length) record.actions = mergeActions(Array.isArray(record.actions) ? record.actions : record.actions ? [record.actions] : void 0, actions);
 	return record;
 }
@@ -10975,6 +11015,51 @@ function isCompleteFunctionExpression(code) {
 	if (!expression) return false;
 	return ts.isFunctionExpression(expression) || ts.isArrowFunction(expression);
 }
+function isMachineCode(value) {
+	return !!value && typeof value === "object" && typeof value["@code"] === "string" && typeof value["@lang"] === "string";
+}
+function hasMachineCode(value, seen = /* @__PURE__ */ new WeakSet()) {
+	if (isMachineCode(value)) return true;
+	if (!value || typeof value !== "object" || seen.has(value)) return false;
+	seen.add(value);
+	return Object.values(value).some((child) => hasMachineCode(child, seen));
+}
+function parse$2(source) {
+	return ts.createSourceFile("inspection.ts", source, ts.ScriptTarget.Latest, true, ts.ScriptKind.TS);
+}
+function expressionSource(source) {
+	if (!parse$2(`const value = (${source});`).parseDiagnostics.length) return source;
+	const methodFile = parse$2(`const value = {${source}};`);
+	const statement = methodFile.statements[0];
+	if (!methodFile.parseDiagnostics.length && statement && ts.isVariableStatement(statement)) {
+		const initializer = statement.declarationList.declarations[0]?.initializer;
+		const method = initializer && ts.isObjectLiteralExpression(initializer) ? initializer.properties[0] : void 0;
+		if (method && ts.isMethodDeclaration(method) && method.body) return `${method.modifiers?.some((modifier) => modifier.kind === ts.SyntaxKind.AsyncKeyword) ? "async " : ""}function${method.asteriskToken ? "*" : ""}(${method.parameters.map((param) => param.getText(methodFile)).join(", ")}) ${method.body.getText(methodFile)}`;
+	}
+	return "() => __stately_inspection_unknown__()";
+}
+/** Project runtime MachineJSON code through the same static parser as authored v6 source. */
+function projectMachineJSON(config) {
+	if (!hasMachineCode(config)) return config;
+	function expressions(value) {
+		if (isMachineCode(value)) return raw(["ts", "js"].includes(value["@lang"]) ? expressionSource(value["@code"]) : "() => __stately_inspection_unknown__()");
+		if (Array.isArray(value)) return value.map(expressions);
+		if (!value || typeof value !== "object") return value;
+		return Object.fromEntries(Object.entries(value).map(([key, item]) => [key, expressions(item)]));
+	}
+	const projected = xstateSourceToConfig(`createMachine(${serializeJS(expressions(config))});`, { profile: "xstate-v6-alpha" });
+	function restoreSchemas(original, parsed) {
+		if (!original || !parsed || typeof original !== "object" || typeof parsed !== "object") return;
+		const source = original;
+		const result = parsed;
+		if (Object.hasOwn(source, "schemas")) result.schemas = source.schemas;
+		const states = source.states;
+		const parsedStates = result.states;
+		for (const key of Object.keys(states ?? {})) restoreSchemas(states[key], parsedStates?.[key]);
+	}
+	restoreSchemas(config, projected);
+	return projected;
+}
 /**
 * A compound state node with no usable `initial` cannot be simulated (XState
 * throws "No initial state specified for compound state node"). This walks a
@@ -11094,6 +11179,7 @@ function actorImplementationItems(value) {
 	}));
 }
 function machineConfigToGraph(config, options = {}) {
+	if (isXStateV6Profile(options.profile)) config = projectMachineJSON(config);
 	const rootState = config;
 	const rootConfig = config;
 	const rootKey = String(rootState.id ?? "machine");
@@ -13065,31 +13151,9 @@ var ParseErrorCode;
 function modify(text, path, value, options) {
 	return setProperty(text, path, value, options);
 }
-/**
-* Applies edits to an input string.
-* @param text The input text
-* @param edits Edit operations following the format described in {@linkcode EditResult}.
-* @returns The text with the applied edits.
-* @throws An error if the edit operations are not well-formed as described in {@linkcode EditResult}.
-*/
-function applyEdits(text, edits) {
-	let sortedEdits = edits.slice(0).sort((a, b) => {
-		const diff = a.offset - b.offset;
-		if (diff === 0) return a.length - b.length;
-		return diff;
-	});
-	let lastModifiedOffset = text.length;
-	for (let i = sortedEdits.length - 1; i >= 0; i--) {
-		let e = sortedEdits[i];
-		if (e.offset + e.length <= lastModifiedOffset) text = applyEdit(text, e);
-		else throw new Error("Overlapping edit");
-		lastModifiedOffset = e.offset;
-	}
-	return text;
-}
 
 //#endregion
-//#region ../editor-sync/dist/adapters-CL5NOglI.mjs
+//#region ../editor-sync/dist/adapters-Dt77BFUa.mjs
 const sourceFileUris = /* @__PURE__ */ new WeakMap();
 function collectXStateSourceLocations(sourceText, document, options = {}) {
 	const sourceFile = ts$1.createSourceFile(document.fileName, sourceText, ts$1.ScriptTarget.Latest, true, getScriptKind$2$1(document.fileName));
@@ -17180,6 +17244,138 @@ function stripPresentationPatches(patches) {
 		return [sourcePatch];
 	});
 }
+const tokenKind = {
+	comma: 5,
+	lineComment: 12,
+	blockComment: 13,
+	lineBreak: 14,
+	eof: 17
+};
+/** Move authored values and same-line comments together, retaining array trivia. */
+function reorderedActionArray(text, array, order, inserted = /* @__PURE__ */ new Map()) {
+	const items = array.children ?? [];
+	if (!items.length || order.some((index, position) => index < 0 ? !inserted.has(position) : !items[index])) return null;
+	const prefixes = [text.slice(array.offset + 1, items[0].offset)];
+	const comments = [];
+	let closing = "";
+	let trailingComma = false;
+	for (let index = 0; index < items.length; index++) {
+		const item = items[index];
+		const end = items[index + 1]?.offset ?? array.offset + array.length - 1;
+		const gap = text.slice(item.offset + item.length, end);
+		const scanner = createScanner(gap, false);
+		let comma = -1;
+		let commentEnd = 0;
+		let onSameLine = true;
+		for (let token = scanner.scan(); token !== tokenKind.eof; token = scanner.scan()) {
+			if (token === tokenKind.comma && comma < 0) comma = scanner.getTokenOffset();
+			if (token === tokenKind.lineBreak) onSameLine = false;
+			if (onSameLine && (token === tokenKind.lineComment || token === tokenKind.blockComment)) {
+				commentEnd = scanner.getTokenOffset() + scanner.getTokenLength();
+				if (scanner.getTokenValue().includes("\n")) onSameLine = false;
+			}
+		}
+		const withoutComma = (value, offset) => comma >= offset && comma < offset + value.length ? value.slice(0, comma - offset) + value.slice(comma - offset + 1) : value;
+		comments.push(withoutComma(gap.slice(0, commentEnd), 0));
+		const remainder = withoutComma(gap.slice(commentEnd), commentEnd);
+		if (index < items.length - 1) prefixes.push(remainder);
+		else {
+			closing = remainder;
+			trailingComma = comma >= 0;
+		}
+	}
+	const defaultPrefix = prefixes[0].match(/\r?\n[ \t]*$/)?.[0] ?? prefixes.find((prefix) => /^\s*$/.test(prefix)) ?? "";
+	let interior = "";
+	for (let index = 0; index < order.length; index++) {
+		const oldIndex = order[index];
+		const item = items[oldIndex];
+		const ownPrefix = oldIndex > 0 ? prefixes[oldIndex] ?? defaultPrefix : defaultPrefix;
+		let prefix = index === 0 ? prefixes[0] : ownPrefix;
+		if (index === 0 && oldIndex > 0 && stripComments(ownPrefix) !== ownPrefix) prefix += ownPrefix.trimStart();
+		interior += prefix + (item ? text.slice(item.offset, item.offset + item.length) : inserted.get(index));
+		if (index < order.length - 1 || trailingComma) interior += ",";
+		interior += comments[oldIndex] ?? "";
+	}
+	return {
+		start: array.offset + 1,
+		end: array.offset + array.length - 1,
+		text: interior + closing
+	};
+}
+/** Keep unchanged source spans as anchors while composing successive tree edits. */
+var PreservedText = class {
+	pieces;
+	constructor(original) {
+		this.original = original;
+		this.pieces = [{
+			text: original,
+			originalOffset: 0
+		}];
+	}
+	replace(start, end, text) {
+		const before = [];
+		const after = [];
+		let offset = 0;
+		for (const piece of this.pieces) {
+			const pieceEnd = offset + piece.text.length;
+			if (offset < start) before.push({
+				...piece,
+				text: piece.text.slice(0, Math.min(start, pieceEnd) - offset)
+			});
+			if (pieceEnd > end) {
+				const skip = Math.max(end - offset, 0);
+				after.push({
+					text: piece.text.slice(skip),
+					originalOffset: piece.originalOffset === void 0 ? void 0 : piece.originalOffset + skip
+				});
+			}
+			offset = pieceEnd;
+		}
+		this.pieces = [
+			...before,
+			...text ? [{ text }] : [],
+			...after
+		];
+	}
+	replacements(document) {
+		const edits = [];
+		let cursor = 0;
+		let pending = "";
+		const flush = (end) => {
+			let start = cursor;
+			let replacement = pending;
+			while (start < end && replacement && this.original[start] === replacement[0]) {
+				start++;
+				replacement = replacement.slice(1);
+			}
+			while (end > start && replacement && this.original[end - 1] === replacement.at(-1)) {
+				end--;
+				replacement = replacement.slice(0, -1);
+			}
+			if (start !== end || replacement) {
+				const from = document.positionAt(start);
+				const to = document.positionAt(end);
+				edits.push({
+					range: {
+						startLine: from.line,
+						startChar: from.character,
+						endLine: to.line,
+						endChar: to.character
+					},
+					newText: replacement
+				});
+			}
+			pending = "";
+		};
+		for (const piece of this.pieces) if (piece.originalOffset === void 0) pending += piece.text;
+		else {
+			flush(piece.originalOffset);
+			cursor = piece.originalOffset + piece.text.length;
+		}
+		flush(this.original.length);
+		return edits;
+	}
+};
 function isRecord$2(value) {
 	return value !== null && typeof value === "object" && !Array.isArray(value);
 }
@@ -17243,6 +17439,36 @@ function collectPropertyRenames(previousGraph, nextGraph, patches) {
 	}
 	return renames;
 }
+/** Recover authored IDs and discard retained implicit runtime IDs using the source. */
+function recoverSourceNodeIds(graph, previousGraph, source, authoredIdChanges = /* @__PURE__ */ new Set()) {
+	const previousById = new Map(previousGraph.nodes.map((node) => [node.id, node]));
+	const defaultIds = /* @__PURE__ */ new Map();
+	const implicitIds = /* @__PURE__ */ new Map();
+	const authoredIds = /* @__PURE__ */ new Map();
+	const resolve = (id) => {
+		const cached = defaultIds.get(id);
+		if (cached !== void 0) return cached;
+		const node = previousById.get(id);
+		const authoredId = findNodeAtLocation(source, [...node.parentId ? [...statePath(previousGraph, id), node.data.key] : [], "id"]);
+		const implicitId = node.parentId ? `${resolve(node.parentId)}.${node.data.key}` : "(machine)";
+		const defaultId = !node.parentId && authoredId ? getNodeValue(authoredId) : implicitId;
+		defaultIds.set(id, defaultId);
+		if (authoredId) authoredIds.set(id, getNodeValue(authoredId));
+		else implicitIds.set(id, implicitId);
+		return defaultId;
+	};
+	for (const node of previousGraph.nodes) resolve(node.id);
+	const updates = /* @__PURE__ */ new Map();
+	for (const node of graph.nodes) {
+		if (authoredIdChanges.has(node.id)) continue;
+		if (node.data.nodeId == null && authoredIds.has(node.id)) updates.set(node.id, authoredIds.get(node.id));
+		else if (node.data.nodeId != null && node.data.nodeId === implicitIds.get(node.id)) updates.set(node.id, void 0);
+	}
+	if (!updates.size) return graph;
+	const normalized = structuredClone(graph);
+	for (const node of normalized.nodes) if (updates.has(node.id)) node.data.nodeId = updates.get(node.id);
+	return normalized;
+}
 function onlyTargetChanged(previous, next) {
 	if (typeof previous.target !== "string" || typeof next.target !== "string") return false;
 	const { target: _previousTarget, ...previousRest } = previous;
@@ -17263,12 +17489,24 @@ function formattingOptions(text) {
 	};
 }
 /** Apply graph-level semantic changes to the source JSON tree, not to an export. */
-function preserveXStateJson(document, previousGraph, nextGraph, machineConfig, patches, preserveStatelyMetadata) {
+function preserveXStateJson(document, previousGraph, nextGraph, machineConfig, patches, preserveStatelyMetadata, authoredIdChanges) {
 	if (!isGraph$1(previousGraph) || !isGraph$1(nextGraph) || !isRecord$2(machineConfig)) return null;
 	const original = document.getText();
 	let text = original;
-	const previousConfig = preserveStatelyMetadata ? graphToMachineConfig(previousGraph) : stripStatelyMetadata(graphToMachineConfig(previousGraph));
-	const nextConfig = preserveStatelyMetadata ? machineConfig : stripStatelyMetadata(machineConfig);
+	const preservedText = new PreservedText(original);
+	const replace = (start, end, value) => {
+		preservedText.replace(start, end, value);
+		text = text.slice(0, start) + value + text.slice(end);
+	};
+	const originalTree = parseTree(original, [], { allowTrailingComma: true });
+	if (!originalTree) return null;
+	const normalizedPrevious = recoverSourceNodeIds(previousGraph, previousGraph, originalTree);
+	const previousIds = new Map(previousGraph.nodes.map((node) => [node.id, node.data.nodeId ?? null]));
+	const intentionalIds = authoredIdChanges ?? nextGraph.nodes.filter((node) => previousIds.has(node.id) && previousIds.get(node.id) !== (node.data.nodeId ?? null)).map((node) => node.id);
+	const normalizedNext = recoverSourceNodeIds(nextGraph, previousGraph, originalTree, new Set(intentionalIds));
+	const previousConfig = preserveStatelyMetadata ? graphToMachineConfig(normalizedPrevious) : stripStatelyMetadata(graphToMachineConfig(normalizedPrevious));
+	const nextMachineConfig = normalizedNext === nextGraph ? machineConfig : graphToMachineConfig(normalizedNext);
+	const nextConfig = preserveStatelyMetadata ? nextMachineConfig : stripStatelyMetadata(nextMachineConfig);
 	const renames = collectPropertyRenames(previousGraph, nextGraph, patches);
 	const treeAt = (path) => {
 		const errors = [];
@@ -17278,12 +17516,39 @@ function preserveXStateJson(document, previousGraph, nextGraph, machineConfig, p
 	};
 	if (!treeAt([])) return null;
 	const setValue = (path, value) => {
-		text = applyEdits(text, modify(text, path, value, { formattingOptions: formattingOptions(text) }));
+		let containerPath = path.slice(0, -1);
+		let container = treeAt(containerPath);
+		while (!container && containerPath.length) {
+			containerPath = containerPath.slice(0, -1);
+			container = treeAt(containerPath);
+		}
+		const compact = container && !text.slice(container.offset, container.offset + container.length).includes("\n");
+		const edits = modify(text, path, value, { ...compact ? {} : { formattingOptions: formattingOptions(text) } });
+		for (const edit of [...edits].sort((a, b) => b.offset - a.offset)) {
+			let content = edit.content;
+			if (compact && container) {
+				const authored = text.slice(container.offset, container.offset + container.length);
+				const colonSpace = authored.match(/"[^"\r\n]+"\s*:([ \t]*)/)?.[1] ?? "";
+				const commaSpace = authored.match(/,([ \t]*)/)?.[1] ?? "";
+				const scanner = createScanner(content, false);
+				const insertions = [];
+				for (let token = scanner.scan(); token !== 17; token = scanner.scan()) {
+					const spacing = token === 6 ? colonSpace : token === 5 ? commaSpace : "";
+					const offset = scanner.getTokenOffset() + scanner.getTokenLength();
+					if (spacing && !/\s/.test(content[offset] ?? "")) insertions.push({
+						offset,
+						text: spacing
+					});
+				}
+				for (const insertion of insertions.reverse()) content = content.slice(0, insertion.offset) + insertion.text + content.slice(insertion.offset);
+			}
+			replace(edit.offset, edit.offset + edit.length, content);
+		}
 	};
 	const renameKey = (path, oldKey, newKey) => {
 		const keyNode = treeAt([...path, oldKey])?.parent?.children?.[0];
 		if (!keyNode || keyNode.type !== "string") return false;
-		text = `${text.slice(0, keyNode.offset)}${JSON.stringify(newKey)}${text.slice(keyNode.offset + keyNode.length)}`;
+		replace(keyNode.offset, keyNode.offset + keyNode.length, JSON.stringify(newKey));
 		return true;
 	};
 	const removePropertyWithoutFormatting = (path, key) => {
@@ -17302,14 +17567,14 @@ function preserveXStateJson(document, previousGraph, nextGraph, machineConfig, p
 			const lineStart = text.lastIndexOf("\n", property.offset - 1) + 1;
 			const nextLineStart = text.lastIndexOf("\n", next.offset - 1) + 1;
 			if (nextLineStart <= lineStart || text.slice(lineStart, property.offset).trim() !== "" || !/^\s*,\s*$/.test(text.slice(propertyEnd, nextLineStart))) return false;
-			text = `${text.slice(0, lineStart)}${text.slice(nextLineStart)}`;
+			replace(lineStart, nextLineStart, "");
 			return true;
 		}
 		const previous = properties[index - 1];
 		if (!previous || trailingLine.trim() !== "") return false;
 		const previousEnd = previous.offset + previous.length;
 		if (!/^\s*,\s*$/.test(text.slice(previousEnd, property.offset))) return false;
-		text = `${text.slice(0, previousEnd)}${text.slice(propertyEnd)}`;
+		replace(previousEnd, propertyEnd, "");
 		return true;
 	};
 	const removeArrayItem = (path, index) => {
@@ -17333,7 +17598,7 @@ function preserveXStateJson(document, previousGraph, nextGraph, machineConfig, p
 			const nextLineStart = next && text.lastIndexOf("\n", next.offset - 1) + 1;
 			const separatorOnNextLine = itemLineEnd >= 0 && nextLineStart !== void 0 && /^[ \t]*,[ \t]*\r?\n$/.test(text.slice(itemLineEnd + 1, nextLineStart));
 			if (next && next.offset > lineEnd && (/^\s*,\s*\/\//.test(inlineSuffix) || /^\s*\/\//.test(inlineSuffix) && separatorOnNextLine)) {
-				text = `${text.slice(0, itemLineStart)}${text.slice(separatorOnNextLine ? nextLineStart : itemLineEnd < 0 ? lineEnd : lineEnd + 1)}`;
+				replace(itemLineStart, separatorOnNextLine ? nextLineStart : itemLineEnd < 0 ? lineEnd : lineEnd + 1, "");
 				return true;
 			}
 		} else {
@@ -17343,7 +17608,7 @@ function preserveXStateJson(document, previousGraph, nextGraph, machineConfig, p
 			const withoutComma = beforeItem.replace(/^(\s*),/, "$1");
 			if (previousEnd !== void 0 && itemLineEnd >= 0 && itemLineStart > previousEnd && withoutComma !== beforeItem && stripComments(withoutComma).trim() === "") {
 				const separator = /^\s*$/.test(withoutComma) ? formattingOptions(text).eol : withoutComma;
-				text = `${text.slice(0, previousEnd)}${separator}${text.slice(itemLineEnd + 1)}`;
+				replace(previousEnd, itemLineEnd + 1, separator);
 				return true;
 			}
 		}
@@ -17370,7 +17635,7 @@ function preserveXStateJson(document, previousGraph, nextGraph, machineConfig, p
 				end = nextLineStart;
 			} else if (!text.slice(end, nextItem.offset).includes("\n") && text.slice(end, nextItem.offset).trim() === "") end = nextItem.offset;
 		} else end = item.offset + item.length;
-		text = `${text.slice(0, start)}${text.slice(end)}`;
+		replace(start, end, "");
 		return true;
 	};
 	const appendArrayItemWithoutFormatting = (path, value) => {
@@ -17390,7 +17655,7 @@ function preserveXStateJson(document, previousGraph, nextGraph, machineConfig, p
 			if (indentation.trim() !== "") return false;
 			separator = `,${formattingOptions(text).eol}${indentation}`;
 		}
-		text = `${text.slice(0, lastEnd)}${separator}${serialized}${text.slice(lastEnd)}`;
+		replace(lastEnd, lastEnd, separator + serialized);
 		return true;
 	};
 	const authoredBranchText = (path, index) => {
@@ -17407,6 +17672,39 @@ function preserveXStateJson(document, previousGraph, nextGraph, machineConfig, p
 		}
 		return `${leadingText}${text.slice(branchNode.offset, branchNode.offset + branchNode.length)}`;
 	};
+	const actionOrder = (previous, next, path) => {
+		const group = path.at(-1);
+		if (group !== "entry" && group !== "exit" && group !== "actions") return void 0;
+		const owner = nextGraph.nodes.filter((node) => {
+			return (node.parentId ? [...statePath(nextGraph, node.id), node.data.key] : []).every((key, index) => path[index] === key);
+		}).sort((a, b) => (statePath(nextGraph, b.id)?.length ?? 0) - (statePath(nextGraph, a.id)?.length ?? 0))[0];
+		if (!owner) return void 0;
+		const previousNode = previousGraph.nodes.find((node) => node.id === owner.id);
+		const serialize = (actions) => actions.map(({ type, params }) => ({
+			type,
+			...params && Object.keys(params).length ? { params } : {}
+		}));
+		const normalized = (values) => values.map((value) => typeof value === "string" ? { type: value } : value);
+		const ownerPath = owner.parentId ? [...statePath(nextGraph, owner.id), owner.data.key] : [];
+		const transitionPath = path.slice(ownerPath.length);
+		const event = transitionPath[0] === "on" ? transitionPath[1] : transitionPath[0] === "always" ? "" : void 0;
+		const matchingEdges = nextGraph.edges.filter((edge) => edge.sourceId === owner.id && (event === void 0 || edge.data.eventType === event));
+		const branchIndex = typeof path.at(-2) === "number" ? path.at(-2) : 0;
+		const edgeId = event === void 0 ? void 0 : matchingEdges[branchIndex]?.id;
+		const matches = (group === "actions" ? previousGraph.edges.filter((edge) => edge.sourceId === owner.id && (event === void 0 || edge.id === edgeId)).map((edge) => ({
+			previous: edge.data.actions ?? [],
+			next: nextGraph.edges.find((candidate) => candidate.id === edge.id)?.data.actions ?? []
+		})) : [{
+			previous: previousNode?.data[group] ?? [],
+			next: owner.data[group] ?? []
+		}]).filter((candidate) => sameValue(serialize(candidate.previous), normalized(previous)) && sameValue(serialize(candidate.next), normalized(next)));
+		if (matches.length !== 1) return void 0;
+		const candidate = matches[0];
+		const ids = candidate.previous.map((action) => action.id);
+		if (ids.some((id) => !id) || new Set(ids).size !== ids.length) return void 0;
+		const order = candidate.next.map((action) => ids.indexOf(action.id));
+		return candidate.next.every((action) => action.id) ? order : void 0;
+	};
 	const visit = (previous, next, path) => {
 		if (sameValue(previous, next)) return true;
 		const sourceNode = treeAt(path);
@@ -17426,10 +17724,15 @@ function preserveXStateJson(document, previousGraph, nextGraph, machineConfig, p
 			const authoredAction = Object.keys(next).length === 1 ? next.type : next;
 			if (text.slice(sourceNode.offset + 1, sourceNode.offset + sourceNode.length - 1) === "") {
 				const insertion = sourceNode.offset + 1;
-				text = `${text.slice(0, insertion)}${JSON.stringify(authoredAction)}${text.slice(insertion)}`;
+				replace(insertion, insertion, JSON.stringify(authoredAction));
 			} else setValue(path, [authoredAction]);
 			return true;
 		}
+		if (sourceNode?.type === "array" && sourceNode.children?.length === 1 && isRecord$2(previous) && Array.isArray(next) && [
+			"entry",
+			"exit",
+			"actions"
+		].includes(String(path.at(-1)))) return visit([previous], next, path);
 		if (sourceNode?.type === "array" && sourceNode.children?.length === 1 && isRecord$2(previous) && isRecord$2(next)) return visit(previous, next, [...path, 0]);
 		if (isRecord$2(previous) && isRecord$2(next) && sourceNode?.type === "object") {
 			const handledOld = /* @__PURE__ */ new Set();
@@ -17490,14 +17793,14 @@ function preserveXStateJson(document, previousGraph, nextGraph, machineConfig, p
 								index
 							]);
 							if (!insertedNode) return false;
-							text = `${text.slice(0, insertedNode.offset)}${authoredText}${text.slice(insertedNode.offset + insertedNode.length)}`;
+							replace(insertedNode.offset, insertedNode.offset + insertedNode.length, authoredText);
 						}
 						continue;
 					}
 					if (!visit(previous[key], next[key], [...path, key])) return false;
 				} else {
 					const existing = key === "actions" ? treeAt([...path, key]) : void 0;
-					if (existing?.type === "array") text = `${text.slice(0, existing.offset)}[]${text.slice(existing.offset + existing.length)}`;
+					if (existing?.type === "array") replace(existing.offset, existing.offset + existing.length, "[]");
 					else if ((key === "entry" || key === "exit") && removePropertyWithoutFormatting(path, key)) {} else setValue([...path, key], void 0);
 				}
 			}
@@ -17510,11 +17813,33 @@ function preserveXStateJson(document, previousGraph, nextGraph, machineConfig, p
 				if (originalBranch !== void 0) {
 					const insertedNode = treeAt([...path, key]);
 					if (!insertedNode) return false;
-					text = `${text.slice(0, insertedNode.offset)}${originalBranch}${text.slice(insertedNode.offset + insertedNode.length)}`;
+					replace(insertedNode.offset, insertedNode.offset + insertedNode.length, originalBranch);
 				}
 			}
 			return true;
 		}
+		if (Array.isArray(previous) && sourceNode?.type === "array" && (Array.isArray(next) || isRecord$2(next))) {
+			const nextValues = Array.isArray(next) ? next : [next];
+			const order = actionOrder(previous, nextValues, path);
+			const pureDeletion = previous.length === nextValues.length + 1 && previous.some((_, index) => sameValue(previous.filter((_, candidate) => candidate !== index), nextValues));
+			const lastSourceItem = sourceNode.children?.at(-1);
+			const sourceSuffix = lastSourceItem ? text.slice(lastSourceItem.offset + lastSourceItem.length, sourceNode.offset + sourceNode.length - 1) : "";
+			const pureAppend = !(stripComments(sourceSuffix) !== sourceSuffix) && order && nextValues.length > previous.length && order.slice(0, previous.length).every((oldIndex, index) => oldIndex === index);
+			if (order && !pureDeletion && !pureAppend && (previous.length !== nextValues.length || order.some((oldIndex, index) => oldIndex !== index))) {
+				for (const [index, oldIndex] of order.entries()) if (oldIndex >= 0 && !visit(previous[oldIndex], nextValues[index], [...path, oldIndex])) return false;
+				const array = treeAt(path);
+				if (!array) return false;
+				const inserted = new Map(order.flatMap((oldIndex, index) => {
+					if (oldIndex >= 0) return [];
+					const value = nextValues[index];
+					return [[index, JSON.stringify(value)]];
+				}));
+				const edit = reorderedActionArray(text, array, order, inserted);
+				if (!edit) return false;
+				replace(edit.start, edit.end, edit.text);
+				return true;
+			}
+		}
 		if (Array.isArray(previous) && isRecord$2(next) && sourceNode?.type === "array") {
 			if (previous.length === 1 && isRecord$2(previous[0])) return visit(previous[0], next, [...path, 0]);
 			const matches = previous.flatMap((value, index) => sameValue(value, next) ? [index] : []);
@@ -17546,25 +17871,7 @@ function preserveXStateJson(document, previousGraph, nextGraph, machineConfig, p
 	parseTree(text, errors, { allowTrailingComma: true });
 	if (errors.length) return null;
 	if (text === original) return [];
-	let start = 0;
-	while (start < original.length && start < text.length && original[start] === text[start]) start++;
-	let oldEnd = original.length;
-	let newEnd = text.length;
-	while (oldEnd > start && newEnd > start && original[oldEnd - 1] === text[newEnd - 1]) {
-		oldEnd--;
-		newEnd--;
-	}
-	const startPosition = document.positionAt(start);
-	const endPosition = document.positionAt(oldEnd);
-	return [{
-		range: {
-			startLine: startPosition.line,
-			startChar: startPosition.character,
-			endLine: endPosition.line,
-			endChar: endPosition.character
-		},
-		newText: text.slice(start, newEnd)
-	}];
+	return preservedText.replacements(document);
 }
 const xstateAdapter = {
 	id: "xstate",
@@ -17653,7 +17960,7 @@ const xstateJsonAdapter = {
 		if (options?.sourceUpdateStrategy === "rewrite") return createSerializedDocumentReplacement(document, options, "xstate-json");
 		const patches = options?.preserveStatelyMetadata === false ? stripPresentationPatches(options.patches ?? []) : options?.patches ?? [];
 		if (!options || !patches.length) return [];
-		return preserveXStateJson(document, options.prevGraph, options.nextGraph, machineConfig, patches, options.preserveStatelyMetadata ?? true) ?? [];
+		return preserveXStateJson(document, options.prevGraph, options.nextGraph, machineConfig, patches, options.preserveStatelyMetadata ?? true, options.authoredIdChanges) ?? [];
 	}
 };
 const asyncAdapter = createSerializedExportAdapter("async", (document, text) => isJavaScriptOrTypeScriptFile(document.fileName) && looksLikeAsyncWorkflow(text));
@@ -17936,7 +18243,7 @@ function diagnosticKey$1(diagnostic) {
 }
 
 //#endregion
-//#region ../editor-sync/dist/localBackend-rcokEw-A.mjs
+//#region ../editor-sync/dist/localBackend-DH1qEsOz.mjs
 var LocalEditorSyncBackend = class {
 	constructor(access) {
 		this.access = access;
@@ -19183,7 +19490,7 @@ const editorSyncApplyResponseSchema = z$1.object({ replacements: z$1.array(edito
 const editorSyncAccessResponseSchema = z$1.object({ access: editorSyncAccessSchema });
 
 //#endregion
-//#region ../editor-sync/dist/host-Dvy75KWk.mjs
+//#region ../editor-sync/dist/host-BX7mLyHj.mjs
 let diagnosticSequence = 0;
 function presentationsEqual(first, second) {
 	return JSON.stringify(createPresentationSnapshot(first)) === JSON.stringify(createPresentationSnapshot(second));
@@ -20150,7 +20457,7 @@ function sourceLocationUris(sourceLocations) {
 
 //#endregion
 //#region src/version.ts
-const CLI_VERSION = "0.12.3";
+const CLI_VERSION = "0.12.4";
 
 //#endregion
 //#region src/cliHost.ts
@@ -21251,7 +21558,7 @@ function getScriptKind$1(fileName) {
 }
 
 //#endregion
-//#region ../../node_modules/.pnpm/@statelyai+graph@2.1.0_@statelyai+layout@0.1.2_cytoscape@3.34.0_d3-force@3.0.0_d3-hiera_3600605a69f548f83255fd3d12957cf4/node_modules/@statelyai/graph/dist/index.mjs
+//#region ../../node_modules/.pnpm/@statelyai+graph@2.1.0_@statelyai+layout@0.3.0_cytoscape@3.34.0_d3-force@3.0.0_d3-hiera_7624816e5d9226bed30c68417318a8b7/node_modules/@statelyai/graph/dist/index.mjs
 const LAYOUT_KEYS = {
 	node: [
 		"x",

package/dist/index.d.mts

@@ -71,7 +71,7 @@ declare function createStatelyProjectConfig(options: {
   defaultXStateVersion?: number;
 }): StatelyProjectConfig;
 //#endregion
-//#region ../../node_modules/.pnpm/@statelyai+graph@2.1.0_@statelyai+layout@0.1.2_cytoscape@3.34.0_d3-force@3.0.0_d3-hiera_3600605a69f548f83255fd3d12957cf4/node_modules/@statelyai/graph/dist/types-BAEQTwK_.d.mts
+//#region ../../node_modules/.pnpm/@statelyai+graph@2.1.0_@statelyai+layout@0.3.0_cytoscape@3.34.0_d3-force@3.0.0_d3-hiera_7624816e5d9226bed30c68417318a8b7/node_modules/@statelyai/graph/dist/types-BAEQTwK_.d.mts
 //#region src/types.d.ts
 /**
  * Directedness of a graph or an individual edge.

package/dist/index.mjs

@@ -1,3 +1,3 @@
-import { C as run, D as verifyProject, E as resolveVerificationRequest, O as formatVerificationJUnit, S as resolveProjectStatus, T as scanProjectSources, _ as isFileGitDirty, a as discoverMachinesInSource, b as resolveCredentialStatus, c as formatDiscoveredMachines, d as formatProjectStatus, f as formatStoredCredentialSource, g as initProject, h as inferInitProjectName, i as discoverLinkedPullTargets, k as createStatelyProjectConfig, l as formatMissingNewMachineDirMessage, m as getEnvCredential, n as buildOAuthLoginStart, o as discoverOAuthLogin, p as getEnvApiKey, r as classifyPushCandidates, s as discoverRemoteProjectMachineTargets, t as COMMANDS, u as formatPlanSummary, v as resolveApiKey, w as scanProjectMachines, x as resolveOpenRootDir, y as resolveConfiguredPullTargets } from "./cli-RFjHJYb3.mjs";
+import { C as run, D as verifyProject, E as resolveVerificationRequest, O as formatVerificationJUnit, S as resolveProjectStatus, T as scanProjectSources, _ as isFileGitDirty, a as discoverMachinesInSource, b as resolveCredentialStatus, c as formatDiscoveredMachines, d as formatProjectStatus, f as formatStoredCredentialSource, g as initProject, h as inferInitProjectName, i as discoverLinkedPullTargets, k as createStatelyProjectConfig, l as formatMissingNewMachineDirMessage, m as getEnvCredential, n as buildOAuthLoginStart, o as discoverOAuthLogin, p as getEnvApiKey, r as classifyPushCandidates, s as discoverRemoteProjectMachineTargets, t as COMMANDS, u as formatPlanSummary, v as resolveApiKey, w as scanProjectMachines, x as resolveOpenRootDir, y as resolveConfiguredPullTargets } from "./cli-_FAuSk1y.mjs";
 
 export { COMMANDS, buildOAuthLoginStart, classifyPushCandidates, createStatelyProjectConfig, discoverLinkedPullTargets, discoverMachinesInSource, discoverOAuthLogin, discoverRemoteProjectMachineTargets, formatDiscoveredMachines, formatMissingNewMachineDirMessage, formatPlanSummary, formatProjectStatus, formatStoredCredentialSource, formatVerificationJUnit, getEnvApiKey, getEnvCredential, inferInitProjectName, initProject, isFileGitDirty, resolveApiKey, resolveConfiguredPullTargets, resolveCredentialStatus, resolveOpenRootDir, resolveProjectStatus, resolveVerificationRequest, run, scanProjectMachines, scanProjectSources, verifyProject };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "statelyai",
-  "version": "0.12.3",
+  "version": "0.12.4",
   "description": "Command-line tools for Stately",
   "license": "MIT",
   "bin": {
@@ -24,14 +24,14 @@
     "typescript": "^5.9.3",
     "ws": "^8.21.0",
     "zod": "^4.4.1",
-    "@statelyai/sdk": "0.37.2"
+    "@statelyai/sdk": "0.37.3"
   },
   "devDependencies": {
     "@types/ws": "^8.18.1",
     "tsdown": "0.21.0-beta.2",
     "vitest": "^3.2.4",
-    "@statelyai/api-contract": "0.5.4",
-    "@statelyai/editor-sync": "0.1.44"
+    "@statelyai/api-contract": "0.5.6",
+    "@statelyai/editor-sync": "0.1.46"
   },
   "oclif": {
     "bin": "statelyai",