codexslimedit 0.7.4-dev.29700855995.1 → 0.7.4-dev.29702567006.1

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import type { Readable, Writable } from "node:stream";
 
 /** Current independent codexslimedit package version. */
-export declare const CODEX_SLIM_EDIT_VERSION = "0.1.0";
+export declare const CODEX_SLIM_EDIT_VERSION = "0.7.4-dev.29702567006.1";
 
 /** Returns whether command-line arguments request the package version. */
 export declare function isVersionRequest(args: readonly string[]): boolean;

package/dist/mcp.js

@@ -4523,6 +4523,7 @@ async function readWorkspaceFile(input) {
 async function editWorkspaceFile(input) {
 	const target = await resolveWorkspaceFile(input);
 	const nextContent = replaceContent(await readUtf8Text(target.absolutePath), input.oldString, input.newString);
+	validateText(nextContent);
 	await atomicWrite(target.absolutePath, nextContent);
 	return {
 		path: target.relativePath,
@@ -4562,9 +4563,19 @@ async function createWorkspaceFile(input) {
 		content: input.content
 	};
 }
+/** Validates a new workspace file without modifying the workspace. */
+async function prepareWorkspaceFileCreation(input) {
+	const target = await resolveNewWorkspaceFile(input, false);
+	validateText(input.content);
+	return {
+		path: target.relativePath,
+		content: input.content
+	};
+}
 /** Deletes one existing regular workspace file. */
 async function deleteWorkspaceFile(input) {
 	const target = await resolveWorkspaceFile(input);
+	if ((await lstat(resolve(await existingDirectory(input.root), normalizeSeparators(input.filePath)))).isSymbolicLink()) throw new WorkspaceFileError("NOT_A_FILE", "Deleting symbolic links is not supported.");
 	const content = await readUtf8Text(target.absolutePath);
 	try {
 		await rm(target.absolutePath);
@@ -4587,7 +4598,7 @@ async function resolveWorkspaceFile(input) {
 		relativePath: relative(rootPath, resolvedCandidate).split(sep).join("/")
 	};
 }
-async function resolveNewWorkspaceFile(input) {
+async function resolveNewWorkspaceFile(input, createParent = true) {
 	const rootPath = await existingDirectory(input.root);
 	const candidate = resolve(rootPath, normalizeSeparators(input.filePath));
 	if (!isInside(rootPath, candidate)) throw new WorkspaceFileError("PATH_OUTSIDE_ROOT", "filePath must remain inside the workspace root.");
@@ -4597,13 +4608,13 @@ async function resolveNewWorkspaceFile(input) {
 	} catch (error) {
 		if (error instanceof WorkspaceFileError) throw error;
 	}
-	const absolutePath = resolve(await createSafeParent(rootPath, dirname(candidate)), basename(candidate));
+	const absolutePath = resolve(await safeParent(rootPath, dirname(candidate), createParent), basename(candidate));
 	return {
 		absolutePath,
 		relativePath: relative(rootPath, absolutePath).split(sep).join("/")
 	};
 }
-async function createSafeParent(rootPath, requestedParent) {
+async function safeParent(rootPath, requestedParent, createParent) {
 	const missingDirectories = [];
 	let existingParent = requestedParent;
 	while (true) try {
@@ -4616,7 +4627,7 @@ async function createSafeParent(rootPath, requestedParent) {
 	}
 	if (existingParent !== rootPath && !isInside(rootPath, existingParent)) throw new WorkspaceFileError("PATH_OUTSIDE_ROOT", "filePath parent resolves outside the workspace root through a symlink.");
 	const parentPath = resolve(existingParent, ...missingDirectories.reverse());
-	await mkdir(parentPath, { recursive: true });
+	if (createParent) await mkdir(parentPath, { recursive: true });
 	return parentPath;
 }
 async function existingDirectory(root) {
@@ -4654,7 +4665,10 @@ async function readUtf8Text(path) {
 		throw new WorkspaceFileError("UNREADABLE_FILE", "filePath could not be read.");
 	}
 	try {
-		const content = new TextDecoder("utf-8", { fatal: true }).decode(bytes);
+		const content = new TextDecoder("utf-8", {
+			fatal: true,
+			ignoreBOM: true
+		}).decode(bytes);
 		validateText(content);
 		return content;
 	} catch {
@@ -4765,38 +4779,69 @@ function message(error) {
 /** Applies Codex add, update, and delete patch operations inside a workspace. */
 async function applyWorkspacePatch(input) {
 	const operations = parsePatch(input.patch);
+	const planned = await planOperations(input.root, operations);
 	const paths = [];
-	for (const operation of operations) {
+	for (const { operation, path, content } of planned) {
 		if (operation.kind === "add") {
-			const result = await createWorkspaceFile({
+			await createWorkspaceFile({
 				root: input.root,
 				filePath: operation.filePath,
 				content: operation.content
 			});
-			paths.push(result.path);
+			paths.push(path);
 			continue;
 		}
 		if (operation.kind === "delete") {
-			const result = await deleteWorkspaceFile({
+			await deleteWorkspaceFile({
 				root: input.root,
 				filePath: operation.filePath
 			});
-			paths.push(result.path);
+			paths.push(path);
 			continue;
 		}
-		const current = await readWorkspaceFile({
-			root: input.root,
-			filePath: operation.filePath
-		});
-		const result = await writeWorkspaceFile({
+		await writeWorkspaceFile({
 			root: input.root,
 			filePath: operation.filePath,
-			content: applyUpdateHunks(current.content, operation.hunks)
+			content: content ?? ""
 		});
-		paths.push(result.path);
+		paths.push(path);
 	}
 	return { paths };
 }
+async function planOperations(root, operations) {
+	const planned = [];
+	const paths = /* @__PURE__ */ new Set();
+	for (const operation of operations) {
+		if (operation.kind === "add") {
+			const result = await prepareWorkspaceFileCreation({
+				root,
+				filePath: operation.filePath,
+				content: operation.content
+			});
+			assertUniquePath(paths, result.path);
+			planned.push({
+				operation,
+				path: result.path
+			});
+			continue;
+		}
+		const current = await readWorkspaceFile({
+			root,
+			filePath: operation.filePath
+		});
+		assertUniquePath(paths, current.path);
+		planned.push({
+			operation,
+			path: current.path,
+			content: operation.kind === "update" ? applyUpdateHunks(current.content, operation.hunks) : void 0
+		});
+	}
+	return planned;
+}
+function assertUniquePath(paths, path) {
+	if (paths.has(path)) invalidPatch(`Patch contains multiple operations for ${path}.`);
+	paths.add(path);
+}
 function parsePatch(patch) {
 	const lines = patch.replace(/\r\n|\r/g, "\n").split("\n");
 	while (lines.at(-1) === "") lines.pop();
@@ -4811,8 +4856,12 @@ function parsePatch(patch) {
 		index += 1;
 		if (addPath !== void 0) {
 			const contentLines = [];
-			while (index < lines.length - 1 && !lines[index]?.startsWith("*** ")) {
+			while (index < lines.length - 1 && !isOperationHeader(lines[index])) {
 				const line = lines[index];
+				if (line === "*** End of File") {
+					index += 1;
+					break;
+				}
 				if (!line?.startsWith("+")) invalidPatch("Add File lines must start with `+`.");
 				contentLines.push(line.slice(1));
 				index += 1;
@@ -4835,8 +4884,12 @@ function parsePatch(patch) {
 			const hunks = [];
 			let oldLines;
 			let newLines;
-			while (index < lines.length - 1 && !lines[index]?.startsWith("*** ")) {
+			while (index < lines.length - 1 && !isOperationHeader(lines[index])) {
 				const line = lines[index];
+				if (line === "*** End of File") {
+					index += 1;
+					break;
+				}
 				if (line?.startsWith("@@")) {
 					if (oldLines !== void 0 && newLines !== void 0) hunks.push(validHunk(oldLines, newLines));
 					oldLines = [];
@@ -4866,6 +4919,9 @@ function parsePatch(patch) {
 	if (operations.length === 0) invalidPatch("Patch must contain at least one file operation.");
 	return operations;
 }
+function isOperationHeader(line) {
+	return /^\*\*\* (?:Add|Update|Delete) File: /.test(line ?? "");
+}
 function validHunk(oldLines, newLines) {
 	if (oldLines.length === 0) invalidPatch("Update hunks require old or context lines for deterministic placement.");
 	return {
@@ -4906,7 +4962,7 @@ function invalidPatch(message) {
 //#endregion
 //#region src/version.ts
 /** Current independent codexslimedit package version. */
-var CODEX_SLIM_EDIT_VERSION = "0.7.4-dev.29700855995.1";
+var CODEX_SLIM_EDIT_VERSION = "0.7.4-dev.29702567006.1";
 /** Returns whether command-line arguments request the package version. */
 function isVersionRequest(args) {
 	return args.includes("--version");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codexslimedit",
-  "version": "0.7.4-dev.29700855995.1",
+  "version": "0.7.4-dev.29702567006.1",
   "description": "Concise, workspace-safe MCP file reading and editing.",
   "license": "SUL-1.0",
   "repository": {