rea-agents 6.5.0 → 6.7.0

package/dist/cli-runtime/{ClientConfigurationDocument-ffQ9X0Se.js → ClientConfigurationDocument-C9T8MNGc.js}

@@ -1,35 +1,39 @@
 import { __esmMin } from "./rolldown-runtime-DXoylpqc.js";
-import { PRODUCT_IDENTITY, compareUnicodeCodePoints, err, init_identity, init_result, init_unicodeCodePointOrder, ok } from "./reconstructionObligationLedgerSchemas-Bao0xMr-.js";
-import { ConfigurationError, init_configurationErrors } from "./errorSchemas-CTRmvMl3.js";
-import { ArtifactReaderFailure, init_ArtifactReader } from "./ArtifactReader-BXkffc1D.js";
-import { NonRegularFileReadError, RegularFileChangedError, init_RegularFile } from "./RegularFile-B_6KPCNQ.js";
-import { init_BoundedFileBytes, readBoundedFileBytes } from "./BoundedFileBytes-BU30odTm.js";
-import { RegularFileCleanupFailure, init_RegularFileRead, readRegularFile, withRegularFile } from "./RegularFileRead-DVlC5faM.js";
-import { clientSkillDirectories, init_SupportedClients, init_environment, parseEnvironment, parseEnvironmentValues } from "./SupportedClients-DaX6Lt2d.js";
+import { PRODUCT_IDENTITY, compareUnicodeCodePoints, err, init_identity, init_result, init_unicodeCodePointOrder, ok } from "./reconstructionObligationLedgerSchemas-Bi6sect1.js";
+import { ConfigurationError, init_configurationErrors } from "./errorSchemas-Ixz_q7qt.js";
+import { NonRegularFileReadError, RegularFileChangedError, RegularFileCleanupFailure, init_OwnedRegularFile, init_RegularFile } from "./OwnedRegularFile-D1f5nUCx.js";
+import { ArtifactReaderFailure, init_ArtifactReader } from "./ArtifactReader-DMwm42bk.js";
+import { init_BoundedFileBytes, readBoundedFileBytes } from "./BoundedFileBytes-DRtiQNAQ.js";
+import { init_RegularFileRead, readRegularFile, withRegularFile } from "./RegularFileRead-mbgGYtxe.js";
+import { clientSkillDirectories, init_SupportedClients, init_environment, parseEnvironment, parseEnvironmentValues } from "./SupportedClients-DMafjitv.js";
 import { z } from "zod";
 import { dirname, join } from "node:path";
 import { createHash } from "node:crypto";
 import { isDeepStrictEqual } from "node:util";
-import { copyFile, lstat, mkdir, readFile, rm } from "node:fs/promises";
 import { constants } from "node:fs";
+import { copyFile, lstat, mkdir, readFile, rm } from "node:fs/promises";
 import { Document, Schema, isAlias, isMap, isNode, isScalar, isSeq, parseDocument, visit } from "yaml";
 import writeFileAtomic from "write-file-atomic";
-import { applyEdits, findNodeAtLocation, modify, parse, parseTree, printParseErrorCode } from "jsonc-parser";
+import { applyEdits, createScanner, format, parse, parseTree, printParseErrorCode } from "jsonc-parser";
 import { parse as parse$1, stringify } from "smol-toml";
 
 //#region dist/application/SetupRecoveryBackup.js
-var isMissing, errorDetail, selectCurrentRecoveryBackup, preserveRecoveryBackup;
+var isMissing, errorDetail, selectCurrentRecoveryBackup, copyExclusive, preserveCurrentRecoveryBackup;
 function init_SetupRecoveryBackup() {
 	return (init_SetupRecoveryBackup = __esmMin((() => {
 		init_result();
 		init_RegularFileRead();
 		isMissing = (cause) => cause instanceof Error && "code" in cause && cause.code === "ENOENT";
 		errorDetail = (cause) => cause instanceof Error ? cause.message : String(cause);
-		selectCurrentRecoveryBackup = async (firstBackupPath, original) => {
+		selectCurrentRecoveryBackup = async (firstBackupPath, original, resources) => {
+			const read = (path) => readRegularFile(path, {
+				symlinks: "reject",
+				...resources === undefined ? {} : { resources }
+			});
 			const expected = Buffer.isBuffer(original) ? original : Buffer.from(original, "utf8");
 			let firstBackup;
 			try {
-				firstBackup = await readRegularFile(firstBackupPath, { symlinks: "reject" });
+				firstBackup = await read(firstBackupPath);
 			} catch (cause) {
 				if (cause instanceof RegularFileCleanupFailure) throw cause;
 				if (!isMissing(cause)) return err({
@@ -50,7 +54,7 @@ function init_SetupRecoveryBackup() {
 			const recoveryPath = `${firstBackupPath}.${digest}.recovery`;
 			let recovery;
 			try {
-				recovery = await readRegularFile(recoveryPath, { symlinks: "reject" });
+				recovery = await read(recoveryPath);
 			} catch (cause) {
 				if (cause instanceof RegularFileCleanupFailure) throw cause;
 				if (!isMissing(cause)) return err({
@@ -69,20 +73,37 @@ function init_SetupRecoveryBackup() {
 				present: recovery !== undefined
 			});
 		};
-		preserveRecoveryBackup = async (source, destination) => {
-			try {
-				await copyFile(source, destination, constants.COPYFILE_EXCL);
-				return true;
-			} catch (cause) {
-				return cause instanceof Error && "code" in cause && cause.code === "EEXIST";
+		copyExclusive = (source, destination) => copyFile(source, destination, constants.COPYFILE_EXCL);
+		preserveCurrentRecoveryBackup = async (firstBackupPath, source, original, { copy = copyExclusive, resources } = {}) => {
+			const selection = await selectCurrentRecoveryBackup(firstBackupPath, original, resources);
+			if (!selection.ok) return selection;
+			const { backupPath } = selection.value;
+			if (!selection.value.present) {
+				try {
+					await copy(source, backupPath);
+				} catch (cause) {
+					if (!(cause instanceof Error && "code" in cause && cause.code === "EEXIST")) return err({
+						kind: "copy",
+						path: backupPath,
+						detail: `The recovery backup could not be written: ${errorDetail(cause)}`
+					});
+				}
 			}
+			const verified = await selectCurrentRecoveryBackup(firstBackupPath, original, resources);
+			if (!verified.ok) return verified;
+			if (verified.value.backupPath !== backupPath || !verified.value.present) return err({
+				kind: "unverified",
+				path: backupPath,
+				detail: `The recovery backup does not match the configuration it preserves: ${backupPath}`
+			});
+			return ok(backupPath);
 		};
 	})))();
 }
 
 //#endregion
 //#region dist/application/SetupSkill.js
-var MANAGED_SKILL_FILES, isManagedSkillManifest, readSkillFile, readSkillFileState, canonicalSkillContent, SetupSkillInstallError, systemSkillInstallFileOperations, skillDestinations, existingSkillDestinations, readOptionalSkillState, inspectSkillDirectory, skillDirectoryIssues, skillDirectoryFailure, validateCanonicalSkillDirectories, canonicalSkillFiles, inspectCanonicalSkill, canonicalSkillNeedsInstall, causeReason, causePath, restoreSkillFiles, preserveCurrentSkillBackup, installCanonicalSkill, readInstalledSkillIdentity;
+var MANAGED_SKILL_FILES, isManagedSkillManifest, readSkillFile, readSkillFileState, canonicalSkillContent, SetupSkillInstallError, systemSkillInstallFileOperations, skillDestinations, existingSkillDestinations, readOptionalSkillState, inspectSkillDirectory, skillDirectoryIssues, skillDirectoryFailure, validateCanonicalSkillDirectories, canonicalSkillFiles, inspectCanonicalSkill, canonicalSkillNeedsInstall, causeReason, causePath, restoreSkillFiles, installCanonicalSkill, readInstalledSkillIdentity;
 function init_SetupSkill() {
 	return (init_SetupSkill = __esmMin((() => {
 		init_result();
@@ -140,14 +161,7 @@ function init_SetupSkill() {
 			mkdir: async (path) => {
 				await mkdir(path, { recursive: true });
 			},
-			backup: async (source, destination) => {
-				try {
-					await copyFile(source, destination, constants.COPYFILE_EXCL);
-				} catch (cause) {
-					if (cause instanceof Error && "code" in cause && cause.code === "EEXIST") return;
-					throw cause;
-				}
-			},
+			backup: (source, destination) => copyFile(source, destination, constants.COPYFILE_EXCL),
 			write: (path, content, mode) => writeFileAtomic(path, content, {
 				encoding: "utf8",
 				mode
@@ -298,7 +312,7 @@ function init_SetupSkill() {
 					}
 				}
 				if (clientIds !== undefined || rootHasFiles || rootIssues.length > 0) {
-					installedDestination = true;
+					installedDestination ||= rootHasFiles;
 					canonical = canonical && rootCanonical;
 					issues.push(...rootIssues);
 				}
@@ -341,16 +355,6 @@ function init_SetupSkill() {
 			}
 			return failures;
 		};
-		preserveCurrentSkillBackup = async (destination, original, operations) => {
-			const firstBackupPath = `${destination}.rea.backup`;
-			const selection = await selectCurrentRecoveryBackup(firstBackupPath, original);
-			if (!selection.ok) throw new Error(selection.error.detail);
-			if (selection.value.present) return selection.value.backupPath;
-			await operations.backup(destination, selection.value.backupPath);
-			const verified = await selectCurrentRecoveryBackup(firstBackupPath, original);
-			if (!verified.ok || verified.value.backupPath !== selection.value.backupPath || !verified.value.present) throw new Error(`The current file was not preserved at ${selection.value.backupPath}`);
-			return verified.value.backupPath;
-		};
 		installCanonicalSkill = async (home, clientIds = [], environment = {}, platform = process.platform, operations = systemSkillInstallFileOperations, resources) => {
 			let attempted = [];
 			let stage = "prepare";
@@ -365,7 +369,12 @@ function init_SetupSkill() {
 					failingPath = destination;
 					await operations.mkdir(dirname(destination));
 					if (original !== undefined) {
-						recoveryPaths.set(destination, await preserveCurrentSkillBackup(destination, original.bytes, operations));
+						const preserved = await preserveCurrentRecoveryBackup(`${destination}.rea.backup`, destination, original.bytes, {
+							copy: operations.backup,
+							...resources === undefined ? {} : { resources }
+						});
+						if (!preserved.ok) throw new Error(preserved.error.detail);
+						recoveryPaths.set(destination, preserved.value);
 					}
 				}
 				stage = "write";
@@ -399,7 +408,6 @@ function init_SetupSkill() {
 			if (inspection.ok && !inspection.value.installedDestination) return undefined;
 			const content = inspection.ok ? inspection.value.manifest : inspection.error.manifest;
 			const issues = inspection.ok ? [] : inspection.error.issues;
-			if (content === undefined && issues.length === 0) return undefined;
 			const toolCount = content === undefined ? undefined : /^\s{2}tool_count:\s*(\d+)\s*$/mu.exec(content)?.[1];
 			return {
 				canonical: inspection.ok && inspection.value.canonical,
@@ -683,7 +691,7 @@ function init_DshCordisPatch() {
 					...literals,
 					...overrides
 				};
-				const validated = validation === "fragment" ? parseEnvironmentValues(environment) : parseEnvironment(environment, unresolvedSettings);
+				const validated = validation === "fragment" ? parseEnvironmentValues(environment, unresolvedSettings) : parseEnvironment(environment, unresolvedSettings);
 				return validated.ok ? ok(environment) : validated;
 			}
 			desired(command, overrides) {
@@ -821,7 +829,7 @@ function init_DshCordisPatch() {
 
 //#endregion
 //#region dist/application/HermesConfigurationYaml.js
-var SOURCE_SCALAR_TAGS, timestampTag, timestampSource, hermesTimestampImplicit, floorDivide, civilDay, parseHermesTimestamp, numericValue, numericValuesEqual, sameResolvedScalarValue, keepScalarSource, createHermesYamlOptions, stringifyHermesConfigurationYaml, isEmptyYamlRoot, parseHermesDocument, parseHermesConfigurationYaml, editHermesConfigurationYaml;
+var SOURCE_SCALAR_TAGS, timestampTag, timestampSource, hermesTimestampImplicit, floorDivide, civilDay, parseHermesTimestamp, numericValue, numericValuesEqual, sameResolvedScalarValue, keepScalarSource, createHermesYamlOptions, stringifyHermesConfigurationYaml, isEmptyYamlRoot, parseHermesDocument, parseHermesConfigurationYaml, retainHermesScalarSource, editHermesConfigurationYaml;
 function init_HermesConfigurationYaml() {
 	return (init_HermesConfigurationYaml = __esmMin((() => {
 		SOURCE_SCALAR_TAGS = new Set([
@@ -999,6 +1007,22 @@ function init_HermesConfigurationYaml() {
 			const document = parseHermesDocument(text);
 			return isEmptyYamlRoot(document.contents) ? {} : document.toJS({ reviver: (_key, value) => typeof value === "bigint" ? Number(value) : value });
 		};
+		retainHermesScalarSource = (previous, next) => {
+			if (isScalar(previous) && isScalar(next) && previous.value === next.value) return previous;
+			if (isMap(previous) && isMap(next)) {
+				const entries = new Map(previous.items.flatMap((pair) => isScalar(pair.key) && typeof pair.key.value === "string" ? [[pair.key.value, pair]] : []));
+				for (const pair of next.items) {
+					const key = isScalar(pair.key) ? pair.key.value : undefined;
+					const prior = typeof key === "string" ? entries.get(key) : undefined;
+					if (prior === undefined) continue;
+					pair.key = prior.key;
+					if (isNode(pair.value)) pair.value = retainHermesScalarSource(prior.value, pair.value);
+				}
+			} else if (isSeq(previous) && isSeq(next)) {
+				next.items = next.items.map((item, index) => isNode(item) ? retainHermesScalarSource(previous.items[index], item) : item);
+			}
+			return next;
+		};
 		editHermesConfigurationYaml = (text, path, value) => {
 			const document = parseHermesDocument(text);
 			const root = document.contents;
@@ -1013,20 +1037,28 @@ function init_HermesConfigurationYaml() {
 					const parent = path.slice(0, length);
 					if (!document.hasIn(parent)) document.setIn(parent, document.createNode({}));
 				}
-				document.setIn(path, value);
-			}
-			return document.toString({ lineWidth: 0 });
+				const previous = document.getIn(path, true);
+				document.setIn(path, isMap(previous) || isSeq(previous) ? retainHermesScalarSource(previous, document.createNode(value)) : value);
+			}
+			return document.toString({
+				lineWidth: 0,
+				...document.directives?.yaml.version === "1.2" ? {
+					defaultStringType: "QUOTE_DOUBLE",
+					defaultKeyType: "QUOTE_DOUBLE"
+				} : {}
+			});
 		};
 	})))();
 }
 
 //#endregion
 //#region dist/application/ClientConfigurationDocument.js
-var objectSchema, clientConfigurationValuesEqual, normalizeConfigurationValue, clientConfigurationServersKey, isEmptyClientConfigurationText, parseDocument$1, ClientConfigurationShapeError, requireObject, parseZcodeFallbackConfiguration, OPENCODE_V2_MCP_SETTINGS, parseClientConfiguration, effectiveClientServer, withClientServers, valueAt, TOML_BASIC_ESCAPES, skipHorizontalSpace, decodeBasicEscape, parseQuotedKey, parseBareKey, parseTomlTableHeader, tomlStringModeAfter, closeMultiline, isBlankOrComment, looksLikeTomlHeader, isTomlServerTable, parseKeyPath, parseAssignment, skipWsAndComments, endOfTomlValue, endOfContainer, tomlBasicString, tomlInlineKey, tomlInlineValue, readTrivia, commasOutsideComments, hasSeparatorComma, editInlineServerTable, rebuildInlineTable, rebuildDelimitedEntries, tomlStringValue, tomlArrayWithoutString, disabledServerListEdit, disabledServerListLines, upsertTomlServerSection, tomlServerEntry, grokServerListedDisabled, OMP_DISABLED_SERVERS_KEY, ompServerListedDisabled, OMP_ENABLED_SERVERS_KEY, clientServerForcedEnabled, clientServerListedDisabled, serializeGrokConfiguration, withoutEmptyServerTable, serializeCodexConfiguration, tomlTextHolds, commentsBetweenProperties, deleteJsonPropertyPreservingComments, serializeClientConfiguration, clientServerPath, legacyClientServerPath, serializeHermesConfiguration, clientRegistrationEntry, parseGeminiMcpPolicy, normalizeGeminiServerName, geminiServerPolicyBlock;
+var objectSchema, clientConfigurationValuesEqual, normalizeConfigurationValue, clientConfigurationServersKey, isEmptyClientConfigurationText, INT64_MIN, INT64_MAX, parseClientToml, parseDocument$1, ClientConfigurationShapeError, requireObject, parseZcodeFallbackConfiguration, OPENCODE_V2_MCP_SETTINGS, parseClientConfiguration, effectiveClientServer, withClientServers, valueAt, TOML_BASIC_ESCAPES, skipHorizontalSpace, decodeBasicEscape, parseQuotedKey, parseBareKey, parseTomlTableHeader, tomlStringModeAfter, closeMultiline, isBlankOrComment, looksLikeTomlHeader, isTomlServerTable, parseKeyPath, parseAssignment, skipWsAndComments, endOfTomlValue, endOfContainer, tomlBasicString, tomlInlineKey, tomlInlineValue, readTrivia, commasOutsideComments, hasSeparatorComma, editInlineServerTable, rebuildInlineTable, rebuildDelimitedEntries, tomlStringValue, tomlArrayWithoutString, disabledServerListEdit, disabledServerListLines, withoutTrailingLineFeeds, upsertTomlServerSection, tomlServerEntry, grokServerListedDisabled, OMP_DISABLED_SERVERS_KEY, ompServerListedDisabled, OMP_ENABLED_SERVERS_KEY, clientServerForcedEnabled, clientServerListedDisabled, serializeGrokConfiguration, withoutEmptyServerTable, serializeCodexConfiguration, tomlTextHolds, JSON_COMMA, nextJsoncToken, isJsonMember, effectiveJsonProperty, applyFormattedJsonEdit, deleteJsonProperty, editJsonMember, serializeClientConfiguration, clientServerPath, legacyClientServerPath, serializeHermesConfiguration, clientRegistrationEntry, parseGeminiMcpPolicy, normalizeGeminiServerName, geminiServerPolicyBlock;
 function init_ClientConfigurationDocument() {
 	return (init_ClientConfigurationDocument = __esmMin((() => {
 		init_DshCordisPatch();
 		init_HermesConfigurationYaml();
+		init_result();
 		init_identity();
 		init_unicodeCodePointOrder();
 		objectSchema = z.record(z.string(), z.unknown());
@@ -1048,8 +1080,20 @@ function init_ClientConfigurationDocument() {
 			}
 		};
 		isEmptyClientConfigurationText = (text) => text.replace(/^\uFEFF/, "").trim() === "";
+		INT64_MIN = -(2n ** 63n);
+		INT64_MAX = 2n ** 63n - 1n;
+		parseClientToml = (text) => {
+			const parsed = parse$1(text, { integersAsBigInt: "asNeeded" });
+			const pending = [parsed];
+			for (let value = pending.pop(); value !== undefined; value = pending.pop()) {
+				if (typeof value === "bigint") {
+					if (value < INT64_MIN || value > INT64_MAX) throw new SyntaxError(`Invalid TOML document: integer ${String(value)} is outside the signed 64-bit range`);
+				} else if (typeof value === "object" && value !== null && !(value instanceof Date)) for (const nested of Object.values(value)) pending.push(nested);
+			}
+			return parsed;
+		};
 		parseDocument$1 = (text, format) => {
-			if (format === "toml" || format === "grok") return requireObject(parse$1(text), "The configuration root");
+			if (format === "toml" || format === "grok") return requireObject(parseClientToml(text), "The configuration root");
 			if (format === "pi" || format === "kimi") {
 				if (format === "kimi" && text.trim().length === 0) return {};
 				return requireObject(JSON.parse(text), "The configuration root");
@@ -1057,6 +1101,7 @@ function init_ClientConfigurationDocument() {
 			if (isEmptyClientConfigurationText(text)) return {};
 			if (format === "hermes") return requireObject(parseHermesConfigurationYaml(text), "The configuration root");
 			if (format === "zcode") return requireObject(JSON.parse(text), "The configuration root");
+			if (format === "claude_code") return requireObject(JSON.parse(text.replace(/^\uFEFF/, "")), "The configuration root");
 			const errors = [];
 			const jsonText = text.startsWith("") ? ` ${text.slice(1)}` : text;
 			const document = parse(jsonText, errors, { allowTrailingComma: true });
@@ -1424,6 +1469,7 @@ function init_ClientConfigurationDocument() {
 			if (typeof value === "string") return tomlBasicString(value);
 			if (typeof value === "boolean") return value ? "true" : "false";
 			if (typeof value === "number" && Number.isFinite(value)) return String(value);
+			if (typeof value === "bigint") return String(value);
 			if (Array.isArray(value)) return `[${value.map((item) => tomlInlineValue(item)).join(", ")}]`;
 			if (typeof value === "object" && value !== null) {
 				const body = Object.entries(value).map(([key, nested]) => `${tomlInlineKey(key)} = ${tomlInlineValue(nested)}`).join(", ");
@@ -1527,7 +1573,7 @@ function init_ClientConfigurationDocument() {
 		};
 		tomlStringValue = (text) => {
 			try {
-				const value = parse$1(`value = ${text}`)["value"];
+				const value = parseClientToml(`value = ${text}`)["value"];
 				return typeof value === "string" ? value : undefined;
 			} catch (cause) {
 				void cause;
@@ -1593,6 +1639,11 @@ function init_ClientConfigurationDocument() {
 				}
 			}
 		};
+		withoutTrailingLineFeeds = (text) => {
+			let end = text.length;
+			while (end > 0 && text.charCodeAt(end - 1) === 10) end -= 1;
+			return text.slice(0, end);
+		};
 		upsertTomlServerSection = (originalText, serverKey, entry, format) => {
 			const bom = originalText.startsWith("");
 			const source = bom ? originalText.slice(1) : originalText;
@@ -1614,15 +1665,13 @@ function init_ClientConfigurationDocument() {
 			const discardPending = () => {
 				pending.length = 0;
 			};
+			const appendLines = (lines) => {
+				for (const line of lines) kept.push(line);
+			};
 			const flushPending = () => {
-				kept.push(...pending);
+				appendLines(pending);
 				pending.length = 0;
 			};
-			const lineIndexAt = (offset) => {
-				let line = 0;
-				for (let index = 0; index < lineStarts.length; index += 1) if ((lineStarts[index] ?? 0) <= offset) line = index;
-				return line;
-			};
 			let lineIndex = 0;
 			while (lineIndex < lines.length) {
 				const physical = lines[lineIndex] ?? "";
@@ -1656,7 +1705,9 @@ function init_ClientConfigurationDocument() {
 					const valueEnd = endOfTomlValue(text, valueOffset);
 					let statementEnd = valueEnd;
 					while (statementEnd < text.length && text[statementEnd] !== "\n") statementEnd += 1;
-					const endLine = lineIndexAt(Math.max(statementEnd - 1, lineStart));
+					const lastOffset = Math.max(statementEnd - 1, lineStart);
+					let endLine = lineIndex;
+					while (endLine + 1 < lineStarts.length && (lineStarts[endLine + 1] ?? 0) <= lastOffset) endLine += 1;
 					if (skipping) {
 						discardPending();
 						lineIndex = endLine + 1;
@@ -1676,7 +1727,7 @@ function init_ClientConfigurationDocument() {
 					}), lines, lineIndex, endLine) : undefined;
 					if (disabledLines !== undefined) {
 						flushPending();
-						kept.push(...disabledLines);
+						appendLines(disabledLines);
 						lineIndex = endLine + 1;
 						mode = "none";
 						continue;
@@ -1691,7 +1742,7 @@ function init_ClientConfigurationDocument() {
 							const prefix = text.slice(lineStart, open);
 							const suffix = text.slice(valueEnd, statementEnd);
 							const replacement = edited === undefined ? text.slice(lineStart, statementEnd) : `${prefix}${edited}${suffix}`;
-							kept.push(...replacement.split("\n"));
+							appendLines(replacement.split("\n"));
 							inlineServerTable = true;
 						} else discardPending();
 					} else {
@@ -1728,11 +1779,11 @@ function init_ClientConfigurationDocument() {
 			let body = kept.join("\n");
 			if (body.endsWith("\r")) body += "\n";
 			if (entry !== undefined && !inlineServerTable) {
-				let fragment = stringify({ mcp_servers: { [serverKey]: entry } }).replace(/\n+$/u, "");
+				let fragment = withoutTrailingLineFeeds(stringify({ mcp_servers: { [serverKey]: entry } }));
 				if (crlf) fragment = fragment.replaceAll("\n", "\r\n");
 				const nl = crlf ? "\r\n" : "\n";
 				const endedWithNewline = body.endsWith("\n");
-				const base = body.replace(/\n+$/u, "");
+				const base = withoutTrailingLineFeeds(body);
 				const trimmed = endedWithNewline && base.endsWith("\r") ? base.slice(0, -1) : base;
 				body = trimmed.length === 0 ? `${fragment}${nl}` : `${trimmed}${nl}${nl}${fragment}${nl}`;
 			}
@@ -1776,98 +1827,111 @@ function init_ClientConfigurationDocument() {
 		};
 		tomlTextHolds = (text, document) => {
 			try {
-				return clientConfigurationValuesEqual(withoutEmptyServerTable(objectSchema.parse(parse$1(text))), withoutEmptyServerTable(document));
+				return clientConfigurationValuesEqual(withoutEmptyServerTable(objectSchema.parse(parseClientToml(text))), withoutEmptyServerTable(document));
 			} catch (cause) {
 				void cause;
 				return false;
 			}
 		};
-		commentsBetweenProperties = (gap) => {
-			const pieces = [];
-			let index = 0;
-			while (index < gap.length) {
-				const line = gap.indexOf("//", index);
-				const block = gap.indexOf("/*", index);
-				if (line < 0 && block < 0) break;
-				const start = line < 0 ? block : block < 0 ? line : Math.min(line, block);
-				const lineComment = start === line;
-				const close = lineComment ? gap.indexOf("\n", start) : gap.indexOf("*/", start + 2);
-				if (!lineComment && close < 0) return undefined;
-				const end = lineComment ? close < 0 ? gap.length : close : close + 2;
-				const comment = gap.slice(start, end);
-				const lineBreak = gap.lastIndexOf("\n", start - 1);
-				if (lineBreak < 0) pieces.push(` ${comment}`);
-				else {
-					const prefix = gap.slice(lineBreak + 1, start);
-					let indentEnd = 0;
-					while (prefix[indentEnd] === " " || prefix[indentEnd] === "	") indentEnd += 1;
-					const newline = lineBreak > 0 && gap[lineBreak - 1] === "\r" ? "\r\n" : "\n";
-					pieces.push(`${newline}${prefix.slice(0, indentEnd)}${comment}`);
+		JSON_COMMA = 5;
+		nextJsoncToken = (text, offset) => {
+			const scanner = createScanner(text, true);
+			scanner.setPosition(offset);
+			const kind = scanner.scan();
+			return {
+				kind,
+				offset: scanner.getTokenOffset()
+			};
+		};
+		isJsonMember = (property, key) => property.children?.length === 2 && property.children[0]?.value === key;
+		effectiveJsonProperty = (object, key) => object.children?.findLast((property) => isJsonMember(property, key));
+		applyFormattedJsonEdit = (text, edit) => {
+			const edited = applyEdits(text, [edit]);
+			let begin = edit.offset;
+			let end = edit.offset + edit.content.length;
+			if (edit.length === 0) {
+				while (begin > 0 && !"\r\n".includes(edited.charAt(begin - 1))) begin -= 1;
+				while (end < edited.length && !"\r\n".includes(edited.charAt(end))) end += 1;
+			}
+			return applyEdits(edited, format(edited, {
+				offset: begin,
+				length: end - begin
+			}, {
+				insertSpaces: true,
+				tabSize: 2,
+				eol: "\n",
+				keepLines: false
+			}));
+		};
+		deleteJsonProperty = (text, object, property) => {
+			const siblings = object.children ?? [];
+			const propertyIndex = siblings.indexOf(property);
+			const previous = siblings[propertyIndex - 1];
+			const next = siblings[propertyIndex + 1];
+			const comma = nextJsoncToken(text, previous === undefined ? property.offset + property.length : previous.offset + previous.length);
+			if (propertyIndex < 0 || comma.kind !== JSON_COMMA && (previous !== undefined || next !== undefined)) throw new TypeError("JSON property separator was not found");
+			const edits = [{
+				offset: property.offset,
+				length: property.length,
+				content: ""
+			}, ...comma.kind === JSON_COMMA ? [{
+				offset: comma.offset,
+				length: 1,
+				content: ""
+			}] : []];
+			return applyEdits(text, edits);
+		};
+		editJsonMember = (text, path, value) => {
+			let object = parseTree(text, [], { allowTrailingComma: true });
+			for (const [index, key] of path.entries()) {
+				if (object?.type !== "object") throw new TypeError("JSON edit parent is not an object");
+				const property = effectiveJsonProperty(object, key);
+				const member = property?.children?.[1];
+				if (property === undefined || member === undefined) {
+					if (value === undefined) return ok(text);
+					const content = `${JSON.stringify(key)}: ${JSON.stringify(path.slice(index + 1).reduceRight((nested, name) => ({ [name]: nested }), value))}`;
+					const previous = object.children?.at(-1);
+					return ok(applyFormattedJsonEdit(text, previous === undefined ? {
+						offset: object.offset + 1,
+						length: 0,
+						content
+					} : {
+						offset: previous.offset + previous.length,
+						length: 0,
+						content: `,${content}`
+					}));
 				}
-				index = end;
-			}
-			return pieces.length === 0 ? undefined : pieces.join("");
-		};
-		deleteJsonPropertyPreservingComments = (text, path) => {
-			const root = parseTree(text, [], { allowTrailingComma: true });
-			const value = root === undefined ? undefined : findNodeAtLocation(root, [...path]);
-			const property = value?.parent;
-			const parent = property?.parent;
-			if (property === undefined || parent?.type !== "object" || property.type !== "property" || parent.children === undefined) return undefined;
-			const propertyIndex = parent.children.indexOf(property);
-			const previous = parent.children[propertyIndex - 1];
-			if (propertyIndex <= 0 || previous === undefined) return undefined;
-			const comments = commentsBetweenProperties(text.slice(previous.offset + previous.length, property.offset));
-			if (comments === undefined) return undefined;
-			let removeEnd = property.offset + property.length;
-			const hasNext = parent.children[propertyIndex + 1] !== undefined;
-			if (hasNext) {
-				let comma = removeEnd;
-				while (comma < text.length) {
-					const char = text[comma];
-					if (char === " " || char === "	" || char === "\r" || char === "\n") {
-						comma += 1;
-						continue;
-					}
-					if (text.startsWith("/*", comma)) {
-						const close = text.indexOf("*/", comma + 2);
-						if (close < 0) return undefined;
-						comma = close + 2;
-						continue;
-					}
-					if (text.startsWith("//", comma)) {
-						while (comma < text.length && text[comma] !== "\n" && text[comma] !== "\r") comma += 1;
-						continue;
-					}
-					break;
+				if (index < path.length - 1) {
+					object = member;
+					continue;
 				}
-				if (text[comma] !== ",") return undefined;
-				removeEnd = comma + 1;
+				if (value !== undefined) return ok(applyFormattedJsonEdit(text, {
+					offset: member.offset,
+					length: member.length,
+					content: JSON.stringify(value)
+				}));
+				if (object.children?.some((sibling) => sibling !== property && isJsonMember(sibling, key))) return err({
+					kind: "shadowed_member",
+					path
+				});
+				return ok(deleteJsonProperty(text, object, property));
 			}
-			const remainder = text.slice(removeEnd);
-			let suffix = `${hasNext ? "," : ""}${comments}`;
-			if (suffix.includes("//") && !suffix.endsWith("\n") && !suffix.endsWith("\r") && !remainder.startsWith("\n") && !remainder.startsWith("\r")) suffix += "\n";
-			return `${text.slice(0, previous.offset + previous.length)}${suffix}${remainder}`;
+			throw new TypeError("JSON edit path is empty");
 		};
 		serializeClientConfiguration = (document, format, originalText, editedPaths) => {
 			if (format === undefined || format === "unsupported") throw new TypeError("client does not have a supported MCP config format");
-			if (format === "toml") return serializeCodexConfiguration(document, originalText);
-			if (format === "grok") return serializeGrokConfiguration(document, originalText);
-			if (format === "hermes") return serializeHermesConfiguration(document, originalText);
-			if (format === "dsh") return serializeDshDocument(document);
-			if (originalText !== undefined && !isEmptyClientConfigurationText(originalText) && editedPaths !== undefined) return editedPaths.reduce((text, path) => {
-				const value = valueAt(document, path);
-				if (value === undefined) {
-					const preserved = deleteJsonPropertyPreservingComments(text, path);
-					if (preserved !== undefined) return preserved;
-				}
-				return applyEdits(text, modify(text, [...path], value, { formattingOptions: {
-					insertSpaces: true,
-					tabSize: 2,
-					eol: "\n"
-				} }));
-			}, originalText);
-			return `${JSON.stringify(document, null, 2)}\n`;
+			if (format === "toml") return ok(serializeCodexConfiguration(document, originalText));
+			if (format === "grok") return ok(serializeGrokConfiguration(document, originalText));
+			if (format === "hermes") return ok(serializeHermesConfiguration(document, originalText));
+			if (format === "dsh") return ok(serializeDshDocument(document));
+			if (originalText === undefined || isEmptyClientConfigurationText(originalText) || editedPaths === undefined) return ok(`${JSON.stringify(document, null, 2)}\n`);
+			let text = originalText;
+			for (const path of editedPaths) {
+				const edited = editJsonMember(text, path, valueAt(document, path));
+				if (!edited.ok) return edited;
+				text = edited.value;
+			}
+			return ok(text);
 		};
 		clientServerPath = (parsed, name) => [...parsed.serversPath, name];
 		legacyClientServerPath = (parsed, name) => Object.hasOwn(parsed.legacyServers, name) ? [parsed.serversPath[0] ?? "mcp", name] : undefined;
@@ -1954,4 +2018,4 @@ function init_ClientConfigurationDocument() {
 }
 
 //#endregion
-export { ClientConfigurationShapeError, DshCordisDocument, MANAGED_SKILL_FILES, OMP_DISABLED_SERVERS_KEY, canonicalSkillNeedsInstall, clientConfigurationValuesEqual, clientRegistrationEntry, clientServerForcedEnabled, clientServerListedDisabled, clientServerPath, dshDocument, effectiveClientServer, existingSkillDestinations, geminiServerPolicyBlock, init_ClientConfigurationDocument, init_DshCordisPatch, init_SetupRecoveryBackup, init_SetupSkill, installCanonicalSkill, isManagedSkillManifest, legacyClientServerPath, parseClientConfiguration, parseGeminiMcpPolicy, parseZcodeFallbackConfiguration, preserveRecoveryBackup, readInstalledSkillIdentity, readSkillFile, selectCurrentRecoveryBackup, serializeClientConfiguration, skillDestinations, validateCanonicalSkillDirectories, withClientServers };
+export { ClientConfigurationShapeError, DshCordisDocument, MANAGED_SKILL_FILES, OMP_DISABLED_SERVERS_KEY, canonicalSkillNeedsInstall, clientConfigurationValuesEqual, clientRegistrationEntry, clientServerForcedEnabled, clientServerListedDisabled, clientServerPath, dshDocument, effectiveClientServer, existingSkillDestinations, geminiServerPolicyBlock, init_ClientConfigurationDocument, init_DshCordisPatch, init_SetupRecoveryBackup, init_SetupSkill, installCanonicalSkill, isManagedSkillManifest, legacyClientServerPath, parseClientConfiguration, parseGeminiMcpPolicy, parseZcodeFallbackConfiguration, preserveCurrentRecoveryBackup, readInstalledSkillIdentity, readSkillFile, selectCurrentRecoveryBackup, serializeClientConfiguration, skillDestinations, validateCanonicalSkillDirectories, withClientServers };