lalph 0.1.33 → 0.1.34

package/dist/cli.mjs

@@ -1579,8 +1579,8 @@ function formatPropertyKey(name) {
 *
 * @internal
 */
-function formatPath(path) {
-	return path.map((key) => `[${formatPropertyKey(key)}]`).join("");
+function formatPath(path$2) {
+	return path$2.map((key) => `[${formatPropertyKey(key)}]`).join("");
 }
 /**
 * Fast path for formatting dates.
@@ -21555,9 +21555,9 @@ var Pointer = class extends Base$1 {
 	* The issue that occurred.
 	*/
 	issue;
-	constructor(path, issue) {
+	constructor(path$2, issue) {
 		super();
-		this.path = path;
+		this.path = path$2;
 		this.issue = issue;
 	}
 };
@@ -21786,41 +21786,41 @@ const defaultCheckHook = (issue) => {
 function getExpectedMessage(expected, actual) {
 	return `Expected ${expected}, got ${actual}`;
 }
-function toDefaultIssues(issue, path, leafHook, checkHook) {
+function toDefaultIssues(issue, path$2, leafHook, checkHook) {
 	switch (issue._tag) {
 		case "Filter": {
 			const message = checkHook(issue);
 			if (message !== void 0) return [{
-				path,
+				path: path$2,
 				message
 			}];
 			switch (issue.issue._tag) {
 				case "InvalidValue": return [{
-					path,
+					path: path$2,
 					message: getExpectedMessage(formatCheck(issue.filter), format$2(issue.actual))
 				}];
-				default: return toDefaultIssues(issue.issue, path, leafHook, checkHook);
+				default: return toDefaultIssues(issue.issue, path$2, leafHook, checkHook);
 			}
 		}
-		case "Encoding": return toDefaultIssues(issue.issue, path, leafHook, checkHook);
-		case "Pointer": return toDefaultIssues(issue.issue, [...path, ...issue.path], leafHook, checkHook);
-		case "Composite": return issue.issues.flatMap((issue$1) => toDefaultIssues(issue$1, path, leafHook, checkHook));
+		case "Encoding": return toDefaultIssues(issue.issue, path$2, leafHook, checkHook);
+		case "Pointer": return toDefaultIssues(issue.issue, [...path$2, ...issue.path], leafHook, checkHook);
+		case "Composite": return issue.issues.flatMap((issue$1) => toDefaultIssues(issue$1, path$2, leafHook, checkHook));
 		case "AnyOf": {
 			const message = findMessage(issue);
 			if (issue.issues.length === 0) {
 				if (message !== void 0) return [{
-					path,
+					path: path$2,
 					message
 				}];
 				return [{
-					path,
+					path: path$2,
 					message: getExpectedMessage(getExpected(issue.ast), format$2(issue.actual))
 				}];
 			}
-			return issue.issues.flatMap((issue$1) => toDefaultIssues(issue$1, path, leafHook, checkHook));
+			return issue.issues.flatMap((issue$1) => toDefaultIssues(issue$1, path$2, leafHook, checkHook));
 		}
 		default: return [{
-			path,
+			path: path$2,
 			message: leafHook(issue)
 		}];
 	}
@@ -21848,8 +21848,8 @@ const defaultFormatter$1 = /* @__PURE__ */ makeFormatterDefault();
 function formatDefaultIssue(issue) {
 	let out = issue.message;
 	if (issue.path && issue.path.length > 0) {
-		const path = formatPath(issue.path);
-		out += `\n  at ${path}`;
+		const path$2 = formatPath(issue.path);
+		out += `\n  at ${path$2}`;
 	}
 	return out;
 }
@@ -31056,8 +31056,8 @@ var require_compiler = /* @__PURE__ */ __commonJSMin$1(((exports, module) => {
 				valueAssignments.push(fullPath);
 			}
 		}
-		function pathAssigned(path) {
-			return assignedPaths.indexOf(path) !== -1;
+		function pathAssigned(path$2) {
+			return assignedPaths.indexOf(path$2) !== -1;
 		}
 		function reduceValueNode(node) {
 			if (node.type === "Array") return reduceArrayWithTypeChecking(node.value);
@@ -31074,18 +31074,18 @@ var require_compiler = /* @__PURE__ */ __commonJSMin$1(((exports, module) => {
 			return obj;
 		}
 		function setPath(node) {
-			var path = node.value;
-			var quotedPath = path.map(quoteDottedString).join(".");
+			var path$2 = node.value;
+			var quotedPath = path$2.map(quoteDottedString).join(".");
 			var line = node.line;
 			var column = node.column;
-			if (pathAssigned(quotedPath)) genError("Cannot redefine existing key '" + path + "'.", line, column);
+			if (pathAssigned(quotedPath)) genError("Cannot redefine existing key '" + path$2 + "'.", line, column);
 			assignedPaths.push(quotedPath);
-			context = deepRef(data, path, Object.create(null), line, column);
-			currentPath = path;
+			context = deepRef(data, path$2, Object.create(null), line, column);
+			currentPath = path$2;
 		}
 		function addTableArray(node) {
-			var path = node.value;
-			var quotedPath = path.map(quoteDottedString).join(".");
+			var path$2 = node.value;
+			var quotedPath = path$2.map(quoteDottedString).join(".");
 			var line = node.line;
 			var column = node.column;
 			if (!pathAssigned(quotedPath)) assignedPaths.push(quotedPath);
@@ -31093,13 +31093,13 @@ var require_compiler = /* @__PURE__ */ __commonJSMin$1(((exports, module) => {
 				return p.indexOf(quotedPath) !== 0;
 			});
 			assignedPaths.push(quotedPath);
-			context = deepRef(data, path, [], line, column);
+			context = deepRef(data, path$2, [], line, column);
 			currentPath = quotedPath;
 			if (context instanceof Array) {
 				var newObj = Object.create(null);
 				context.push(newObj);
 				context = newObj;
-			} else genError("Cannot redefine existing key '" + path + "'.", line, column);
+			} else genError("Cannot redefine existing key '" + path$2 + "'.", line, column);
 		}
 		function deepRef(start, keys$1, value, line, column) {
 			var traversed = [];
@@ -31246,17 +31246,17 @@ var require_visit = /* @__PURE__ */ __commonJSMin$1(((exports) => {
 	visit.SKIP = SKIP;
 	/** Remove the current node */
 	visit.REMOVE = REMOVE;
-	function visit_(key, node, visitor, path) {
-		const ctrl = callVisitor(key, node, visitor, path);
+	function visit_(key, node, visitor, path$2) {
+		const ctrl = callVisitor(key, node, visitor, path$2);
 		if (identity.isNode(ctrl) || identity.isPair(ctrl)) {
-			replaceNode(key, path, ctrl);
-			return visit_(key, ctrl, visitor, path);
+			replaceNode(key, path$2, ctrl);
+			return visit_(key, ctrl, visitor, path$2);
 		}
 		if (typeof ctrl !== "symbol") {
 			if (identity.isCollection(node)) {
-				path = Object.freeze(path.concat(node));
+				path$2 = Object.freeze(path$2.concat(node));
 				for (let i = 0; i < node.items.length; ++i) {
-					const ci = visit_(i, node.items[i], visitor, path);
+					const ci = visit_(i, node.items[i], visitor, path$2);
 					if (typeof ci === "number") i = ci - 1;
 					else if (ci === BREAK) return BREAK;
 					else if (ci === REMOVE) {
@@ -31265,11 +31265,11 @@ var require_visit = /* @__PURE__ */ __commonJSMin$1(((exports) => {
 					}
 				}
 			} else if (identity.isPair(node)) {
-				path = Object.freeze(path.concat(node));
-				const ck = visit_("key", node.key, visitor, path);
+				path$2 = Object.freeze(path$2.concat(node));
+				const ck = visit_("key", node.key, visitor, path$2);
 				if (ck === BREAK) return BREAK;
 				else if (ck === REMOVE) node.key = null;
-				const cv = visit_("value", node.value, visitor, path);
+				const cv = visit_("value", node.value, visitor, path$2);
 				if (cv === BREAK) return BREAK;
 				else if (cv === REMOVE) node.value = null;
 			}
@@ -31319,17 +31319,17 @@ var require_visit = /* @__PURE__ */ __commonJSMin$1(((exports) => {
 	visitAsync.SKIP = SKIP;
 	/** Remove the current node */
 	visitAsync.REMOVE = REMOVE;
-	async function visitAsync_(key, node, visitor, path) {
-		const ctrl = await callVisitor(key, node, visitor, path);
+	async function visitAsync_(key, node, visitor, path$2) {
+		const ctrl = await callVisitor(key, node, visitor, path$2);
 		if (identity.isNode(ctrl) || identity.isPair(ctrl)) {
-			replaceNode(key, path, ctrl);
-			return visitAsync_(key, ctrl, visitor, path);
+			replaceNode(key, path$2, ctrl);
+			return visitAsync_(key, ctrl, visitor, path$2);
 		}
 		if (typeof ctrl !== "symbol") {
 			if (identity.isCollection(node)) {
-				path = Object.freeze(path.concat(node));
+				path$2 = Object.freeze(path$2.concat(node));
 				for (let i = 0; i < node.items.length; ++i) {
-					const ci = await visitAsync_(i, node.items[i], visitor, path);
+					const ci = await visitAsync_(i, node.items[i], visitor, path$2);
 					if (typeof ci === "number") i = ci - 1;
 					else if (ci === BREAK) return BREAK;
 					else if (ci === REMOVE) {
@@ -31338,11 +31338,11 @@ var require_visit = /* @__PURE__ */ __commonJSMin$1(((exports) => {
 					}
 				}
 			} else if (identity.isPair(node)) {
-				path = Object.freeze(path.concat(node));
-				const ck = await visitAsync_("key", node.key, visitor, path);
+				path$2 = Object.freeze(path$2.concat(node));
+				const ck = await visitAsync_("key", node.key, visitor, path$2);
 				if (ck === BREAK) return BREAK;
 				else if (ck === REMOVE) node.key = null;
-				const cv = await visitAsync_("value", node.value, visitor, path);
+				const cv = await visitAsync_("value", node.value, visitor, path$2);
 				if (cv === BREAK) return BREAK;
 				else if (cv === REMOVE) node.value = null;
 			}
@@ -31365,16 +31365,16 @@ var require_visit = /* @__PURE__ */ __commonJSMin$1(((exports) => {
 		}, visitor);
 		return visitor;
 	}
-	function callVisitor(key, node, visitor, path) {
-		if (typeof visitor === "function") return visitor(key, node, path);
-		if (identity.isMap(node)) return visitor.Map?.(key, node, path);
-		if (identity.isSeq(node)) return visitor.Seq?.(key, node, path);
-		if (identity.isPair(node)) return visitor.Pair?.(key, node, path);
-		if (identity.isScalar(node)) return visitor.Scalar?.(key, node, path);
-		if (identity.isAlias(node)) return visitor.Alias?.(key, node, path);
+	function callVisitor(key, node, visitor, path$2) {
+		if (typeof visitor === "function") return visitor(key, node, path$2);
+		if (identity.isMap(node)) return visitor.Map?.(key, node, path$2);
+		if (identity.isSeq(node)) return visitor.Seq?.(key, node, path$2);
+		if (identity.isPair(node)) return visitor.Pair?.(key, node, path$2);
+		if (identity.isScalar(node)) return visitor.Scalar?.(key, node, path$2);
+		if (identity.isAlias(node)) return visitor.Alias?.(key, node, path$2);
 	}
-	function replaceNode(key, path, node) {
-		const parent = path[path.length - 1];
+	function replaceNode(key, path$2, node) {
+		const parent = path$2[path$2.length - 1];
 		if (identity.isCollection(parent)) parent.items[key] = node;
 		else if (identity.isPair(parent)) if (key === "key") parent.key = node;
 		else parent.value = node;
@@ -31923,10 +31923,10 @@ var require_Collection = /* @__PURE__ */ __commonJSMin$1(((exports) => {
 	var createNode = require_createNode();
 	var identity = require_identity();
 	var Node = require_Node();
-	function collectionFromPath(schema, path, value) {
+	function collectionFromPath(schema, path$2, value) {
 		let v = value;
-		for (let i = path.length - 1; i >= 0; --i) {
-			const k = path[i];
+		for (let i = path$2.length - 1; i >= 0; --i) {
+			const k = path$2[i];
 			if (typeof k === "number" && Number.isInteger(k) && k >= 0) {
 				const a = [];
 				a[k] = v;
@@ -31943,7 +31943,7 @@ var require_Collection = /* @__PURE__ */ __commonJSMin$1(((exports) => {
 			sourceObjects: /* @__PURE__ */ new Map()
 		});
 	}
-	const isEmptyPath = (path) => path == null || typeof path === "object" && !!path[Symbol.iterator]().next().done;
+	const isEmptyPath = (path$2) => path$2 == null || typeof path$2 === "object" && !!path$2[Symbol.iterator]().next().done;
 	var Collection = class extends Node.NodeBase {
 		constructor(type, schema) {
 			super(type);
@@ -31971,10 +31971,10 @@ var require_Collection = /* @__PURE__ */ __commonJSMin$1(((exports) => {
 		* be a Pair instance or a `{ key, value }` object, which may not have a key
 		* that already exists in the map.
 		*/
-		addIn(path, value) {
-			if (isEmptyPath(path)) this.add(value);
+		addIn(path$2, value) {
+			if (isEmptyPath(path$2)) this.add(value);
 			else {
-				const [key, ...rest] = path;
+				const [key, ...rest] = path$2;
 				const node = this.get(key, true);
 				if (identity.isCollection(node)) node.addIn(rest, value);
 				else if (node === void 0 && this.schema) this.set(key, collectionFromPath(this.schema, rest, value));
@@ -31985,8 +31985,8 @@ var require_Collection = /* @__PURE__ */ __commonJSMin$1(((exports) => {
 		* Removes a value from the collection.
 		* @returns `true` if the item was found and removed.
 		*/
-		deleteIn(path) {
-			const [key, ...rest] = path;
+		deleteIn(path$2) {
+			const [key, ...rest] = path$2;
 			if (rest.length === 0) return this.delete(key);
 			const node = this.get(key, true);
 			if (identity.isCollection(node)) return node.deleteIn(rest);
@@ -31997,8 +31997,8 @@ var require_Collection = /* @__PURE__ */ __commonJSMin$1(((exports) => {
 		* scalar values from their surrounding node; to disable set `keepScalar` to
 		* `true` (collections are always returned intact).
 		*/
-		getIn(path, keepScalar) {
-			const [key, ...rest] = path;
+		getIn(path$2, keepScalar) {
+			const [key, ...rest] = path$2;
 			const node = this.get(key, true);
 			if (rest.length === 0) return !keepScalar && identity.isScalar(node) ? node.value : node;
 			else return identity.isCollection(node) ? node.getIn(rest, keepScalar) : void 0;
@@ -32013,8 +32013,8 @@ var require_Collection = /* @__PURE__ */ __commonJSMin$1(((exports) => {
 		/**
 		* Checks if the collection includes a value with the key `key`.
 		*/
-		hasIn(path) {
-			const [key, ...rest] = path;
+		hasIn(path$2) {
+			const [key, ...rest] = path$2;
 			if (rest.length === 0) return this.has(key);
 			const node = this.get(key, true);
 			return identity.isCollection(node) ? node.hasIn(rest) : false;
@@ -32023,8 +32023,8 @@ var require_Collection = /* @__PURE__ */ __commonJSMin$1(((exports) => {
 		* Sets a value in this collection. For `!!set`, `value` needs to be a
 		* boolean to add/remove the item from the set.
 		*/
-		setIn(path, value) {
-			const [key, ...rest] = path;
+		setIn(path$2, value) {
+			const [key, ...rest] = path$2;
 			if (rest.length === 0) this.set(key, value);
 			else {
 				const node = this.get(key, true);
@@ -34140,8 +34140,8 @@ var require_Document = /* @__PURE__ */ __commonJSMin$1(((exports) => {
 			if (assertCollection(this.contents)) this.contents.add(value);
 		}
 		/** Adds a value to the document. */
-		addIn(path, value) {
-			if (assertCollection(this.contents)) this.contents.addIn(path, value);
+		addIn(path$2, value) {
+			if (assertCollection(this.contents)) this.contents.addIn(path$2, value);
 		}
 		/**
 		* Create a new `Alias` node, ensuring that the target `node` has the required anchor.
@@ -34209,13 +34209,13 @@ var require_Document = /* @__PURE__ */ __commonJSMin$1(((exports) => {
 		* Removes a value from the document.
 		* @returns `true` if the item was found and removed.
 		*/
-		deleteIn(path) {
-			if (Collection.isEmptyPath(path)) {
+		deleteIn(path$2) {
+			if (Collection.isEmptyPath(path$2)) {
 				if (this.contents == null) return false;
 				this.contents = null;
 				return true;
 			}
-			return assertCollection(this.contents) ? this.contents.deleteIn(path) : false;
+			return assertCollection(this.contents) ? this.contents.deleteIn(path$2) : false;
 		}
 		/**
 		* Returns item at `key`, or `undefined` if not found. By default unwraps
@@ -34230,9 +34230,9 @@ var require_Document = /* @__PURE__ */ __commonJSMin$1(((exports) => {
 		* scalar values from their surrounding node; to disable set `keepScalar` to
 		* `true` (collections are always returned intact).
 		*/
-		getIn(path, keepScalar) {
-			if (Collection.isEmptyPath(path)) return !keepScalar && identity.isScalar(this.contents) ? this.contents.value : this.contents;
-			return identity.isCollection(this.contents) ? this.contents.getIn(path, keepScalar) : void 0;
+		getIn(path$2, keepScalar) {
+			if (Collection.isEmptyPath(path$2)) return !keepScalar && identity.isScalar(this.contents) ? this.contents.value : this.contents;
+			return identity.isCollection(this.contents) ? this.contents.getIn(path$2, keepScalar) : void 0;
 		}
 		/**
 		* Checks if the document includes a value with the key `key`.
@@ -34243,9 +34243,9 @@ var require_Document = /* @__PURE__ */ __commonJSMin$1(((exports) => {
 		/**
 		* Checks if the document includes a value at `path`.
 		*/
-		hasIn(path) {
-			if (Collection.isEmptyPath(path)) return this.contents !== void 0;
-			return identity.isCollection(this.contents) ? this.contents.hasIn(path) : false;
+		hasIn(path$2) {
+			if (Collection.isEmptyPath(path$2)) return this.contents !== void 0;
+			return identity.isCollection(this.contents) ? this.contents.hasIn(path$2) : false;
 		}
 		/**
 		* Sets a value in this document. For `!!set`, `value` needs to be a
@@ -34259,10 +34259,10 @@ var require_Document = /* @__PURE__ */ __commonJSMin$1(((exports) => {
 		* Sets a value in this document. For `!!set`, `value` needs to be a
 		* boolean to add/remove the item from the set.
 		*/
-		setIn(path, value) {
-			if (Collection.isEmptyPath(path)) this.contents = value;
-			else if (this.contents == null) this.contents = Collection.collectionFromPath(this.schema, Array.from(path), value);
-			else if (assertCollection(this.contents)) this.contents.setIn(path, value);
+		setIn(path$2, value) {
+			if (Collection.isEmptyPath(path$2)) this.contents = value;
+			else if (this.contents == null) this.contents = Collection.collectionFromPath(this.schema, Array.from(path$2), value);
+			else if (assertCollection(this.contents)) this.contents.setIn(path$2, value);
 		}
 		/**
 		* Change the YAML version and schema used by the document.
@@ -36110,9 +36110,9 @@ var require_cst_visit = /* @__PURE__ */ __commonJSMin$1(((exports) => {
 	/** Remove the current item */
 	visit.REMOVE = REMOVE;
 	/** Find the item at `path` from `cst` as the root */
-	visit.itemAtPath = (cst, path) => {
+	visit.itemAtPath = (cst, path$2) => {
 		let item = cst;
-		for (const [field, index] of path) {
+		for (const [field, index] of path$2) {
 			const tok = item?.[field];
 			if (tok && "items" in tok) item = tok.items[index];
 			else return void 0;
@@ -36124,21 +36124,21 @@ var require_cst_visit = /* @__PURE__ */ __commonJSMin$1(((exports) => {
 	*
 	* Throws an error if the collection is not found, which should never happen if the item itself exists.
 	*/
-	visit.parentCollection = (cst, path) => {
-		const parent = visit.itemAtPath(cst, path.slice(0, -1));
-		const field = path[path.length - 1][0];
+	visit.parentCollection = (cst, path$2) => {
+		const parent = visit.itemAtPath(cst, path$2.slice(0, -1));
+		const field = path$2[path$2.length - 1][0];
 		const coll = parent?.[field];
 		if (coll && "items" in coll) return coll;
 		throw new Error("Parent collection not found");
 	};
-	function _visit(path, item, visitor) {
-		let ctrl = visitor(item, path);
+	function _visit(path$2, item, visitor) {
+		let ctrl = visitor(item, path$2);
 		if (typeof ctrl === "symbol") return ctrl;
 		for (const field of ["key", "value"]) {
 			const token = item[field];
 			if (token && "items" in token) {
 				for (let i = 0; i < token.items.length; ++i) {
-					const ci = _visit(Object.freeze(path.concat([[field, i]])), token.items[i], visitor);
+					const ci = _visit(Object.freeze(path$2.concat([[field, i]])), token.items[i], visitor);
 					if (typeof ci === "number") i = ci - 1;
 					else if (ci === BREAK) return BREAK;
 					else if (ci === REMOVE) {
@@ -36146,10 +36146,10 @@ var require_cst_visit = /* @__PURE__ */ __commonJSMin$1(((exports) => {
 						i -= 1;
 					}
 				}
-				if (typeof ctrl === "function" && field === "key") ctrl = ctrl(item, path);
+				if (typeof ctrl === "function" && field === "key") ctrl = ctrl(item, path$2);
 			}
 		}
-		return typeof ctrl === "function" ? ctrl(item, path) : ctrl;
+		return typeof ctrl === "function" ? ctrl(item, path$2) : ctrl;
 	}
 	exports.visit = visit;
 }));
@@ -42181,8 +42181,8 @@ const FileSystem = /* @__PURE__ */ Service("effect/platform/FileSystem");
 const make$28 = (impl) => FileSystem.of({
 	...impl,
 	[TypeId$26]: TypeId$26,
-	exists: (path) => pipe(impl.access(path), as(true), catchTag("PlatformError", (e) => e.reason === "NotFound" ? succeed(false) : fail$3(e))),
-	readFileString: (path, encoding) => flatMap(impl.readFile(path), (_) => try_({
+	exists: (path$2) => pipe(impl.access(path$2), as(true), catchTag("PlatformError", (e) => e.reason === "NotFound" ? succeed(false) : fail$3(e))),
+	readFileString: (path$2, encoding) => flatMap(impl.readFile(path$2), (_) => try_({
 		try: () => new TextDecoder(encoding).decode(_),
 		catch: (cause) => new BadArgument({
 			module: "FileSystem",
@@ -42191,8 +42191,8 @@ const make$28 = (impl) => FileSystem.of({
 			cause
 		})
 	})),
-	stream: fnUntraced(function* (path, options) {
-		const file = yield* impl.open(path, { flag: "r" });
+	stream: fnUntraced(function* (path$2, options) {
+		const file = yield* impl.open(path$2, { flag: "r" });
 		if (options?.offset) yield* file.seek(options.offset, "start");
 		const bytesToRead = options?.bytesToRead !== void 0 ? Size(options.bytesToRead) : void 0;
 		let totalBytesRead = BigInt(0);
@@ -42207,11 +42207,11 @@ const make$28 = (impl) => FileSystem.of({
 			return succeed(of(buf));
 		})));
 	}, unwrap),
-	sink: (path, options) => pipe(impl.open(path, {
+	sink: (path$2, options) => pipe(impl.open(path$2, {
 		flag: "w",
 		...options
 	}), map$4((file) => forEach((_) => file.writeAll(_))), unwrap$1),
-	writeFileString: (path, data, options) => flatMap(try_({
+	writeFileString: (path$2, data, options) => flatMap(try_({
 		try: () => new TextEncoder().encode(data),
 		catch: (cause) => new BadArgument({
 			module: "FileSystem",
@@ -42219,7 +42219,7 @@ const make$28 = (impl) => FileSystem.of({
 			description: "could not encode string",
 			cause
 		})
-	}), (_) => impl.writeFile(path, _, options))
+	}), (_) => impl.writeFile(path$2, _, options))
 });
 /**
 * @since 4.0.0
@@ -42350,14 +42350,14 @@ const Path$1 = /* @__PURE__ */ Service("effect/Path");
 * The following license applies to these functions:
 * - MIT
 */
-function normalizeStringPosix(path, allowAboveRoot) {
+function normalizeStringPosix(path$2, allowAboveRoot) {
 	let res = "";
 	let lastSegmentLength = 0;
 	let lastSlash = -1;
 	let dots = 0;
 	let code;
-	for (let i = 0; i <= path.length; ++i) {
-		if (i < path.length) code = path.charCodeAt(i);
+	for (let i = 0; i <= path$2.length; ++i) {
+		if (i < path$2.length) code = path$2.charCodeAt(i);
 		else if (code === 47) break;
 		else code = 47;
 		if (code === 47) {
@@ -42391,8 +42391,8 @@ function normalizeStringPosix(path, allowAboveRoot) {
 					lastSegmentLength = 2;
 				}
 			} else {
-				if (res.length > 0) res += "/" + path.slice(lastSlash + 1, i);
-				else res = path.slice(lastSlash + 1, i);
+				if (res.length > 0) res += "/" + path$2.slice(lastSlash + 1, i);
+				else res = path$2.slice(lastSlash + 1, i);
 				lastSegmentLength = i - lastSlash - 1;
 			}
 			lastSlash = i;
@@ -42436,16 +42436,16 @@ const resolve = function resolve$3() {
 	let resolvedAbsolute = false;
 	let cwd = void 0;
 	for (let i = arguments.length - 1; i >= -1 && !resolvedAbsolute; i--) {
-		let path;
-		if (i >= 0) path = arguments[i];
+		let path$2;
+		if (i >= 0) path$2 = arguments[i];
 		else {
 			const process$1 = globalThis.process;
 			if (cwd === void 0 && "process" in globalThis && typeof process$1 === "object" && process$1 !== null && typeof process$1.cwd === "function") cwd = process$1.cwd();
-			path = cwd;
+			path$2 = cwd;
 		}
-		if (path.length === 0) continue;
-		resolvedPath = path + "/" + resolvedPath;
-		resolvedAbsolute = path.charCodeAt(0) === 47;
+		if (path$2.length === 0) continue;
+		resolvedPath = path$2 + "/" + resolvedPath;
+		resolvedAbsolute = path$2.charCodeAt(0) === 47;
 	}
 	resolvedPath = normalizeStringPosix(resolvedPath, !resolvedAbsolute);
 	if (resolvedAbsolute) if (resolvedPath.length > 0) return "/" + resolvedPath;
@@ -42477,18 +42477,18 @@ function encodePathChars(filepath) {
 const posixImpl = /* @__PURE__ */ Path$1.of({
 	[TypeId$25]: TypeId$25,
 	resolve,
-	normalize(path) {
-		if (path.length === 0) return ".";
-		const isAbsolute = path.charCodeAt(0) === 47;
-		const trailingSeparator = path.charCodeAt(path.length - 1) === 47;
-		path = normalizeStringPosix(path, !isAbsolute);
-		if (path.length === 0 && !isAbsolute) path = ".";
-		if (path.length > 0 && trailingSeparator) path += "/";
-		if (isAbsolute) return "/" + path;
-		return path;
+	normalize(path$2) {
+		if (path$2.length === 0) return ".";
+		const isAbsolute = path$2.charCodeAt(0) === 47;
+		const trailingSeparator = path$2.charCodeAt(path$2.length - 1) === 47;
+		path$2 = normalizeStringPosix(path$2, !isAbsolute);
+		if (path$2.length === 0 && !isAbsolute) path$2 = ".";
+		if (path$2.length > 0 && trailingSeparator) path$2 += "/";
+		if (isAbsolute) return "/" + path$2;
+		return path$2;
 	},
-	isAbsolute(path) {
-		return path.length > 0 && path.charCodeAt(0) === 47;
+	isAbsolute(path$2) {
+		return path$2.length > 0 && path$2.charCodeAt(0) === 47;
 	},
 	join() {
 		if (arguments.length === 0) return ".";
@@ -42541,14 +42541,14 @@ const posixImpl = /* @__PURE__ */ Path$1.of({
 			return to.slice(toStart);
 		}
 	},
-	dirname(path) {
-		if (path.length === 0) return ".";
-		let code = path.charCodeAt(0);
+	dirname(path$2) {
+		if (path$2.length === 0) return ".";
+		let code = path$2.charCodeAt(0);
 		const hasRoot = code === 47;
 		let end$1 = -1;
 		let matchedSlash = true;
-		for (let i = path.length - 1; i >= 1; --i) {
-			code = path.charCodeAt(i);
+		for (let i = path$2.length - 1; i >= 1; --i) {
+			code = path$2.charCodeAt(i);
 			if (code === 47) {
 				if (!matchedSlash) {
 					end$1 = i;
@@ -42558,19 +42558,19 @@ const posixImpl = /* @__PURE__ */ Path$1.of({
 		}
 		if (end$1 === -1) return hasRoot ? "/" : ".";
 		if (hasRoot && end$1 === 1) return "//";
-		return path.slice(0, end$1);
+		return path$2.slice(0, end$1);
 	},
-	basename(path, ext) {
+	basename(path$2, ext) {
 		let start = 0;
 		let end$1 = -1;
 		let matchedSlash = true;
 		let i;
-		if (ext !== void 0 && ext.length > 0 && ext.length <= path.length) {
-			if (ext.length === path.length && ext === path) return "";
+		if (ext !== void 0 && ext.length > 0 && ext.length <= path$2.length) {
+			if (ext.length === path$2.length && ext === path$2) return "";
 			let extIdx = ext.length - 1;
 			let firstNonSlashEnd = -1;
-			for (i = path.length - 1; i >= 0; --i) {
-				const code = path.charCodeAt(i);
+			for (i = path$2.length - 1; i >= 0; --i) {
+				const code = path$2.charCodeAt(i);
 				if (code === 47) {
 					if (!matchedSlash) {
 						start = i + 1;
@@ -42590,10 +42590,10 @@ const posixImpl = /* @__PURE__ */ Path$1.of({
 				}
 			}
 			if (start === end$1) end$1 = firstNonSlashEnd;
-			else if (end$1 === -1) end$1 = path.length;
-			return path.slice(start, end$1);
+			else if (end$1 === -1) end$1 = path$2.length;
+			return path$2.slice(start, end$1);
 		} else {
-			for (i = path.length - 1; i >= 0; --i) if (path.charCodeAt(i) === 47) {
+			for (i = path$2.length - 1; i >= 0; --i) if (path$2.charCodeAt(i) === 47) {
 				if (!matchedSlash) {
 					start = i + 1;
 					break;
@@ -42603,17 +42603,17 @@ const posixImpl = /* @__PURE__ */ Path$1.of({
 				end$1 = i + 1;
 			}
 			if (end$1 === -1) return "";
-			return path.slice(start, end$1);
+			return path$2.slice(start, end$1);
 		}
 	},
-	extname(path) {
+	extname(path$2) {
 		let startDot = -1;
 		let startPart = 0;
 		let end$1 = -1;
 		let matchedSlash = true;
 		let preDotState = 0;
-		for (let i = path.length - 1; i >= 0; --i) {
-			const code = path.charCodeAt(i);
+		for (let i = path$2.length - 1; i >= 0; --i) {
+			const code = path$2.charCodeAt(i);
 			if (code === 47) {
 				if (!matchedSlash) {
 					startPart = i + 1;
@@ -42631,13 +42631,13 @@ const posixImpl = /* @__PURE__ */ Path$1.of({
 			} else if (startDot !== -1) preDotState = -1;
 		}
 		if (startDot === -1 || end$1 === -1 || preDotState === 0 || preDotState === 1 && startDot === end$1 - 1 && startDot === startPart + 1) return "";
-		return path.slice(startDot, end$1);
+		return path$2.slice(startDot, end$1);
 	},
 	format: function format$3(pathObject) {
 		if (pathObject === null || typeof pathObject !== "object") throw new TypeError("The \"pathObject\" argument must be of type Object. Received type " + typeof pathObject);
 		return _format("/", pathObject);
 	},
-	parse(path) {
+	parse(path$2) {
 		const ret = {
 			root: "",
 			dir: "",
@@ -42645,8 +42645,8 @@ const posixImpl = /* @__PURE__ */ Path$1.of({
 			ext: "",
 			name: ""
 		};
-		if (path.length === 0) return ret;
-		let code = path.charCodeAt(0);
+		if (path$2.length === 0) return ret;
+		let code = path$2.charCodeAt(0);
 		const isAbsolute = code === 47;
 		let start;
 		if (isAbsolute) {
@@ -42657,10 +42657,10 @@ const posixImpl = /* @__PURE__ */ Path$1.of({
 		let startPart = 0;
 		let end$1 = -1;
 		let matchedSlash = true;
-		let i = path.length - 1;
+		let i = path$2.length - 1;
 		let preDotState = 0;
 		for (; i >= start; --i) {
-			code = path.charCodeAt(i);
+			code = path$2.charCodeAt(i);
 			if (code === 47) {
 				if (!matchedSlash) {
 					startPart = i + 1;
@@ -42678,19 +42678,19 @@ const posixImpl = /* @__PURE__ */ Path$1.of({
 			} else if (startDot !== -1) preDotState = -1;
 		}
 		if (startDot === -1 || end$1 === -1 || preDotState === 0 || preDotState === 1 && startDot === end$1 - 1 && startDot === startPart + 1) {
-			if (end$1 !== -1) if (startPart === 0 && isAbsolute) ret.base = ret.name = path.slice(1, end$1);
-			else ret.base = ret.name = path.slice(startPart, end$1);
+			if (end$1 !== -1) if (startPart === 0 && isAbsolute) ret.base = ret.name = path$2.slice(1, end$1);
+			else ret.base = ret.name = path$2.slice(startPart, end$1);
 		} else {
 			if (startPart === 0 && isAbsolute) {
-				ret.name = path.slice(1, startDot);
-				ret.base = path.slice(1, end$1);
+				ret.name = path$2.slice(1, startDot);
+				ret.base = path$2.slice(1, end$1);
 			} else {
-				ret.name = path.slice(startPart, startDot);
-				ret.base = path.slice(startPart, end$1);
+				ret.name = path$2.slice(startPart, startDot);
+				ret.base = path$2.slice(startPart, end$1);
 			}
-			ret.ext = path.slice(startDot, end$1);
+			ret.ext = path$2.slice(startDot, end$1);
 		}
-		if (startPart > 0) ret.dir = path.slice(0, startPart - 1);
+		if (startPart > 0) ret.dir = path$2.slice(0, startPart - 1);
 		else if (isAbsolute) ret.dir = "/";
 		return ret;
 	},
@@ -42754,10 +42754,10 @@ function make$27(get$8, mapInput$1, prefix$1) {
 	self$1.get = get$8;
 	self$1.mapInput = mapInput$1;
 	self$1.prefix = prefix$1;
-	self$1.load = (path) => {
-		if (mapInput$1) path = mapInput$1(path);
-		if (prefix$1) path = [...prefix$1, ...path];
-		return get$8(path);
+	self$1.load = (path$2) => {
+		if (mapInput$1) path$2 = mapInput$1(path$2);
+		if (prefix$1) path$2 = [...prefix$1, ...path$2];
+		return get$8(path$2);
 	};
 	return self$1;
 }
@@ -42776,7 +42776,7 @@ function fromEnv(options) {
 		...import.meta?.env
 	};
 	const trie = buildEnvTrie(env);
-	return make$27((path) => succeed(nodeAtEnv(trie, env, path)));
+	return make$27((path$2) => succeed(nodeAtEnv(trie, env, path$2)));
 }
 function buildEnvTrie(env) {
 	const root$1 = {};
@@ -42793,18 +42793,18 @@ function buildEnvTrie(env) {
 	return root$1;
 }
 const NUMERIC_INDEX = /^(0|[1-9][0-9]*)$/;
-function nodeAtEnv(trie, env, path) {
-	const leafValue = env[path.map(String).join("_")];
-	const trieNode = trieNodeAt(trie, path);
+function nodeAtEnv(trie, env, path$2) {
+	const leafValue = env[path$2.map(String).join("_")];
+	const trieNode = trieNodeAt(trie, path$2);
 	const children = trieNode?.children ? Object.keys(trieNode.children) : [];
 	if (children.length === 0) return leafValue === void 0 ? void 0 : makeValue(leafValue);
 	if (children.every((k) => NUMERIC_INDEX.test(k))) return makeArray(Math.max(...children.map((k) => parseInt(k, 10))) + 1, leafValue);
 	return makeRecord(new Set(children), leafValue);
 }
-function trieNodeAt(root$1, path) {
-	if (path.length === 0) return root$1;
+function trieNodeAt(root$1, path$2) {
+	if (path$2.length === 0) return root$1;
 	let node = root$1;
-	for (const seg of path) {
+	for (const seg of path$2) {
 		node = node?.children?.[String(seg)];
 		if (!node) return void 0;
 	}
@@ -43242,6 +43242,48 @@ const choice$2 = (choices) => {
 	});
 };
 /**
+* Creates a primitive that validates and resolves file system paths.
+*
+* @example
+* ```ts
+* import { Effect } from "effect"
+* import { Primitive } from "effect/unstable/cli"
+*
+* const program = Effect.gen(function*() {
+*   // Parse a file path that must exist
+*   const filePrimitive = Primitive.path("file", true)
+*   const filePath = yield* filePrimitive.parse("./package.json")
+*   console.log(filePath) // Absolute path to package.json
+*
+*   // Parse a directory path
+*   const dirPrimitive = Primitive.path("directory", false)
+*   const dirPath = yield* dirPrimitive.parse("./src")
+*   console.log(dirPath) // Absolute path to src directory
+*
+*   // Parse any path type
+*   const anyPrimitive = Primitive.path("either", false)
+*   const anyPath = yield* anyPrimitive.parse("./some/path")
+*   console.log(anyPath) // Absolute path
+* })
+* ```
+*
+* @since 4.0.0
+* @category constructors
+*/
+const path$1 = (pathType, mustExist) => makePrimitive("Path", fnUntraced(function* (value) {
+	const fs = yield* FileSystem;
+	const path$2 = yield* Path$1;
+	const absolutePath = path$2.isAbsolute(value) ? value : path$2.resolve(value);
+	const exists = yield* mapError$2(fs.exists(absolutePath), (error$1) => `Failed to check path existence: ${error$1.message}`);
+	if (mustExist === true && !exists) return yield* fail$3(`Path does not exist: ${absolutePath}`);
+	if (exists && pathType !== "either") {
+		const stat$1 = yield* mapError$2(fs.stat(absolutePath), (error$1) => `Failed to stat path: ${error$1.message}`);
+		if (pathType === "file" && stat$1.type !== "File") return yield* fail$3(`Path is not a file: ${absolutePath}`);
+		if (pathType === "directory" && stat$1.type !== "Directory") return yield* fail$3(`Path is not a directory: ${absolutePath}`);
+	}
+	return absolutePath;
+}));
+/**
 * A sentinel primitive that always fails to parse a value.
 *
 * Used for flags that don't accept values.
@@ -43520,6 +43562,67 @@ const choice$1 = (kind, name, choices) => {
 	return choiceWithValue$1(kind, name, choices.map((value) => [value, value]));
 };
 /**
+* Creates a path parameter that accepts file or directory paths.
+*
+* @example
+* ```ts
+* import * as Param from "effect/unstable/cli/Param"
+*
+* // @internal - this module is not exported publicly
+*
+* // Basic path parameter
+* const outputPath = Param.path(Param.flagKind, "output")
+*
+* // Path that must exist
+* const inputPath = Param.path(Param.flagKind, "input", { mustExist: true })
+*
+* // File-only path
+* const configFile = Param.path(Param.flagKind, "config", {
+*   pathType: "file",
+*   mustExist: true,
+*   typeName: "config-file"
+* })
+* ```
+*
+* @since 4.0.0
+* @category constructors
+*/
+const path = (kind, name, options) => makeSingle({
+	name,
+	kind,
+	primitiveType: path$1(options?.pathType ?? "either", options?.mustExist),
+	typeName: options?.typeName
+});
+/**
+* Creates a directory path parameter.
+*
+* This is a convenience function that creates a path parameter with the
+* `pathType` set to `"directory"` and a default type name of `"directory"`.
+*
+* @example
+* ```ts
+* import * as Param from "effect/unstable/cli/Param"
+*
+* // @internal - this module is not exported publicly
+*
+* // Basic directory parameter
+* const outputDir = Param.directory(Param.flagKind, "output-dir")
+*
+* // Directory that must exist
+* const sourceDir = Param.directory(Param.flagKind, "source", { mustExist: true })
+*
+* // Usage: --output-dir /path/to/dir --source /existing/dir
+* ```
+*
+* @since 4.0.0
+* @category constructors
+*/
+const directory$1 = (kind, name, options) => path(kind, name, {
+	pathType: "directory",
+	typeName: "directory",
+	mustExist: options?.mustExist
+});
+/**
 * Creates an empty sentinel parameter that always fails to parse.
 *
 * This is useful for creating placeholder parameters or for combinators.
@@ -45079,6 +45182,26 @@ const choiceWithValue = (name, choices) => choiceWithValue$1(flagKind, name, cho
 */
 const choice = (name, choices) => choice$1(flagKind, name, choices);
 /**
+* Creates a directory path flag that accepts directory paths with optional existence validation.
+*
+* @example
+* ```ts
+* import { Flag } from "effect/unstable/cli"
+*
+* // Basic directory flag
+* const outputFlag = Flag.directory("output")
+* // Usage: --output ./build
+*
+* // Directory that must exist
+* const sourceFlag = Flag.directory("source", { mustExist: true })
+* // Usage: --source ./src (directory must exist)
+* ```
+*
+* @since 4.0.0
+* @category constructors
+*/
+const directory = (name, options) => directory$1(flagKind, name, options);
+/**
 * Creates an empty sentinel flag that always fails to parse.
 * This is useful for creating placeholder flags or for combinators.
 *
@@ -46273,14 +46396,14 @@ const withSubcommands = /* @__PURE__ */ dual(2, (self$1, subcommands) => {
 			result: result$2
 		} });
 	});
-	const handle = fnUntraced(function* (input, path) {
+	const handle = fnUntraced(function* (input, path$2) {
 		const internal = input;
 		if (internal._subcommand) {
 			const child = byName.get(internal._subcommand.name);
-			if (!child) return yield* new ShowHelp({ commandPath: path });
-			return yield* child.handle(internal._subcommand.result, [...path, child.name]).pipe(provideService(impl.service, input));
+			if (!child) return yield* new ShowHelp({ commandPath: path$2 });
+			return yield* child.handle(internal._subcommand.result, [...path$2, child.name]).pipe(provideService(impl.service, input));
 		}
-		return yield* impl.handle(input, path);
+		return yield* impl.handle(input, path$2);
 	});
 	return makeCommand({
 		name: impl.name,
@@ -46324,7 +46447,7 @@ const mapHandler = (self$1, f) => {
 	const impl = toImpl(self$1);
 	return makeCommand({
 		...impl,
-		handle: (input, path) => f(impl.handle(input, path), input)
+		handle: (input, path$2) => f(impl.handle(input, path$2), input)
 	});
 };
 /**
@@ -47157,11 +47280,11 @@ const prefix = /* @__PURE__ */ dual(2, (self$1, prefix$1) => ({
 * @since 4.0.0
 * @category layers
 */
-const layerFileSystem = (directory) => effect(KeyValueStore)(gen(function* () {
+const layerFileSystem = (directory$2) => effect(KeyValueStore)(gen(function* () {
 	const fs = yield* FileSystem;
-	const path = yield* Path$1;
-	const keyPath = (key) => path.join(directory, encodeURIComponent(key));
-	if (!(yield* fs.exists(directory))) yield* fs.makeDirectory(directory, { recursive: true });
+	const path$2 = yield* Path$1;
+	const keyPath = (key) => path$2.join(directory$2, encodeURIComponent(key));
+	if (!(yield* fs.exists(directory$2))) yield* fs.makeDirectory(directory$2, { recursive: true });
 	return make$22({
 		get: (key) => catchTag(fs.readFileString(keyPath(key)), "PlatformError", (cause) => cause.reason === "NotFound" ? undefined_$1 : fail$3(new KeyValueStoreError({
 			method: "get",
@@ -47193,12 +47316,12 @@ const layerFileSystem = (directory) => effect(KeyValueStore)(gen(function* () {
 			message: `Unable to check existence of item with key ${key}`,
 			cause
 		})),
-		clear: mapError$2(andThen(fs.remove(directory, { recursive: true }), fs.makeDirectory(directory, { recursive: true })), (cause) => new KeyValueStoreError({
+		clear: mapError$2(andThen(fs.remove(directory$2, { recursive: true }), fs.makeDirectory(directory$2, { recursive: true })), (cause) => new KeyValueStoreError({
 			method: "clear",
 			message: `Unable to clear storage`,
 			cause
 		})),
-		size: matchEffect(fs.readDirectory(directory), {
+		size: matchEffect(fs.readDirectory(directory$2), {
 			onSuccess: (files) => succeed(files.length),
 			onFailure: (cause) => fail$3(new KeyValueStoreError({
 				method: "size",
@@ -48728,11 +48851,11 @@ var Mime = class {
 		}
 		return this;
 	}
-	getType(path) {
-		if (typeof path !== "string") return null;
-		const last$1 = path.replace(/^.*[/\\]/s, "").toLowerCase();
+	getType(path$2) {
+		if (typeof path$2 !== "string") return null;
+		const last$1 = path$2.replace(/^.*[/\\]/s, "").toLowerCase();
 		const ext = last$1.replace(/^.*\./s, "").toLowerCase();
-		const hasPath = last$1.length < path.length;
+		const hasPath = last$1.length < path$2.length;
 		if (!(ext.length < last$1.length - 1) && hasPath) return null;
 		return __classPrivateFieldGet(this, _Mime_extensionToType, "f").get(ext) ?? null;
 	}
@@ -49105,7 +49228,7 @@ const concatTokens = (prevTokens, nextTokens, isSeparated) => isSeparated || pre
 //#endregion
 //#region node_modules/.pnpm/@effect+platform-node-shared@https+++pkg.pr.new+Effect-TS+effect-smol+@effect+platform-_54df9a1830a145bfb881d9dab26a21ab/node_modules/@effect/platform-node-shared/dist/internal/utils.js
 /** @internal */
-const handleErrnoException = (module$1, method) => (err, [path]) => {
+const handleErrnoException = (module$1, method) => (err, [path$2]) => {
 	let reason = "Unknown";
 	switch (err.code) {
 		case "ENOENT":
@@ -49134,7 +49257,7 @@ const handleErrnoException = (module$1, method) => (err, [path]) => {
 		reason,
 		module: module$1,
 		method,
-		pathOrDescriptor: path,
+		pathOrDescriptor: path$2,
 		syscall: err.syscall,
 		cause: err
 	});
@@ -49323,7 +49446,7 @@ const toPlatformError = (method, error$1, command) => {
 };
 const make$20 = /* @__PURE__ */ gen(function* () {
 	const fs = yield* FileSystem;
-	const path = yield* Path$1;
+	const path$2 = yield* Path$1;
 	const resolveCommand = fnUntraced(function* (command) {
 		if (isStandardCommand(command)) return command;
 		const parsed = yield* sync(() => parseTemplates(command.templates, command.expressions));
@@ -49332,7 +49455,7 @@ const make$20 = /* @__PURE__ */ gen(function* () {
 	const resolveWorkingDirectory = fnUntraced(function* (options) {
 		if (isUndefined(options.cwd)) return void 0;
 		yield* fs.access(options.cwd);
-		return path.resolve(options.cwd);
+		return path$2.resolve(options.cwd);
 	});
 	const resolveEnvironment = (options) => {
 		return options.extendEnv ? {
@@ -50749,7 +50872,7 @@ const setUrl = /* @__PURE__ */ dual(2, (self$1, url) => {
 * @since 4.0.0
 * @category combinators
 */
-const prependUrl = /* @__PURE__ */ dual(2, (self$1, path) => makeProto(self$1.method, path.endsWith("/") && self$1.url.startsWith("/") ? path + self$1.url.slice(1) : path + self$1.url, self$1.urlParams, self$1.hash, self$1.headers, self$1.body));
+const prependUrl = /* @__PURE__ */ dual(2, (self$1, path$2) => makeProto(self$1.method, path$2.endsWith("/") && self$1.url.startsWith("/") ? path$2 + self$1.url.slice(1) : path$2 + self$1.url, self$1.urlParams, self$1.hash, self$1.headers, self$1.body));
 /**
 * @since 4.0.0
 * @category combinators
@@ -51369,27 +51492,27 @@ var RouterImpl = class {
 	options;
 	routes = [];
 	trees = {};
-	on(method, path, handler$1) {
-		const optionalParamMatch = path.match(OPTIONAL_PARAM_REGEXP);
+	on(method, path$2, handler$1) {
+		const optionalParamMatch = path$2.match(OPTIONAL_PARAM_REGEXP);
 		if (optionalParamMatch && optionalParamMatch.index !== void 0) {
-			assert(path.length === optionalParamMatch.index + optionalParamMatch[0].length, "Optional Parameter needs to be the last parameter of the path");
-			const pathFull = path.replace(OPTIONAL_PARAM_REGEXP, "$1$2");
-			const pathOptional = path.replace(OPTIONAL_PARAM_REGEXP, "$2");
+			assert(path$2.length === optionalParamMatch.index + optionalParamMatch[0].length, "Optional Parameter needs to be the last parameter of the path");
+			const pathFull = path$2.replace(OPTIONAL_PARAM_REGEXP, "$1$2");
+			const pathOptional = path$2.replace(OPTIONAL_PARAM_REGEXP, "$2");
 			this.on(method, pathFull, handler$1);
 			this.on(method, pathOptional, handler$1);
 			return;
 		}
-		if (this.options.ignoreDuplicateSlashes) path = removeDuplicateSlashes(path);
-		if (this.options.ignoreTrailingSlash) path = trimLastSlash(path);
+		if (this.options.ignoreDuplicateSlashes) path$2 = removeDuplicateSlashes(path$2);
+		if (this.options.ignoreTrailingSlash) path$2 = trimLastSlash(path$2);
 		const methods = typeof method === "string" ? [method] : method;
-		for (const method$1 of methods) this._on(method$1, path, handler$1);
+		for (const method$1 of methods) this._on(method$1, path$2, handler$1);
 	}
-	all(path, handler$1) {
-		this.on(httpMethods, path, handler$1);
+	all(path$2, handler$1) {
+		this.on(httpMethods, path$2, handler$1);
 	}
-	_on(method, path, handler$1) {
+	_on(method, path$2, handler$1) {
 		if (this.trees[method] === void 0) this.trees[method] = new StaticNode("/");
-		let pattern = path;
+		let pattern = path$2;
 		if (pattern === "*" && this.trees[method].prefix.length !== 0) {
 			const currentRoot = this.trees[method];
 			this.trees[method] = new StaticNode("");
@@ -51469,7 +51592,7 @@ var RouterImpl = class {
 		for (const existRoute of this.routes) if (existRoute.method === method && existRoute.pattern === pattern) throw new Error(`Method '${method}' already declared for route '${pattern}'`);
 		const route$1 = {
 			method,
-			path,
+			path: path$2,
 			pattern,
 			params,
 			handler: handler$1
@@ -51477,36 +51600,36 @@ var RouterImpl = class {
 		this.routes.push(route$1);
 		currentNode.addRoute(route$1);
 	}
-	has(method, path) {
+	has(method, path$2) {
 		const node = this.trees[method];
 		if (node === void 0) return false;
-		const staticNode = node.getStaticChild(path);
+		const staticNode = node.getStaticChild(path$2);
 		if (staticNode === void 0) return false;
 		return staticNode.isLeafNode;
 	}
-	find(method, path) {
+	find(method, path$2) {
 		let currentNode = this.trees[method];
 		if (currentNode === void 0) return void 0;
-		if (path.charCodeAt(0) !== 47) path = path.replace(FULL_PATH_REGEXP, "/");
-		if (this.options.ignoreDuplicateSlashes) path = removeDuplicateSlashes(path);
+		if (path$2.charCodeAt(0) !== 47) path$2 = path$2.replace(FULL_PATH_REGEXP, "/");
+		if (this.options.ignoreDuplicateSlashes) path$2 = removeDuplicateSlashes(path$2);
 		let sanitizedUrl;
 		let querystring;
 		let shouldDecodeParam;
 		try {
-			sanitizedUrl = safeDecodeURI(path);
-			path = sanitizedUrl.path;
+			sanitizedUrl = safeDecodeURI(path$2);
+			path$2 = sanitizedUrl.path;
 			querystring = sanitizedUrl.querystring;
 			shouldDecodeParam = sanitizedUrl.shouldDecodeParam;
 		} catch (error$1) {
 			return;
 		}
-		if (this.options.ignoreTrailingSlash) path = trimLastSlash(path);
-		const originPath = path;
-		if (this.options.caseSensitive === false) path = path.toLowerCase();
+		if (this.options.ignoreTrailingSlash) path$2 = trimLastSlash(path$2);
+		const originPath = path$2;
+		if (this.options.caseSensitive === false) path$2 = path$2.toLowerCase();
 		const maxParamLength = this.options.maxParamLength;
 		let pathIndex = currentNode.prefix.length;
 		const params = [];
-		const pathLen = path.length;
+		const pathLen = path$2.length;
 		const brothersNodesStack = [];
 		while (true) {
 			if (pathIndex === pathLen && currentNode.isLeafNode) {
@@ -51517,7 +51640,7 @@ var RouterImpl = class {
 					searchParams: parse$2(querystring)
 				};
 			}
-			let node = currentNode.getNextNode(path, pathIndex, brothersNodesStack, params.length);
+			let node = currentNode.getNextNode(path$2, pathIndex, brothersNodesStack, params.length);
 			if (node === void 0) {
 				if (brothersNodesStack.length === 0) return;
 				const brotherNodeState = brothersNodesStack.pop();
@@ -51589,30 +51712,30 @@ var NodeBase = class {
 };
 var ParentNode = class extends NodeBase {
 	staticChildren = {};
-	findStaticMatchingChild(path, pathIndex) {
-		const staticChild = this.staticChildren[path.charAt(pathIndex)];
-		if (staticChild === void 0 || !staticChild.matchPrefix(path, pathIndex)) return;
+	findStaticMatchingChild(path$2, pathIndex) {
+		const staticChild = this.staticChildren[path$2.charAt(pathIndex)];
+		if (staticChild === void 0 || !staticChild.matchPrefix(path$2, pathIndex)) return;
 		return staticChild;
 	}
-	getStaticChild(path, pathIndex = 0) {
-		if (path.length === pathIndex) return this;
-		const staticChild = this.findStaticMatchingChild(path, pathIndex);
+	getStaticChild(path$2, pathIndex = 0) {
+		if (path$2.length === pathIndex) return this;
+		const staticChild = this.findStaticMatchingChild(path$2, pathIndex);
 		if (staticChild === void 0) return;
-		return staticChild.getStaticChild(path, pathIndex + staticChild.prefix.length);
+		return staticChild.getStaticChild(path$2, pathIndex + staticChild.prefix.length);
 	}
-	createStaticChild(path) {
-		if (path.length === 0) return this;
-		let staticChild = this.staticChildren[path.charAt(0)];
+	createStaticChild(path$2) {
+		if (path$2.length === 0) return this;
+		let staticChild = this.staticChildren[path$2.charAt(0)];
 		if (staticChild) {
 			let i = 1;
-			for (; i < staticChild.prefix.length; i++) if (path.charCodeAt(i) !== staticChild.prefix.charCodeAt(i)) {
+			for (; i < staticChild.prefix.length; i++) if (path$2.charCodeAt(i) !== staticChild.prefix.charCodeAt(i)) {
 				staticChild = staticChild.split(this, i);
 				break;
 			}
-			return staticChild.createStaticChild(path.slice(i));
+			return staticChild.createStaticChild(path$2.slice(i));
 		}
-		const label = path.charAt(0);
-		this.staticChildren[label] = new StaticNode(path);
+		const label = path$2.charAt(0);
+		this.staticChildren[label] = new StaticNode(path$2);
 		return this.staticChildren[label];
 	}
 };
@@ -51631,8 +51754,8 @@ var StaticNode = class StaticNode extends ParentNode {
 		if (prefix$1.length === 1) this.matchPrefix = (_path, _pathIndex) => true;
 		else {
 			const len = prefix$1.length;
-			this.matchPrefix = function(path, pathIndex) {
-				for (let i = 1; i < len; i++) if (path.charCodeAt(pathIndex + i) !== this.prefix.charCodeAt(i)) return false;
+			this.matchPrefix = function(path$2, pathIndex) {
+				for (let i = 1; i < len; i++) if (path$2.charCodeAt(pathIndex + i) !== this.prefix.charCodeAt(i)) return false;
 				return true;
 			};
 		}
@@ -51677,8 +51800,8 @@ var StaticNode = class StaticNode extends ParentNode {
 		parentNode.staticChildren[parentPrefix.charAt(0)] = staticNode;
 		return staticNode;
 	}
-	getNextNode(path, pathIndex, nodeStack, paramsCount) {
-		let node = this.findStaticMatchingChild(path, pathIndex);
+	getNextNode(path$2, pathIndex, nodeStack, paramsCount) {
+		let node = this.findStaticMatchingChild(path$2, pathIndex);
 		let parametricBrotherNodeIndex = 0;
 		if (node === void 0) {
 			if (this.parametricChildren.length === 0) return this.wildcardChild;
@@ -51711,8 +51834,8 @@ var ParametricNode = class extends ParentNode {
 	}
 	isRegex;
 	nodePaths;
-	getNextNode(path, pathIndex) {
-		return this.findStaticMatchingChild(path, pathIndex);
+	getNextNode(path$2, pathIndex) {
+		return this.findStaticMatchingChild(path$2, pathIndex);
 	}
 };
 var WildcardNode = class extends NodeBase {
@@ -51722,12 +51845,12 @@ var WildcardNode = class extends NodeBase {
 const assert = (condition, message) => {
 	if (!condition) throw new Error(message);
 };
-function removeDuplicateSlashes(path) {
-	return path.replace(/\/\/+/g, "/");
+function removeDuplicateSlashes(path$2) {
+	return path$2.replace(/\/\/+/g, "/");
 }
-function trimLastSlash(path) {
-	if (path.length > 1 && path.charCodeAt(path.length - 1) === 47) return path.slice(0, -1);
-	return path;
+function trimLastSlash(path$2) {
+	if (path$2.length > 1 && path$2.charCodeAt(path$2.length - 1) === 47) return path$2.slice(0, -1);
+	return path$2;
 }
 function compileCreateParams(params) {
 	const len = params.length;
@@ -51737,19 +51860,19 @@ function compileCreateParams(params) {
 		return paramsObject;
 	};
 }
-function getClosingParenthensePosition(path, idx) {
+function getClosingParenthensePosition(path$2, idx) {
 	let parentheses = 1;
-	while (idx < path.length) {
+	while (idx < path$2.length) {
 		idx++;
-		if (path[idx] === "\\") {
+		if (path$2[idx] === "\\") {
 			idx++;
 			continue;
 		}
-		if (path[idx] === ")") parentheses--;
-		else if (path[idx] === "(") parentheses++;
+		if (path$2[idx] === ")") parentheses--;
+		else if (path$2[idx] === "(") parentheses++;
 		if (!parentheses) return idx;
 	}
-	throw new TypeError("Invalid regexp expression in \"" + path + "\"");
+	throw new TypeError("Invalid regexp expression in \"" + path$2 + "\"");
 }
 function trimRegExpStartAndEnd(regexString) {
 	if (regexString.charCodeAt(1) === 94) regexString = regexString.slice(0, 1) + regexString.slice(2);
@@ -51786,33 +51909,33 @@ function decodeComponentChar(highCharCode, lowCharCode) {
 	}
 	if (highCharCode === 52 && lowCharCode === 48) return "@";
 }
-function safeDecodeURI(path) {
+function safeDecodeURI(path$2) {
 	let shouldDecode = false;
 	let shouldDecodeParam = false;
 	let querystring = "";
-	for (let i = 1; i < path.length; i++) {
-		const charCode = path.charCodeAt(i);
+	for (let i = 1; i < path$2.length; i++) {
+		const charCode = path$2.charCodeAt(i);
 		if (charCode === 37) {
-			const highCharCode = path.charCodeAt(i + 1);
-			const lowCharCode = path.charCodeAt(i + 2);
+			const highCharCode = path$2.charCodeAt(i + 1);
+			const lowCharCode = path$2.charCodeAt(i + 2);
 			if (decodeComponentChar(highCharCode, lowCharCode) === void 0) shouldDecode = true;
 			else {
 				shouldDecodeParam = true;
 				if (highCharCode === 50 && lowCharCode === 53) {
 					shouldDecode = true;
-					path = path.slice(0, i + 1) + "25" + path.slice(i + 1);
+					path$2 = path$2.slice(0, i + 1) + "25" + path$2.slice(i + 1);
 					i += 2;
 				}
 				i += 2;
 			}
 		} else if (charCode === 63 || charCode === 59 || charCode === 35) {
-			querystring = path.slice(i + 1);
-			path = path.slice(0, i);
+			querystring = path$2.slice(i + 1);
+			path$2 = path$2.slice(0, i);
 			break;
 		}
 	}
 	return {
-		path: shouldDecode ? decodeURI(path) : path,
+		path: shouldDecode ? decodeURI(path$2) : path$2,
 		querystring,
 		shouldDecodeParam
 	};
@@ -53475,7 +53598,7 @@ var FileImpl$1 = class extends PartBase$1 {
 		};
 	}
 };
-const defaultWriteFile = (path, file) => flatMap(FileSystem.asEffect(), (fs) => mapError$2(run$4(file.content, fs.sink(path)), (cause) => new MultipartError({
+const defaultWriteFile = (path$2, file) => flatMap(FileSystem.asEffect(), (fs) => mapError$2(run$4(file.content, fs.sink(path$2)), (cause) => new MultipartError({
 	reason: "InternalError",
 	cause
 })));
@@ -53510,11 +53633,11 @@ const toPersisted = (stream$3, writeFile$1 = defaultWriteFile) => gen(function*
 			return void_$1;
 		} else if (part.name === "") return void_$1;
 		const file = part;
-		const path = path_.join(dir, path_.basename(file.name).slice(-128));
-		const filePart = new PersistedFileImpl(file.key, file.name, file.contentType, path);
+		const path$2 = path_.join(dir, path_.basename(file.name).slice(-128));
+		const filePart = new PersistedFileImpl(file.key, file.name, file.contentType, path$2);
 		if (Array.isArray(persisted$1[part.key])) persisted$1[part.key].push(filePart);
 		else persisted$1[part.key] = [filePart];
-		return writeFile$1(path, file);
+		return writeFile$1(path$2, file);
 	});
 	return persisted$1;
 }).pipe(catchTag("PlatformError", (cause) => fail$3(new MultipartError({
@@ -53527,12 +53650,12 @@ var PersistedFileImpl = class extends PartBase$1 {
 	name;
 	contentType;
 	path;
-	constructor(key, name, contentType, path) {
+	constructor(key, name, contentType, path$2) {
 		super();
 		this.key = key;
 		this.name = name;
 		this.contentType = contentType;
-		this.path = path;
+		this.path = path$2;
 	}
 	toJSON() {
 		return {
@@ -53992,15 +54115,15 @@ const make$7 = /* @__PURE__ */ fnUntraced(function* (impl) {
 	const fs = yield* FileSystem;
 	const etagGen = yield* Generator;
 	return HttpPlatform.of({
-		fileResponse: fnUntraced(function* (path, options) {
-			const info = yield* fs.stat(path);
+		fileResponse: fnUntraced(function* (path$2, options) {
+			const info = yield* fs.stat(path$2);
 			const etag = yield* etagGen.fromFileInfo(info);
 			const start = Number(options?.offset ?? 0);
 			const end$1 = options?.bytesToRead !== void 0 ? start + Number(options.bytesToRead) : void 0;
 			const headers = set$2(options?.headers ? fromInput$1(options.headers) : empty$4, "etag", toString(etag));
 			if (info.mtime) headers["last-modified"] = info.mtime.toUTCString();
 			const contentLength = end$1 !== void 0 ? end$1 - start : Number(info.size) - start;
-			return impl.fileResponse(path, options?.status ?? 200, options?.statusText, headers, start, end$1, contentLength);
+			return impl.fileResponse(path$2, options?.status ?? 200, options?.statusText, headers, start, end$1, contentLength);
 		}),
 		fileWebResponse(file, options) {
 			return map$4(etagGen.fromFileWeb(file), (etag) => {
@@ -54018,8 +54141,8 @@ const make$7 = /* @__PURE__ */ fnUntraced(function* (impl) {
 * @category layers
 */
 const layer$11 = /* @__PURE__ */ effect(HttpPlatform)(flatMap(FileSystem.asEffect(), (fs) => make$7({
-	fileResponse(path, status, statusText, headers, start, end$1, contentLength) {
-		return stream$1(fs.stream(path, {
+	fileResponse(path$2, status, statusText, headers, start, end$1, contentLength) {
+		return stream$1(fs.stream(path$2, {
 			offset: start,
 			bytesToRead: end$1 !== void 0 ? end$1 - start : void 0
 		}), {
@@ -54151,9 +54274,9 @@ const make$5 = /* @__PURE__ */ gen(function* () {
 				...this,
 				prefixed: (newPrefix) => this.prefixed(prefixPath(prefix$1, newPrefix)),
 				addAll: (routes) => addAll(routes.map(prefixRoute(prefix$1))),
-				add: (method, path, handler$1, options) => addAll([makeRoute({
+				add: (method, path$2, handler$1, options) => addAll([makeRoute({
 					method,
-					path: prefixPath(path, prefix$1),
+					path: prefixPath(path$2, prefix$1),
 					handler: isHttpServerResponse(handler$1) ? succeed(handler$1) : isEffect(handler$1) ? handler$1 : flatMap(HttpServerRequest.asEffect(), handler$1),
 					uninterruptible: options?.uninterruptible ?? false,
 					prefix: prefix$1
@@ -54161,7 +54284,7 @@ const make$5 = /* @__PURE__ */ gen(function* () {
 			});
 		},
 		addAll,
-		add: (method, path, handler$1, options) => addAll([route(method, path, handler$1, options)]),
+		add: (method, path$2, handler$1, options) => addAll([route(method, path$2, handler$1, options)]),
 		addGlobalMiddleware: (middleware_) => sync(() => {
 			middleware$1.add(middleware_);
 		}),
@@ -54243,7 +54366,7 @@ const use = (f) => effectDiscard(flatMap(HttpRouter.asEffect(), f));
 * @since 4.0.0
 * @category HttpRouter
 */
-const add = (method, path, handler$1, options) => use((router) => router.add(method, path, handler$1, options));
+const add = (method, path$2, handler$1, options) => use((router) => router.add(method, path$2, handler$1, options));
 /**
 * @since 4.0.0
 * @category HttpRouter
@@ -54260,14 +54383,14 @@ const makeRoute = (options) => ({
 * @since 4.0.0
 * @category Route
 */
-const route = (method, path, handler$1, options) => makeRoute({
+const route = (method, path$2, handler$1, options) => makeRoute({
 	...options,
 	method,
-	path,
+	path: path$2,
 	handler: isHttpServerResponse(handler$1) ? succeed(handler$1) : isEffect(handler$1) ? handler$1 : flatMap(HttpServerRequest.asEffect(), handler$1),
 	uninterruptible: options?.uninterruptible ?? false
 });
-const removeTrailingSlash = (path) => path.endsWith("/") ? path.slice(0, -1) : path;
+const removeTrailingSlash = (path$2) => path$2.endsWith("/") ? path$2.slice(0, -1) : path$2;
 /**
 * @since 4.0.0
 * @category PathInput
@@ -57986,11 +58109,11 @@ const handleBadArgument = (method) => (err) => new BadArgument({
 });
 const access = /* @__PURE__ */ (() => {
 	const nodeAccess = /* @__PURE__ */ effectify(NFS.access, /* @__PURE__ */ handleErrnoException("FileSystem", "access"), /* @__PURE__ */ handleBadArgument("access"));
-	return (path, options) => {
+	return (path$2, options) => {
 		let mode = NFS.constants.F_OK;
 		if (options?.readable) mode |= NFS.constants.R_OK;
 		if (options?.writable) mode |= NFS.constants.W_OK;
-		return nodeAccess(path, mode);
+		return nodeAccess(path$2, mode);
 	};
 })();
 const copy = /* @__PURE__ */ (() => {
@@ -58007,11 +58130,11 @@ const copyFile = /* @__PURE__ */ (() => {
 })();
 const chmod = /* @__PURE__ */ (() => {
 	const nodeChmod = /* @__PURE__ */ effectify(NFS.chmod, /* @__PURE__ */ handleErrnoException("FileSystem", "chmod"), /* @__PURE__ */ handleBadArgument("chmod"));
-	return (path, mode) => nodeChmod(path, mode);
+	return (path$2, mode) => nodeChmod(path$2, mode);
 })();
 const chown = /* @__PURE__ */ (() => {
 	const nodeChown = /* @__PURE__ */ effectify(NFS.chown, /* @__PURE__ */ handleErrnoException("FileSystem", "chown"), /* @__PURE__ */ handleBadArgument("chown"));
-	return (path, uid, gid) => nodeChown(path, uid, gid);
+	return (path$2, uid, gid) => nodeChown(path$2, uid, gid);
 })();
 const link = /* @__PURE__ */ (() => {
 	const nodeLink = /* @__PURE__ */ effectify(NFS.link, /* @__PURE__ */ handleErrnoException("FileSystem", "link"), /* @__PURE__ */ handleBadArgument("link"));
@@ -58019,7 +58142,7 @@ const link = /* @__PURE__ */ (() => {
 })();
 const makeDirectory = /* @__PURE__ */ (() => {
 	const nodeMkdir = /* @__PURE__ */ effectify(NFS.mkdir, /* @__PURE__ */ handleErrnoException("FileSystem", "makeDirectory"), /* @__PURE__ */ handleBadArgument("makeDirectory"));
-	return (path, options) => nodeMkdir(path, {
+	return (path$2, options) => nodeMkdir(path$2, {
 		recursive: options?.recursive ?? false,
 		mode: options?.mode
 	});
@@ -58028,14 +58151,14 @@ const makeTempDirectoryFactory = (method) => {
 	const nodeMkdtemp = effectify(NFS.mkdtemp, handleErrnoException("FileSystem", method), handleBadArgument(method));
 	return (options) => suspend$2(() => {
 		const prefix$1 = options?.prefix ?? "";
-		const directory = typeof options?.directory === "string" ? Path.join(options.directory, ".") : OS.tmpdir();
-		return nodeMkdtemp(prefix$1 ? Path.join(directory, prefix$1) : directory + "/");
+		const directory$2 = typeof options?.directory === "string" ? Path.join(options.directory, ".") : OS.tmpdir();
+		return nodeMkdtemp(prefix$1 ? Path.join(directory$2, prefix$1) : directory$2 + "/");
 	});
 };
 const makeTempDirectory = /* @__PURE__ */ makeTempDirectoryFactory("makeTempDirectory");
 const removeFactory = (method) => {
 	const nodeRm = effectify(NFS.rm, handleErrnoException("FileSystem", method), handleBadArgument(method));
-	return (path, options) => nodeRm(path, {
+	return (path$2, options) => nodeRm(path$2, {
 		recursive: options?.recursive ?? false,
 		force: options?.force ?? false
 	});
@@ -58044,12 +58167,12 @@ const remove = /* @__PURE__ */ removeFactory("remove");
 const makeTempDirectoryScoped = /* @__PURE__ */ (() => {
 	const makeDirectory$1 = /* @__PURE__ */ makeTempDirectoryFactory("makeTempDirectoryScoped");
 	const removeDirectory = /* @__PURE__ */ removeFactory("makeTempDirectoryScoped");
-	return (options) => acquireRelease(makeDirectory$1(options), (directory) => orDie$2(removeDirectory(directory, { recursive: true })));
+	return (options) => acquireRelease(makeDirectory$1(options), (directory$2) => orDie$2(removeDirectory(directory$2, { recursive: true })));
 })();
 const openFactory = (method) => {
 	const nodeOpen = effectify(NFS.open, handleErrnoException("FileSystem", method), handleBadArgument(method));
 	const nodeClose = effectify(NFS.close, handleErrnoException("FileSystem", method), handleBadArgument(method));
-	return (path, options) => pipe(acquireRelease(nodeOpen(path, options?.flag ?? "r", options?.mode), (fd) => orDie$2(nodeClose(fd))), map$4((fd) => makeFile(FileDescriptor(fd), options?.flag?.startsWith("a") ?? false)));
+	return (path$2, options) => pipe(acquireRelease(nodeOpen(path$2, options?.flag ?? "r", options?.mode), (fd) => orDie$2(nodeClose(fd))), map$4((fd) => makeFile(FileDescriptor(fd), options?.flag?.startsWith("a") ?? false)));
 };
 const open = /* @__PURE__ */ openFactory("open");
 const makeFile = /* @__PURE__ */ (() => {
@@ -58160,9 +58283,9 @@ const makeFile = /* @__PURE__ */ (() => {
 const makeTempFileFactory = (method) => {
 	const makeDirectory$1 = makeTempDirectoryFactory(method);
 	return fnUntraced(function* (options) {
-		const directory = yield* makeDirectory$1(options);
+		const directory$2 = yield* makeDirectory$1(options);
 		const random$1 = Crypto.randomBytes(6).toString("hex");
-		const name = Path.join(directory, options?.suffix ? `${random$1}${options.suffix}` : random$1);
+		const name = Path.join(directory$2, options?.suffix ? `${random$1}${options.suffix}` : random$1);
 		yield* writeFile(name, new Uint8Array(0));
 		return name;
 	});
@@ -58173,14 +58296,14 @@ const makeTempFileScoped = /* @__PURE__ */ (() => {
 	const removeDirectory = /* @__PURE__ */ removeFactory("makeTempFileScoped");
 	return (options) => acquireRelease(makeFile$1(options), (file) => orDie$2(removeDirectory(Path.dirname(file), { recursive: true })));
 })();
-const readDirectory = (path, options) => tryPromise({
-	try: () => NFS.promises.readdir(path, options),
-	catch: (err) => handleErrnoException("FileSystem", "readDirectory")(err, [path])
+const readDirectory = (path$2, options) => tryPromise({
+	try: () => NFS.promises.readdir(path$2, options),
+	catch: (err) => handleErrnoException("FileSystem", "readDirectory")(err, [path$2])
 });
-const readFile = (path) => callback$1((resume, signal) => {
+const readFile = (path$2) => callback$1((resume, signal) => {
 	try {
-		NFS.readFile(path, { signal }, (err, data) => {
-			if (err) resume(fail$3(handleErrnoException("FileSystem", "readFile")(err, [path])));
+		NFS.readFile(path$2, { signal }, (err, data) => {
+			if (err) resume(fail$3(handleErrnoException("FileSystem", "readFile")(err, [path$2])));
 			else resume(succeed(data));
 		});
 	} catch (err) {
@@ -58189,11 +58312,11 @@ const readFile = (path) => callback$1((resume, signal) => {
 });
 const readLink = /* @__PURE__ */ (() => {
 	const nodeReadLink = /* @__PURE__ */ effectify(NFS.readlink, /* @__PURE__ */ handleErrnoException("FileSystem", "readLink"), /* @__PURE__ */ handleBadArgument("readLink"));
-	return (path) => nodeReadLink(path);
+	return (path$2) => nodeReadLink(path$2);
 })();
 const realPath = /* @__PURE__ */ (() => {
 	const nodeRealPath = /* @__PURE__ */ effectify(NFS.realpath, /* @__PURE__ */ handleErrnoException("FileSystem", "realPath"), /* @__PURE__ */ handleBadArgument("realPath"));
-	return (path) => nodeRealPath(path);
+	return (path$2) => nodeRealPath(path$2);
 })();
 const rename = /* @__PURE__ */ (() => {
 	const nodeRename = /* @__PURE__ */ effectify(NFS.rename, /* @__PURE__ */ handleErrnoException("FileSystem", "rename"), /* @__PURE__ */ handleBadArgument("rename"));
@@ -58217,40 +58340,40 @@ const makeFileInfo = (stat$1) => ({
 });
 const stat = /* @__PURE__ */ (() => {
 	const nodeStat = /* @__PURE__ */ effectify(NFS.stat, /* @__PURE__ */ handleErrnoException("FileSystem", "stat"), /* @__PURE__ */ handleBadArgument("stat"));
-	return (path) => map$4(nodeStat(path), makeFileInfo);
+	return (path$2) => map$4(nodeStat(path$2), makeFileInfo);
 })();
 const symlink = /* @__PURE__ */ (() => {
 	const nodeSymlink = /* @__PURE__ */ effectify(NFS.symlink, /* @__PURE__ */ handleErrnoException("FileSystem", "symlink"), /* @__PURE__ */ handleBadArgument("symlink"));
-	return (target, path) => nodeSymlink(target, path);
+	return (target, path$2) => nodeSymlink(target, path$2);
 })();
 const truncate = /* @__PURE__ */ (() => {
 	const nodeTruncate = /* @__PURE__ */ effectify(NFS.truncate, /* @__PURE__ */ handleErrnoException("FileSystem", "truncate"), /* @__PURE__ */ handleBadArgument("truncate"));
-	return (path, length) => nodeTruncate(path, length !== void 0 ? Number(length) : void 0);
+	return (path$2, length) => nodeTruncate(path$2, length !== void 0 ? Number(length) : void 0);
 })();
 const utimes = /* @__PURE__ */ (() => {
 	const nodeUtimes = /* @__PURE__ */ effectify(NFS.utimes, /* @__PURE__ */ handleErrnoException("FileSystem", "utime"), /* @__PURE__ */ handleBadArgument("utime"));
-	return (path, atime, mtime) => nodeUtimes(path, atime, mtime);
+	return (path$2, atime, mtime) => nodeUtimes(path$2, atime, mtime);
 })();
-const watchNode = (path) => callback((queue) => acquireRelease(sync(() => {
-	const watcher = NFS.watch(path, {}, (event, path$1) => {
-		if (!path$1) return;
+const watchNode = (path$2) => callback((queue) => acquireRelease(sync(() => {
+	const watcher = NFS.watch(path$2, {}, (event, path$3) => {
+		if (!path$3) return;
 		switch (event) {
 			case "rename":
-				runFork(matchEffect(stat(path$1), {
+				runFork(matchEffect(stat(path$3), {
 					onSuccess: (_) => offer(queue, {
 						_tag: "Create",
-						path: path$1
+						path: path$3
 					}),
 					onFailure: (_) => offer(queue, {
 						_tag: "Remove",
-						path: path$1
+						path: path$3
 					})
 				}));
 				return;
 			case "change":
 				offerUnsafe(queue, {
 					_tag: "Update",
-					path: path$1
+					path: path$3
 				});
 				return;
 		}
@@ -58260,7 +58383,7 @@ const watchNode = (path) => callback((queue) => acquireRelease(sync(() => {
 			module: "FileSystem",
 			reason: "Unknown",
 			method: "watch",
-			pathOrDescriptor: path,
+			pathOrDescriptor: path$2,
 			cause: error$1
 		})));
 	});
@@ -58269,21 +58392,21 @@ const watchNode = (path) => callback((queue) => acquireRelease(sync(() => {
 	});
 	return watcher;
 }), (watcher) => sync(() => watcher.close())));
-const watch = (backend, path) => stat(path).pipe(map$4((stat$1) => {
+const watch = (backend, path$2) => stat(path$2).pipe(map$4((stat$1) => {
 	if (backend) {
-		const stream$3 = backend.register(path, stat$1);
+		const stream$3 = backend.register(path$2, stat$1);
 		if (stream$3) return stream$3;
 	}
-	return watchNode(path);
+	return watchNode(path$2);
 }), unwrap);
-const writeFile = (path, data, options) => callback$1((resume, signal) => {
+const writeFile = (path$2, data, options) => callback$1((resume, signal) => {
 	try {
-		NFS.writeFile(path, data, {
+		NFS.writeFile(path$2, data, {
 			signal,
 			flag: options?.flag,
 			mode: options?.mode
 		}, (err) => {
-			if (err) resume(fail$3(handleErrnoException("FileSystem", "writeFile")(err, [path])));
+			if (err) resume(fail$3(handleErrnoException("FileSystem", "writeFile")(err, [path$2])));
 			else resume(void_$1);
 		});
 	} catch (err) {
@@ -58313,8 +58436,8 @@ const makeFileSystem = /* @__PURE__ */ map$4(/* @__PURE__ */ serviceOption(Watch
 	symlink,
 	truncate,
 	utimes,
-	watch(path) {
-		return watch(getOrUndefined(backend), path);
+	watch(path$2) {
+		return watch(getOrUndefined(backend), path$2);
 	},
 	writeFile
 }));
@@ -58464,15 +58587,15 @@ const layer$7 = /* @__PURE__ */ layerMergedServices(/* @__PURE__ */ succeed(fetc
 * @category Constructors
 */
 const make$4 = /* @__PURE__ */ make$7({
-	fileResponse(path, status, statusText, headers, start, end$1, contentLength) {
-		const stream$3 = NFS.createReadStream(path, {
+	fileResponse(path$2, status, statusText, headers, start, end$1, contentLength) {
+		const stream$3 = NFS.createReadStream(path$2, {
 			start,
 			end: end$1
 		});
 		return raw(stream$3, {
 			headers: {
 				...headers,
-				"content-type": headers["content-type"] ?? Mime_default.getType(path) ?? "application/octet-stream",
+				"content-type": headers["content-type"] ?? Mime_default.getType(path$2) ?? "application/octet-stream",
 				"content-length": contentLength.toString()
 			},
 			status,
@@ -58599,8 +58722,8 @@ const stream = (source, headers) => makeConfig(headers).pipe(map$4((config) => f
 * @since 1.0.0
 * @category constructors
 */
-const persisted = (source, headers) => toPersisted(stream(source, headers), (path, file) => tryPromise({
-	try: (signal) => NodeStreamP.pipeline(file.file, NFS.createWriteStream(path), { signal }),
+const persisted = (source, headers) => toPersisted(stream(source, headers), (path$2, file) => tryPromise({
+	try: (signal) => NodeStreamP.pipeline(file.file, NFS.createWriteStream(path$2), { signal }),
 	catch: (cause) => new MultipartError({
 		reason: "InternalError",
 		cause
@@ -58711,8 +58834,8 @@ const fromFileUrl = (url) => try_({
 		cause
 	})
 });
-const toFileUrl = (path) => try_({
-	try: () => NodeUrl.pathToFileURL(path),
+const toFileUrl = (path$2) => try_({
+	try: () => NodeUrl.pathToFileURL(path$2),
 	catch: (cause) => new BadArgument({
 		module: "Path",
 		method: "toFileUrl",
@@ -60089,7 +60212,7 @@ var require_visitor = /* @__PURE__ */ __commonJSMin(((exports$1) => {
 		var node = void 0;
 		var key = void 0;
 		var parent = void 0;
-		var path = [];
+		var path$2 = [];
 		var ancestors = [];
 		var newRoot = root$1;
 		do {
@@ -60097,7 +60220,7 @@ var require_visitor = /* @__PURE__ */ __commonJSMin(((exports$1) => {
 			var isLeaving = index === keys$1.length;
 			var isEdited = isLeaving && edits.length !== 0;
 			if (isLeaving) {
-				key = ancestors.length === 0 ? void 0 : path[path.length - 1];
+				key = ancestors.length === 0 ? void 0 : path$2[path$2.length - 1];
 				node = parent;
 				parent = ancestors.pop();
 				if (isEdited) {
@@ -60130,32 +60253,32 @@ var require_visitor = /* @__PURE__ */ __commonJSMin(((exports$1) => {
 				key = parent ? inArray ? index : keys$1[index] : void 0;
 				node = parent ? parent[key] : newRoot;
 				if (node === null || node === void 0) continue;
-				if (parent) path.push(key);
+				if (parent) path$2.push(key);
 			}
 			var result$2 = void 0;
 			if (!Array.isArray(node)) {
 				if (!(0, _ast.isNode)(node)) throw new Error("Invalid AST Node: ".concat((0, _inspect.default)(node), "."));
 				var visitFn = getVisitFn(visitor, node.kind, isLeaving);
 				if (visitFn) {
-					result$2 = visitFn.call(visitor, node, key, parent, path, ancestors);
+					result$2 = visitFn.call(visitor, node, key, parent, path$2, ancestors);
 					if (result$2 === BREAK) break;
 					if (result$2 === false) {
 						if (!isLeaving) {
-							path.pop();
+							path$2.pop();
 							continue;
 						}
 					} else if (result$2 !== void 0) {
 						edits.push([key, result$2]);
 						if (!isLeaving) if ((0, _ast.isNode)(result$2)) node = result$2;
 						else {
-							path.pop();
+							path$2.pop();
 							continue;
 						}
 					}
 				}
 			}
 			if (result$2 === void 0 && isEdited) edits.push([key, node]);
-			if (isLeaving) path.pop();
+			if (isLeaving) path$2.pop();
 			else {
 				var _visitorKeys$node$kin;
 				stack = {
@@ -134682,7 +134805,7 @@ paginateRest.VERSION = VERSION$11;
 
 //#endregion
 //#region node_modules/.pnpm/@octokit+plugin-paginate-graphql@6.0.0_@octokit+core@7.0.6/node_modules/@octokit/plugin-paginate-graphql/dist-bundle/index.js
-var generateMessage = (path, cursorValue) => `The cursor at "${path.join(",")}" did not change its value "${cursorValue}" after a page transition. Please make sure your that your query is set up correctly.`;
+var generateMessage = (path$2, cursorValue) => `The cursor at "${path$2.join(",")}" did not change its value "${cursorValue}" after a page transition. Please make sure your that your query is set up correctly.`;
 var MissingCursorChange = class extends Error {
 	constructor(pageInfo, cursorValue) {
 		super(generateMessage(pageInfo.pathInQuery, cursorValue));
@@ -134706,9 +134829,9 @@ function findPaginatedResourcePath(responseData) {
 	if (paginatedResourcePath.length === 0) throw new MissingPageInfo(responseData);
 	return paginatedResourcePath;
 }
-var deepFindPathToProperty = (object, searchProp, path = []) => {
+var deepFindPathToProperty = (object, searchProp, path$2 = []) => {
 	for (const key of Object.keys(object)) {
-		const currentPath = [...path, key];
+		const currentPath = [...path$2, key];
 		const currentValue = object[key];
 		if (isObject(currentValue)) {
 			if (currentValue.hasOwnProperty(searchProp)) return currentPath;
@@ -134718,12 +134841,12 @@ var deepFindPathToProperty = (object, searchProp, path = []) => {
 	}
 	return [];
 };
-var get$1 = (object, path) => {
-	return path.reduce((current, nextProperty) => current[nextProperty], object);
+var get$1 = (object, path$2) => {
+	return path$2.reduce((current, nextProperty) => current[nextProperty], object);
 };
-var set$1 = (object, path, mutator) => {
-	const lastProperty = path[path.length - 1];
-	const parent = get$1(object, [...path].slice(0, -1));
+var set$1 = (object, path$2, mutator) => {
+	const lastProperty = path$2[path$2.length - 1];
+	const parent = get$1(object, [...path$2].slice(0, -1));
 	if (typeof mutator === "function") parent[lastProperty] = mutator(parent[lastProperty]);
 	else parent[lastProperty] = mutator;
 };
@@ -134766,18 +134889,18 @@ var createIterator = (octokit) => {
 };
 var mergeResponses = (response1, response2) => {
 	if (Object.keys(response1).length === 0) return Object.assign(response1, response2);
-	const path = findPaginatedResourcePath(response1);
-	const nodesPath = [...path, "nodes"];
+	const path$2 = findPaginatedResourcePath(response1);
+	const nodesPath = [...path$2, "nodes"];
 	const newNodes = get$1(response2, nodesPath);
 	if (newNodes) set$1(response1, nodesPath, (values$1) => {
 		return [...values$1, ...newNodes];
 	});
-	const edgesPath = [...path, "edges"];
+	const edgesPath = [...path$2, "edges"];
 	const newEdges = get$1(response2, edgesPath);
 	if (newEdges) set$1(response1, edgesPath, (values$1) => {
 		return [...values$1, ...newEdges];
 	});
-	const pageInfoPath = [...path, "pageInfo"];
+	const pageInfoPath = [...path$2, "pageInfo"];
 	set$1(response1, pageInfoPath, get$1(response2, pageInfoPath));
 	return response1;
 };
@@ -137489,7 +137612,7 @@ var triggers_notification_paths_default = [
 	"/teams/{team_id}/discussions/{discussion_number}/comments"
 ];
 function routeMatcher$1(paths) {
-	const regex2 = `^(?:${paths.map((path) => path.split("/").map((c) => c.startsWith("{") ? "(?:.+?)" : c).join("/")).map((r) => `(?:${r})`).join("|")})[^/]*$`;
+	const regex2 = `^(?:${paths.map((path$2) => path$2.split("/").map((c) => c.startsWith("{") ? "(?:.+?)" : c).join("/")).map((r) => `(?:${r})`).join("|")})[^/]*$`;
 	return new RegExp(regex2, "i");
 }
 var regex = routeMatcher$1(triggers_notification_paths_default);
@@ -140171,6 +140294,7 @@ permission.
      HEAD as the base.
    - New branches should be named using the format \`{task id}/description\`.
    - When checking for PR reviews, make sure to check the "reviews" field and read ALL unresolved comments.
+     Also read the normal comments to see if there are any additional requests.
 4. Implement the task.
    - This session will time out after a certain period, so make sure to record
      key information that could speed up future work on the task in the task
@@ -140222,6 +140346,7 @@ permission.
 3. Mark the original task as "done" by updating its \`state\` in the prd.yml file.
 4. Each new task should have an id of \`null\`, a title, and a concise description that
    includes a short summary of the task and a brief list of steps to complete it.
+   - Include where to find the plan specification in the description (if applicable).
    - The tasks should start in the "todo" state.
    - Each task should be an atomic, committable piece of work.
      Instead of creating tasks like "Refactor the authentication system", create
@@ -140231,32 +140356,46 @@ permission.
    to assign ids to the new tasks before you can setup dependencies.
 
 ${prdNotes}`;
-	return {
-		promptChoose,
-		prompt,
-		promptTimeout,
-		planPrompt: `# Instructions
+	const planPrompt = (options) => `# Instructions
 
-1. Ask the user for the idea / request, then break it down into multiple smaller tasks
-   that can be added to the prd.yml file. If a plan already exists in "lalph-plan.md",
-   then your job is to iterate on the existing plan by updating the existing tasks.
-   - Make sure to research the codebase before creating any tasks, to ensure they
-     are relevant and feasible.
-   - Check if similar tasks already exist in the prd.yml file to avoid duplication.
-2. Each task should have a id of \`null\`, a title, and a concise description that
-   includes a short summary of the task and a brief list of steps to complete it.
+1. Ask the user for the idea / request, then your job is to create a detailed
+   specification for the project based on that input and save it to a file.
+   - If the user is asking to update an existing plan, then read the
+     existing specification before continuing.
+   - Make sure to research the codebase before creating the specification, to
+     ensure it is relevant and feasible.
+2. Once you have saved the specification, your next job is to break down the
+   specification into smaller, manageable tasks.
+   Each task should have a id of \`null\`, a title, and a concise description that
+   includes a where to find the plan specification, a short summary of the task and a
+   brief list of steps to complete it.
    - The tasks should start in the "todo" state.
    - Each task should be an atomic, committable piece of work.
      Instead of creating tasks like "Refactor the authentication system", create
      smaller tasks like "Implement OAuth2 login endpoint", "Add JWT token refresh mechanism", etc.
-3. Add the new tasks to the prd.yml file.
+3. Add the new or updated tasks to the prd.yml file.
 4. Wait until the tasks are saved, then setup task dependencies using the \`blockedBy\` field.
-5. Add a outline of the plan to a "lalph-plan.md" file, that will help guide future iterations.
-6. Start a subagent with a copy of this prompt, to review the plan and provide feedback or improvements.
+5. Start a subagent with a copy of this prompt, to review the plan and provide feedback or improvements.
+
+**Important:** You are only creating or updating a plan, not implementing any tasks yet.
 
-**Important:** You are only creating or updating the plan, not implementing any tasks yet.
+## Specifications
+
+- Should go into a \`${options.specsDirectory}\` directory, with a filename that reflects the
+  project name.
+
+A specification file should include:
+
+- Requirements: functional and non-functional requirements.
+- Design: technical design, architecture decisions, data models, etc.
+- Acceptance criteria that define when the project is considered complete.
  
-${prdNotes}`
+${prdNotes}`;
+	return {
+		promptChoose,
+		prompt,
+		promptTimeout,
+		planPrompt
 	};
 }) }) {
 	static layer = effect(this, this.make);
@@ -140267,19 +140406,19 @@ ${prdNotes}`
 var Worktree = class extends Service()("lalph/Worktree", { make: gen(function* () {
 	const fs = yield* FileSystem;
 	const pathService = yield* Path$1;
-	const directory = yield* fs.makeTempDirectory();
+	const directory$2 = yield* fs.makeTempDirectory();
 	yield* addFinalizer(fnUntraced(function* () {
-		yield* execIgnore(make$21`git worktree remove --force ${directory}`);
+		yield* execIgnore(make$21`git worktree remove --force ${directory$2}`);
 	}));
-	yield* make$21`git worktree add ${directory} -d HEAD`.pipe(exitCode);
-	yield* fs.makeDirectory(pathService.join(directory, ".lalph"), { recursive: true });
+	yield* make$21`git worktree add ${directory$2} -d HEAD`.pipe(exitCode);
+	yield* fs.makeDirectory(pathService.join(directory$2, ".lalph"), { recursive: true });
 	const setupPath = pathService.resolve(".lalph-setup.sh");
 	if (yield* fs.exists(setupPath)) yield* make$21({
-		cwd: directory,
+		cwd: directory$2,
 		extendEnv: true,
 		shell: process.env.SHELL ?? true
 	})`${setupPath}`.pipe(exitCode);
-	return { directory };
+	return { directory: directory$2 };
 }) }) {
 	static layer = effect(this, this.make);
 };
@@ -140503,16 +140642,13 @@ const ChosenTask = fromJsonString(Struct({ id: String$1 }));
 
 //#endregion
 //#region src/Planner.ts
-const plan = gen(function* () {
+const plan = fnUntraced(function* (options) {
 	const fs = yield* FileSystem;
 	const pathService = yield* Path$1;
 	const worktree = yield* Worktree;
 	const promptGen = yield* PromptGen;
-	const cliAgent = yield* getOrSelectCliAgent;
-	const lalphPlanPath = pathService.join(worktree.directory, "lalph-plan.md");
-	yield* scoped$1(fs.open(lalphPlanPath, { flag: "a+" }));
-	const cliCommand = cliAgent.commandPlan({
-		prompt: promptGen.planPrompt,
+	const cliCommand = (yield* getOrSelectCliAgent).commandPlan({
+		prompt: promptGen.planPrompt(options),
 		prdFilePath: pathService.join(worktree.directory, ".lalph", "prd.yml")
 	});
 	const exitCode$1 = yield* make$21(cliCommand[0], cliCommand.slice(1), {
@@ -140524,9 +140660,8 @@ const plan = gen(function* () {
 		stdin: "inherit"
 	}).pipe(exitCode);
 	yield* log$1(`Agent exited with code: ${exitCode$1}`);
-	const planContent = yield* fs.readFileString(lalphPlanPath);
-	yield* fs.writeFileString(pathService.resolve("lalph-plan.md"), planContent);
-}).pipe(scoped$1, provide$1([
+	yield* fs.copy(pathService.join(worktree.directory, options.specsDirectory), options.specsDirectory, { overwrite: true }).pipe(ignore);
+}, scoped$1, provide$1([
 	PromptGen.layer,
 	Prd.layer,
 	Worktree.layer
@@ -140536,7 +140671,8 @@ const plan = gen(function* () {
 //#region src/cli.ts
 const selectAgent = make$25("agent").pipe(withDescription("Select the CLI agent to use"), withHandler(() => selectCliAgent));
 const selectSource = make$25("source").pipe(withDescription("Select the issue source to use"), withHandler(() => selectIssueSource));
-const planMode = make$25("plan").pipe(withDescription("Iterate on an issue plan and create PRD tasks"), withHandler(() => plan), provide(CurrentIssueSource.layer));
+const specsDirectory = directory("specs").pipe(withDescription$1("Directory to store plan specifications"), withAlias("s"), withDefault(".specs"));
+const planMode = make$25("plan", { specsDirectory }).pipe(withDescription("Iterate on an issue plan and create PRD tasks"), withHandler(plan), provide(CurrentIssueSource.layer));
 const iterations = integer("iterations").pipe(withDescription$1("Number of iterations to run, defaults to unlimited"), withAlias("i"), withDefault(Number.POSITIVE_INFINITY));
 const concurrency = integer("concurrency").pipe(withDescription$1("Number of concurrent agents, defaults to 1"), withAlias("c"), withDefault(1));
 const autoMerge = boolean("auto-merge").pipe(withAlias("a"), withDescription$1("Automatically merge eligible PRs"));