ai-hero-cli 0.4.1 → 0.5.0

package/bin.cjs

@@ -51,9 +51,9 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
 var __commonJS = (cb, mod) => function __require2() {
   return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
 };
-var __export = (target, all10) => {
+var __export = (target2, all10) => {
   for (var name in all10)
-    __defProp(target, name, { get: all10[name], enumerable: true });
+    __defProp(target2, name, { get: all10[name], enumerable: true });
 };
 var __copyProps = (to, from, except, desc) => {
   if (from && typeof from === "object" || typeof from === "function") {
@@ -63,13 +63,13 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget);
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+var __reExport = (target2, mod, secondTarget) => (__copyProps(target2, mod, "default"), secondTarget);
+var __toESM = (mod, isNodeMode, target2) => (target2 = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
   // If the importer is in node compatibility mode or this is not an ESM
   // file that has been converted to a CommonJS file using a Babel-
   // compatible transform (i.e. "__esModule" has not been set), then set
   // "default" to the CommonJS "module.exports" for node compatibility.
-  __defProp(target, "default", { value: mod, enumerable: true }) ,
+  __defProp(target2, "default", { value: mod, enumerable: true }) ,
   mod
 ));
 
@@ -3886,8 +3886,8 @@ var require_compiler = __commonJS({
           valueAssignments.push(fullPath);
         }
       }
-      function pathAssigned(path15) {
-        return assignedPaths.indexOf(path15) !== -1;
+      function pathAssigned(path16) {
+        return assignedPaths.indexOf(path16) !== -1;
       }
       function reduceValueNode(node) {
         if (node.type === "Array") {
@@ -3911,20 +3911,20 @@ var require_compiler = __commonJS({
         return obj;
       }
       function setPath(node) {
-        var path15 = node.value;
-        var quotedPath = path15.map(quoteDottedString).join(".");
+        var path16 = node.value;
+        var quotedPath = path16.map(quoteDottedString).join(".");
         var line4 = node.line;
         var column3 = node.column;
         if (pathAssigned(quotedPath)) {
-          genError("Cannot redefine existing key '" + path15 + "'.", line4, column3);
+          genError("Cannot redefine existing key '" + path16 + "'.", line4, column3);
         }
         assignedPaths.push(quotedPath);
-        context8 = deepRef(data, path15, /* @__PURE__ */ Object.create(null), line4, column3);
-        currentPath = path15;
+        context8 = deepRef(data, path16, /* @__PURE__ */ Object.create(null), line4, column3);
+        currentPath = path16;
       }
       function addTableArray(node) {
-        var path15 = node.value;
-        var quotedPath = path15.map(quoteDottedString).join(".");
+        var path16 = node.value;
+        var quotedPath = path16.map(quoteDottedString).join(".");
         var line4 = node.line;
         var column3 = node.column;
         if (!pathAssigned(quotedPath)) {
@@ -3934,14 +3934,14 @@ var require_compiler = __commonJS({
           return p3.indexOf(quotedPath) !== 0;
         });
         assignedPaths.push(quotedPath);
-        context8 = deepRef(data, path15, [], line4, column3);
+        context8 = deepRef(data, path16, [], line4, column3);
         currentPath = quotedPath;
         if (context8 instanceof Array) {
           var newObj = /* @__PURE__ */ Object.create(null);
           context8.push(newObj);
           context8 = newObj;
         } else {
-          genError("Cannot redefine existing key '" + path15 + "'.", line4, column3);
+          genError("Cannot redefine existing key '" + path16 + "'.", line4, column3);
         }
       }
       function deepRef(start5, keys6, value5, line4, column3) {
@@ -4086,17 +4086,17 @@ var require_visit = __commonJS({
     visit.BREAK = BREAK;
     visit.SKIP = SKIP;
     visit.REMOVE = REMOVE;
-    function visit_(key, node, visitor, path15) {
-      const ctrl = callVisitor(key, node, visitor, path15);
+    function visit_(key, node, visitor, path16) {
+      const ctrl = callVisitor(key, node, visitor, path16);
       if (identity3.isNode(ctrl) || identity3.isPair(ctrl)) {
-        replaceNode(key, path15, ctrl);
-        return visit_(key, ctrl, visitor, path15);
+        replaceNode(key, path16, ctrl);
+        return visit_(key, ctrl, visitor, path16);
       }
       if (typeof ctrl !== "symbol") {
         if (identity3.isCollection(node)) {
-          path15 = Object.freeze(path15.concat(node));
+          path16 = Object.freeze(path16.concat(node));
           for (let i = 0; i < node.items.length; ++i) {
-            const ci = visit_(i, node.items[i], visitor, path15);
+            const ci = visit_(i, node.items[i], visitor, path16);
             if (typeof ci === "number")
               i = ci - 1;
             else if (ci === BREAK)
@@ -4107,13 +4107,13 @@ var require_visit = __commonJS({
             }
           }
         } else if (identity3.isPair(node)) {
-          path15 = Object.freeze(path15.concat(node));
-          const ck = visit_("key", node.key, visitor, path15);
+          path16 = Object.freeze(path16.concat(node));
+          const ck = visit_("key", node.key, visitor, path16);
           if (ck === BREAK)
             return BREAK;
           else if (ck === REMOVE)
             node.key = null;
-          const cv = visit_("value", node.value, visitor, path15);
+          const cv = visit_("value", node.value, visitor, path16);
           if (cv === BREAK)
             return BREAK;
           else if (cv === REMOVE)
@@ -4134,17 +4134,17 @@ var require_visit = __commonJS({
     visitAsync.BREAK = BREAK;
     visitAsync.SKIP = SKIP;
     visitAsync.REMOVE = REMOVE;
-    async function visitAsync_(key, node, visitor, path15) {
-      const ctrl = await callVisitor(key, node, visitor, path15);
+    async function visitAsync_(key, node, visitor, path16) {
+      const ctrl = await callVisitor(key, node, visitor, path16);
       if (identity3.isNode(ctrl) || identity3.isPair(ctrl)) {
-        replaceNode(key, path15, ctrl);
-        return visitAsync_(key, ctrl, visitor, path15);
+        replaceNode(key, path16, ctrl);
+        return visitAsync_(key, ctrl, visitor, path16);
       }
       if (typeof ctrl !== "symbol") {
         if (identity3.isCollection(node)) {
-          path15 = Object.freeze(path15.concat(node));
+          path16 = Object.freeze(path16.concat(node));
           for (let i = 0; i < node.items.length; ++i) {
-            const ci = await visitAsync_(i, node.items[i], visitor, path15);
+            const ci = await visitAsync_(i, node.items[i], visitor, path16);
             if (typeof ci === "number")
               i = ci - 1;
             else if (ci === BREAK)
@@ -4155,13 +4155,13 @@ var require_visit = __commonJS({
             }
           }
         } else if (identity3.isPair(node)) {
-          path15 = Object.freeze(path15.concat(node));
-          const ck = await visitAsync_("key", node.key, visitor, path15);
+          path16 = Object.freeze(path16.concat(node));
+          const ck = await visitAsync_("key", node.key, visitor, path16);
           if (ck === BREAK)
             return BREAK;
           else if (ck === REMOVE)
             node.key = null;
-          const cv = await visitAsync_("value", node.value, visitor, path15);
+          const cv = await visitAsync_("value", node.value, visitor, path16);
           if (cv === BREAK)
             return BREAK;
           else if (cv === REMOVE)
@@ -4188,23 +4188,23 @@ var require_visit = __commonJS({
       }
       return visitor;
     }
-    function callVisitor(key, node, visitor, path15) {
+    function callVisitor(key, node, visitor, path16) {
       if (typeof visitor === "function")
-        return visitor(key, node, path15);
+        return visitor(key, node, path16);
       if (identity3.isMap(node))
-        return visitor.Map?.(key, node, path15);
+        return visitor.Map?.(key, node, path16);
       if (identity3.isSeq(node))
-        return visitor.Seq?.(key, node, path15);
+        return visitor.Seq?.(key, node, path16);
       if (identity3.isPair(node))
-        return visitor.Pair?.(key, node, path15);
+        return visitor.Pair?.(key, node, path16);
       if (identity3.isScalar(node))
-        return visitor.Scalar?.(key, node, path15);
+        return visitor.Scalar?.(key, node, path16);
       if (identity3.isAlias(node))
-        return visitor.Alias?.(key, node, path15);
+        return visitor.Alias?.(key, node, path16);
       return void 0;
     }
-    function replaceNode(key, path15, node) {
-      const parent = path15[path15.length - 1];
+    function replaceNode(key, path16, node) {
+      const parent = path16[path16.length - 1];
       if (identity3.isCollection(parent)) {
         parent.items[key] = node;
       } else if (identity3.isPair(parent)) {
@@ -4803,10 +4803,10 @@ var require_Collection = __commonJS({
     var createNode = require_createNode();
     var identity3 = require_identity();
     var Node = require_Node();
-    function collectionFromPath(schema, path15, value5) {
+    function collectionFromPath(schema, path16, value5) {
       let v = value5;
-      for (let i = path15.length - 1; i >= 0; --i) {
-        const k = path15[i];
+      for (let i = path16.length - 1; i >= 0; --i) {
+        const k = path16[i];
         if (typeof k === "number" && Number.isInteger(k) && k >= 0) {
           const a = [];
           a[k] = v;
@@ -4825,7 +4825,7 @@ var require_Collection = __commonJS({
         sourceObjects: /* @__PURE__ */ new Map()
       });
     }
-    var isEmptyPath = (path15) => path15 == null || typeof path15 === "object" && !!path15[Symbol.iterator]().next().done;
+    var isEmptyPath = (path16) => path16 == null || typeof path16 === "object" && !!path16[Symbol.iterator]().next().done;
     var Collection = class extends Node.NodeBase {
       constructor(type2, schema) {
         super(type2);
@@ -4855,11 +4855,11 @@ var require_Collection = __commonJS({
        * be a Pair instance or a `{ key, value }` object, which may not have a key
        * that already exists in the map.
        */
-      addIn(path15, value5) {
-        if (isEmptyPath(path15))
+      addIn(path16, value5) {
+        if (isEmptyPath(path16))
           this.add(value5);
         else {
-          const [key, ...rest] = path15;
+          const [key, ...rest] = path16;
           const node = this.get(key, true);
           if (identity3.isCollection(node))
             node.addIn(rest, value5);
@@ -4873,8 +4873,8 @@ var require_Collection = __commonJS({
        * Removes a value from the collection.
        * @returns `true` if the item was found and removed.
        */
-      deleteIn(path15) {
-        const [key, ...rest] = path15;
+      deleteIn(path16) {
+        const [key, ...rest] = path16;
         if (rest.length === 0)
           return this.delete(key);
         const node = this.get(key, true);
@@ -4888,8 +4888,8 @@ var require_Collection = __commonJS({
        * scalar values from their surrounding node; to disable set `keepScalar` to
        * `true` (collections are always returned intact).
        */
-      getIn(path15, keepScalar) {
-        const [key, ...rest] = path15;
+      getIn(path16, keepScalar) {
+        const [key, ...rest] = path16;
         const node = this.get(key, true);
         if (rest.length === 0)
           return !keepScalar && identity3.isScalar(node) ? node.value : node;
@@ -4907,8 +4907,8 @@ var require_Collection = __commonJS({
       /**
        * Checks if the collection includes a value with the key `key`.
        */
-      hasIn(path15) {
-        const [key, ...rest] = path15;
+      hasIn(path16) {
+        const [key, ...rest] = path16;
         if (rest.length === 0)
           return this.has(key);
         const node = this.get(key, true);
@@ -4918,8 +4918,8 @@ var require_Collection = __commonJS({
        * Sets a value in this collection. For `!!set`, `value` needs to be a
        * boolean to add/remove the item from the set.
        */
-      setIn(path15, value5) {
-        const [key, ...rest] = path15;
+      setIn(path16, value5) {
+        const [key, ...rest] = path16;
         if (rest.length === 0) {
           this.set(key, value5);
         } else {
@@ -7388,9 +7388,9 @@ var require_Document = __commonJS({
           this.contents.add(value5);
       }
       /** Adds a value to the document. */
-      addIn(path15, value5) {
+      addIn(path16, value5) {
         if (assertCollection(this.contents))
-          this.contents.addIn(path15, value5);
+          this.contents.addIn(path16, value5);
       }
       /**
        * Create a new `Alias` node, ensuring that the target `node` has the required anchor.
@@ -7465,14 +7465,14 @@ var require_Document = __commonJS({
        * Removes a value from the document.
        * @returns `true` if the item was found and removed.
        */
-      deleteIn(path15) {
-        if (Collection.isEmptyPath(path15)) {
+      deleteIn(path16) {
+        if (Collection.isEmptyPath(path16)) {
           if (this.contents == null)
             return false;
           this.contents = null;
           return true;
         }
-        return assertCollection(this.contents) ? this.contents.deleteIn(path15) : false;
+        return assertCollection(this.contents) ? this.contents.deleteIn(path16) : false;
       }
       /**
        * Returns item at `key`, or `undefined` if not found. By default unwraps
@@ -7487,10 +7487,10 @@ var require_Document = __commonJS({
        * scalar values from their surrounding node; to disable set `keepScalar` to
        * `true` (collections are always returned intact).
        */
-      getIn(path15, keepScalar) {
-        if (Collection.isEmptyPath(path15))
+      getIn(path16, keepScalar) {
+        if (Collection.isEmptyPath(path16))
           return !keepScalar && identity3.isScalar(this.contents) ? this.contents.value : this.contents;
-        return identity3.isCollection(this.contents) ? this.contents.getIn(path15, keepScalar) : void 0;
+        return identity3.isCollection(this.contents) ? this.contents.getIn(path16, keepScalar) : void 0;
       }
       /**
        * Checks if the document includes a value with the key `key`.
@@ -7501,10 +7501,10 @@ var require_Document = __commonJS({
       /**
        * Checks if the document includes a value at `path`.
        */
-      hasIn(path15) {
-        if (Collection.isEmptyPath(path15))
+      hasIn(path16) {
+        if (Collection.isEmptyPath(path16))
           return this.contents !== void 0;
-        return identity3.isCollection(this.contents) ? this.contents.hasIn(path15) : false;
+        return identity3.isCollection(this.contents) ? this.contents.hasIn(path16) : false;
       }
       /**
        * Sets a value in this document. For `!!set`, `value` needs to be a
@@ -7521,13 +7521,13 @@ var require_Document = __commonJS({
        * Sets a value in this document. For `!!set`, `value` needs to be a
        * boolean to add/remove the item from the set.
        */
-      setIn(path15, value5) {
-        if (Collection.isEmptyPath(path15)) {
+      setIn(path16, value5) {
+        if (Collection.isEmptyPath(path16)) {
           this.contents = value5;
         } else if (this.contents == null) {
-          this.contents = Collection.collectionFromPath(this.schema, Array.from(path15), value5);
+          this.contents = Collection.collectionFromPath(this.schema, Array.from(path16), value5);
         } else if (assertCollection(this.contents)) {
-          this.contents.setIn(path15, value5);
+          this.contents.setIn(path16, value5);
         }
       }
       /**
@@ -9459,9 +9459,9 @@ var require_cst_visit = __commonJS({
     visit.BREAK = BREAK;
     visit.SKIP = SKIP;
     visit.REMOVE = REMOVE;
-    visit.itemAtPath = (cst, path15) => {
+    visit.itemAtPath = (cst, path16) => {
       let item = cst;
-      for (const [field, index] of path15) {
+      for (const [field, index] of path16) {
         const tok = item?.[field];
         if (tok && "items" in tok) {
           item = tok.items[index];
@@ -9470,23 +9470,23 @@ var require_cst_visit = __commonJS({
       }
       return item;
     };
-    visit.parentCollection = (cst, path15) => {
-      const parent = visit.itemAtPath(cst, path15.slice(0, -1));
-      const field = path15[path15.length - 1][0];
+    visit.parentCollection = (cst, path16) => {
+      const parent = visit.itemAtPath(cst, path16.slice(0, -1));
+      const field = path16[path16.length - 1][0];
       const coll = parent?.[field];
       if (coll && "items" in coll)
         return coll;
       throw new Error("Parent collection not found");
     };
-    function _visit(path15, item, visitor) {
-      let ctrl = visitor(item, path15);
+    function _visit(path16, item, visitor) {
+      let ctrl = visitor(item, path16);
       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(path15.concat([[field, i]])), token.items[i], visitor);
+            const ci = _visit(Object.freeze(path16.concat([[field, i]])), token.items[i], visitor);
             if (typeof ci === "number")
               i = ci - 1;
             else if (ci === BREAK)
@@ -9497,10 +9497,10 @@ var require_cst_visit = __commonJS({
             }
           }
           if (typeof ctrl === "function" && field === "key")
-            ctrl = ctrl(item, path15);
+            ctrl = ctrl(item, path16);
         }
       }
-      return typeof ctrl === "function" ? ctrl(item, path15) : ctrl;
+      return typeof ctrl === "function" ? ctrl(item, path16) : ctrl;
     }
     exports.visit = visit;
   }
@@ -12135,14 +12135,14 @@ var require_util = __commonJS({
         }
         const port2 = url2.port != null ? url2.port : url2.protocol === "https:" ? 443 : 80;
         let origin = url2.origin != null ? url2.origin : `${url2.protocol || ""}//${url2.hostname || ""}:${port2}`;
-        let path15 = url2.path != null ? url2.path : `${url2.pathname || ""}${url2.search || ""}`;
+        let path16 = url2.path != null ? url2.path : `${url2.pathname || ""}${url2.search || ""}`;
         if (origin[origin.length - 1] === "/") {
           origin = origin.slice(0, origin.length - 1);
         }
-        if (path15 && path15[0] !== "/") {
-          path15 = `/${path15}`;
+        if (path16 && path16[0] !== "/") {
+          path16 = `/${path16}`;
         }
-        return new URL(`${origin}${path15}`);
+        return new URL(`${origin}${path16}`);
       }
       if (!isHttpOrHttpsPrefixed(url2.origin || url2.protocol)) {
         throw new InvalidArgumentError("Invalid URL protocol: the URL must start with `http:` or `https:`.");
@@ -12688,9 +12688,9 @@ var require_diagnostics = __commonJS({
         "undici:client:sendHeaders",
         (evt) => {
           const {
-            request: { method, path: path15, origin }
+            request: { method, path: path16, origin }
           } = evt;
-          debugLog("sending request to %s %s%s", method, origin, path15);
+          debugLog("sending request to %s %s%s", method, origin, path16);
         }
       );
     }
@@ -12704,14 +12704,14 @@ var require_diagnostics = __commonJS({
         "undici:request:headers",
         (evt) => {
           const {
-            request: { method, path: path15, origin },
+            request: { method, path: path16, origin },
             response: { statusCode }
           } = evt;
           debugLog(
             "received response to %s %s%s - HTTP %d",
             method,
             origin,
-            path15,
+            path16,
             statusCode
           );
         }
@@ -12720,23 +12720,23 @@ var require_diagnostics = __commonJS({
         "undici:request:trailers",
         (evt) => {
           const {
-            request: { method, path: path15, origin }
+            request: { method, path: path16, origin }
           } = evt;
-          debugLog("trailers received from %s %s%s", method, origin, path15);
+          debugLog("trailers received from %s %s%s", method, origin, path16);
         }
       );
       diagnosticsChannel.subscribe(
         "undici:request:error",
         (evt) => {
           const {
-            request: { method, path: path15, origin },
+            request: { method, path: path16, origin },
             error: error4
           } = evt;
           debugLog(
             "request to %s %s%s errored - %s",
             method,
             origin,
-            path15,
+            path16,
             error4.message
           );
         }
@@ -12830,7 +12830,7 @@ var require_request = __commonJS({
     var kHandler = Symbol("handler");
     var Request = class {
       constructor(origin, {
-        path: path15,
+        path: path16,
         method,
         body,
         headers,
@@ -12846,11 +12846,11 @@ var require_request = __commonJS({
         throwOnError,
         maxRedirections
       }, handler) {
-        if (typeof path15 !== "string") {
+        if (typeof path16 !== "string") {
           throw new InvalidArgumentError("path must be a string");
-        } else if (path15[0] !== "/" && !(path15.startsWith("http://") || path15.startsWith("https://")) && method !== "CONNECT") {
+        } else if (path16[0] !== "/" && !(path16.startsWith("http://") || path16.startsWith("https://")) && method !== "CONNECT") {
           throw new InvalidArgumentError("path must be an absolute URL or start with a slash");
-        } else if (invalidPathRegex.test(path15)) {
+        } else if (invalidPathRegex.test(path16)) {
           throw new InvalidArgumentError("invalid request path");
         }
         if (typeof method !== "string") {
@@ -12918,7 +12918,7 @@ var require_request = __commonJS({
         this.completed = false;
         this.aborted = false;
         this.upgrade = upgrade || null;
-        this.path = query ? serializePathWithQuery(path15, query) : path15;
+        this.path = query ? serializePathWithQuery(path16, query) : path16;
         this.origin = origin;
         this.idempotent = idempotent == null ? method === "HEAD" || method === "GET" : idempotent;
         this.blocking = blocking ?? this.method !== "HEAD";
@@ -12983,14 +12983,14 @@ var require_request = __commonJS({
           }
         }
       }
-      onConnect(abort) {
+      onConnect(abort2) {
         assert3(!this.aborted);
         assert3(!this.completed);
         if (this.error) {
-          abort(this.error);
+          abort2(this.error);
         } else {
-          this.abort = abort;
-          return this[kHandler].onConnect(abort);
+          this.abort = abort2;
+          return this[kHandler].onConnect(abort2);
         }
       }
       onResponseStarted() {
@@ -13151,8 +13151,8 @@ var require_wrap_handler = __commonJS({
         return handler.onRequestStart ? handler : new WrapHandler(handler);
       }
       // Unwrap Interface
-      onConnect(abort, context8) {
-        return this.#handler.onConnect?.(abort, context8);
+      onConnect(abort2, context8) {
+        return this.#handler.onConnect?.(abort2, context8);
       }
       onHeaders(statusCode, rawHeaders, resume2, statusMessage) {
         return this.#handler.onHeaders?.(statusCode, rawHeaders, resume2, statusMessage);
@@ -13247,7 +13247,7 @@ var require_dispatcher = __commonJS({
           }
         }
         return new Proxy(this, {
-          get: (target, key) => key === "dispatch" ? dispatch : target[key]
+          get: (target2, key) => key === "dispatch" ? dispatch : target2[key]
         });
       }
     };
@@ -13267,8 +13267,8 @@ var require_unwrap_handler = __commonJS({
       #aborted = false;
       #abort;
       [kResume] = null;
-      constructor(abort) {
-        this.#abort = abort;
+      constructor(abort2) {
+        this.#abort = abort2;
       }
       pause() {
         this.#paused = true;
@@ -13305,8 +13305,8 @@ var require_unwrap_handler = __commonJS({
       static unwrap(handler) {
         return !handler.onRequestStart ? handler : new UnwrapHandler(handler);
       }
-      onConnect(abort, context8) {
-        this.#controller = new UnwrapController(abort);
+      onConnect(abort2, context8) {
+        this.#controller = new UnwrapController(abort2);
         this.#handler.onRequestStart?.(this.#controller, context8);
       }
       onUpgrade(statusCode, rawHeaders, socket) {
@@ -15748,8 +15748,8 @@ var require_util2 = __commonJS({
          * @param {unknown} target
          * @param {'key' | 'value' | 'key+value'} kind
          */
-        constructor(target, kind) {
-          this.#target = target;
+        constructor(target2, kind) {
+          this.#target = target2;
           this.#kind = kind;
           this.#index = 0;
         }
@@ -15799,8 +15799,8 @@ var require_util2 = __commonJS({
         },
         next: { writable: true, enumerable: true, configurable: true }
       });
-      return function(target, kind) {
-        return new FastIterableIterator(target, kind);
+      return function(target2, kind) {
+        return new FastIterableIterator(target2, kind);
       };
     }
     function iteratorMixin(name, object, kInternalIterator, keyIndex = 0, valueIndex = 1) {
@@ -17661,7 +17661,7 @@ var require_client_h1 = __commonJS({
       return method !== "GET" && method !== "HEAD" && method !== "OPTIONS" && method !== "TRACE" && method !== "CONNECT";
     }
     function writeH1(client, request2) {
-      const { method, path: path15, host, upgrade, blocking, reset: reset3 } = request2;
+      const { method, path: path16, host, upgrade, blocking, reset: reset3 } = request2;
       let { body, headers, contentLength } = request2;
       const expectsPayload = method === "PUT" || method === "POST" || method === "PATCH" || method === "QUERY" || method === "PROPFIND" || method === "PROPPATCH";
       if (util.isFormDataLike(body)) {
@@ -17696,7 +17696,7 @@ var require_client_h1 = __commonJS({
         process.emitWarning(new RequestContentLengthMismatchError());
       }
       const socket = client[kSocket];
-      const abort = (err) => {
+      const abort2 = (err) => {
         if (request2.aborted || request2.completed) {
           return;
         }
@@ -17705,7 +17705,7 @@ var require_client_h1 = __commonJS({
         util.destroy(socket, new InformationalError("aborted"));
       };
       try {
-        request2.onConnect(abort);
+        request2.onConnect(abort2);
       } catch (err) {
         util.errorRequest(client, request2, err);
       }
@@ -17727,7 +17727,7 @@ var require_client_h1 = __commonJS({
       if (blocking) {
         socket[kBlocking] = true;
       }
-      let header = `${method} ${path15} HTTP/1.1\r
+      let header = `${method} ${path16} HTTP/1.1\r
 `;
       if (typeof host === "string") {
         header += `host: ${host}\r
@@ -17763,28 +17763,28 @@ upgrade: ${upgrade}\r
         channels.sendHeaders.publish({ request: request2, headers: header, socket });
       }
       if (!body || bodyLength === 0) {
-        writeBuffer(abort, null, client, request2, socket, contentLength, header, expectsPayload);
+        writeBuffer(abort2, null, client, request2, socket, contentLength, header, expectsPayload);
       } else if (util.isBuffer(body)) {
-        writeBuffer(abort, body, client, request2, socket, contentLength, header, expectsPayload);
+        writeBuffer(abort2, body, client, request2, socket, contentLength, header, expectsPayload);
       } else if (util.isBlobLike(body)) {
         if (typeof body.stream === "function") {
-          writeIterable(abort, body.stream(), client, request2, socket, contentLength, header, expectsPayload);
+          writeIterable(abort2, body.stream(), client, request2, socket, contentLength, header, expectsPayload);
         } else {
-          writeBlob(abort, body, client, request2, socket, contentLength, header, expectsPayload);
+          writeBlob(abort2, body, client, request2, socket, contentLength, header, expectsPayload);
         }
       } else if (util.isStream(body)) {
-        writeStream(abort, body, client, request2, socket, contentLength, header, expectsPayload);
+        writeStream(abort2, body, client, request2, socket, contentLength, header, expectsPayload);
       } else if (util.isIterable(body)) {
-        writeIterable(abort, body, client, request2, socket, contentLength, header, expectsPayload);
+        writeIterable(abort2, body, client, request2, socket, contentLength, header, expectsPayload);
       } else {
         assert3(false);
       }
       return true;
     }
-    function writeStream(abort, body, client, request2, socket, contentLength, header, expectsPayload) {
+    function writeStream(abort2, body, client, request2, socket, contentLength, header, expectsPayload) {
       assert3(contentLength !== 0 || client[kRunning] === 0, "stream body cannot be pipelined");
       let finished = false;
-      const writer = new AsyncWriter({ abort, socket, request: request2, contentLength, client, expectsPayload, header });
+      const writer = new AsyncWriter({ abort: abort2, socket, request: request2, contentLength, client, expectsPayload, header });
       const onData = function(chunk4) {
         if (finished) {
           return;
@@ -17850,7 +17850,7 @@ upgrade: ${upgrade}\r
         setImmediate(onClose);
       }
     }
-    function writeBuffer(abort, body, client, request2, socket, contentLength, header, expectsPayload) {
+    function writeBuffer(abort2, body, client, request2, socket, contentLength, header, expectsPayload) {
       try {
         if (!body) {
           if (contentLength === 0) {
@@ -17878,10 +17878,10 @@ upgrade: ${upgrade}\r
         request2.onRequestSent();
         client[kResume]();
       } catch (err) {
-        abort(err);
+        abort2(err);
       }
     }
-    async function writeBlob(abort, body, client, request2, socket, contentLength, header, expectsPayload) {
+    async function writeBlob(abort2, body, client, request2, socket, contentLength, header, expectsPayload) {
       assert3(contentLength === body.size, "blob body must have content length");
       try {
         if (contentLength != null && contentLength !== body.size) {
@@ -17901,10 +17901,10 @@ upgrade: ${upgrade}\r
         }
         client[kResume]();
       } catch (err) {
-        abort(err);
+        abort2(err);
       }
     }
-    async function writeIterable(abort, body, client, request2, socket, contentLength, header, expectsPayload) {
+    async function writeIterable(abort2, body, client, request2, socket, contentLength, header, expectsPayload) {
       assert3(contentLength !== 0 || client[kRunning] === 0, "iterator body cannot be pipelined");
       let callback = null;
       function onDrain() {
@@ -17923,7 +17923,7 @@ upgrade: ${upgrade}\r
         }
       });
       socket.on("close", onDrain).on("drain", onDrain);
-      const writer = new AsyncWriter({ abort, socket, request: request2, contentLength, client, expectsPayload, header });
+      const writer = new AsyncWriter({ abort: abort2, socket, request: request2, contentLength, client, expectsPayload, header });
       try {
         for await (const chunk4 of body) {
           if (socket[kError]) {
@@ -17952,7 +17952,7 @@ upgrade: ${upgrade}\r
        * @param {boolean} arg.expectsPayload
        * @param {string} arg.header
        */
-      constructor({ abort, socket, request: request2, contentLength, client, expectsPayload, header }) {
+      constructor({ abort: abort2, socket, request: request2, contentLength, client, expectsPayload, header }) {
         this.socket = socket;
         this.request = request2;
         this.contentLength = contentLength;
@@ -17960,7 +17960,7 @@ upgrade: ${upgrade}\r
         this.bytesWritten = 0;
         this.expectsPayload = expectsPayload;
         this.header = header;
-        this.abort = abort;
+        this.abort = abort2;
         socket[kWriting] = true;
       }
       /**
@@ -18061,11 +18061,11 @@ ${len.toString(16)}\r
        * @returns {void}
        */
       destroy(err) {
-        const { socket, client, abort } = this;
+        const { socket, client, abort: abort2 } = this;
         socket[kWriting] = false;
         if (err) {
           assert3(client[kRunning] <= 1, "pipeline should only contain this request");
-          abort(err);
+          abort2(err);
         }
       }
     };
@@ -18283,7 +18283,7 @@ var require_client_h2 = __commonJS({
     function writeH2(client, request2) {
       const requestTimeout = request2.bodyTimeout ?? client[kBodyTimeout];
       const session = client[kHTTP2Session];
-      const { method, path: path15, host, upgrade, expectContinue, signal, headers: reqHeaders } = request2;
+      const { method, path: path16, host, upgrade, expectContinue, signal, headers: reqHeaders } = request2;
       let { body } = request2;
       if (upgrade) {
         util.errorRequest(client, request2, new Error("Upgrade not supported for H2"));
@@ -18311,7 +18311,7 @@ var require_client_h2 = __commonJS({
       const { hostname, port: port2 } = client[kUrl];
       headers[HTTP2_HEADER_AUTHORITY] = host || `${hostname}${port2 ? `:${port2}` : ""}`;
       headers[HTTP2_HEADER_METHOD] = method;
-      const abort = (err) => {
+      const abort2 = (err) => {
         if (request2.aborted || request2.completed) {
           return;
         }
@@ -18326,7 +18326,7 @@ var require_client_h2 = __commonJS({
         util.destroy(body, err);
       };
       try {
-        request2.onConnect(abort);
+        request2.onConnect(abort2);
       } catch (err) {
         util.errorRequest(client, request2, err);
       }
@@ -18354,7 +18354,7 @@ var require_client_h2 = __commonJS({
         stream4.setTimeout(requestTimeout);
         return true;
       }
-      headers[HTTP2_HEADER_PATH] = path15;
+      headers[HTTP2_HEADER_PATH] = path16;
       headers[HTTP2_HEADER_SCHEME] = "https";
       const expectsPayload = method === "PUT" || method === "POST" || method === "PATCH";
       if (body && typeof body.read === "function") {
@@ -18437,7 +18437,7 @@ var require_client_h2 = __commonJS({
           if (session[kOpenStreams] === 0) {
             session.unref();
           }
-          abort(err ?? new InformationalError("HTTP/2: stream half-closed (remote)"));
+          abort2(err ?? new InformationalError("HTTP/2: stream half-closed (remote)"));
           client[kQueue][client[kRunningIdx]++] = null;
           client[kPendingIdx] = client[kRunningIdx];
           client[kResume]();
@@ -18452,11 +18452,11 @@ var require_client_h2 = __commonJS({
       });
       stream4.once("error", function(err) {
         stream4.removeAllListeners("data");
-        abort(err);
+        abort2(err);
       });
       stream4.once("frameError", (type2, code2) => {
         stream4.removeAllListeners("data");
-        abort(new InformationalError(`HTTP/2: "frameError" received - type ${type2}, code ${code2}`));
+        abort2(new InformationalError(`HTTP/2: "frameError" received - type ${type2}, code ${code2}`));
       });
       stream4.on("aborted", () => {
         stream4.removeAllListeners("data");
@@ -18468,7 +18468,7 @@ var require_client_h2 = __commonJS({
         if (session[kOpenStreams] === 0) {
           session.unref();
         }
-        abort(err);
+        abort2(err);
       });
       stream4.once("trailers", (trailers) => {
         if (request2.aborted || request2.completed) {
@@ -18480,7 +18480,7 @@ var require_client_h2 = __commonJS({
       function writeBodyH2() {
         if (!body || contentLength === 0) {
           writeBuffer(
-            abort,
+            abort2,
             stream4,
             null,
             client,
@@ -18491,7 +18491,7 @@ var require_client_h2 = __commonJS({
           );
         } else if (util.isBuffer(body)) {
           writeBuffer(
-            abort,
+            abort2,
             stream4,
             body,
             client,
@@ -18503,7 +18503,7 @@ var require_client_h2 = __commonJS({
         } else if (util.isBlobLike(body)) {
           if (typeof body.stream === "function") {
             writeIterable(
-              abort,
+              abort2,
               stream4,
               body.stream(),
               client,
@@ -18514,7 +18514,7 @@ var require_client_h2 = __commonJS({
             );
           } else {
             writeBlob(
-              abort,
+              abort2,
               stream4,
               body,
               client,
@@ -18526,7 +18526,7 @@ var require_client_h2 = __commonJS({
           }
         } else if (util.isStream(body)) {
           writeStream(
-            abort,
+            abort2,
             client[kSocket],
             expectsPayload,
             stream4,
@@ -18537,7 +18537,7 @@ var require_client_h2 = __commonJS({
           );
         } else if (util.isIterable(body)) {
           writeIterable(
-            abort,
+            abort2,
             stream4,
             body,
             client,
@@ -18551,7 +18551,7 @@ var require_client_h2 = __commonJS({
         }
       }
     }
-    function writeBuffer(abort, h2stream, body, client, request2, socket, contentLength, expectsPayload) {
+    function writeBuffer(abort2, h2stream, body, client, request2, socket, contentLength, expectsPayload) {
       try {
         if (body != null && util.isBuffer(body)) {
           assert3(contentLength === body.byteLength, "buffer body must have content length");
@@ -18567,10 +18567,10 @@ var require_client_h2 = __commonJS({
         request2.onRequestSent();
         client[kResume]();
       } catch (error4) {
-        abort(error4);
+        abort2(error4);
       }
     }
-    function writeStream(abort, socket, expectsPayload, h2stream, body, client, request2, contentLength) {
+    function writeStream(abort2, socket, expectsPayload, h2stream, body, client, request2, contentLength) {
       assert3(contentLength !== 0 || client[kRunning] === 0, "stream body cannot be pipelined");
       const pipe2 = pipeline(
         body,
@@ -18578,7 +18578,7 @@ var require_client_h2 = __commonJS({
         (err) => {
           if (err) {
             util.destroy(pipe2, err);
-            abort(err);
+            abort2(err);
           } else {
             util.removeAllListeners(pipe2);
             request2.onRequestSent();
@@ -18594,7 +18594,7 @@ var require_client_h2 = __commonJS({
         request2.onBodySent(chunk4);
       }
     }
-    async function writeBlob(abort, h2stream, body, client, request2, socket, contentLength, expectsPayload) {
+    async function writeBlob(abort2, h2stream, body, client, request2, socket, contentLength, expectsPayload) {
       assert3(contentLength === body.size, "blob body must have content length");
       try {
         if (contentLength != null && contentLength !== body.size) {
@@ -18612,10 +18612,10 @@ var require_client_h2 = __commonJS({
         }
         client[kResume]();
       } catch (err) {
-        abort(err);
+        abort2(err);
       }
     }
-    async function writeIterable(abort, h2stream, body, client, request2, socket, contentLength, expectsPayload) {
+    async function writeIterable(abort2, h2stream, body, client, request2, socket, contentLength, expectsPayload) {
       assert3(contentLength !== 0 || client[kRunning] === 0, "iterator body cannot be pipelined");
       let callback = null;
       function onDrain() {
@@ -18652,7 +18652,7 @@ var require_client_h2 = __commonJS({
         }
         client[kResume]();
       } catch (err) {
-        abort(err);
+        abort2(err);
       } finally {
         h2stream.off("close", onDrain).off("drain", onDrain);
       }
@@ -19448,14 +19448,14 @@ var require_pool = __commonJS({
         this[kFactory] = factory;
         this.on("connect", (origin2, targets) => {
           if (clientTtl != null && clientTtl > 0) {
-            for (const target of targets) {
-              Object.assign(target, { ttl: Date.now() });
+            for (const target2 of targets) {
+              Object.assign(target2, { ttl: Date.now() });
             }
           }
         });
         this.on("connectionError", (origin2, targets, error4) => {
-          for (const target of targets) {
-            const idx = this[kClients].indexOf(target);
+          for (const target2 of targets) {
+            const idx = this[kClients].indexOf(target2);
             if (idx !== -1) {
               this[kClients].splice(idx, 1);
             }
@@ -19793,10 +19793,10 @@ var require_proxy_agent = __commonJS({
         };
         const {
           origin,
-          path: path15 = "/",
+          path: path16 = "/",
           headers = {}
         } = opts;
-        opts.path = origin + path15;
+        opts.path = origin + path16;
         if (!("host" in headers) && !("Host" in headers)) {
           const { host } = new URL2(origin);
           headers.host = host;
@@ -20550,7 +20550,7 @@ var require_readable = __commonJS({
        */
       constructor({
         resume: resume2,
-        abort,
+        abort: abort2,
         contentType = "",
         contentLength,
         highWaterMark = 64 * 1024
@@ -20562,7 +20562,7 @@ var require_readable = __commonJS({
           highWaterMark
         });
         this._readableState.dataEmitted = false;
-        this[kAbort] = abort;
+        this[kAbort] = abort2;
         this[kConsume] = null;
         this[kBytesRead] = 0;
         this[kBody] = null;
@@ -20985,17 +20985,17 @@ var require_api_request = __commonJS({
           });
         }
       }
-      onConnect(abort, context8) {
+      onConnect(abort2, context8) {
         if (this.reason) {
-          abort(this.reason);
+          abort2(this.reason);
           return;
         }
         assert3(this.callback);
-        this.abort = abort;
+        this.abort = abort2;
         this.context = context8;
       }
       onHeaders(statusCode, rawHeaders, resume2, statusMessage) {
-        const { callback, opaque, abort, context: context8, responseHeaders, highWaterMark } = this;
+        const { callback, opaque, abort: abort2, context: context8, responseHeaders, highWaterMark } = this;
         const headers = responseHeaders === "raw" ? util.parseRawHeaders(rawHeaders) : util.parseHeaders(rawHeaders);
         if (statusCode < 200) {
           if (this.onInfo) {
@@ -21008,7 +21008,7 @@ var require_api_request = __commonJS({
         const contentLength = parsedHeaders["content-length"];
         const res = new Readable2({
           resume: resume2,
-          abort,
+          abort: abort2,
           contentType,
           contentLength: this.method !== "HEAD" && contentLength ? Number(contentLength) : null,
           highWaterMark
@@ -21095,7 +21095,7 @@ var require_abort_signal = __commonJS({
     var { RequestAbortedError } = require_errors2();
     var kListener = Symbol("kListener");
     var kSignal = Symbol("kSignal");
-    function abort(self2) {
+    function abort2(self2) {
       if (self2.abort) {
         self2.abort(self2[kSignal]?.reason);
       } else {
@@ -21111,12 +21111,12 @@ var require_abort_signal = __commonJS({
         return;
       }
       if (signal.aborted) {
-        abort(self2);
+        abort2(self2);
         return;
       }
       self2[kSignal] = signal;
       self2[kListener] = () => {
-        abort(self2);
+        abort2(self2);
       };
       addAbortListener(self2[kSignal], self2[kListener]);
     }
@@ -21196,13 +21196,13 @@ var require_api_stream = __commonJS({
         }
         addSignal(this, signal);
       }
-      onConnect(abort, context8) {
+      onConnect(abort2, context8) {
         if (this.reason) {
-          abort(this.reason);
+          abort2(this.reason);
           return;
         }
         assert3(this.callback);
-        this.abort = abort;
+        this.abort = abort2;
         this.context = context8;
       }
       onHeaders(statusCode, rawHeaders, resume2, statusMessage) {
@@ -21228,7 +21228,7 @@ var require_api_stream = __commonJS({
           throw new InvalidReturnValueError("expected Writable");
         }
         finished(res, { readable: false }, (err) => {
-          const { callback, res: res2, opaque: opaque2, trailers, abort } = this;
+          const { callback, res: res2, opaque: opaque2, trailers, abort: abort2 } = this;
           this.res = null;
           if (err || !res2?.readable) {
             util.destroy(res2, err);
@@ -21236,7 +21236,7 @@ var require_api_stream = __commonJS({
           this.callback = null;
           this.runInAsyncScope(callback, null, err || null, { opaque: opaque2, trailers });
           if (err) {
-            abort();
+            abort2();
           }
         });
         res.on("drain", resume2);
@@ -21395,12 +21395,12 @@ var require_api_pipeline = __commonJS({
             }
           },
           destroy: (err, callback) => {
-            const { body, req, res, ret, abort } = this;
+            const { body, req, res, ret, abort: abort2 } = this;
             if (!err && !ret._readableState.endEmitted) {
               err = new RequestAbortedError();
             }
-            if (abort && err) {
-              abort();
+            if (abort2 && err) {
+              abort2();
             }
             util.destroy(body, err);
             util.destroy(req, err);
@@ -21415,14 +21415,14 @@ var require_api_pipeline = __commonJS({
         this.res = null;
         addSignal(this, signal);
       }
-      onConnect(abort, context8) {
+      onConnect(abort2, context8) {
         const { res } = this;
         if (this.reason) {
-          abort(this.reason);
+          abort2(this.reason);
           return;
         }
         assert3(!res, "pipeline cannot be retried");
-        this.abort = abort;
+        this.abort = abort2;
         this.context = context8;
       }
       onHeaders(statusCode, rawHeaders, resume2) {
@@ -21527,13 +21527,13 @@ var require_api_upgrade = __commonJS({
         this.context = null;
         addSignal(this, signal);
       }
-      onConnect(abort, context8) {
+      onConnect(abort2, context8) {
         if (this.reason) {
-          abort(this.reason);
+          abort2(this.reason);
           return;
         }
         assert3(this.callback);
-        this.abort = abort;
+        this.abort = abort2;
         this.context = null;
       }
       onHeaders() {
@@ -21618,13 +21618,13 @@ var require_api_connect = __commonJS({
         this.abort = null;
         addSignal(this, signal);
       }
-      onConnect(abort, context8) {
+      onConnect(abort2, context8) {
         if (this.reason) {
-          abort(this.reason);
+          abort2(this.reason);
           return;
         }
         assert3(this.callback);
-        this.abort = abort;
+        this.abort = abort2;
         this.context = context8;
       }
       onHeaders() {
@@ -21850,20 +21850,20 @@ var require_mock_utils = __commonJS({
       }
       return normalizedQp;
     }
-    function safeUrl(path15) {
-      if (typeof path15 !== "string") {
-        return path15;
+    function safeUrl(path16) {
+      if (typeof path16 !== "string") {
+        return path16;
       }
-      const pathSegments = path15.split("?", 3);
+      const pathSegments = path16.split("?", 3);
       if (pathSegments.length !== 2) {
-        return path15;
+        return path16;
       }
       const qp = new URLSearchParams(pathSegments.pop());
       qp.sort();
       return [...pathSegments, qp.toString()].join("?");
     }
-    function matchKey(mockDispatch2, { path: path15, method, body, headers }) {
-      const pathMatch = matchValue(mockDispatch2.path, path15);
+    function matchKey(mockDispatch2, { path: path16, method, body, headers }) {
+      const pathMatch = matchValue(mockDispatch2.path, path16);
       const methodMatch = matchValue(mockDispatch2.method, method);
       const bodyMatch = typeof mockDispatch2.body !== "undefined" ? matchValue(mockDispatch2.body, body) : true;
       const headersMatch = matchHeaders(mockDispatch2, headers);
@@ -21888,8 +21888,8 @@ var require_mock_utils = __commonJS({
       const basePath = key.query ? serializePathWithQuery(key.path, key.query) : key.path;
       const resolvedPath = typeof basePath === "string" ? safeUrl(basePath) : basePath;
       const resolvedPathWithoutTrailingSlash = removeTrailingSlash(resolvedPath);
-      let matchedMockDispatches = mockDispatches.filter(({ consumed }) => !consumed).filter(({ path: path15, ignoreTrailingSlash }) => {
-        return ignoreTrailingSlash ? matchValue(removeTrailingSlash(safeUrl(path15)), resolvedPathWithoutTrailingSlash) : matchValue(safeUrl(path15), resolvedPath);
+      let matchedMockDispatches = mockDispatches.filter(({ consumed }) => !consumed).filter(({ path: path16, ignoreTrailingSlash }) => {
+        return ignoreTrailingSlash ? matchValue(removeTrailingSlash(safeUrl(path16)), resolvedPathWithoutTrailingSlash) : matchValue(safeUrl(path16), resolvedPath);
       });
       if (matchedMockDispatches.length === 0) {
         throw new MockNotMatchedError(`Mock dispatch not matched for path '${resolvedPath}'`);
@@ -21927,19 +21927,19 @@ var require_mock_utils = __commonJS({
         mockDispatches.splice(index, 1);
       }
     }
-    function removeTrailingSlash(path15) {
-      while (path15.endsWith("/")) {
-        path15 = path15.slice(0, -1);
+    function removeTrailingSlash(path16) {
+      while (path16.endsWith("/")) {
+        path16 = path16.slice(0, -1);
       }
-      if (path15.length === 0) {
-        path15 = "/";
+      if (path16.length === 0) {
+        path16 = "/";
       }
-      return path15;
+      return path16;
     }
     function buildKey(opts) {
-      const { path: path15, method, body, headers, query } = opts;
+      const { path: path16, method, body, headers, query } = opts;
       return {
-        path: path15,
+        path: path16,
         method,
         body,
         headers,
@@ -22591,10 +22591,10 @@ var require_pending_interceptors_formatter = __commonJS({
       }
       format(pendingInterceptors) {
         const withPrettyHeaders = pendingInterceptors.map(
-          ({ method, path: path15, data: { statusCode }, persist, times: times2, timesInvoked, origin }) => ({
+          ({ method, path: path16, data: { statusCode }, persist, times: times2, timesInvoked, origin }) => ({
             Method: method,
             Origin: origin,
-            Path: path15,
+            Path: path16,
             "Status code": statusCode,
             Persistent: persist ? PERSISTENT : NOT_PERSISTENT,
             Invocations: timesInvoked,
@@ -22673,9 +22673,9 @@ var require_mock_agent = __commonJS({
         const acceptNonStandardSearchParameters = this[kMockAgentAcceptsNonStandardSearchParameters];
         const dispatchOpts = { ...opts };
         if (acceptNonStandardSearchParameters && dispatchOpts.path) {
-          const [path15, searchParams] = dispatchOpts.path.split("?");
+          const [path16, searchParams] = dispatchOpts.path.split("?");
           const normalizedSearchParams = normalizeSearchParams(searchParams, acceptNonStandardSearchParameters);
-          dispatchOpts.path = `${path15}?${normalizedSearchParams}`;
+          dispatchOpts.path = `${path16}?${normalizedSearchParams}`;
         }
         return this[kAgent].dispatch(dispatchOpts, handler);
       }
@@ -22793,7 +22793,7 @@ ${pendingInterceptorsFormatter.format(pending3)}`.trim()
 var require_snapshot_recorder = __commonJS({
   "node_modules/.pnpm/undici@7.13.0/node_modules/undici/lib/mock/snapshot-recorder.js"(exports, module) {
     var { writeFile: writeFile3, readFile: readFile3, mkdir: mkdir2 } = __require("fs/promises");
-    var { dirname: dirname3, resolve: resolve7 } = __require("path");
+    var { dirname: dirname4, resolve: resolve7 } = __require("path");
     var { InvalidArgumentError, UndiciError } = require_errors2();
     function formatRequestKey(opts, cachedSets, matchOptions2 = {}) {
       const url2 = new URL(opts.path, opts.origin);
@@ -23013,12 +23013,12 @@ var require_snapshot_recorder = __commonJS({
        * Loads snapshots from file
        */
       async loadSnapshots(filePath) {
-        const path15 = filePath || this.snapshotPath;
-        if (!path15) {
+        const path16 = filePath || this.snapshotPath;
+        if (!path16) {
           throw new InvalidArgumentError("Snapshot path is required");
         }
         try {
-          const data = await readFile3(resolve7(path15), "utf8");
+          const data = await readFile3(resolve7(path16), "utf8");
           const parsed = JSON.parse(data);
           if (Array.isArray(parsed)) {
             this.snapshots.clear();
@@ -23034,7 +23034,7 @@ var require_snapshot_recorder = __commonJS({
             this.snapshots.clear();
             this.loaded = true;
           } else {
-            throw new UndiciError(`Failed to load snapshots from ${path15}`, { cause: error4 });
+            throw new UndiciError(`Failed to load snapshots from ${path16}`, { cause: error4 });
           }
         }
       }
@@ -23042,12 +23042,12 @@ var require_snapshot_recorder = __commonJS({
        * Saves snapshots to file
        */
       async saveSnapshots(filePath) {
-        const path15 = filePath || this.snapshotPath;
-        if (!path15) {
+        const path16 = filePath || this.snapshotPath;
+        if (!path16) {
           throw new InvalidArgumentError("Snapshot path is required");
         }
-        const resolvedPath = resolve7(path15);
-        await mkdir2(dirname3(resolvedPath), { recursive: true });
+        const resolvedPath = resolve7(path16);
+        await mkdir2(dirname4(resolvedPath), { recursive: true });
         const data = Array.from(this.snapshots.entries()).map(([hash2, snapshot]) => ({
           hash: hash2,
           snapshot
@@ -23623,15 +23623,15 @@ var require_redirect_handler = __commonJS({
           return;
         }
         const { origin, pathname, search } = util.parseURL(new URL(this.location, this.opts.origin && new URL(this.opts.path, this.opts.origin)));
-        const path15 = search ? `${pathname}${search}` : pathname;
-        const redirectUrlString = `${origin}${path15}`;
+        const path16 = search ? `${pathname}${search}` : pathname;
+        const redirectUrlString = `${origin}${path16}`;
         for (const historyUrl of this.history) {
           if (historyUrl.toString() === redirectUrlString) {
             throw new InvalidArgumentError(`Redirect loop detected. Cannot redirect to ${origin}. This typically happens when using a Client or Pool with cross-origin redirects. Use an Agent for cross-origin redirects.`);
           }
         }
         this.opts.headers = cleanRequestHeaders(this.opts.headers, statusCode === 303, this.opts.origin !== origin);
-        this.opts.path = path15;
+        this.opts.path = path16;
         this.opts.origin = origin;
         this.opts.query = null;
       }
@@ -25899,8 +25899,8 @@ var require_headers = __commonJS({
       }
       return getHeadersList(headers).append(name, value5, false);
     }
-    function headersListSortAndCombine(target) {
-      const headersList = getHeadersList(target);
+    function headersListSortAndCombine(target2) {
+      const headersList = getHeadersList(target2);
       if (!headersList) {
         return [];
       }
@@ -26232,8 +26232,8 @@ var require_headers = __commonJS({
        * @param {Headers} target
        * @param {HeadersList} list
        */
-      static setHeadersList(target, list4) {
-        target.#headersList = list4;
+      static setHeadersList(target2, list4) {
+        target2.#headersList = list4;
       }
     };
     var { getHeadersGuard, setHeadersGuard, getHeadersList, setHeadersList } = Headers;
@@ -26342,21 +26342,21 @@ var require_response = __commonJS({
         return responseObject;
       }
       // Creates a redirect Response that redirects to url with status status.
-      static redirect(url2, status2 = 302) {
+      static redirect(url2, status3 = 302) {
         webidl.argumentLengthCheck(arguments, 1, "Response.redirect");
         url2 = webidl.converters.USVString(url2);
-        status2 = webidl.converters["unsigned short"](status2);
+        status3 = webidl.converters["unsigned short"](status3);
         let parsedURL;
         try {
           parsedURL = new URL(url2, relevantRealm.settingsObject.baseUrl);
         } catch (err) {
           throw new TypeError(`Failed to parse URL from ${url2}`, { cause: err });
         }
-        if (!redirectStatusSet.has(status2)) {
-          throw new RangeError(`Invalid status code ${status2}`);
+        if (!redirectStatusSet.has(status3)) {
+          throw new RangeError(`Invalid status code ${status3}`);
         }
         const responseObject = fromInnerResponse(makeResponse({}), "immutable");
-        responseObject.#state.status = status2;
+        responseObject.#state.status = status3;
         const value5 = isomorphicEncode(URLSerializer(parsedURL));
         responseObject.#state.headersList.append("location", value5, true);
         return responseObject;
@@ -26566,12 +26566,12 @@ var require_response = __commonJS({
         ...state
       };
       return new Proxy(response, {
-        get(target, p3) {
-          return p3 in state ? state[p3] : target[p3];
+        get(target2, p3) {
+          return p3 in state ? state[p3] : target2[p3];
         },
-        set(target, p3, value5) {
+        set(target2, p3, value5) {
           assert3(!(p3 in state));
-          target[p3] = value5;
+          target2[p3] = value5;
           return true;
         }
       });
@@ -26741,8 +26741,8 @@ var require_request2 = __commonJS({
     var assert3 = __require("assert");
     var { getMaxListeners, setMaxListeners, defaultMaxListeners } = __require("events");
     var kAbortController = Symbol("abortController");
-    var requestFinalizer = new FinalizationRegistry(({ signal, abort }) => {
-      signal.removeEventListener("abort", abort);
+    var requestFinalizer = new FinalizationRegistry(({ signal, abort: abort2 }) => {
+      signal.removeEventListener("abort", abort2);
     });
     var dependentControllerMap = /* @__PURE__ */ new WeakMap();
     var abortSignalHasEventHandlerLeakWarning;
@@ -26752,12 +26752,12 @@ var require_request2 = __commonJS({
       abortSignalHasEventHandlerLeakWarning = false;
     }
     function buildAbort(acRef) {
-      return abort;
-      function abort() {
+      return abort2;
+      function abort2() {
         const ac = acRef.deref();
         if (ac !== void 0) {
-          requestFinalizer.unregister(abort);
-          this.removeEventListener("abort", abort);
+          requestFinalizer.unregister(abort2);
+          this.removeEventListener("abort", abort2);
           ac.abort(this.reason);
           const controllerList = dependentControllerMap.get(ac.signal);
           if (controllerList !== void 0) {
@@ -26977,12 +26977,12 @@ var require_request2 = __commonJS({
           } else {
             this[kAbortController] = ac;
             const acRef = new WeakRef(ac);
-            const abort = buildAbort(acRef);
+            const abort2 = buildAbort(acRef);
             if (abortSignalHasEventHandlerLeakWarning && getMaxListeners(signal) === defaultMaxListeners) {
               setMaxListeners(1500, signal);
             }
-            util.addAbortListener(signal, abort);
-            requestFinalizer.register(ac, { signal, abort }, abort);
+            util.addAbortListener(signal, abort2);
+            requestFinalizer.register(ac, { signal, abort: abort2 }, abort2);
           }
         }
         this.#headers = new Headers(kConstruct);
@@ -28200,10 +28200,10 @@ var require_fetch = __commonJS({
       fetchParams.controller.connection = {
         abort: null,
         destroyed: false,
-        destroy(err, abort = true) {
+        destroy(err, abort2 = true) {
           if (!this.destroyed) {
             this.destroyed = true;
-            if (abort) {
+            if (abort2) {
               this.abort?.(err ?? new DOMException("The operation was aborted.", "AbortError"));
             }
           }
@@ -28256,13 +28256,13 @@ var require_fetch = __commonJS({
         })();
       }
       try {
-        const { body, status: status2, statusText, headersList, socket } = await dispatch({ body: requestBody });
+        const { body, status: status3, statusText, headersList, socket } = await dispatch({ body: requestBody });
         if (socket) {
-          response = makeResponse({ status: status2, statusText, headersList, socket });
+          response = makeResponse({ status: status3, statusText, headersList, socket });
         } else {
           const iterator = body[Symbol.asyncIterator]();
           fetchParams.controller.next = () => iterator.next();
-          response = makeResponse({ status: status2, statusText, headersList });
+          response = makeResponse({ status: status3, statusText, headersList });
         }
       } catch (err) {
         if (err.name === "AbortError") {
@@ -28368,22 +28368,22 @@ var require_fetch = __commonJS({
           {
             body: null,
             abort: null,
-            onConnect(abort) {
+            onConnect(abort2) {
               const { connection } = fetchParams.controller;
               timingInfo.finalConnectionTimingInfo = clampAndCoarsenConnectionTimingInfo(void 0, timingInfo.postRedirectStartTime, fetchParams.crossOriginIsolatedCapability);
               if (connection.destroyed) {
-                abort(new DOMException("The operation was aborted.", "AbortError"));
+                abort2(new DOMException("The operation was aborted.", "AbortError"));
               } else {
-                fetchParams.controller.on("terminated", abort);
-                this.abort = connection.abort = abort;
+                fetchParams.controller.on("terminated", abort2);
+                this.abort = connection.abort = abort2;
               }
               timingInfo.finalNetworkRequestStartTime = coarsenedSharedCurrentTime(fetchParams.crossOriginIsolatedCapability);
             },
             onResponseStarted() {
               timingInfo.finalNetworkResponseStartTime = coarsenedSharedCurrentTime(fetchParams.crossOriginIsolatedCapability);
             },
-            onHeaders(status2, rawHeaders, resume2, statusText) {
-              if (status2 < 200) {
+            onHeaders(status3, rawHeaders, resume2, statusText) {
+              if (status3 < 200) {
                 return false;
               }
               let codings = [];
@@ -28398,8 +28398,8 @@ var require_fetch = __commonJS({
               const location = headersList.get("location", true);
               this.body = new Readable2({ read: resume2 });
               const decoders = [];
-              const willFollow = location && request2.redirect === "follow" && redirectStatusSet.has(status2);
-              if (codings.length !== 0 && request2.method !== "HEAD" && request2.method !== "CONNECT" && !nullBodyStatus.includes(status2) && !willFollow) {
+              const willFollow = location && request2.redirect === "follow" && redirectStatusSet.has(status3);
+              if (codings.length !== 0 && request2.method !== "HEAD" && request2.method !== "CONNECT" && !nullBodyStatus.includes(status3) && !willFollow) {
                 for (let i = codings.length - 1; i >= 0; --i) {
                   const coding = codings[i];
                   if (coding === "x-gzip" || coding === "gzip") {
@@ -28434,7 +28434,7 @@ var require_fetch = __commonJS({
               }
               const onError4 = this.onError.bind(this);
               resolve7({
-                status: status2,
+                status: status3,
                 statusText,
                 headersList,
                 body: decoders.length ? pipeline(this.body, ...decoders, (err) => {
@@ -28468,8 +28468,8 @@ var require_fetch = __commonJS({
               fetchParams.controller.terminate(error4);
               reject(error4);
             },
-            onUpgrade(status2, rawHeaders, socket) {
-              if (status2 !== 101) {
+            onUpgrade(status3, rawHeaders, socket) {
+              if (status3 !== 101) {
                 return;
               }
               const headersList = new HeadersList();
@@ -28477,8 +28477,8 @@ var require_fetch = __commonJS({
                 headersList.append(bufferToLowerCasedHeaderName(rawHeaders[i]), rawHeaders[i + 1].toString("latin1"), true);
               }
               resolve7({
-                status: status2,
-                statusText: STATUS_CODES[status2],
+                status: status3,
+                statusText: STATUS_CODES[status3],
                 headersList,
                 socket
               });
@@ -29255,9 +29255,9 @@ var require_util4 = __commonJS({
         }
       }
     }
-    function validateCookiePath(path15) {
-      for (let i = 0; i < path15.length; ++i) {
-        const code2 = path15.charCodeAt(i);
+    function validateCookiePath(path16) {
+      for (let i = 0; i < path16.length; ++i) {
+        const code2 = path16.charCodeAt(i);
         if (code2 < 32 || // exclude CTLs (0-31)
         code2 === 127 || // DEL
         code2 === 59) {
@@ -29978,9 +29978,9 @@ var require_util5 = __commonJS({
     function isClosed(readyState) {
       return readyState === states.CLOSED;
     }
-    function fireEvent(e, target, eventFactory = (type2, init3) => new Event(type2, init3), eventInitDict = {}) {
+    function fireEvent(e, target2, eventFactory = (type2, init3) => new Event(type2, init3), eventInitDict = {}) {
       const event = eventFactory(e, eventInitDict);
-      target.dispatchEvent(event);
+      target2.dispatchEvent(event);
     }
     function websocketMessageReceived(handler, type2, data) {
       handler.onMessage(type2, data);
@@ -32314,11 +32314,11 @@ var require_undici = __commonJS({
           if (typeof opts.path !== "string") {
             throw new InvalidArgumentError("invalid opts.path");
           }
-          let path15 = opts.path;
+          let path16 = opts.path;
           if (!opts.path.startsWith("/")) {
-            path15 = `/${path15}`;
+            path16 = `/${path16}`;
           }
-          url2 = new URL(util.parseOrigin(url2).origin + path15);
+          url2 = new URL(util.parseOrigin(url2).origin + path16);
         } else {
           if (!opts) {
             opts = typeof url2 === "object" ? url2 : {};
@@ -34859,22 +34859,22 @@ var require_dist2 = __commonJS({
       }
       return keys6;
     }
-    function _objectSpread(target) {
+    function _objectSpread(target2) {
       for (var i = 1; i < arguments.length; i++) {
         var source = arguments[i] != null ? arguments[i] : {};
         if (i % 2) {
           ownKeys(Object(source), true).forEach(function(key) {
-            _defineProperty(target, key, source[key]);
+            _defineProperty(target2, key, source[key]);
           });
         } else if (Object.getOwnPropertyDescriptors) {
-          Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
+          Object.defineProperties(target2, Object.getOwnPropertyDescriptors(source));
         } else {
           ownKeys(Object(source)).forEach(function(key) {
-            Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+            Object.defineProperty(target2, key, Object.getOwnPropertyDescriptor(source, key));
           });
         }
       }
-      return target;
+      return target2;
     }
     function _defineProperty(obj, key, value5) {
       if (key in obj) {
@@ -38526,11 +38526,11 @@ var require_lodash = __commonJS({
             return isFunction3(object[key]);
           });
         }
-        function baseGet(object, path15) {
-          path15 = castPath(path15, object);
-          var index = 0, length4 = path15.length;
+        function baseGet(object, path16) {
+          path16 = castPath(path16, object);
+          var index = 0, length4 = path16.length;
           while (object != null && index < length4) {
-            object = object[toKey(path15[index++])];
+            object = object[toKey(path16[index++])];
           }
           return index && index == length4 ? object : undefined2;
         }
@@ -38594,10 +38594,10 @@ var require_lodash = __commonJS({
           });
           return accumulator;
         }
-        function baseInvoke(object, path15, args2) {
-          path15 = castPath(path15, object);
-          object = parent(object, path15);
-          var func = object == null ? object : object[toKey(last5(path15))];
+        function baseInvoke(object, path16, args2) {
+          path16 = castPath(path16, object);
+          object = parent(object, path16);
+          var func = object == null ? object : object[toKey(last5(path16))];
           return func == null ? undefined2 : apply(func, object, args2);
         }
         function baseIsArguments(value5) {
@@ -38753,13 +38753,13 @@ var require_lodash = __commonJS({
             return object === source || baseIsMatch(object, source, matchData);
           };
         }
-        function baseMatchesProperty(path15, srcValue) {
-          if (isKey(path15) && isStrictComparable(srcValue)) {
-            return matchesStrictComparable(toKey(path15), srcValue);
+        function baseMatchesProperty(path16, srcValue) {
+          if (isKey(path16) && isStrictComparable(srcValue)) {
+            return matchesStrictComparable(toKey(path16), srcValue);
           }
           return function(object) {
-            var objValue = get16(object, path15);
-            return objValue === undefined2 && objValue === srcValue ? hasIn(object, path15) : baseIsEqual(srcValue, objValue, COMPARE_PARTIAL_FLAG | COMPARE_UNORDERED_FLAG);
+            var objValue = get16(object, path16);
+            return objValue === undefined2 && objValue === srcValue ? hasIn(object, path16) : baseIsEqual(srcValue, objValue, COMPARE_PARTIAL_FLAG | COMPARE_UNORDERED_FLAG);
           };
         }
         function baseMerge(object, source, srcIndex, customizer, stack) {
@@ -38856,23 +38856,23 @@ var require_lodash = __commonJS({
           });
         }
         function basePick(object, paths) {
-          return basePickBy(object, paths, function(value5, path15) {
-            return hasIn(object, path15);
+          return basePickBy(object, paths, function(value5, path16) {
+            return hasIn(object, path16);
           });
         }
         function basePickBy(object, paths, predicate) {
           var index = -1, length4 = paths.length, result2 = {};
           while (++index < length4) {
-            var path15 = paths[index], value5 = baseGet(object, path15);
-            if (predicate(value5, path15)) {
-              baseSet(result2, castPath(path15, object), value5);
+            var path16 = paths[index], value5 = baseGet(object, path16);
+            if (predicate(value5, path16)) {
+              baseSet(result2, castPath(path16, object), value5);
             }
           }
           return result2;
         }
-        function basePropertyDeep(path15) {
+        function basePropertyDeep(path16) {
           return function(object) {
-            return baseGet(object, path15);
+            return baseGet(object, path16);
           };
         }
         function basePullAll(array8, values4, iteratee2, comparator) {
@@ -38946,14 +38946,14 @@ var require_lodash = __commonJS({
           var array8 = values3(collection);
           return shuffleSelf(array8, baseClamp(n, 0, array8.length));
         }
-        function baseSet(object, path15, value5, customizer) {
+        function baseSet(object, path16, value5, customizer) {
           if (!isObject2(object)) {
             return object;
           }
-          path15 = castPath(path15, object);
-          var index = -1, length4 = path15.length, lastIndex = length4 - 1, nested3 = object;
+          path16 = castPath(path16, object);
+          var index = -1, length4 = path16.length, lastIndex = length4 - 1, nested3 = object;
           while (nested3 != null && ++index < length4) {
-            var key = toKey(path15[index]), newValue = value5;
+            var key = toKey(path16[index]), newValue = value5;
             if (key === "__proto__" || key === "constructor" || key === "prototype") {
               return object;
             }
@@ -38961,7 +38961,7 @@ var require_lodash = __commonJS({
               var objValue = nested3[key];
               newValue = customizer ? customizer(objValue, key, nested3) : undefined2;
               if (newValue === undefined2) {
-                newValue = isObject2(objValue) ? objValue : isIndex(path15[index + 1]) ? [] : {};
+                newValue = isObject2(objValue) ? objValue : isIndex(path16[index + 1]) ? [] : {};
               }
             }
             assignValue(nested3, key, newValue);
@@ -39127,13 +39127,13 @@ var require_lodash = __commonJS({
             }
           return result2;
         }
-        function baseUnset(object, path15) {
-          path15 = castPath(path15, object);
-          object = parent(object, path15);
-          return object == null || delete object[toKey(last5(path15))];
+        function baseUnset(object, path16) {
+          path16 = castPath(path16, object);
+          object = parent(object, path16);
+          return object == null || delete object[toKey(last5(path16))];
         }
-        function baseUpdate(object, path15, updater, customizer) {
-          return baseSet(object, path15, updater(baseGet(object, path15)), customizer);
+        function baseUpdate(object, path16, updater, customizer) {
+          return baseSet(object, path16, updater(baseGet(object, path16)), customizer);
         }
         function baseWhile(array8, predicate, isDrop, fromRight) {
           var length4 = array8.length, index = fromRight ? length4 : -1;
@@ -40016,11 +40016,11 @@ var require_lodash = __commonJS({
           var match18 = source.match(reWrapDetails);
           return match18 ? match18[1].split(reSplitDetails) : [];
         }
-        function hasPath(object, path15, hasFunc) {
-          path15 = castPath(path15, object);
-          var index = -1, length4 = path15.length, result2 = false;
+        function hasPath(object, path16, hasFunc) {
+          path16 = castPath(path16, object);
+          var index = -1, length4 = path16.length, result2 = false;
           while (++index < length4) {
-            var key = toKey(path15[index]);
+            var key = toKey(path16[index]);
             if (!(result2 = object != null && hasFunc(object, key))) {
               break;
             }
@@ -40222,8 +40222,8 @@ var require_lodash = __commonJS({
             return apply(func, this, otherArgs);
           };
         }
-        function parent(object, path15) {
-          return path15.length < 2 ? object : baseGet(object, baseSlice(path15, 0, -1));
+        function parent(object, path16) {
+          return path16.length < 2 ? object : baseGet(object, baseSlice(path16, 0, -1));
         }
         function reorder(array8, indexes) {
           var arrLength = array8.length, length4 = nativeMin(indexes.length, arrLength), oldArray = copyArray(array8);
@@ -40500,7 +40500,7 @@ var require_lodash = __commonJS({
           }
           return mapped.length && mapped[0] === arrays[0] ? baseIntersection(mapped, undefined2, comparator) : [];
         });
-        function join16(array8, separator) {
+        function join17(array8, separator) {
           return array8 == null ? "" : nativeJoin.call(array8, separator);
         }
         function last5(array8) {
@@ -40858,10 +40858,10 @@ var require_lodash = __commonJS({
           }
           return isString2(collection) ? fromIndex <= length4 && collection.indexOf(value5, fromIndex) > -1 : !!length4 && baseIndexOf(collection, value5, fromIndex) > -1;
         }
-        var invokeMap = baseRest(function(collection, path15, args2) {
-          var index = -1, isFunc = typeof path15 == "function", result2 = isArrayLike(collection) ? Array2(collection.length) : [];
+        var invokeMap = baseRest(function(collection, path16, args2) {
+          var index = -1, isFunc = typeof path16 == "function", result2 = isArrayLike(collection) ? Array2(collection.length) : [];
           baseEach(collection, function(value5) {
-            result2[++index] = isFunc ? apply(path15, value5, args2) : baseInvoke(value5, path15, args2);
+            result2[++index] = isFunc ? apply(path16, value5, args2) : baseInvoke(value5, path16, args2);
           });
           return result2;
         });
@@ -41513,15 +41513,15 @@ var require_lodash = __commonJS({
         function functionsIn(object) {
           return object == null ? [] : baseFunctions(object, keysIn(object));
         }
-        function get16(object, path15, defaultValue) {
-          var result2 = object == null ? undefined2 : baseGet(object, path15);
+        function get16(object, path16, defaultValue) {
+          var result2 = object == null ? undefined2 : baseGet(object, path16);
           return result2 === undefined2 ? defaultValue : result2;
         }
-        function has8(object, path15) {
-          return object != null && hasPath(object, path15, baseHas);
+        function has8(object, path16) {
+          return object != null && hasPath(object, path16, baseHas);
         }
-        function hasIn(object, path15) {
-          return object != null && hasPath(object, path15, baseHasIn);
+        function hasIn(object, path16) {
+          return object != null && hasPath(object, path16, baseHasIn);
         }
         var invert2 = createInverter(function(result2, value5, key) {
           if (value5 != null && typeof value5.toString != "function") {
@@ -41574,10 +41574,10 @@ var require_lodash = __commonJS({
             return result2;
           }
           var isDeep = false;
-          paths = arrayMap(paths, function(path15) {
-            path15 = castPath(path15, object);
-            isDeep || (isDeep = path15.length > 1);
-            return path15;
+          paths = arrayMap(paths, function(path16) {
+            path16 = castPath(path16, object);
+            isDeep || (isDeep = path16.length > 1);
+            return path16;
           });
           copyObject(object, getAllKeysIn(object), result2);
           if (isDeep) {
@@ -41603,19 +41603,19 @@ var require_lodash = __commonJS({
             return [prop];
           });
           predicate = getIteratee(predicate);
-          return basePickBy(object, props, function(value5, path15) {
-            return predicate(value5, path15[0]);
+          return basePickBy(object, props, function(value5, path16) {
+            return predicate(value5, path16[0]);
           });
         }
-        function result(object, path15, defaultValue) {
-          path15 = castPath(path15, object);
-          var index = -1, length4 = path15.length;
+        function result(object, path16, defaultValue) {
+          path16 = castPath(path16, object);
+          var index = -1, length4 = path16.length;
           if (!length4) {
             length4 = 1;
             object = undefined2;
           }
           while (++index < length4) {
-            var value5 = object == null ? undefined2 : object[toKey(path15[index])];
+            var value5 = object == null ? undefined2 : object[toKey(path16[index])];
             if (value5 === undefined2) {
               index = length4;
               value5 = defaultValue;
@@ -41624,12 +41624,12 @@ var require_lodash = __commonJS({
           }
           return object;
         }
-        function set7(object, path15, value5) {
-          return object == null ? object : baseSet(object, path15, value5);
+        function set7(object, path16, value5) {
+          return object == null ? object : baseSet(object, path16, value5);
         }
-        function setWith(object, path15, value5, customizer) {
+        function setWith(object, path16, value5, customizer) {
           customizer = typeof customizer == "function" ? customizer : undefined2;
-          return object == null ? object : baseSet(object, path15, value5, customizer);
+          return object == null ? object : baseSet(object, path16, value5, customizer);
         }
         var toPairs = createToPairs(keys6);
         var toPairsIn = createToPairs(keysIn);
@@ -41651,15 +41651,15 @@ var require_lodash = __commonJS({
           });
           return accumulator;
         }
-        function unset(object, path15) {
-          return object == null ? true : baseUnset(object, path15);
+        function unset(object, path16) {
+          return object == null ? true : baseUnset(object, path16);
         }
-        function update5(object, path15, updater) {
-          return object == null ? object : baseUpdate(object, path15, castFunction(updater));
+        function update5(object, path16, updater) {
+          return object == null ? object : baseUpdate(object, path16, castFunction(updater));
         }
-        function updateWith2(object, path15, updater, customizer) {
+        function updateWith2(object, path16, updater, customizer) {
           customizer = typeof customizer == "function" ? customizer : undefined2;
-          return object == null ? object : baseUpdate(object, path15, castFunction(updater), customizer);
+          return object == null ? object : baseUpdate(object, path16, castFunction(updater), customizer);
         }
         function values3(object) {
           return object == null ? [] : baseValues(object, keys6(object));
@@ -41740,14 +41740,14 @@ var require_lodash = __commonJS({
           string8 = toString(string8);
           return string8 && string8.replace(reLatin, deburrLetter).replace(reComboMark, "");
         }
-        function endsWith(string8, target, position) {
+        function endsWith(string8, target2, position) {
           string8 = toString(string8);
-          target = baseToString(target);
+          target2 = baseToString(target2);
           var length4 = string8.length;
           position = position === undefined2 ? length4 : baseClamp(toInteger(position), 0, length4);
           var end5 = position;
-          position -= target.length;
-          return position >= 0 && string8.slice(position, end5) == target;
+          position -= target2.length;
+          return position >= 0 && string8.slice(position, end5) == target2;
         }
         function escape3(string8) {
           string8 = toString(string8);
@@ -41829,11 +41829,11 @@ var require_lodash = __commonJS({
         var startCase = createCompounder(function(result2, word, index) {
           return result2 + (index ? " " : "") + upperFirst(word);
         });
-        function startsWith(string8, target, position) {
+        function startsWith(string8, target2, position) {
           string8 = toString(string8);
           position = position == null ? 0 : baseClamp(toInteger(position), 0, string8.length);
-          target = baseToString(target);
-          return string8.slice(position, position + target.length) == target;
+          target2 = baseToString(target2);
+          return string8.slice(position, position + target2.length) == target2;
         }
         function template(string8, options3, guard) {
           var settings = lodash.templateSettings;
@@ -42040,17 +42040,17 @@ var require_lodash = __commonJS({
         function matches(source) {
           return baseMatches(baseClone(source, CLONE_DEEP_FLAG));
         }
-        function matchesProperty(path15, srcValue) {
-          return baseMatchesProperty(path15, baseClone(srcValue, CLONE_DEEP_FLAG));
+        function matchesProperty(path16, srcValue) {
+          return baseMatchesProperty(path16, baseClone(srcValue, CLONE_DEEP_FLAG));
         }
-        var method = baseRest(function(path15, args2) {
+        var method = baseRest(function(path16, args2) {
           return function(object) {
-            return baseInvoke(object, path15, args2);
+            return baseInvoke(object, path16, args2);
           };
         });
         var methodOf = baseRest(function(object, args2) {
-          return function(path15) {
-            return baseInvoke(object, path15, args2);
+          return function(path16) {
+            return baseInvoke(object, path16, args2);
           };
         });
         function mixin(object, source, options3) {
@@ -42097,12 +42097,12 @@ var require_lodash = __commonJS({
         var over = createOver(arrayMap);
         var overEvery = createOver(arrayEvery);
         var overSome = createOver(arraySome);
-        function property(path15) {
-          return isKey(path15) ? baseProperty(toKey(path15)) : basePropertyDeep(path15);
+        function property(path16) {
+          return isKey(path16) ? baseProperty(toKey(path16)) : basePropertyDeep(path16);
         }
         function propertyOf(object) {
-          return function(path15) {
-            return object == null ? undefined2 : baseGet(object, path15);
+          return function(path16) {
+            return object == null ? undefined2 : baseGet(object, path16);
           };
         }
         var range4 = createRange();
@@ -42419,7 +42419,7 @@ var require_lodash = __commonJS({
         lodash.isUndefined = isUndefined2;
         lodash.isWeakMap = isWeakMap;
         lodash.isWeakSet = isWeakSet;
-        lodash.join = join16;
+        lodash.join = join17;
         lodash.kebabCase = kebabCase;
         lodash.last = last5;
         lodash.lastIndexOf = lastIndexOf;
@@ -42555,12 +42555,12 @@ var require_lodash = __commonJS({
         LazyWrapper.prototype.findLast = function(predicate) {
           return this.reverse().find(predicate);
         };
-        LazyWrapper.prototype.invokeMap = baseRest(function(path15, args2) {
-          if (typeof path15 == "function") {
+        LazyWrapper.prototype.invokeMap = baseRest(function(path16, args2) {
+          if (typeof path16 == "function") {
             return new LazyWrapper(this);
           }
           return this.map(function(value5) {
-            return baseInvoke(value5, path15, args2);
+            return baseInvoke(value5, path16, args2);
           });
         });
         LazyWrapper.prototype.reject = function(predicate) {
@@ -45061,11 +45061,11 @@ var require_baseGet = __commonJS({
   "node_modules/.pnpm/lodash@4.17.21/node_modules/lodash/_baseGet.js"(exports, module) {
     var castPath = require_castPath();
     var toKey = require_toKey();
-    function baseGet(object, path15) {
-      path15 = castPath(path15, object);
-      var index = 0, length4 = path15.length;
+    function baseGet(object, path16) {
+      path16 = castPath(path16, object);
+      var index = 0, length4 = path16.length;
       while (object != null && index < length4) {
-        object = object[toKey(path15[index++])];
+        object = object[toKey(path16[index++])];
       }
       return index && index == length4 ? object : void 0;
     }
@@ -45077,8 +45077,8 @@ var require_baseGet = __commonJS({
 var require_get = __commonJS({
   "node_modules/.pnpm/lodash@4.17.21/node_modules/lodash/get.js"(exports, module) {
     var baseGet = require_baseGet();
-    function get16(object, path15, defaultValue) {
-      var result = object == null ? void 0 : baseGet(object, path15);
+    function get16(object, path16, defaultValue) {
+      var result = object == null ? void 0 : baseGet(object, path16);
       return result === void 0 ? defaultValue : result;
     }
     module.exports = get16;
@@ -45104,11 +45104,11 @@ var require_hasPath = __commonJS({
     var isIndex = require_isIndex();
     var isLength = require_isLength();
     var toKey = require_toKey();
-    function hasPath(object, path15, hasFunc) {
-      path15 = castPath(path15, object);
-      var index = -1, length4 = path15.length, result = false;
+    function hasPath(object, path16, hasFunc) {
+      path16 = castPath(path16, object);
+      var index = -1, length4 = path16.length, result = false;
       while (++index < length4) {
-        var key = toKey(path15[index]);
+        var key = toKey(path16[index]);
         if (!(result = object != null && hasFunc(object, key))) {
           break;
         }
@@ -45129,8 +45129,8 @@ var require_hasIn = __commonJS({
   "node_modules/.pnpm/lodash@4.17.21/node_modules/lodash/hasIn.js"(exports, module) {
     var baseHasIn = require_baseHasIn();
     var hasPath = require_hasPath();
-    function hasIn(object, path15) {
-      return object != null && hasPath(object, path15, baseHasIn);
+    function hasIn(object, path16) {
+      return object != null && hasPath(object, path16, baseHasIn);
     }
     module.exports = hasIn;
   }
@@ -45148,13 +45148,13 @@ var require_baseMatchesProperty = __commonJS({
     var toKey = require_toKey();
     var COMPARE_PARTIAL_FLAG = 1;
     var COMPARE_UNORDERED_FLAG = 2;
-    function baseMatchesProperty(path15, srcValue) {
-      if (isKey(path15) && isStrictComparable(srcValue)) {
-        return matchesStrictComparable(toKey(path15), srcValue);
+    function baseMatchesProperty(path16, srcValue) {
+      if (isKey(path16) && isStrictComparable(srcValue)) {
+        return matchesStrictComparable(toKey(path16), srcValue);
       }
       return function(object) {
-        var objValue = get16(object, path15);
-        return objValue === void 0 && objValue === srcValue ? hasIn(object, path15) : baseIsEqual(srcValue, objValue, COMPARE_PARTIAL_FLAG | COMPARE_UNORDERED_FLAG);
+        var objValue = get16(object, path16);
+        return objValue === void 0 && objValue === srcValue ? hasIn(object, path16) : baseIsEqual(srcValue, objValue, COMPARE_PARTIAL_FLAG | COMPARE_UNORDERED_FLAG);
       };
     }
     module.exports = baseMatchesProperty;
@@ -45177,9 +45177,9 @@ var require_baseProperty = __commonJS({
 var require_basePropertyDeep = __commonJS({
   "node_modules/.pnpm/lodash@4.17.21/node_modules/lodash/_basePropertyDeep.js"(exports, module) {
     var baseGet = require_baseGet();
-    function basePropertyDeep(path15) {
+    function basePropertyDeep(path16) {
       return function(object) {
-        return baseGet(object, path15);
+        return baseGet(object, path16);
       };
     }
     module.exports = basePropertyDeep;
@@ -45193,8 +45193,8 @@ var require_property = __commonJS({
     var basePropertyDeep = require_basePropertyDeep();
     var isKey = require_isKey();
     var toKey = require_toKey();
-    function property(path15) {
-      return isKey(path15) ? baseProperty(toKey(path15)) : basePropertyDeep(path15);
+    function property(path16) {
+      return isKey(path16) ? baseProperty(toKey(path16)) : basePropertyDeep(path16);
     }
     module.exports = property;
   }
@@ -46467,10 +46467,10 @@ var require_isRemoteUrl = __commonJS({
 var require_getSDKVersions = __commonJS({
   "node_modules/.pnpm/cloudinary@2.7.0/node_modules/cloudinary/lib/utils/analytics/getSDKVersions.js"(exports, module) {
     var fs = __require("fs");
-    var path15 = __require("path");
+    var path16 = __require("path");
     var sdkCode = "M";
     function readSdkSemver() {
-      const pkgJsonPath = path15.join(__dirname, "../../../package.json");
+      const pkgJsonPath = path16.join(__dirname, "../../../package.json");
       try {
         const pkgJSONFile = fs.readFileSync(pkgJsonPath, "utf-8");
         return JSON.parse(pkgJSONFile).version;
@@ -47688,11 +47688,11 @@ var require_utils2 = __commonJS({
       if (!api_version || api_version.length === 0) {
         throw new Error("api_version needs to be a non-empty string");
       }
-      return (path15 = [], options3 = []) => {
+      return (path16 = [], options3 = []) => {
         let cloudinary2 = ensureOption(options3, "upload_prefix", UPLOAD_PREFIX);
         let cloud_name = ensureOption(options3, "cloud_name");
         let encode_path = (unencoded_path) => encodeURIComponent(unencoded_path).replace("'", "%27");
-        let encoded_path = Array.isArray(path15) ? path15.map(encode_path) : encode_path(path15);
+        let encoded_path = Array.isArray(path16) ? path16.map(encode_path) : encode_path(path16);
         return [cloudinary2, api_version, cloud_name].concat(encoded_path).join("/");
       };
     }
@@ -49595,19 +49595,19 @@ var require_uploader = __commonJS({
         return isRemoteUrl(file6) ? [params, { file: file6 }] : [params, {}, file6];
       });
     };
-    exports.upload_large = function upload_large(path15, callback, options3 = {}) {
-      if (path15 != null && isRemoteUrl(path15)) {
-        return exports.upload(path15, callback, options3);
+    exports.upload_large = function upload_large(path16, callback, options3 = {}) {
+      if (path16 != null && isRemoteUrl(path16)) {
+        return exports.upload(path16, callback, options3);
       }
-      if (path15 != null && !options3.filename) {
-        options3.filename = path15.split(/(\\|\/)/g).pop().replace(/\.[^/.]+$/, "");
+      if (path16 != null && !options3.filename) {
+        options3.filename = path16.split(/(\\|\/)/g).pop().replace(/\.[^/.]+$/, "");
       }
-      return exports.upload_chunked(path15, callback, extend5({
+      return exports.upload_chunked(path16, callback, extend5({
         resource_type: "raw"
       }, options3));
     };
-    exports.upload_chunked = function upload_chunked(path15, callback, options3) {
-      let file_reader = fs.createReadStream(path15);
+    exports.upload_chunked = function upload_chunked(path16, callback, options3) {
+      let file_reader = fs.createReadStream(path16);
       let out_stream = exports.upload_chunked_stream(callback, options3);
       return file_reader.pipe(out_stream);
     };
@@ -50362,10 +50362,10 @@ var require_api2 = __commonJS({
       }
       return call_api("get", uri, params, callback, options3);
     };
-    exports.resources_by_moderation = function resources_by_moderation(kind, status2, callback, options3 = {}) {
+    exports.resources_by_moderation = function resources_by_moderation(kind, status3, callback, options3 = {}) {
       let resource_type, uri;
       resource_type = options3.resource_type || "image";
-      uri = ["resources", resource_type, "moderations", kind, status2];
+      uri = ["resources", resource_type, "moderations", kind, status3];
       return call_api("get", uri, pickOnlyExistingValues(options3, "next_cursor", "max_results", "tags", "context", "direction", "moderations", "metadata", "fields"), callback, options3);
     };
     exports.resource_by_asset_id = function resource_by_asset_id(asset_id, callback, options3 = {}) {
@@ -50586,20 +50586,20 @@ var require_api2 = __commonJS({
       params = pickOnlyExistingValues(options3, "next_cursor", "max_results");
       return call_api("get", uri, params, callback, options3);
     };
-    exports.sub_folders = function sub_folders(path15, callback, options3 = {}) {
+    exports.sub_folders = function sub_folders(path16, callback, options3 = {}) {
       let uri, params;
-      uri = ["folders", path15];
+      uri = ["folders", path16];
       params = pickOnlyExistingValues(options3, "next_cursor", "max_results");
       return call_api("get", uri, params, callback, options3);
     };
-    exports.create_folder = function create_folder(path15, callback, options3 = {}) {
+    exports.create_folder = function create_folder(path16, callback, options3 = {}) {
       let uri;
-      uri = ["folders", path15];
+      uri = ["folders", path16];
       return call_api("post", uri, {}, callback, options3);
     };
-    exports.delete_folder = function delete_folder(path15, callback, options3 = {}) {
+    exports.delete_folder = function delete_folder(path16, callback, options3 = {}) {
       let uri;
-      uri = ["folders", path15];
+      uri = ["folders", path16];
       return call_api("delete", uri, {}, callback, options3);
     };
     exports.rename_folder = function rename_folder(old_path, new_path, callback, options3 = {}) {
@@ -51776,7 +51776,7 @@ var require_package2 = __commonJS({
 var require_main = __commonJS({
   "node_modules/.pnpm/dotenv@17.2.3/node_modules/dotenv/lib/main.js"(exports, module) {
     var fs = __require("fs");
-    var path15 = __require("path");
+    var path16 = __require("path");
     var os2 = __require("os");
     var crypto = __require("crypto");
     var packageJson = require_package2();
@@ -51925,7 +51925,7 @@ var require_main = __commonJS({
           possibleVaultPath = options3.path.endsWith(".vault") ? options3.path : `${options3.path}.vault`;
         }
       } else {
-        possibleVaultPath = path15.resolve(process.cwd(), ".env.vault");
+        possibleVaultPath = path16.resolve(process.cwd(), ".env.vault");
       }
       if (fs.existsSync(possibleVaultPath)) {
         return possibleVaultPath;
@@ -51933,7 +51933,7 @@ var require_main = __commonJS({
       return null;
     }
     function _resolveHome(envPath) {
-      return envPath[0] === "~" ? path15.join(os2.homedir(), envPath.slice(1)) : envPath;
+      return envPath[0] === "~" ? path16.join(os2.homedir(), envPath.slice(1)) : envPath;
     }
     function _configVault(options3) {
       const debug3 = parseBoolean(process.env.DOTENV_CONFIG_DEBUG || options3 && options3.debug);
@@ -51950,7 +51950,7 @@ var require_main = __commonJS({
       return { parsed };
     }
     function configDotenv(options3) {
-      const dotenvPath = path15.resolve(process.cwd(), ".env");
+      const dotenvPath = path16.resolve(process.cwd(), ".env");
       let encoding = "utf8";
       let processEnv = process.env;
       if (options3 && options3.processEnv != null) {
@@ -51978,13 +51978,13 @@ var require_main = __commonJS({
       }
       let lastError;
       const parsedAll = {};
-      for (const path16 of optionPaths) {
+      for (const path17 of optionPaths) {
         try {
-          const parsed = DotenvModule.parse(fs.readFileSync(path16, { encoding }));
+          const parsed = DotenvModule.parse(fs.readFileSync(path17, { encoding }));
           DotenvModule.populate(parsedAll, parsed, options3);
         } catch (e) {
           if (debug3) {
-            _debug(`Failed to load ${path16} ${e.message}`);
+            _debug(`Failed to load ${path17} ${e.message}`);
           }
           lastError = e;
         }
@@ -51997,7 +51997,7 @@ var require_main = __commonJS({
         const shortPaths = [];
         for (const filePath of optionPaths) {
           try {
-            const relative3 = path15.relative(process.cwd(), filePath);
+            const relative3 = path16.relative(process.cwd(), filePath);
             shortPaths.push(relative3);
           } catch (e) {
             if (debug3) {
@@ -57903,22 +57903,22 @@ var catchSome = /* @__PURE__ */ dual(2, (self2, pf) => catchAllCause(self2, (cau
       return failCause(either7.right);
   }
 }));
-var checkInterruptible = (f) => withFiberRuntime((_, status2) => f(interruption(status2.runtimeFlags)));
+var checkInterruptible = (f) => withFiberRuntime((_, status3) => f(interruption(status3.runtimeFlags)));
 var originalSymbol = /* @__PURE__ */ Symbol.for("effect/OriginalAnnotation");
 var capture = (obj, span4) => {
   if (isSome2(span4)) {
     return new Proxy(obj, {
-      has(target, p3) {
-        return p3 === spanSymbol || p3 === originalSymbol || p3 in target;
+      has(target2, p3) {
+        return p3 === spanSymbol || p3 === originalSymbol || p3 in target2;
       },
-      get(target, p3) {
+      get(target2, p3) {
         if (p3 === spanSymbol) {
           return span4.value;
         }
         if (p3 === originalSymbol) {
           return obj;
         }
-        return target[p3];
+        return target2[p3];
       }
     });
   }
@@ -58080,7 +58080,7 @@ var orDieWith = /* @__PURE__ */ dual(2, (self2, f) => matchEffect(self2, {
   onSuccess: succeed
 }));
 var partitionMap3 = partitionMap2;
-var runtimeFlags = /* @__PURE__ */ withFiberRuntime((_, status2) => succeed(status2.runtimeFlags));
+var runtimeFlags = /* @__PURE__ */ withFiberRuntime((_, status3) => succeed(status3.runtimeFlags));
 var succeed = (value5) => {
   const effect3 = new EffectPrimitiveSuccess(OP_SUCCESS);
   effect3.effect_instruction_i0 = value5;
@@ -59195,67 +59195,67 @@ var Or = (self2, that) => {
   });
   return error4;
 };
-var InvalidData = (path15, message, options3 = {
+var InvalidData = (path16, message, options3 = {
   pathDelim: "."
 }) => {
   const error4 = Object.create(proto2);
   error4._op = OP_INVALID_DATA;
-  error4.path = path15;
+  error4.path = path16;
   error4.message = message;
   Object.defineProperty(error4, "toString", {
     enumerable: false,
     value() {
-      const path16 = pipe(this.path, join(options3.pathDelim));
-      return `(Invalid data at ${path16}: "${this.message}")`;
+      const path17 = pipe(this.path, join(options3.pathDelim));
+      return `(Invalid data at ${path17}: "${this.message}")`;
     }
   });
   return error4;
 };
-var MissingData = (path15, message, options3 = {
+var MissingData = (path16, message, options3 = {
   pathDelim: "."
 }) => {
   const error4 = Object.create(proto2);
   error4._op = OP_MISSING_DATA;
-  error4.path = path15;
+  error4.path = path16;
   error4.message = message;
   Object.defineProperty(error4, "toString", {
     enumerable: false,
     value() {
-      const path16 = pipe(this.path, join(options3.pathDelim));
-      return `(Missing data at ${path16}: "${this.message}")`;
+      const path17 = pipe(this.path, join(options3.pathDelim));
+      return `(Missing data at ${path17}: "${this.message}")`;
     }
   });
   return error4;
 };
-var SourceUnavailable = (path15, message, cause3, options3 = {
+var SourceUnavailable = (path16, message, cause3, options3 = {
   pathDelim: "."
 }) => {
   const error4 = Object.create(proto2);
   error4._op = OP_SOURCE_UNAVAILABLE;
-  error4.path = path15;
+  error4.path = path16;
   error4.message = message;
   error4.cause = cause3;
   Object.defineProperty(error4, "toString", {
     enumerable: false,
     value() {
-      const path16 = pipe(this.path, join(options3.pathDelim));
-      return `(Source unavailable at ${path16}: "${this.message}")`;
+      const path17 = pipe(this.path, join(options3.pathDelim));
+      return `(Source unavailable at ${path17}: "${this.message}")`;
     }
   });
   return error4;
 };
-var Unsupported = (path15, message, options3 = {
+var Unsupported = (path16, message, options3 = {
   pathDelim: "."
 }) => {
   const error4 = Object.create(proto2);
   error4._op = OP_UNSUPPORTED;
-  error4.path = path15;
+  error4.path = path16;
   error4.message = message;
   Object.defineProperty(error4, "toString", {
     enumerable: false,
     value() {
-      const path16 = pipe(this.path, join(options3.pathDelim));
-      return `(Unsupported operation at ${path16}: "${this.message}")`;
+      const path17 = pipe(this.path, join(options3.pathDelim));
+      return `(Unsupported operation at ${path17}: "${this.message}")`;
     }
   });
   return error4;
@@ -59371,9 +59371,9 @@ var isMissingDataOnly = (self2) => reduceWithContext3(self2, void 0, IsMissingDa
 var empty20 = {
   _tag: "Empty"
 };
-var patch5 = /* @__PURE__ */ dual(2, (path15, patch9) => {
+var patch5 = /* @__PURE__ */ dual(2, (path16, patch9) => {
   let input = of3(patch9);
-  let output = path15;
+  let output = path16;
   while (isCons(input)) {
     const patch10 = input.head;
     switch (patch10._tag) {
@@ -59440,7 +59440,7 @@ var make21 = (options3) => ({
 var makeFlat = (options3) => ({
   [FlatConfigProviderTypeId]: FlatConfigProviderTypeId,
   patch: options3.patch,
-  load: (path15, config3, split3 = true) => options3.load(path15, config3, split3),
+  load: (path16, config3, split3 = true) => options3.load(path16, config3, split3),
   enumerateChildren: options3.enumerateChildren
 });
 var fromFlat = (flat) => make21({
@@ -59458,29 +59458,29 @@ var fromEnv = (options3) => {
     pathDelim: "_",
     seqDelim: ","
   }, options3);
-  const makePathString = (path15) => pipe(path15, join(pathDelim));
+  const makePathString = (path16) => pipe(path16, join(pathDelim));
   const unmakePathString = (pathString) => pathString.split(pathDelim);
   const getEnv = () => typeof process !== "undefined" && "env" in process && typeof process.env === "object" ? process.env : {};
-  const load = (path15, primitive2, split3 = true) => {
-    const pathString = makePathString(path15);
+  const load = (path16, primitive2, split3 = true) => {
+    const pathString = makePathString(path16);
     const current = getEnv();
     const valueOpt = pathString in current ? some2(current[pathString]) : none2();
-    return pipe(valueOpt, mapError(() => MissingData(path15, `Expected ${pathString} to exist in the process context`)), flatMap7((value5) => parsePrimitive(value5, path15, primitive2, seqDelim, split3)));
+    return pipe(valueOpt, mapError(() => MissingData(path16, `Expected ${pathString} to exist in the process context`)), flatMap7((value5) => parsePrimitive(value5, path16, primitive2, seqDelim, split3)));
   };
-  const enumerateChildren = (path15) => sync(() => {
+  const enumerateChildren = (path16) => sync(() => {
     const current = getEnv();
     const keys6 = Object.keys(current);
     const keyPaths = keys6.map((value5) => unmakePathString(value5.toUpperCase()));
     const filteredKeyPaths = keyPaths.filter((keyPath) => {
-      for (let i = 0; i < path15.length; i++) {
-        const pathComponent = pipe(path15, unsafeGet(i));
+      for (let i = 0; i < path16.length; i++) {
+        const pathComponent = pipe(path16, unsafeGet(i));
         const currentElement = keyPath[i];
         if (currentElement === void 0 || pathComponent !== currentElement) {
           return false;
         }
       }
       return true;
-    }).flatMap((keyPath) => keyPath.slice(path15.length, path15.length + 1));
+    }).flatMap((keyPath) => keyPath.slice(path16.length, path16.length + 1));
     return fromIterable6(filteredKeyPaths);
   });
   return fromFlat(makeFlat({
@@ -59496,17 +59496,17 @@ var extend2 = (leftDef, rightDef, left3, right3) => {
   const rightExtension = concat(right3, rightPad);
   return [leftExtension, rightExtension];
 };
-var appendConfigPath = (path15, config3) => {
+var appendConfigPath = (path16, config3) => {
   let op = config3;
   if (op._tag === "Nested") {
-    const out = path15.slice();
+    const out = path16.slice();
     while (op._tag === "Nested") {
       out.push(op.name);
       op = op.config;
     }
     return out;
   }
-  return path15;
+  return path16;
 };
 var fromFlatLoop = (flat, prefix, config3, split3) => {
   const op = config3;
@@ -59582,8 +59582,8 @@ var fromFlatLoop = (flat, prefix, config3, split3) => {
           return fail2(right3.left);
         }
         if (isRight2(left3) && isRight2(right3)) {
-          const path15 = pipe(prefix, join("."));
-          const fail20 = fromFlatLoopFail(prefix, path15);
+          const path16 = pipe(prefix, join("."));
+          const fail20 = fromFlatLoopFail(prefix, path16);
           const [lefts, rights] = extend2(fail20, fail20, pipe(left3.right, map3(right2)), pipe(right3.right, map3(right2)));
           return pipe(lefts, zip(rights), forEachSequential(([left4, right4]) => pipe(zip2(left4, right4), map10(([left5, right5]) => op.zip(left5, right5)))));
         }
@@ -59592,19 +59592,19 @@ var fromFlatLoop = (flat, prefix, config3, split3) => {
     }
   }
 };
-var fromFlatLoopFail = (prefix, path15) => (index) => left2(MissingData(prefix, `The element at index ${index} in a sequence at path "${path15}" was missing`));
+var fromFlatLoopFail = (prefix, path16) => (index) => left2(MissingData(prefix, `The element at index ${index} in a sequence at path "${path16}" was missing`));
 var splitPathString = (text11, delim) => {
   const split3 = text11.split(new RegExp(`\\s*${escape(delim)}\\s*`));
   return split3;
 };
-var parsePrimitive = (text11, path15, primitive2, delimiter, split3) => {
+var parsePrimitive = (text11, path16, primitive2, delimiter, split3) => {
   if (!split3) {
     return pipe(primitive2.parse(text11), mapBoth2({
-      onFailure: prefixed(path15),
+      onFailure: prefixed(path16),
       onSuccess: of
     }));
   }
-  return pipe(splitPathString(text11, delimiter), forEachSequential((char4) => primitive2.parse(char4.trim())), mapError(prefixed(path15)));
+  return pipe(splitPathString(text11, delimiter), forEachSequential((char4) => primitive2.parse(char4.trim())), mapError(prefixed(path16)));
 };
 var transpose = (array8) => {
   return Object.keys(array8[0]).map((column3) => array8.map((row) => row[column3]));
@@ -61187,9 +61187,9 @@ var cause = (self2) => matchCause(self2, {
 var clockWith3 = clockWith2;
 var clock = /* @__PURE__ */ clockWith3(succeed);
 var delay = /* @__PURE__ */ dual(2, (self2, duration3) => zipRight2(sleep2(duration3), self2));
-var descriptorWith = (f) => withFiberRuntime((state, status2) => f({
+var descriptorWith = (f) => withFiberRuntime((state, status3) => f({
   id: state.id(),
-  status: status2,
+  status: status3,
   interruptors: interruptors(state.getFiberRef(currentInterruptedCause))
 }));
 var allowInterrupt = /* @__PURE__ */ descriptorWith((descriptor3) => size3(descriptor3.interruptors) > 0 ? interrupt2 : void_2);
@@ -62720,8 +62720,8 @@ var summary3 = (key) => {
   const observe = (value5, timestamp) => {
     if (maxSize > 0) {
       head6 = head6 + 1;
-      const target = head6 % maxSize;
-      values3[target] = [timestamp, value5];
+      const target2 = head6 % maxSize;
+      values3[target2] = [timestamp, value5];
     }
     min6 = count5 === 0 ? value5 : Math.min(min6, value5);
     max8 = count5 === 0 ? value5 : Math.max(max8, value5);
@@ -63468,17 +63468,17 @@ var FiberRuntime = class extends Class2 {
    * The status of the fiber.
    */
   get status() {
-    return this.ask((_, status2) => status2);
+    return this.ask((_, status3) => status3);
   }
   /**
    * Gets the fiber runtime flags.
    */
   get runtimeFlags() {
-    return this.ask((state, status2) => {
-      if (isDone2(status2)) {
+    return this.ask((state, status3) => {
+      if (isDone2(status3)) {
         return state.currentRuntimeFlags;
       }
-      return status2.runtimeFlags;
+      return status3.runtimeFlags;
     });
   }
   /**
@@ -63529,8 +63529,8 @@ var FiberRuntime = class extends Class2 {
   ask(f) {
     return suspend(() => {
       const deferred = deferredUnsafeMake(this._fiberId);
-      this.tell(stateful((fiber, status2) => {
-        deferredUnsafeDone(deferred, sync(() => f(fiber, status2)));
+      this.tell(stateful((fiber, status3) => {
+        deferredUnsafeDone(deferred, sync(() => f(fiber, status3)));
       }));
       return deferredAwait(deferred);
     });
@@ -64620,8 +64620,8 @@ var forEachParUnbounded = (self2, f, batching) => suspend(() => {
 });
 var forEachConcurrentDiscard = (self2, f, batching, processAll, n) => uninterruptibleMask((restore) => transplant((graft) => withFiberRuntime((parent) => {
   let todos = Array.from(self2).reverse();
-  let target = todos.length;
-  if (target === 0) {
+  let target2 = todos.length;
+  if (target2 === 0) {
     return void_2;
   }
   let counter6 = 0;
@@ -64661,7 +64661,7 @@ var forEachConcurrentDiscard = (self2, f, batching, processAll, n) => uninterrup
   };
   const onInterruptSignal = () => {
     if (!processAll) {
-      target -= todos.length;
+      target2 -= todos.length;
       todos = [];
     }
     interrupted2 = true;
@@ -64719,11 +64719,11 @@ var forEachConcurrentDiscard = (self2, f, batching, processAll, n) => uninterrup
           joinOrder.push(fiber);
           fibers.delete(fiber);
           pushResult(exit4, index);
-          if (results.length === target) {
+          if (results.length === target2) {
             resume2(succeed(getOrElse(exitCollectAll(collectExits(), {
               parallel: true
             }), () => exitVoid)));
-          } else if (residual.length + results.length === target) {
+          } else if (residual.length + results.length === target2) {
             const exits = collectExits();
             const requests = residual.map((blocked3) => blocked3.effect_instruction_i0).reduce(par);
             resume2(succeed(blocked(requests, forEachConcurrentDiscard([getOrElse(exitCollectAll(exits, {
@@ -64742,7 +64742,7 @@ var forEachConcurrentDiscard = (self2, f, batching, processAll, n) => uninterrup
   return asVoid2(onExit(flatten5(restore(join2(processingFiber))), exitMatch({
     onFailure: (cause3) => {
       onInterruptSignal();
-      const target2 = residual.length + 1;
+      const target3 = residual.length + 1;
       const concurrency = Math.min(typeof n === "number" ? n : residual.length, residual.length);
       const toPop = Array.from(residual);
       return async_((cb) => {
@@ -64750,7 +64750,7 @@ var forEachConcurrentDiscard = (self2, f, batching, processAll, n) => uninterrup
         let index = 0;
         const check2 = (index2, hitNext) => (exit4) => {
           count5++;
-          if (count5 === target2) {
+          if (count5 === target3) {
             cb(exitSucceed(exitFailCause(cause3)));
           }
           if (toPop.length > 0 && hitNext) {
@@ -64777,7 +64777,7 @@ var forEachParN = (self2, n, f, batching) => suspend(() => {
   const fn2 = (a, i) => map10(f(a, i), (b) => array8[i] = b);
   return zipRight2(forEachConcurrentDiscard(as10, fn2, batching, false, n), succeed(array8));
 });
-var fork = (self2) => withFiberRuntime((state, status2) => succeed(unsafeFork2(self2, state, status2.runtimeFlags)));
+var fork = (self2) => withFiberRuntime((state, status3) => succeed(unsafeFork2(self2, state, status3.runtimeFlags)));
 var forkDaemon = (self2) => forkWithScopeOverride(self2, globalScope);
 var forkWithErrorHandler = /* @__PURE__ */ dual(2, (self2, handler) => fork(onError(self2, (cause3) => {
   const either7 = failureOrCause(cause3);
@@ -64818,7 +64818,7 @@ var validateAll = /* @__PURE__ */ dual((args2) => isIterable(args2[0]), (element
   batching: options3?.batching,
   concurrentFinalizers: options3?.concurrentFinalizers
 }), ([es, bs]) => isNonEmptyArray2(es) ? fail2(es) : options3?.discard ? void_2 : succeed(bs)));
-var raceAll = (all10) => withFiberRuntime((state, status2) => async_((resume2) => {
+var raceAll = (all10) => withFiberRuntime((state, status3) => async_((resume2) => {
   const fibers = /* @__PURE__ */ new Set();
   let winner;
   let failures2 = empty8;
@@ -64831,7 +64831,7 @@ var raceAll = (all10) => withFiberRuntime((state, status2) => async_((resume2) =
   let empty42 = true;
   for (const self2 of all10) {
     empty42 = false;
-    const fiber = unsafeFork2(interruptible2(self2), state, status2.runtimeFlags);
+    const fiber = unsafeFork2(interruptible2(self2), state, status3.runtimeFlags);
     fibers.add(fiber);
     fiber.addObserver((exit4) => {
       fibers.delete(fiber);
@@ -65884,7 +65884,7 @@ var RuntimeImpl = class {
   }
 };
 var make39 = (options3) => new RuntimeImpl(options3.context, options3.runtimeFlags, options3.fiberRefs);
-var runtime3 = () => withFiberRuntime((state, status2) => succeed(new RuntimeImpl(state.getFiberRef(currentContext), status2.runtimeFlags, state.getFiberRefs())));
+var runtime3 = () => withFiberRuntime((state, status3) => succeed(new RuntimeImpl(state.getFiberRef(currentContext), status3.runtimeFlags, state.getFiberRefs())));
 var defaultRuntimeFlags = /* @__PURE__ */ make19(Interruption, CooperativeYielding, RuntimeMetrics);
 var defaultRuntime = /* @__PURE__ */ make39({
   context: /* @__PURE__ */ empty10(),
@@ -66115,9 +66115,9 @@ var mock = function() {
 var mockImpl = (tag4, service3) => succeed6(tag4, new Proxy({
   ...service3
 }, {
-  get(target, prop, _receiver) {
-    if (prop in target) {
-      return target[prop];
+  get(target2, prop, _receiver) {
+    if (prop in target2) {
+      return target2[prop];
     }
     const prevLimit = Error.stackTraceLimit;
     Error.stackTraceLimit = 2;
@@ -67808,22 +67808,22 @@ var transposeMapOption = /* @__PURE__ */ dual(2, (self2, f) => isNone(self2) ? s
 var makeTagProxy = (TagClass) => {
   const cache = /* @__PURE__ */ new Map();
   return new Proxy(TagClass, {
-    get(target, prop, receiver) {
-      if (prop in target) {
-        return Reflect.get(target, prop, receiver);
+    get(target2, prop, receiver) {
+      if (prop in target2) {
+        return Reflect.get(target2, prop, receiver);
       }
       if (cache.has(prop)) {
         return cache.get(prop);
       }
-      const fn2 = (...args2) => andThen3(target, (s) => {
+      const fn2 = (...args2) => andThen3(target2, (s) => {
         if (typeof s[prop] === "function") {
-          cache.set(prop, (...args3) => andThen3(target, (s2) => s2[prop](...args3)));
+          cache.set(prop, (...args3) => andThen3(target2, (s2) => s2[prop](...args3)));
           return s[prop](...args2);
         }
-        cache.set(prop, andThen3(target, (s2) => s2[prop]));
+        cache.set(prop, andThen3(target2, (s2) => s2[prop]));
         return s[prop];
       });
-      const cn = andThen3(target, (s) => s[prop]);
+      const cn = andThen3(target2, (s) => s[prop]);
       Object.assign(fn2, cn);
       const apply = fn2.apply;
       const bind7 = fn2.bind;
@@ -68383,14 +68383,14 @@ var memoizeThunk = (f) => {
 var isNonEmpty5 = (x) => Array.isArray(x);
 var isSingle = (x) => !Array.isArray(x);
 var formatPathKey = (key) => `[${formatPropertyKey(key)}]`;
-var formatPath = (path15) => isNonEmpty5(path15) ? path15.map(formatPathKey).join("") : formatPathKey(path15);
+var formatPath = (path16) => isNonEmpty5(path16) ? path16.map(formatPathKey).join("") : formatPathKey(path16);
 
 // node_modules/.pnpm/effect@3.21.0/node_modules/effect/dist/esm/internal/schema/errors.js
-var getErrorMessage = (reason, details, path15, ast) => {
+var getErrorMessage = (reason, details, path16, ast) => {
   let out = reason;
-  if (path15 && isNonEmptyReadonlyArray(path15)) {
+  if (path16 && isNonEmptyReadonlyArray(path16)) {
     out += `
-at path: ${formatPath(path15)}`;
+at path: ${formatPath(path16)}`;
   }
   if (details !== void 0) {
     out += `
@@ -68402,7 +68402,7 @@ schema (${ast._tag}): ${ast}`;
   }
   return out;
 };
-var getSchemaExtendErrorMessage = (x, y, path15) => getErrorMessage("Unsupported schema or overlapping types", `cannot extend ${x} with ${y}`, path15);
+var getSchemaExtendErrorMessage = (x, y, path16) => getErrorMessage("Unsupported schema or overlapping types", `cannot extend ${x} with ${y}`, path16);
 var getASTUnsupportedKeySchemaErrorMessage = (ast) => getErrorMessage("Unsupported key schema", void 0, void 0, ast);
 var getASTUnsupportedLiteralErrorMessage = (literal2) => getErrorMessage("Unsupported literal", `literal value: ${formatUnknown(literal2)}`);
 var getASTDuplicateIndexSignatureErrorMessage = (type2) => getErrorMessage("Duplicate index signature", `${type2} index signature`);
@@ -69594,8 +69594,8 @@ var Pointer = class {
    * @since 3.10.0
    */
   _tag = "Pointer";
-  constructor(path15, actual, issue) {
-    this.path = path15;
+  constructor(path16, actual, issue) {
+    this.path = path16;
     this.actual = actual;
     this.issue = issue;
   }
@@ -73104,7 +73104,7 @@ var updateContext3 = updateContext2;
 var spaced2 = spaced;
 
 // node_modules/.pnpm/effect@3.21.0/node_modules/effect/dist/esm/internal/stream/emit.js
-var make48 = (emit) => {
+var make48 = (emit2) => {
   const ops = {
     chunk(as10) {
       return this(succeed9(as10));
@@ -73143,7 +73143,7 @@ var make48 = (emit) => {
       return this(succeed9(of2(value5)));
     }
   };
-  return Object.assign(emit, ops);
+  return Object.assign(emit2, ops);
 };
 
 // node_modules/.pnpm/effect@3.21.0/node_modules/effect/dist/esm/internal/take.js
@@ -73901,7 +73901,7 @@ function makeTypeLiteralClass(fields, records, ast = getDefaultTypeLiteralAST(fi
 function Struct(fields, ...records) {
   return makeTypeLiteralClass(fields, records);
 }
-var intersectTypeLiterals = (x, y, path15) => {
+var intersectTypeLiterals = (x, y, path16) => {
   if (isTypeLiteral(x) && isTypeLiteral(y)) {
     const propertySignatures = [...x.propertySignatures];
     for (const ps of y.propertySignatures) {
@@ -73914,18 +73914,18 @@ var intersectTypeLiterals = (x, y, path15) => {
           isOptional,
           type: type2
         } = propertySignatures[i];
-        propertySignatures[i] = new PropertySignature(name, extendAST(type2, ps.type, path15.concat(name)), isOptional, true);
+        propertySignatures[i] = new PropertySignature(name, extendAST(type2, ps.type, path16.concat(name)), isOptional, true);
       }
     }
     return new TypeLiteral(propertySignatures, x.indexSignatures.concat(y.indexSignatures));
   }
-  throw new Error(getSchemaExtendErrorMessage(x, y, path15));
+  throw new Error(getSchemaExtendErrorMessage(x, y, path16));
 };
 var preserveRefinementAnnotations = /* @__PURE__ */ omitAnnotations([IdentifierAnnotationId]);
 var addRefinementToMembers = (refinement, asts) => asts.map((ast) => new Refinement(ast, refinement.filter, preserveRefinementAnnotations(refinement)));
-var extendAST = (x, y, path15) => Union.make(intersectUnionMembers([x], [y], path15));
+var extendAST = (x, y, path16) => Union.make(intersectUnionMembers([x], [y], path16));
 var getTypes = (ast) => isUnion(ast) ? ast.types : [ast];
-var intersectUnionMembers = (xs, ys, path15) => flatMap2(xs, (x) => flatMap2(ys, (y) => {
+var intersectUnionMembers = (xs, ys, path16) => flatMap2(xs, (x) => flatMap2(ys, (y) => {
   switch (y._tag) {
     case "Literal": {
       if (isString(y.literal) && isStringKeyword(x) || isNumber(y.literal) && isNumberKeyword(x) || isBoolean(y.literal) && isBooleanKeyword(x)) {
@@ -73938,7 +73938,7 @@ var intersectUnionMembers = (xs, ys, path15) => flatMap2(xs, (x) => flatMap2(ys,
         if (isStringKeyword(x) || isLiteral(x) && isString(x.literal)) {
           return [x];
         } else if (isRefinement(x)) {
-          return addRefinementToMembers(x, intersectUnionMembers(getTypes(x.from), [y], path15));
+          return addRefinementToMembers(x, intersectUnionMembers(getTypes(x.from), [y], path16));
         }
       } else if (x === stringKeyword) {
         return [y];
@@ -73950,7 +73950,7 @@ var intersectUnionMembers = (xs, ys, path15) => flatMap2(xs, (x) => flatMap2(ys,
         if (isNumberKeyword(x) || isLiteral(x) && isNumber(x.literal)) {
           return [x];
         } else if (isRefinement(x)) {
-          return addRefinementToMembers(x, intersectUnionMembers(getTypes(x.from), [y], path15));
+          return addRefinementToMembers(x, intersectUnionMembers(getTypes(x.from), [y], path16));
         }
       } else if (x === numberKeyword) {
         return [y];
@@ -73962,7 +73962,7 @@ var intersectUnionMembers = (xs, ys, path15) => flatMap2(xs, (x) => flatMap2(ys,
         if (isBooleanKeyword(x) || isLiteral(x) && isBoolean(x.literal)) {
           return [x];
         } else if (isRefinement(x)) {
-          return addRefinementToMembers(x, intersectUnionMembers(getTypes(x.from), [y], path15));
+          return addRefinementToMembers(x, intersectUnionMembers(getTypes(x.from), [y], path16));
         }
       } else if (x === booleanKeyword) {
         return [y];
@@ -73970,25 +73970,25 @@ var intersectUnionMembers = (xs, ys, path15) => flatMap2(xs, (x) => flatMap2(ys,
       break;
     }
     case "Union":
-      return intersectUnionMembers(getTypes(x), y.types, path15);
+      return intersectUnionMembers(getTypes(x), y.types, path16);
     case "Suspend":
-      return [new Suspend(() => extendAST(x, y.f(), path15))];
+      return [new Suspend(() => extendAST(x, y.f(), path16))];
     case "Refinement":
-      return addRefinementToMembers(y, intersectUnionMembers(getTypes(x), getTypes(y.from), path15));
+      return addRefinementToMembers(y, intersectUnionMembers(getTypes(x), getTypes(y.from), path16));
     case "TypeLiteral": {
       switch (x._tag) {
         case "Union":
-          return intersectUnionMembers(x.types, [y], path15);
+          return intersectUnionMembers(x.types, [y], path16);
         case "Suspend":
-          return [new Suspend(() => extendAST(x.f(), y, path15))];
+          return [new Suspend(() => extendAST(x.f(), y, path16))];
         case "Refinement":
-          return addRefinementToMembers(x, intersectUnionMembers(getTypes(x.from), [y], path15));
+          return addRefinementToMembers(x, intersectUnionMembers(getTypes(x.from), [y], path16));
         case "TypeLiteral":
-          return [intersectTypeLiterals(x, y, path15)];
+          return [intersectTypeLiterals(x, y, path16)];
         case "Transformation": {
           const transformation = x.transformation;
-          const from = intersectTypeLiterals(x.from, y, path15);
-          const to = intersectTypeLiterals(x.to, typeAST(y), path15);
+          const from = intersectTypeLiterals(x.from, y, path16);
+          const to = intersectTypeLiterals(x.to, typeAST(y), path16);
           switch (transformation._tag) {
             case "TypeLiteralTransformation":
               return [new Transformation(from, to, new TypeLiteralTransformation(transformation.propertySignatureTransformations))];
@@ -74010,15 +74010,15 @@ var intersectUnionMembers = (xs, ys, path15) => flatMap2(xs, (x) => flatMap2(ys,
     case "Transformation": {
       if (isTransformation(x)) {
         if (isTypeLiteralTransformation(y.transformation) && isTypeLiteralTransformation(x.transformation)) {
-          return [new Transformation(intersectTypeLiterals(x.from, y.from, path15), intersectTypeLiterals(x.to, y.to, path15), new TypeLiteralTransformation(y.transformation.propertySignatureTransformations.concat(x.transformation.propertySignatureTransformations)))];
+          return [new Transformation(intersectTypeLiterals(x.from, y.from, path16), intersectTypeLiterals(x.to, y.to, path16), new TypeLiteralTransformation(y.transformation.propertySignatureTransformations.concat(x.transformation.propertySignatureTransformations)))];
         }
       } else {
-        return intersectUnionMembers([y], [x], path15);
+        return intersectUnionMembers([y], [x], path16);
       }
       break;
     }
   }
-  throw new Error(getSchemaExtendErrorMessage(x, y, path15));
+  throw new Error(getSchemaExtendErrorMessage(x, y, path16));
 }));
 var extend4 = /* @__PURE__ */ dual(2, (self2, that) => make53(extendAST(self2.ast, that.ast, [])));
 var compose3 = /* @__PURE__ */ dual((args2) => isSchema(args2[1]), (from, to) => makeTransformationClass(from, to, compose(from.ast, to.ast)));
@@ -74693,8 +74693,8 @@ var PiB = (n) => Size(BigInt(n) * bigintPiB);
 var make54 = (impl) => {
   return tag.of({
     ...impl,
-    exists: (path15) => pipe(impl.access(path15), as5(true), catchTag2("SystemError", (e) => e.reason === "NotFound" ? succeed9(false) : fail9(e))),
-    readFileString: (path15, encoding) => tryMap2(impl.readFile(path15), {
+    exists: (path16) => pipe(impl.access(path16), as5(true), catchTag2("SystemError", (e) => e.reason === "NotFound" ? succeed9(false) : fail9(e))),
+    readFileString: (path16, encoding) => tryMap2(impl.readFile(path16), {
       try: (_) => new TextDecoder(encoding).decode(_),
       catch: (cause3) => new BadArgument({
         module: "FileSystem",
@@ -74703,14 +74703,14 @@ var make54 = (impl) => {
         cause: cause3
       })
     }),
-    stream: (path15, options3) => pipe(impl.open(path15, {
+    stream: (path16, options3) => pipe(impl.open(path16, {
       flag: "r"
     }), options3?.offset ? tap4((file6) => file6.seek(options3.offset, "start")) : identity, map18((file6) => stream(file6, options3)), unwrapScoped7),
-    sink: (path15, options3) => pipe(impl.open(path15, {
+    sink: (path16, options3) => pipe(impl.open(path16, {
       flag: "w",
       ...options3
     }), map18((file6) => forEach11((_) => file6.writeAll(_))), unwrapScoped6),
-    writeFileString: (path15, data, options3) => flatMap10(try_2({
+    writeFileString: (path16, data, options3) => flatMap10(try_2({
       try: () => new TextEncoder().encode(data),
       catch: (cause3) => new BadArgument({
         module: "FileSystem",
@@ -74718,38 +74718,38 @@ var make54 = (impl) => {
         description: "could not encode string",
         cause: cause3
       })
-    }), (_) => impl.writeFile(path15, _, options3))
+    }), (_) => impl.writeFile(path16, _, options3))
   });
 };
-var notFound = (method, path15) => new SystemError({
+var notFound = (method, path16) => new SystemError({
   module: "FileSystem",
   method,
   reason: "NotFound",
   description: "No such file or directory",
-  pathOrDescriptor: path15
+  pathOrDescriptor: path16
 });
 var makeNoop = (fileSystem) => {
   return {
-    access(path15) {
-      return fail9(notFound("access", path15));
+    access(path16) {
+      return fail9(notFound("access", path16));
     },
-    chmod(path15) {
-      return fail9(notFound("chmod", path15));
+    chmod(path16) {
+      return fail9(notFound("chmod", path16));
     },
-    chown(path15) {
-      return fail9(notFound("chown", path15));
+    chown(path16) {
+      return fail9(notFound("chown", path16));
     },
-    copy(path15) {
-      return fail9(notFound("copy", path15));
+    copy(path16) {
+      return fail9(notFound("copy", path16));
     },
-    copyFile(path15) {
-      return fail9(notFound("copyFile", path15));
+    copyFile(path16) {
+      return fail9(notFound("copyFile", path16));
     },
     exists() {
       return succeed9(false);
     },
-    link(path15) {
-      return fail9(notFound("link", path15));
+    link(path16) {
+      return fail9(notFound("link", path16));
     },
     makeDirectory() {
       return die6("not implemented");
@@ -74766,23 +74766,23 @@ var makeNoop = (fileSystem) => {
     makeTempFileScoped() {
       return die6("not implemented");
     },
-    open(path15) {
-      return fail9(notFound("open", path15));
+    open(path16) {
+      return fail9(notFound("open", path16));
     },
-    readDirectory(path15) {
-      return fail9(notFound("readDirectory", path15));
+    readDirectory(path16) {
+      return fail9(notFound("readDirectory", path16));
     },
-    readFile(path15) {
-      return fail9(notFound("readFile", path15));
+    readFile(path16) {
+      return fail9(notFound("readFile", path16));
     },
-    readFileString(path15) {
-      return fail9(notFound("readFileString", path15));
+    readFileString(path16) {
+      return fail9(notFound("readFileString", path16));
     },
-    readLink(path15) {
-      return fail9(notFound("readLink", path15));
+    readLink(path16) {
+      return fail9(notFound("readLink", path16));
     },
-    realPath(path15) {
-      return fail9(notFound("realPath", path15));
+    realPath(path16) {
+      return fail9(notFound("realPath", path16));
     },
     remove() {
       return _void;
@@ -74790,32 +74790,32 @@ var makeNoop = (fileSystem) => {
     rename(oldPath) {
       return fail9(notFound("rename", oldPath));
     },
-    sink(path15) {
-      return fail15(notFound("sink", path15));
+    sink(path16) {
+      return fail15(notFound("sink", path16));
     },
-    stat(path15) {
-      return fail9(notFound("stat", path15));
+    stat(path16) {
+      return fail9(notFound("stat", path16));
     },
-    stream(path15) {
-      return fail16(notFound("stream", path15));
+    stream(path16) {
+      return fail16(notFound("stream", path16));
     },
     symlink(fromPath) {
       return fail9(notFound("symlink", fromPath));
     },
-    truncate(path15) {
-      return fail9(notFound("truncate", path15));
+    truncate(path16) {
+      return fail9(notFound("truncate", path16));
     },
-    utimes(path15) {
-      return fail9(notFound("utimes", path15));
+    utimes(path16) {
+      return fail9(notFound("utimes", path16));
     },
-    watch(path15) {
-      return fail16(notFound("watch", path15));
+    watch(path16) {
+      return fail16(notFound("watch", path16));
     },
-    writeFile(path15) {
-      return fail9(notFound("writeFile", path15));
+    writeFile(path16) {
+      return fail9(notFound("writeFile", path16));
     },
-    writeFileString(path15) {
-      return fail9(notFound("writeFileString", path15));
+    writeFileString(path16) {
+      return fail9(notFound("writeFileString", path16));
     },
     ...fileSystem
   };
@@ -74875,22 +74875,22 @@ var fileParsers = {
   toml: (content) => Toml.parse(content),
   tml: (content) => Toml.parse(content)
 };
-var read2 = (path15) => flatMap10(FileSystem, (fs) => matchEffect2(fs.readFile(path15), {
-  onFailure: (error4) => fail9(`Could not read file (${path15}): ${error4}`),
-  onSuccess: (content) => succeed9([path15, content])
+var read2 = (path16) => flatMap10(FileSystem, (fs) => matchEffect2(fs.readFile(path16), {
+  onFailure: (error4) => fail9(`Could not read file (${path16}): ${error4}`),
+  onSuccess: (content) => succeed9([path16, content])
 }));
-var readString = (path15) => flatMap10(FileSystem, (fs) => matchEffect2(fs.readFileString(path15), {
-  onFailure: (error4) => fail9(`Could not read file (${path15}): ${error4}`),
-  onSuccess: (content) => succeed9([path15, content])
+var readString = (path16) => flatMap10(FileSystem, (fs) => matchEffect2(fs.readFileString(path16), {
+  onFailure: (error4) => fail9(`Could not read file (${path16}): ${error4}`),
+  onSuccess: (content) => succeed9([path16, content])
 }));
-var parse5 = (path15, content, format6) => {
-  const parser = fileParsers[format6 ?? path15.split(".").pop()];
+var parse5 = (path16, content, format6) => {
+  const parser = fileParsers[format6 ?? path16.split(".").pop()];
   if (parser === void 0) {
     return fail9(`Unsupported file format: ${format6}`);
   }
   return try_2({
     try: () => parser(content),
-    catch: (e) => `Could not parse ${format6} file (${path15}): ${e}`
+    catch: (e) => `Could not parse ${format6} file (${path16}): ${e}`
   });
 };
 
@@ -77191,15 +77191,15 @@ __export(Path_exports, {
 // node_modules/.pnpm/@effect+platform@0.96.0_effect@3.21.0/node_modules/@effect/platform/dist/esm/internal/path.js
 var TypeId22 = /* @__PURE__ */ Symbol.for("@effect/platform/Path");
 var Path = /* @__PURE__ */ GenericTag("@effect/platform/Path");
-function normalizeStringPosix(path15, allowAboveRoot) {
+function normalizeStringPosix(path16, allowAboveRoot) {
   let res = "";
   let lastSegmentLength = 0;
   let lastSlash = -1;
   let dots = 0;
   let code2;
-  for (let i = 0; i <= path15.length; ++i) {
-    if (i < path15.length) {
-      code2 = path15.charCodeAt(i);
+  for (let i = 0; i <= path16.length; ++i) {
+    if (i < path16.length) {
+      code2 = path16.charCodeAt(i);
     } else if (code2 === 47) {
       break;
     } else {
@@ -77240,9 +77240,9 @@ function normalizeStringPosix(path15, allowAboveRoot) {
         }
       } else {
         if (res.length > 0) {
-          res += "/" + path15.slice(lastSlash + 1, i);
+          res += "/" + path16.slice(lastSlash + 1, i);
         } else {
-          res = path15.slice(lastSlash + 1, i);
+          res = path16.slice(lastSlash + 1, i);
         }
         lastSegmentLength = i - lastSlash - 1;
       }
@@ -77301,21 +77301,21 @@ var resolve = function resolve2() {
   let resolvedAbsolute = false;
   let cwd = void 0;
   for (let i = arguments.length - 1; i >= -1 && !resolvedAbsolute; i--) {
-    let path15;
+    let path16;
     if (i >= 0) {
-      path15 = arguments[i];
+      path16 = arguments[i];
     } else {
       const process2 = globalThis.process;
       if (cwd === void 0 && "process" in globalThis && typeof process2 === "object" && process2 !== null && typeof process2.cwd === "function") {
         cwd = process2.cwd();
       }
-      path15 = cwd;
+      path16 = cwd;
     }
-    if (path15.length === 0) {
+    if (path16.length === 0) {
       continue;
     }
-    resolvedPath = path15 + "/" + resolvedPath;
-    resolvedAbsolute = path15.charCodeAt(0) === 47;
+    resolvedPath = path16 + "/" + resolvedPath;
+    resolvedAbsolute = path16.charCodeAt(0) === 47;
   }
   resolvedPath = normalizeStringPosix(resolvedPath, !resolvedAbsolute);
   if (resolvedAbsolute) {
@@ -77367,18 +77367,18 @@ function encodePathChars(filepath) {
 var posixImpl = /* @__PURE__ */ Path.of({
   [TypeId22]: TypeId22,
   resolve,
-  normalize(path15) {
-    if (path15.length === 0) return ".";
-    const isAbsolute = path15.charCodeAt(0) === 47;
-    const trailingSeparator = path15.charCodeAt(path15.length - 1) === 47;
-    path15 = normalizeStringPosix(path15, !isAbsolute);
-    if (path15.length === 0 && !isAbsolute) path15 = ".";
-    if (path15.length > 0 && trailingSeparator) path15 += "/";
-    if (isAbsolute) return "/" + path15;
-    return path15;
+  normalize(path16) {
+    if (path16.length === 0) return ".";
+    const isAbsolute = path16.charCodeAt(0) === 47;
+    const trailingSeparator = path16.charCodeAt(path16.length - 1) === 47;
+    path16 = normalizeStringPosix(path16, !isAbsolute);
+    if (path16.length === 0 && !isAbsolute) path16 = ".";
+    if (path16.length > 0 && trailingSeparator) path16 += "/";
+    if (isAbsolute) return "/" + path16;
+    return path16;
   },
-  isAbsolute(path15) {
-    return path15.length > 0 && path15.charCodeAt(0) === 47;
+  isAbsolute(path16) {
+    return path16.length > 0 && path16.charCodeAt(0) === 47;
   },
   join() {
     if (arguments.length === 0) {
@@ -77469,14 +77469,14 @@ var posixImpl = /* @__PURE__ */ Path.of({
       return to.slice(toStart);
     }
   },
-  dirname(path15) {
-    if (path15.length === 0) return ".";
-    let code2 = path15.charCodeAt(0);
+  dirname(path16) {
+    if (path16.length === 0) return ".";
+    let code2 = path16.charCodeAt(0);
     const hasRoot = code2 === 47;
     let end5 = -1;
     let matchedSlash = true;
-    for (let i = path15.length - 1; i >= 1; --i) {
-      code2 = path15.charCodeAt(i);
+    for (let i = path16.length - 1; i >= 1; --i) {
+      code2 = path16.charCodeAt(i);
       if (code2 === 47) {
         if (!matchedSlash) {
           end5 = i;
@@ -77488,19 +77488,19 @@ var posixImpl = /* @__PURE__ */ Path.of({
     }
     if (end5 === -1) return hasRoot ? "/" : ".";
     if (hasRoot && end5 === 1) return "//";
-    return path15.slice(0, end5);
+    return path16.slice(0, end5);
   },
-  basename(path15, ext) {
+  basename(path16, ext) {
     let start5 = 0;
     let end5 = -1;
     let matchedSlash = true;
     let i;
-    if (ext !== void 0 && ext.length > 0 && ext.length <= path15.length) {
-      if (ext.length === path15.length && ext === path15) return "";
+    if (ext !== void 0 && ext.length > 0 && ext.length <= path16.length) {
+      if (ext.length === path16.length && ext === path16) return "";
       let extIdx = ext.length - 1;
       let firstNonSlashEnd = -1;
-      for (i = path15.length - 1; i >= 0; --i) {
-        const code2 = path15.charCodeAt(i);
+      for (i = path16.length - 1; i >= 0; --i) {
+        const code2 = path16.charCodeAt(i);
         if (code2 === 47) {
           if (!matchedSlash) {
             start5 = i + 1;
@@ -77524,11 +77524,11 @@ var posixImpl = /* @__PURE__ */ Path.of({
         }
       }
       if (start5 === end5) end5 = firstNonSlashEnd;
-      else if (end5 === -1) end5 = path15.length;
-      return path15.slice(start5, end5);
+      else if (end5 === -1) end5 = path16.length;
+      return path16.slice(start5, end5);
     } else {
-      for (i = path15.length - 1; i >= 0; --i) {
-        if (path15.charCodeAt(i) === 47) {
+      for (i = path16.length - 1; i >= 0; --i) {
+        if (path16.charCodeAt(i) === 47) {
           if (!matchedSlash) {
             start5 = i + 1;
             break;
@@ -77539,17 +77539,17 @@ var posixImpl = /* @__PURE__ */ Path.of({
         }
       }
       if (end5 === -1) return "";
-      return path15.slice(start5, end5);
+      return path16.slice(start5, end5);
     }
   },
-  extname(path15) {
+  extname(path16) {
     let startDot = -1;
     let startPart = 0;
     let end5 = -1;
     let matchedSlash = true;
     let preDotState = 0;
-    for (let i = path15.length - 1; i >= 0; --i) {
-      const code2 = path15.charCodeAt(i);
+    for (let i = path16.length - 1; i >= 0; --i) {
+      const code2 = path16.charCodeAt(i);
       if (code2 === 47) {
         if (!matchedSlash) {
           startPart = i + 1;
@@ -77576,7 +77576,7 @@ var posixImpl = /* @__PURE__ */ Path.of({
     preDotState === 1 && startDot === end5 - 1 && startDot === startPart + 1) {
       return "";
     }
-    return path15.slice(startDot, end5);
+    return path16.slice(startDot, end5);
   },
   format: function format5(pathObject) {
     if (pathObject === null || typeof pathObject !== "object") {
@@ -77584,7 +77584,7 @@ var posixImpl = /* @__PURE__ */ Path.of({
     }
     return _format("/", pathObject);
   },
-  parse(path15) {
+  parse(path16) {
     const ret = {
       root: "",
       dir: "",
@@ -77592,8 +77592,8 @@ var posixImpl = /* @__PURE__ */ Path.of({
       ext: "",
       name: ""
     };
-    if (path15.length === 0) return ret;
-    let code2 = path15.charCodeAt(0);
+    if (path16.length === 0) return ret;
+    let code2 = path16.charCodeAt(0);
     const isAbsolute = code2 === 47;
     let start5;
     if (isAbsolute) {
@@ -77606,10 +77606,10 @@ var posixImpl = /* @__PURE__ */ Path.of({
     let startPart = 0;
     let end5 = -1;
     let matchedSlash = true;
-    let i = path15.length - 1;
+    let i = path16.length - 1;
     let preDotState = 0;
     for (; i >= start5; --i) {
-      code2 = path15.charCodeAt(i);
+      code2 = path16.charCodeAt(i);
       if (code2 === 47) {
         if (!matchedSlash) {
           startPart = i + 1;
@@ -77632,20 +77632,20 @@ var posixImpl = /* @__PURE__ */ Path.of({
     preDotState === 0 || // The (right-most) trimmed path component is exactly '..'
     preDotState === 1 && startDot === end5 - 1 && startDot === startPart + 1) {
       if (end5 !== -1) {
-        if (startPart === 0 && isAbsolute) ret.base = ret.name = path15.slice(1, end5);
-        else ret.base = ret.name = path15.slice(startPart, end5);
+        if (startPart === 0 && isAbsolute) ret.base = ret.name = path16.slice(1, end5);
+        else ret.base = ret.name = path16.slice(startPart, end5);
       }
     } else {
       if (startPart === 0 && isAbsolute) {
-        ret.name = path15.slice(1, startDot);
-        ret.base = path15.slice(1, end5);
+        ret.name = path16.slice(1, startDot);
+        ret.base = path16.slice(1, end5);
       } else {
-        ret.name = path15.slice(startPart, startDot);
-        ret.base = path15.slice(startPart, end5);
+        ret.name = path16.slice(startPart, startDot);
+        ret.base = path16.slice(startPart, end5);
       }
-      ret.ext = path15.slice(startDot, end5);
+      ret.ext = path16.slice(startDot, end5);
     }
-    if (startPart > 0) ret.dir = path15.slice(0, startPart - 1);
+    if (startPart > 0) ret.dir = path16.slice(0, startPart - 1);
     else if (isAbsolute) ret.dir = "/";
     return ret;
   },
@@ -77682,22 +77682,22 @@ var showConfirmation = /* @__PURE__ */ Confirm.$is("Show");
 var renderBeep2 = /* @__PURE__ */ render3(beep3, {
   style: "pretty"
 });
-function resolveCurrentPath(path15, options3) {
-  return match2(path15, {
+function resolveCurrentPath(path16, options3) {
+  return match2(path16, {
     onNone: () => match2(options3.startingPath, {
       onNone: () => sync5(() => process.cwd()),
-      onSome: (path16) => flatMap10(FileSystem, (fs) => (
+      onSome: (path17) => flatMap10(FileSystem, (fs) => (
         // Ensure the user provided starting path exists
-        orDie3(fs.exists(path16)).pipe(filterOrDieMessage2(identity, `The provided starting path '${path16}' does not exist`), as5(path16))
+        orDie3(fs.exists(path17)).pipe(filterOrDieMessage2(identity, `The provided starting path '${path17}' does not exist`), as5(path17))
       ))
     }),
-    onSome: (path16) => succeed9(path16)
+    onSome: (path17) => succeed9(path17)
   });
 }
 function getFileList(directory5, options3) {
   return gen3(function* () {
     const fs = yield* FileSystem;
-    const path15 = yield* Path2;
+    const path16 = yield* Path2;
     const files = yield* orDie3(fs.readDirectory(directory5)).pipe(
       // Always prepend the `".."` option to the file list but allow it
       // to be filtered out if the user so desires
@@ -77706,7 +77706,7 @@ function getFileList(directory5, options3) {
     return yield* filter8(files, (file6) => {
       const result = options3.filter(file6);
       const userDefinedFilter = isEffect2(result) ? result : succeed9(result);
-      const directoryFilter = options3.type === "directory" ? map18(orDie3(fs.stat(path15.join(directory5, file6))), (info3) => info3.type === "Directory") : succeed9(true);
+      const directoryFilter = options3.type === "directory" ? map18(orDie3(fs.stat(path16.join(directory5, file6))), (info3) => info3.type === "Directory") : succeed9(true);
       return zipWith5(userDefinedFilter, directoryFilter, (a, b) => a && b);
     }, {
       concurrency: files.length
@@ -77772,13 +77772,13 @@ function renderFiles(state, files, figures2, options3) {
 }
 function renderNextFrame2(state, options3) {
   return gen3(function* () {
-    const path15 = yield* Path2;
+    const path16 = yield* Path2;
     const terminal = yield* Terminal;
     const columns = yield* terminal.columns;
     const figures2 = yield* figures;
     const currentPath = yield* resolveCurrentPath(state.path, options3);
     const selectedPath = state.files[state.cursor];
-    const resolvedPath = path15.resolve(currentPath, selectedPath);
+    const resolvedPath = path16.resolve(currentPath, selectedPath);
     const resolvedPathMsg = figures2.pointerSmall.pipe(cat2(space2), cat2(text3(resolvedPath)), annotate2(blackBright2));
     if (showConfirmation(state.confirm)) {
       const leadingSymbol2 = annotate2(text3("?"), cyanBright2);
@@ -77853,10 +77853,10 @@ function processCursorDown(state) {
 function processSelection(state, options3) {
   return gen3(function* () {
     const fs = yield* FileSystem;
-    const path15 = yield* Path2;
+    const path16 = yield* Path2;
     const currentPath = yield* resolveCurrentPath(state.path, options3);
     const selectedPath = state.files[state.cursor];
-    const resolvedPath = path15.resolve(currentPath, selectedPath);
+    const resolvedPath = path16.resolve(currentPath, selectedPath);
     const info3 = yield* orDie3(fs.stat(resolvedPath));
     if (info3.type === "Directory") {
       const files = yield* getFileList(resolvedPath, options3);
@@ -77904,10 +77904,10 @@ function handleProcess2(options3) {
       case "y":
       case "t": {
         if (showConfirmation(state.confirm)) {
-          const path15 = yield* Path2;
+          const path16 = yield* Path2;
           const currentPath = yield* resolveCurrentPath(state.path, options3);
           const selectedPath = state.files[state.cursor];
-          const resolvedPath = path15.resolve(currentPath, selectedPath);
+          const resolvedPath = path16.resolve(currentPath, selectedPath);
           const files = yield* getFileList(resolvedPath, options3);
           return Action.NextFrame({
             state: {
@@ -77923,10 +77923,10 @@ function handleProcess2(options3) {
       case "n":
       case "f": {
         if (showConfirmation(state.confirm)) {
-          const path15 = yield* Path2;
+          const path16 = yield* Path2;
           const currentPath = yield* resolveCurrentPath(state.path, options3);
           const selectedPath = state.files[state.cursor];
-          const resolvedPath = path15.resolve(currentPath, selectedPath);
+          const resolvedPath = path16.resolve(currentPath, selectedPath);
           return Action.Submit({
             value: resolvedPath
           });
@@ -77948,14 +77948,14 @@ var file = (options3 = {}) => {
     filter: options3.filter ?? (() => succeed9(true))
   };
   const initialState3 = gen3(function* () {
-    const path15 = none2();
-    const currentPath = yield* resolveCurrentPath(path15, opts);
+    const path16 = none2();
+    const currentPath = yield* resolveCurrentPath(path16, opts);
     const files = yield* getFileList(currentPath, opts);
     const confirm = Confirm.Hide();
     return {
       cursor: 0,
       files,
-      path: path15,
+      path: path16,
       confirm
     };
   });
@@ -79116,7 +79116,7 @@ var validateInternal = (self2, value5, config3) => {
     case "Path": {
       return flatMap10(FileSystem, (fileSystem) => {
         const errorMsg = "Path options do not have a default value";
-        return orElseFail2(value5, () => errorMsg).pipe(tap4((path15) => orDie3(fileSystem.exists(path15)).pipe(tap4((pathExists) => validatePathExistence(path15, self2.pathExists, pathExists).pipe(zipRight5(validatePathType(path15, self2.pathType, fileSystem).pipe(when2(() => self2.pathExists !== "no" && pathExists))))))));
+        return orElseFail2(value5, () => errorMsg).pipe(tap4((path16) => orDie3(fileSystem.exists(path16)).pipe(tap4((pathExists) => validatePathExistence(path16, self2.pathExists, pathExists).pipe(zipRight5(validatePathType(path16, self2.pathType, fileSystem).pipe(when2(() => self2.pathExists !== "no" && pathExists))))))));
       });
     }
     case "Redacted": {
@@ -79131,24 +79131,24 @@ var validateInternal = (self2, value5, config3) => {
   }
 };
 var attempt = (option5, typeName, parse9) => orElseFail2(option5, () => `${typeName} options do not have a default value`).pipe(flatMap10((value5) => orElseFail2(parse9(value5), () => `'${value5}' is not a ${typeName}`)));
-var validatePathExistence = (path15, shouldPathExist, pathExists) => {
+var validatePathExistence = (path16, shouldPathExist, pathExists) => {
   if (shouldPathExist === "no" && pathExists) {
-    return fail9(`Path '${path15}' must not exist`);
+    return fail9(`Path '${path16}' must not exist`);
   }
   if (shouldPathExist === "yes" && !pathExists) {
-    return fail9(`Path '${path15}' must exist`);
+    return fail9(`Path '${path16}' must exist`);
   }
   return _void;
 };
-var validatePathType = (path15, pathType, fileSystem) => {
+var validatePathType = (path16, pathType, fileSystem) => {
   switch (pathType) {
     case "file": {
-      const checkIsFile = fileSystem.stat(path15).pipe(map18((info3) => info3.type === "File"), orDie3);
-      return fail9(`Expected path '${path15}' to be a regular file`).pipe(unlessEffect2(checkIsFile), asVoid4);
+      const checkIsFile = fileSystem.stat(path16).pipe(map18((info3) => info3.type === "File"), orDie3);
+      return fail9(`Expected path '${path16}' to be a regular file`).pipe(unlessEffect2(checkIsFile), asVoid4);
     }
     case "directory": {
-      const checkIsDirectory = fileSystem.stat(path15).pipe(map18((info3) => info3.type === "Directory"), orDie3);
-      return fail9(`Expected path '${path15}' to be a directory`).pipe(unlessEffect2(checkIsDirectory), asVoid4);
+      const checkIsDirectory = fileSystem.stat(path16).pipe(map18((info3) => info3.type === "Directory"), orDie3);
+      return fail9(`Expected path '${path16}' to be a directory`).pipe(unlessEffect2(checkIsDirectory), asVoid4);
     }
     case "either": {
       return _void;
@@ -79570,13 +79570,13 @@ var file2 = (config3) => makeSingle(fromNullable(config3?.name), path("file", co
 var fileContent = (config3) => mapEffect5(file2({
   ...config3,
   exists: "yes"
-}), (path15) => mapError3(read2(path15), (e) => p(e)));
-var fileParse = (config3) => mapEffect5(fileText(config3), ([path15, content]) => mapError3(parse5(path15, content, config3?.format), (e) => p(e)));
+}), (path16) => mapError3(read2(path16), (e) => p(e)));
+var fileParse = (config3) => mapEffect5(fileText(config3), ([path16, content]) => mapError3(parse5(path16, content, config3?.format), (e) => p(e)));
 var fileSchema = (schema, config3) => withSchema(fileParse(config3), schema);
 var fileText = (config3) => mapEffect5(file2({
   ...config3,
   exists: "yes"
-}), (path15) => mapError3(readString(path15), (e) => p(e)));
+}), (path16) => mapError3(readString(path16), (e) => p(e)));
 var float3 = (config3) => makeSingle(fromNullable(config3?.name), float2);
 var integer4 = (config3) => makeSingle(fromNullable(config3?.name), integer3);
 var none12 = /* @__PURE__ */ (() => {
@@ -80192,12 +80192,12 @@ var directory3 = (name, config3) => makeSingle2(name, empty3(), path("directory"
 var file4 = (name, config3) => makeSingle2(name, empty3(), path("file", config3?.exists ?? "either"));
 var fileContent3 = (name) => mapEffect7(file4(name, {
   exists: "yes"
-}), (path15) => mapError3(read2(path15), (msg) => invalidValue(p(msg))));
-var fileParse3 = (name, format6) => mapEffect7(fileText3(name), ([path15, content]) => mapError3(parse5(path15, content, format6), (error4) => invalidValue(p(error4))));
+}), (path16) => mapError3(read2(path16), (msg) => invalidValue(p(msg))));
+var fileParse3 = (name, format6) => mapEffect7(fileText3(name), ([path16, content]) => mapError3(parse5(path16, content, format6), (error4) => invalidValue(p(error4))));
 var fileSchema3 = (name, schema, format6) => withSchema3(fileParse3(name, format6), schema);
 var fileText3 = (name) => mapEffect7(file4(name, {
   exists: "yes"
-}), (path15) => mapError3(readString(path15), (error4) => invalidValue(p(error4))));
+}), (path16) => mapError3(readString(path16), (error4) => invalidValue(p(error4))));
 var filterMap8 = /* @__PURE__ */ dual(3, (self2, f, message) => mapEffect7(self2, (a) => match2(f(a), {
   onNone: () => left2(invalidValue(p(message))),
   onSome: right2
@@ -83592,7 +83592,7 @@ __export(NodeFileSystem_exports, {
 });
 
 // node_modules/.pnpm/@effect+platform-node-shared@0.59.0_@effect+cluster@0.58.0_@effect+platform@0.96.0_effe_794592f1554307ab57a76b09e48a12a6/node_modules/@effect/platform-node-shared/dist/esm/internal/error.js
-var handleErrnoException = (module, method) => (err, [path15]) => {
+var handleErrnoException = (module, method) => (err, [path16]) => {
   let reason = "Unknown";
   switch (err.code) {
     case "ENOENT":
@@ -83621,7 +83621,7 @@ var handleErrnoException = (module, method) => (err, [path15]) => {
     reason,
     module,
     method,
-    pathOrDescriptor: path15,
+    pathOrDescriptor: path16,
     syscall: err.syscall,
     description: err.message,
     cause: err
@@ -83636,7 +83636,7 @@ var handleBadArgument = (method) => (cause3) => new BadArgument({
 });
 var access2 = /* @__PURE__ */ (() => {
   const nodeAccess = /* @__PURE__ */ effectify2(NFS__namespace.access, /* @__PURE__ */ handleErrnoException("FileSystem", "access"), /* @__PURE__ */ handleBadArgument("access"));
-  return (path15, options3) => {
+  return (path16, options3) => {
     let mode = NFS__namespace.constants.F_OK;
     if (options3?.readable) {
       mode |= NFS__namespace.constants.R_OK;
@@ -83644,7 +83644,7 @@ var access2 = /* @__PURE__ */ (() => {
     if (options3?.writable) {
       mode |= NFS__namespace.constants.W_OK;
     }
-    return nodeAccess(path15, mode);
+    return nodeAccess(path16, mode);
   };
 })();
 var copy3 = /* @__PURE__ */ (() => {
@@ -83661,11 +83661,11 @@ var copyFile2 = /* @__PURE__ */ (() => {
 })();
 var chmod2 = /* @__PURE__ */ (() => {
   const nodeChmod = /* @__PURE__ */ effectify2(NFS__namespace.chmod, /* @__PURE__ */ handleErrnoException("FileSystem", "chmod"), /* @__PURE__ */ handleBadArgument("chmod"));
-  return (path15, mode) => nodeChmod(path15, mode);
+  return (path16, mode) => nodeChmod(path16, mode);
 })();
 var chown2 = /* @__PURE__ */ (() => {
   const nodeChown = /* @__PURE__ */ effectify2(NFS__namespace.chown, /* @__PURE__ */ handleErrnoException("FileSystem", "chown"), /* @__PURE__ */ handleBadArgument("chown"));
-  return (path15, uid, gid) => nodeChown(path15, uid, gid);
+  return (path16, uid, gid) => nodeChown(path16, uid, gid);
 })();
 var link2 = /* @__PURE__ */ (() => {
   const nodeLink = /* @__PURE__ */ effectify2(NFS__namespace.link, /* @__PURE__ */ handleErrnoException("FileSystem", "link"), /* @__PURE__ */ handleBadArgument("link"));
@@ -83673,7 +83673,7 @@ var link2 = /* @__PURE__ */ (() => {
 })();
 var makeDirectory = /* @__PURE__ */ (() => {
   const nodeMkdir = /* @__PURE__ */ effectify2(NFS__namespace.mkdir, /* @__PURE__ */ handleErrnoException("FileSystem", "makeDirectory"), /* @__PURE__ */ handleBadArgument("makeDirectory"));
-  return (path15, options3) => nodeMkdir(path15, {
+  return (path16, options3) => nodeMkdir(path16, {
     recursive: options3?.recursive ?? false,
     mode: options3?.mode
   });
@@ -83689,7 +83689,7 @@ var makeTempDirectoryFactory = (method) => {
 var makeTempDirectory = /* @__PURE__ */ makeTempDirectoryFactory("makeTempDirectory");
 var removeFactory = (method) => {
   const nodeRm = effectify2(NFS__namespace.rm, handleErrnoException("FileSystem", method), handleBadArgument(method));
-  return (path15, options3) => nodeRm(path15, {
+  return (path16, options3) => nodeRm(path16, {
     recursive: options3?.recursive ?? false,
     force: options3?.force ?? false
   });
@@ -83705,7 +83705,7 @@ var makeTempDirectoryScoped = /* @__PURE__ */ (() => {
 var openFactory = (method) => {
   const nodeOpen = effectify2(NFS__namespace.open, handleErrnoException("FileSystem", method), handleBadArgument(method));
   const nodeClose = effectify2(NFS__namespace.close, handleErrnoException("FileSystem", method), handleBadArgument(method));
-  return (path15, options3) => pipe(acquireRelease2(nodeOpen(path15, options3?.flag ?? "r", options3?.mode), (fd) => orDie3(nodeClose(fd))), map18((fd) => makeFile(FileDescriptor(fd), options3?.flag?.startsWith("a") ?? false)));
+  return (path16, options3) => pipe(acquireRelease2(nodeOpen(path16, options3?.flag ?? "r", options3?.mode), (fd) => orDie3(nodeClose(fd))), map18((fd) => makeFile(FileDescriptor(fd), options3?.flag?.startsWith("a") ?? false)));
 };
 var open2 = /* @__PURE__ */ openFactory("open");
 var makeFile = /* @__PURE__ */ (() => {
@@ -83820,7 +83820,7 @@ var makeTempFileFactory = (method) => {
   const makeDirectory2 = makeTempDirectoryFactory(method);
   const open3 = openFactory(method);
   const randomHexString2 = (bytes) => sync5(() => Crypto__namespace.randomBytes(bytes).toString("hex"));
-  return (options3) => pipe(zip6(makeDirectory2(options3), randomHexString2(6)), map18(([directory5, random4]) => path6__namespace.join(directory5, random4 + (options3?.suffix ?? ""))), tap4((path15) => scoped2(open3(path15, {
+  return (options3) => pipe(zip6(makeDirectory2(options3), randomHexString2(6)), map18(([directory5, random4]) => path6__namespace.join(directory5, random4 + (options3?.suffix ?? ""))), tap4((path16) => scoped2(open3(path16, {
     flag: "w+"
   }))));
 };
@@ -83832,17 +83832,17 @@ var makeTempFileScoped = /* @__PURE__ */ (() => {
     recursive: true
   })));
 })();
-var readDirectory = (path15, options3) => tryPromise2({
-  try: () => NFS__namespace.promises.readdir(path15, options3),
-  catch: (err) => handleErrnoException("FileSystem", "readDirectory")(err, [path15])
+var readDirectory = (path16, options3) => tryPromise2({
+  try: () => NFS__namespace.promises.readdir(path16, options3),
+  catch: (err) => handleErrnoException("FileSystem", "readDirectory")(err, [path16])
 });
-var readFile2 = (path15) => async2((resume2, signal) => {
+var readFile2 = (path16) => async2((resume2, signal) => {
   try {
-    NFS__namespace.readFile(path15, {
+    NFS__namespace.readFile(path16, {
       signal
     }, (err, data) => {
       if (err) {
-        resume2(fail9(handleErrnoException("FileSystem", "readFile")(err, [path15])));
+        resume2(fail9(handleErrnoException("FileSystem", "readFile")(err, [path16])));
       } else {
         resume2(succeed9(data));
       }
@@ -83853,11 +83853,11 @@ var readFile2 = (path15) => async2((resume2, signal) => {
 });
 var readLink = /* @__PURE__ */ (() => {
   const nodeReadLink = /* @__PURE__ */ effectify2(NFS__namespace.readlink, /* @__PURE__ */ handleErrnoException("FileSystem", "readLink"), /* @__PURE__ */ handleBadArgument("readLink"));
-  return (path15) => nodeReadLink(path15);
+  return (path16) => nodeReadLink(path16);
 })();
 var realPath = /* @__PURE__ */ (() => {
   const nodeRealPath = /* @__PURE__ */ effectify2(NFS__namespace.realpath, /* @__PURE__ */ handleErrnoException("FileSystem", "realPath"), /* @__PURE__ */ handleBadArgument("realPath"));
-  return (path15) => nodeRealPath(path15);
+  return (path16) => nodeRealPath(path16);
 })();
 var rename3 = /* @__PURE__ */ (() => {
   const nodeRename = /* @__PURE__ */ effectify2(NFS__namespace.rename, /* @__PURE__ */ handleErrnoException("FileSystem", "rename"), /* @__PURE__ */ handleBadArgument("rename"));
@@ -83881,69 +83881,69 @@ var makeFileInfo = (stat3) => ({
 });
 var stat2 = /* @__PURE__ */ (() => {
   const nodeStat = /* @__PURE__ */ effectify2(NFS__namespace.stat, /* @__PURE__ */ handleErrnoException("FileSystem", "stat"), /* @__PURE__ */ handleBadArgument("stat"));
-  return (path15) => map18(nodeStat(path15), makeFileInfo);
+  return (path16) => map18(nodeStat(path16), makeFileInfo);
 })();
 var symlink2 = /* @__PURE__ */ (() => {
   const nodeSymlink = /* @__PURE__ */ effectify2(NFS__namespace.symlink, /* @__PURE__ */ handleErrnoException("FileSystem", "symlink"), /* @__PURE__ */ handleBadArgument("symlink"));
-  return (target, path15) => nodeSymlink(target, path15);
+  return (target2, path16) => nodeSymlink(target2, path16);
 })();
 var truncate2 = /* @__PURE__ */ (() => {
   const nodeTruncate = /* @__PURE__ */ effectify2(NFS__namespace.truncate, /* @__PURE__ */ handleErrnoException("FileSystem", "truncate"), /* @__PURE__ */ handleBadArgument("truncate"));
-  return (path15, length4) => nodeTruncate(path15, length4 !== void 0 ? Number(length4) : void 0);
+  return (path16, length4) => nodeTruncate(path16, length4 !== void 0 ? Number(length4) : void 0);
 })();
 var utimes2 = /* @__PURE__ */ (() => {
   const nodeUtimes = /* @__PURE__ */ effectify2(NFS__namespace.utimes, /* @__PURE__ */ handleErrnoException("FileSystem", "utime"), /* @__PURE__ */ handleBadArgument("utime"));
-  return (path15, atime, mtime) => nodeUtimes(path15, atime, mtime);
+  return (path16, atime, mtime) => nodeUtimes(path16, atime, mtime);
 })();
-var watchNode = (path15, options3) => asyncScoped2((emit) => acquireRelease2(sync5(() => {
-  const watcher = NFS__namespace.watch(path15, {
+var watchNode = (path16, options3) => asyncScoped2((emit2) => acquireRelease2(sync5(() => {
+  const watcher = NFS__namespace.watch(path16, {
     recursive: options3?.recursive
-  }, (event, path16) => {
-    if (!path16) return;
+  }, (event, path17) => {
+    if (!path17) return;
     switch (event) {
       case "rename": {
-        emit.fromEffect(matchEffect2(stat2(path16), {
+        emit2.fromEffect(matchEffect2(stat2(path17), {
           onSuccess: (_) => succeed9(WatchEventCreate({
-            path: path16
+            path: path17
           })),
           onFailure: (err) => err._tag === "SystemError" && err.reason === "NotFound" ? succeed9(WatchEventRemove({
-            path: path16
+            path: path17
           })) : fail9(err)
         }));
         return;
       }
       case "change": {
-        emit.single(WatchEventUpdate({
-          path: path16
+        emit2.single(WatchEventUpdate({
+          path: path17
         }));
         return;
       }
     }
   });
   watcher.on("error", (error4) => {
-    emit.fail(new SystemError({
+    emit2.fail(new SystemError({
       module: "FileSystem",
       reason: "Unknown",
       method: "watch",
-      pathOrDescriptor: path15,
+      pathOrDescriptor: path16,
       cause: error4
     }));
   });
   watcher.on("close", () => {
-    emit.end();
+    emit2.end();
   });
   return watcher;
 }), (watcher) => sync5(() => watcher.close())));
-var watch2 = (backend, path15, options3) => stat2(path15).pipe(map18((stat3) => backend.pipe(flatMap((_) => _.register(path15, stat3, options3)), getOrElse(() => watchNode(path15, options3)))), unwrap4);
-var writeFile2 = (path15, data, options3) => async2((resume2, signal) => {
+var watch2 = (backend, path16, options3) => stat2(path16).pipe(map18((stat3) => backend.pipe(flatMap((_) => _.register(path16, stat3, options3)), getOrElse(() => watchNode(path16, options3)))), unwrap4);
+var writeFile2 = (path16, data, options3) => async2((resume2, signal) => {
   try {
-    NFS__namespace.writeFile(path15, data, {
+    NFS__namespace.writeFile(path16, data, {
       signal,
       flag: options3?.flag,
       mode: options3?.mode
     }, (err) => {
       if (err) {
-        resume2(fail9(handleErrnoException("FileSystem", "writeFile")(err, [path15])));
+        resume2(fail9(handleErrnoException("FileSystem", "writeFile")(err, [path16])));
       } else {
         resume2(_void);
       }
@@ -83975,8 +83975,8 @@ var makeFileSystem = /* @__PURE__ */ map18(/* @__PURE__ */ serviceOption2(WatchB
   symlink: symlink2,
   truncate: truncate2,
   utimes: utimes2,
-  watch(path15, options3) {
-    return watch2(backend, path15, options3);
+  watch(path16, options3) {
+    return watch2(backend, path16, options3);
   },
   writeFile: writeFile2
 }));
@@ -84236,12 +84236,12 @@ var fromFileUrl2 = (url2) => try_2({
     cause: error4
   })
 });
-var toFileUrl2 = (path15) => try_2({
-  try: () => NodeUrl__namespace.pathToFileURL(path15),
+var toFileUrl2 = (path16) => try_2({
+  try: () => NodeUrl__namespace.pathToFileURL(path16),
   catch: (error4) => new BadArgument({
     module: "Path",
     method: "toFileUrl",
-    description: `Invalid path: ${path15}`,
+    description: `Invalid path: ${path16}`,
     cause: error4
   })
 });
@@ -84359,11 +84359,11 @@ var platformWorkerImpl = /* @__PURE__ */ makePlatform2()({
   },
   listen({
     deferred,
-    emit,
+    emit: emit2,
     port: port2
   }) {
     port2.worker.on("message", (message) => {
-      emit(message);
+      emit2(message);
     });
     port2.worker.on("messageerror", (cause3) => {
       unsafeDone(deferred, new WorkerError({
@@ -84460,6 +84460,13 @@ var makeGitService = Effect_exports.gen(function* () {
   const resetHead = Effect_exports.fn("resetHead")(function* () {
     yield* runCommandWithExitCode("git", "reset", "HEAD^");
   });
+  const clean = Effect_exports.fn("clean")(function* () {
+    yield* runCommandWithExitCode(
+      "git",
+      "clean",
+      "-fd"
+    );
+  });
   const restoreStaged = Effect_exports.fn(
     "restoreStaged"
   )(function* () {
@@ -84522,6 +84529,7 @@ var makeGitService = Effect_exports.gen(function* () {
     resetHard,
     resetHead,
     restoreStaged,
+    clean,
     applyAsUnstagedChanges: Effect_exports.fn(
       "applyAsUnstagedChanges"
     )(function* (sha) {
@@ -85303,28 +85311,36 @@ var CommitNotFoundError = class extends Data_exports.TaggedError(
   "CommitNotFoundError"
 ) {
 };
+var LESSON_ID_BOUNDARY = ": ";
 var parseCommits = (commitHistory) => {
   return commitHistory.trim().split("\n").filter(Boolean).map((line4) => {
     const [sha, ...messageParts] = line4.split(" ");
     const fullMessage = messageParts.join(" ");
-    const lessonMatch = fullMessage.match(
-      /^(\d+)[.-](\d+)[.-](\d+)\s*/
+    const boundaryIndex = fullMessage.indexOf(
+      LESSON_ID_BOUNDARY
     );
-    const extractedLessonId = lessonMatch ? `${lessonMatch[1].padStart(
-      2,
-      "0"
-    )}.${lessonMatch[2].padStart(
-      2,
-      "0"
-    )}.${lessonMatch[3].padStart(2, "0")}` : null;
-    const message = lessonMatch ? fullMessage.slice(lessonMatch[0].length).trim() : fullMessage;
+    const lessonId = boundaryIndex > 0 ? fullMessage.slice(0, boundaryIndex) : null;
+    const message = boundaryIndex > 0 ? fullMessage.slice(boundaryIndex + LESSON_ID_BOUNDARY.length).trim() : fullMessage;
     return {
       sha,
       message,
-      lessonId: extractedLessonId
+      lessonId
     };
   });
 };
+var getCandidateCommits = (branch) => Effect_exports.gen(function* () {
+  const git = yield* GitService;
+  const hasUpstreamMain = yield* git.fetch("upstream", "main").pipe(
+    Effect_exports.as(true),
+    Effect_exports.catchTag(
+      "FailedToFetchError",
+      () => Effect_exports.succeed(false)
+    )
+  );
+  const range4 = hasUpstreamMain ? `upstream/main..${branch}` : branch;
+  const history = yield* git.getLogOnelineReverse(range4);
+  return parseCommits(history);
+});
 var selectLessonCommit = ({
   branch,
   excludeCurrentBranch,
@@ -85334,21 +85350,18 @@ var selectLessonCommit = ({
 }) => Effect_exports.gen(function* () {
   const gitService = yield* GitService;
   const promptService = yield* PromptService;
-  let commits;
+  let commits = yield* getCandidateCommits(branch);
   if (excludeCurrentBranch) {
     const currentBranchHistory = yield* gitService.getLogOneline("HEAD");
-    const currentBranchCommits = parseCommits(currentBranchHistory);
+    const currentBranchCommits = parseCommits(
+      currentBranchHistory
+    );
     const currentLessonIds = new Set(
       currentBranchCommits.filter((c) => c.lessonId !== null).map((c) => c.lessonId)
     );
-    const targetBranchHistory = yield* gitService.getLogOneline(branch);
-    const allTargetCommits = parseCommits(targetBranchHistory);
-    commits = allTargetCommits.filter(
+    commits = commits.filter(
       (c) => !c.lessonId || !currentLessonIds.has(c.lessonId)
     );
-  } else {
-    const commitHistory = yield* gitService.getLogOneline(branch);
-    commits = parseCommits(commitHistory);
   }
   let selectedLessonId;
   if (Option_exports.isSome(lessonId)) {
@@ -85369,12 +85382,9 @@ var selectLessonCommit = ({
         })
       );
     }
-    const sortedCommits = commitsWithLessonIds.sort((a, b) => {
-      return a.lessonId.localeCompare(b.lessonId);
-    });
     const choices = [
       ...extraChoices ?? [],
-      ...sortedCommits.map((commit) => ({
+      ...commitsWithLessonIds.map((commit) => ({
         lessonId: commit.lessonId,
         message: commit.message
       }))
@@ -85675,13 +85685,13 @@ var Lesson = class {
     });
   }
 };
-var getNameAndNumberFromPath = (path15) => {
-  const numSection = path15.split("-")[0];
+var getNameAndNumberFromPath = (path16) => {
+  const numSection = path16.split("-")[0];
   if (typeof numSection === "undefined") {
     return Effect_exports.fail(
       new InvalidPathError({
-        path: path15,
-        message: `Could not retrieve number from path: ${path15}`
+        path: path16,
+        message: `Could not retrieve number from path: ${path16}`
       })
     );
   }
@@ -85689,18 +85699,18 @@ var getNameAndNumberFromPath = (path15) => {
   if (Number.isNaN(num)) {
     return Effect_exports.fail(
       new PathNumberIsNaNError({
-        path: path15,
+        path: path16,
         numSection,
-        message: `Could not retrieve number from path: ${path15}`
+        message: `Could not retrieve number from path: ${path16}`
       })
     );
   }
-  const name = path15.split("-").slice(1).join("-");
+  const name = path16.split("-").slice(1).join("-");
   if (!name) {
     return Effect_exports.fail(
       new InvalidPathError({
-        path: path15,
-        message: `Could not retrieve name from path: ${path15}`
+        path: path16,
+        message: `Could not retrieve name from path: ${path16}`
       })
     );
   }
@@ -85709,12 +85719,12 @@ var getNameAndNumberFromPath = (path15) => {
     num
   });
 };
-var parseSection = Effect_exports.fn("parseSection")(function* (path15) {
-  const { name, num } = yield* getNameAndNumberFromPath(path15);
+var parseSection = Effect_exports.fn("parseSection")(function* (path16) {
+  const { name, num } = yield* getNameAndNumberFromPath(path16);
   return {
     name,
     num,
-    path: path15
+    path: path16
   };
 });
 var filterMeOut = Symbol("filterMeOut");
@@ -86116,8 +86126,8 @@ var RunLessonSimpleError = class extends Data_exports.TaggedError(
 ) {
 };
 var notFound2 = Symbol("notFound");
-var getNumberFromPathSegment = (path15) => {
-  const numberSegment = path15.split("-")[0];
+var getNumberFromPathSegment = (path16) => {
+  const numberSegment = path16.split("-")[0];
   return Number.isNaN(Number(numberSegment)) ? notFound2 : Number(numberSegment);
 };
 var startsWithNumber = (segment) => {
@@ -87066,25 +87076,6 @@ var getCommitsBetweenBranches = (opts) => Effect_exports.gen(function* () {
   }
   return commits;
 });
-var selectCommit = (opts) => Effect_exports.gen(function* () {
-  const promptService = yield* PromptService;
-  const formattedCommits = opts.commits.map((commit) => ({
-    lessonId: commit.sequence.toString().padStart(2, "0"),
-    message: commit.message
-  }));
-  const selectedId = yield* promptService.selectLessonCommit(
-    formattedCommits,
-    opts.promptMessage
-  );
-  const selectedSequence = parseInt(selectedId, 10);
-  const selectedCommit = opts.commits.find(
-    (c) => c.sequence === selectedSequence
-  );
-  if (!selectedCommit) {
-    return opts.commits[0];
-  }
-  return selectedCommit;
-});
 
 // src/internal/diffs-to-repo.ts
 var InvalidProjectRepoError2 = class extends Data_exports.TaggedError(
@@ -87287,320 +87278,423 @@ var diffsToRepo = Command_exports.make(
     "Generate sequential lesson folders from commits on live branch"
   )
 );
-var NotAGitRepoError2 = class extends Data_exports.TaggedError(
-  "NotAGitRepoError"
+
+// src/internal/edit-commit/errors.ts
+var SessionExistsError = class extends Data_exports.TaggedError(
+  "SessionExistsError"
 ) {
+  code = "session_exists";
 };
-(class extends Data_exports.TaggedError(
-  "NoFollowingCommitsError"
+var CommitNotFoundError2 = class extends Data_exports.TaggedError(
+  "CommitNotFoundError"
 ) {
-});
-var CommitFailedError = class extends Data_exports.TaggedError(
-  "CommitFailedError"
+  code = "commit_not_found";
+};
+var NoSessionError = class extends Data_exports.TaggedError(
+  "NoSessionError"
 ) {
+  code = "no_session";
 };
-var editCommit = Command_exports.make(
-  "edit-commit",
-  {
-    branch: Options_exports.text("branch").pipe(
-      Options_exports.withDescription("Branch to get commits from"),
-      Options_exports.withDefault(DEFAULT_PROJECT_TARGET_BRANCH)
-    ),
-    mainBranch: Options_exports.text("main-branch").pipe(
-      Options_exports.withDescription("The main branch of the project"),
-      Options_exports.withDefault("main")
-    )
-  },
-  ({ branch: liveBranch, mainBranch }) => Effect_exports.gen(function* () {
-    const cwd = process.cwd();
-    const gitService = yield* GitService;
-    const promptService = yield* PromptService;
-    const gitDirPath = path6__namespace.join(cwd, ".git");
-    if (!NFS.existsSync(gitDirPath)) {
-      return yield* Effect_exports.fail(
-        new NotAGitRepoError2({
-          path: cwd,
-          message: `Current directory is not a git repository: ${cwd}`
-        })
-      );
-    }
-    const fetchResult = yield* gitService.fetchOrigin().pipe(
-      Effect_exports.map(() => ({ failed: false })),
-      Effect_exports.catchTag(
-        "FailedToFetchOriginError",
-        () => Effect_exports.succeed({ failed: true })
-      )
-    );
-    if (fetchResult.failed) {
-      yield* Console_exports.error("Failed to fetch branch");
-      process.exitCode = 1;
-      return;
-    }
-    const originalBranch = yield* gitService.getCurrentBranch();
-    const tempBranchName = `matt/edit-commit-${Date.now()}`;
-    yield* Console_exports.log(
-      `Creating temporary branch: ${tempBranchName}`
+var UnresolvedConflictsError = class extends Data_exports.TaggedError(
+  "UnresolvedConflictsError"
+) {
+  code = "unresolved_conflicts";
+};
+var LeaseRejectedError = class extends Data_exports.TaggedError(
+  "LeaseRejectedError"
+) {
+  code = "lease_rejected";
+};
+var InvalidPhaseError = class extends Data_exports.TaggedError(
+  "InvalidPhaseError"
+) {
+  code = "invalid_phase";
+};
+var StateDivergedError = class extends Data_exports.TaggedError(
+  "StateDivergedError"
+) {
+  code = "state_diverged";
+};
+var stateFilePath = (cwd) => path6__namespace.join(cwd, ".git", "ai-hero", "edit-commit.json");
+var readState = Effect_exports.gen(function* () {
+  const fs = yield* FileSystem_exports.FileSystem;
+  const { cwd } = yield* GitServiceConfig;
+  const raw = yield* fs.readFileString(stateFilePath(cwd));
+  return JSON.parse(raw);
+});
+var readStateOption = Effect_exports.gen(function* () {
+  const fs = yield* FileSystem_exports.FileSystem;
+  const { cwd } = yield* GitServiceConfig;
+  const exists4 = yield* fs.exists(stateFilePath(cwd));
+  if (!exists4) return void 0;
+  return yield* readState;
+});
+var requireState = Effect_exports.gen(function* () {
+  const state = yield* readStateOption;
+  if (!state) {
+    return yield* Effect_exports.fail(new NoSessionError());
+  }
+  return state;
+});
+var writeState = (state) => Effect_exports.gen(function* () {
+  const fs = yield* FileSystem_exports.FileSystem;
+  const { cwd } = yield* GitServiceConfig;
+  const file6 = stateFilePath(cwd);
+  yield* fs.makeDirectory(path6__namespace.dirname(file6), {
+    recursive: true
+  });
+  yield* fs.writeFileString(
+    file6,
+    JSON.stringify(state, null, 2)
+  );
+});
+var requireSessionTempBranchExists = (state) => Effect_exports.gen(function* () {
+  const git = yield* GitService;
+  const exists4 = yield* git.hasLocalBranch(state.tempBranch);
+  if (!exists4) {
+    return yield* Effect_exports.fail(
+      new StateDivergedError({
+        message: `Session temp branch \`${state.tempBranch}\` no longer exists.`
+      })
     );
-    const createBranchResult = yield* gitService.checkoutNewBranch(tempBranchName).pipe(
-      Effect_exports.map(() => ({ failed: false })),
-      Effect_exports.catchTag(
-        "FailedToCreateBranchError",
-        () => Effect_exports.succeed({ failed: true })
-      )
+  }
+  return state;
+});
+var requireSessionOnTempBranch = (state) => Effect_exports.gen(function* () {
+  yield* requireSessionTempBranchExists(state);
+  const git = yield* GitService;
+  const current = yield* git.getCurrentBranch();
+  if (current !== state.tempBranch) {
+    return yield* Effect_exports.fail(
+      new StateDivergedError({
+        message: `Expected to be on session branch \`${state.tempBranch}\` but currently on \`${current}\`.`
+      })
     );
-    if (createBranchResult.failed) {
-      yield* Console_exports.error(
-        `Failed to create temporary branch "${tempBranchName}". A branch with this name may already exist.`
-      );
-      process.exitCode = 1;
-      return;
-    }
-    const commits = yield* getCommitsBetweenBranches({
-      mainBranch,
-      liveBranch
-    });
-    const targetCommit = yield* selectCommit({
-      commits,
-      promptMessage: "Which commit do you want to edit? (type to search)"
-    });
-    const originalMessage = targetCommit.message;
-    const targetSha = targetCommit.sha;
-    const commitLabel = `#${targetCommit.sequence}`;
-    const targetBranchHead = yield* gitService.revParse(
-      liveBranch
+  }
+  return state;
+});
+var clearState = Effect_exports.gen(function* () {
+  const fs = yield* FileSystem_exports.FileSystem;
+  const { cwd } = yield* GitServiceConfig;
+  yield* fs.remove(stateFilePath(cwd), { force: true });
+});
+
+// src/internal/edit-commit/run.ts
+var nextStepFor = {
+  editing: "Edit the unstaged working-tree changes, then run `edit-commit continue`.",
+  conflict: "Resolve the conflicted files, then run `edit-commit continue`.",
+  ready: "Inspect the recomposed branch, then run `edit-commit publish` to force-push.",
+  published: "Done \u2014 the live branch is updated on origin.",
+  aborted: "Session discarded \u2014 the original branch is restored."
+};
+var runBegin = (opts) => Effect_exports.gen(function* () {
+  const git = yield* GitService;
+  const existing = yield* readStateOption;
+  if (existing) {
+    return yield* Effect_exports.fail(
+      new SessionExistsError({ phase: existing.phase })
     );
-    const followingCommitCount = yield* gitService.revListCount(targetSha, liveBranch);
-    if (followingCommitCount === 0) {
-      yield* Console_exports.log(
-        `Warning: No commits after ${commitLabel}. You can still edit this commit.`
-      );
-    } else {
-      yield* Console_exports.log(
-        `Will reset to ${commitLabel}. Will cherry-pick ${followingCommitCount} commit${followingCommitCount === 1 ? "" : "s"} after.`
-      );
-    }
-    yield* Console_exports.log(
-      `Resetting to ${targetSha} (${commitLabel})...`
+  }
+  yield* git.fetchOrigin();
+  const commits = yield* getCommitsBetweenBranches({
+    mainBranch: opts.mainBranch,
+    liveBranch: opts.branch
+  });
+  const asSequence = /^\d+$/.test(opts.commit) ? commits.find(
+    (c) => c.sequence === Number(opts.commit)
+  ) : void 0;
+  const target2 = asSequence ?? commits.find((c) => c.sha.startsWith(opts.commit));
+  if (!target2) {
+    return yield* Effect_exports.fail(
+      new CommitNotFoundError2({ commit: opts.commit })
     );
-    const resetResult = yield* gitService.applyAsUnstagedChanges(targetSha).pipe(
-      Effect_exports.map(() => ({ failed: false })),
-      Effect_exports.catchTag(
-        "FailedToResetError",
-        () => Effect_exports.succeed({ failed: true })
-      )
+  }
+  const following = commits.length - target2.sequence;
+  const targetBranchHead = yield* git.revParse(opts.branch);
+  const originalBranch = yield* git.getCurrentBranch();
+  const tempBranch = `matt/edit-commit-${Date.now()}`;
+  yield* git.checkoutNewBranch(tempBranch);
+  yield* git.applyAsUnstagedChanges(target2.sha);
+  yield* writeState({
+    phase: "editing",
+    tempBranch,
+    originalBranch,
+    liveBranch: opts.branch,
+    mainBranch: opts.mainBranch,
+    targetSha: target2.sha,
+    targetMessage: target2.message,
+    targetSequence: target2.sequence,
+    targetBranchHead,
+    following
+  });
+  const envelope = {
+    phase: "editing",
+    target: {
+      sha: target2.sha,
+      message: target2.message,
+      sequence: target2.sequence
+    },
+    following,
+    conflictedFiles: [],
+    nextStep: nextStepFor.editing
+  };
+  return envelope;
+});
+var parseStatusPaths = (status3) => status3.split("\n").filter(Boolean).map((line4) => ({
+  xy: line4.slice(0, 2),
+  path: line4.slice(3).trim()
+}));
+var conflictedFiles = (git) => Effect_exports.gen(function* () {
+  const status3 = yield* git.getStatusShort();
+  return parseStatusPaths(status3).filter(
+    ({ xy }) => xy.includes("U") || xy === "AA" || xy === "DD"
+  ).map((entry) => entry.path);
+});
+var detectConflict = (effect3) => effect3.pipe(
+  Effect_exports.map(() => ({ conflict: false })),
+  Effect_exports.catchTag(
+    "CherryPickConflictError",
+    () => Effect_exports.succeed({ conflict: true })
+  )
+);
+var target = (state) => ({
+  sha: state.targetSha,
+  message: state.targetMessage,
+  sequence: state.targetSequence
+});
+var enterConflict = (git, state) => Effect_exports.gen(function* () {
+  const files = yield* conflictedFiles(git);
+  yield* writeState({ ...state, phase: "conflict" });
+  return {
+    phase: "conflict",
+    target: target(state),
+    following: state.following,
+    conflictedFiles: files,
+    nextStep: nextStepFor.conflict
+  };
+});
+var enterReady = (state) => Effect_exports.gen(function* () {
+  yield* writeState({ ...state, phase: "ready" });
+  return {
+    phase: "ready",
+    target: target(state),
+    following: state.following,
+    conflictedFiles: [],
+    nextStep: nextStepFor.ready
+  };
+});
+var filesWithMarkers = (git) => Effect_exports.gen(function* () {
+  const fs = yield* FileSystem_exports.FileSystem;
+  const { cwd } = yield* GitServiceConfig;
+  const unmerged = yield* conflictedFiles(git);
+  const remaining = [];
+  for (const file6 of unmerged) {
+    const content = yield* fs.readFileString(
+      path6__namespace.join(cwd, file6)
     );
-    if (resetResult.failed) {
-      yield* Console_exports.error("Failed to reset");
-      process.exitCode = 1;
-      return;
+    if (content.includes("<<<<<<<") || content.includes(">>>>>>>")) {
+      remaining.push(file6);
     }
-    yield* Console_exports.log(
-      "\u2713 Reset complete with unstaged changes"
-    );
-    yield* Console_exports.log(
-      "\nSession active. Make your changes to the code. ALL unstaged changes will be added to the commit."
-    );
-    yield* promptService.confirmReadyToCommit();
-    yield* Console_exports.log(
-      `Committing with original message: "${originalMessage}"`
-    );
-    yield* gitService.stageAll();
-    const commitResult = yield* gitService.commit(originalMessage).pipe(
-      Effect_exports.map(() => ({ failed: false })),
-      Effect_exports.catchTag(
-        "FailedToCommitError",
-        () => Effect_exports.succeed({ failed: true })
-      )
-    );
-    if (commitResult.failed) {
+  }
+  return remaining;
+});
+var requirePhase = (state, allowed) => allowed.includes(state.phase) ? Effect_exports.succeed(state) : Effect_exports.fail(
+  new InvalidPhaseError({ phase: state.phase, allowed })
+);
+var runContinue = () => Effect_exports.gen(function* () {
+  const git = yield* GitService;
+  const state = yield* requireState;
+  yield* requirePhase(state, ["editing", "conflict"]);
+  yield* requireSessionOnTempBranch(state);
+  if (state.phase === "conflict") {
+    const stillMarked = yield* filesWithMarkers(git);
+    if (stillMarked.length > 0) {
       return yield* Effect_exports.fail(
-        new CommitFailedError({
-          message: "Failed to commit. You may have no changes to commit."
+        new UnresolvedConflictsError({
+          files: stillMarked
         })
       );
     }
-    yield* Console_exports.log("\u2713 Commit complete");
-    if (followingCommitCount > 0) {
-      yield* Console_exports.log(
-        `
-Cherry-picking ${followingCommitCount} commit${followingCommitCount === 1 ? "" : "s"}...`
-      );
-      const cherryPickResult = yield* gitService.cherryPick(`${targetSha}..${targetBranchHead}`).pipe(
-        Effect_exports.map(() => ({ conflict: false })),
-        Effect_exports.catchTag(
-          "CherryPickConflictError",
-          () => Effect_exports.succeed({ conflict: true })
-        )
-      );
-      if (cherryPickResult.conflict) {
-        yield* Console_exports.log(
-          "\n\u26A0\uFE0F  Cherry-pick conflict detected!"
-        );
-        yield* Console_exports.log(
-          "Resolve conflicts, then continue.\n"
-        );
-        yield* resolveConflictLoop(gitService, promptService);
-      } else {
-        yield* Console_exports.log("\u2713 Cherry-pick complete");
-      }
-    }
-    yield* Console_exports.log(
-      `
-\u2713 Edit complete! Commit ${commitLabel} updated.`
-    );
-    yield* promptService.confirmSaveToTargetBranch(liveBranch);
-    yield* Console_exports.log(
-      `Switching to ${liveBranch} and applying changes...`
+    yield* git.stageAll();
+    const result = yield* detectConflict(
+      git.cherryPickContinue()
     );
-    const checkoutResult = yield* gitService.checkout(liveBranch).pipe(
-      Effect_exports.map(() => ({ failed: false })),
-      Effect_exports.catchTag(
-        "FailedToCheckoutError",
-        () => Effect_exports.succeed({ failed: true })
+    return result.conflict ? yield* enterConflict(git, state) : yield* enterReady(state);
+  }
+  yield* git.stageAll();
+  yield* git.commit(state.targetMessage);
+  if (state.following > 0) {
+    const result = yield* detectConflict(
+      git.cherryPick(
+        `${state.targetSha}..${state.targetBranchHead}`
       )
     );
-    if (checkoutResult.failed) {
-      yield* Console_exports.error(
-        `Failed to checkout ${liveBranch}. Changes remain on ${tempBranchName}.`
-      );
-      process.exitCode = 1;
-      return;
+    if (result.conflict) {
+      return yield* enterConflict(git, state);
     }
-    const resetToCurrentResult = yield* gitService.resetHard(tempBranchName).pipe(
-      Effect_exports.map(() => ({ failed: false })),
-      Effect_exports.catchTag(
-        "FailedToResetError",
-        () => Effect_exports.succeed({ failed: true })
+  }
+  return yield* enterReady(state);
+});
+var runPublish = () => Effect_exports.gen(function* () {
+  const git = yield* GitService;
+  const state = yield* requireState;
+  yield* requirePhase(state, ["ready"]);
+  yield* requireSessionTempBranchExists(state);
+  yield* git.checkout(state.liveBranch);
+  yield* git.resetHard(state.tempBranch);
+  yield* git.pushForceWithLease("origin", state.liveBranch).pipe(
+    Effect_exports.catchTag(
+      "FailedToPushError",
+      () => Effect_exports.fail(
+        new LeaseRejectedError({
+          branch: state.liveBranch
+        })
       )
-    );
-    if (resetToCurrentResult.failed) {
-      yield* Console_exports.error(
-        `Failed to reset ${liveBranch} to ${tempBranchName}.`
+    )
+  );
+  yield* git.checkout(state.originalBranch);
+  yield* git.deleteBranch(state.tempBranch);
+  yield* clearState;
+  return {
+    phase: "published",
+    target: target(state),
+    following: state.following,
+    conflictedFiles: [],
+    nextStep: nextStepFor.published
+  };
+});
+var runStatus = () => Effect_exports.gen(function* () {
+  const git = yield* GitService;
+  const state = yield* requireState;
+  yield* requireSessionTempBranchExists(state);
+  const files = state.phase === "conflict" ? yield* conflictedFiles(git) : [];
+  return {
+    phase: state.phase,
+    target: target(state),
+    following: state.following,
+    conflictedFiles: files,
+    nextStep: nextStepFor[state.phase]
+  };
+});
+var runAbort = () => Effect_exports.gen(function* () {
+  const git = yield* GitService;
+  const state = yield* requireState;
+  yield* requireSessionOnTempBranch(state);
+  const discardedFiles = parseStatusPaths(
+    yield* git.getStatusShort()
+  ).map((entry) => entry.path);
+  if (state.phase === "conflict") {
+    yield* git.cherryPickAbort();
+  }
+  yield* git.resetHard(state.tempBranch);
+  yield* git.clean();
+  yield* git.checkout(state.originalBranch);
+  yield* git.deleteBranch(state.tempBranch);
+  yield* clearState;
+  return {
+    phase: "aborted",
+    target: target(state),
+    following: state.following,
+    conflictedFiles: [],
+    nextStep: nextStepFor.aborted,
+    restoredBranch: state.originalBranch,
+    deletedBranch: state.tempBranch,
+    discardedFiles
+  };
+});
+
+// src/internal/edit-commit/command.ts
+var branchOption = Options_exports.text("branch").pipe(
+  Options_exports.withDescription("The live branch holding the commits"),
+  Options_exports.withDefault(DEFAULT_PROJECT_TARGET_BRANCH)
+);
+var mainBranchOption = Options_exports.text("main-branch").pipe(
+  Options_exports.withDescription("The base branch of the project"),
+  Options_exports.withDefault("main")
+);
+var FALLBACK_ERROR_CODES = {
+  NoCommitsFoundError: "no_commits_found"
+};
+var emit = (effect3) => effect3.pipe(
+  Effect_exports.flatMap(
+    (result) => Console_exports.log(JSON.stringify(result))
+  ),
+  Effect_exports.catchAll(
+    (error4) => Effect_exports.gen(function* () {
+      const code2 = error4.code ?? FALLBACK_ERROR_CODES[error4._tag] ?? "error";
+      yield* Console_exports.log(
+        JSON.stringify({ error: code2, ...error4 })
       );
       process.exitCode = 1;
-      return;
-    }
-    yield* Console_exports.log(
-      `\u2713 ${liveBranch} updated with your changes`
-    );
-    yield* promptService.confirmForcePush(liveBranch);
-    yield* Console_exports.log(
-      `Force pushing ${liveBranch} to origin...`
-    );
-    const forcePushResult = yield* gitService.pushForceWithLease("origin", liveBranch).pipe(
-      Effect_exports.map(() => ({ failed: false })),
-      Effect_exports.catchTag(
-        "FailedToPushError",
-        () => Effect_exports.succeed({ failed: true })
-      )
-    );
-    if (forcePushResult.failed) {
-      yield* Console_exports.error("Failed to force push");
-      process.exitCode = 1;
-      return;
-    }
-    yield* Console_exports.log(
-      `\u2713 Successfully pushed ${liveBranch} to origin`
-    );
-    yield* Console_exports.log(
-      `Switching back to ${originalBranch}...`
-    );
-    yield* gitService.checkout(originalBranch).pipe(
-      Effect_exports.catchTag(
-        "FailedToCheckoutError",
-        () => Effect_exports.void
-      )
-    );
-    yield* Console_exports.log(`\u2713 Switched back to ${originalBranch}`);
-    yield* Console_exports.log(
-      `Deleting temporary branch ${tempBranchName}...`
-    );
-    yield* gitService.deleteBranch(tempBranchName).pipe(
-      Effect_exports.catchTag(
-        "FailedToDeleteBranchError",
-        () => Effect_exports.void
-      )
-    );
-    yield* Console_exports.log(`\u2713 Deleted temporary branch`);
-  }).pipe(
-    Effect_exports.catchTags({
-      NotAGitRepoError: (error4) => {
-        return Effect_exports.gen(function* () {
-          yield* Console_exports.error(`Error: ${error4.message}`);
-          process.exitCode = 1;
-        });
-      },
-      NoCommitsFoundError: (error4) => {
-        return Effect_exports.gen(function* () {
-          yield* Console_exports.error(
-            `Error: No commits found on ${error4.liveBranch} beyond ${error4.mainBranch}`
-          );
-          process.exitCode = 1;
-        });
-      },
-      PromptCancelledError: () => {
-        return Effect_exports.gen(function* () {
-          yield* Console_exports.log(
-            "Operation cancelled. Branch left as-is."
-          );
-          process.exitCode = 0;
-        });
-      },
-      CommitFailedError: (error4) => {
-        return Effect_exports.gen(function* () {
-          yield* Console_exports.error(`Error: ${error4.message}`);
-          process.exitCode = 1;
-        });
-      }
-    }),
-    Effect_exports.catchAll((error4) => {
-      return Effect_exports.gen(function* () {
-        yield* Console_exports.error(`Unexpected error: ${error4}`);
-        process.exitCode = 1;
-      });
     })
   )
+);
+var begin = Command_exports.make(
+  "begin",
+  {
+    commit: Options_exports.text("commit").pipe(
+      Options_exports.withAlias("c"),
+      Options_exports.withDescription(
+        "Commit to edit: a 1-based sequence number or a SHA prefix"
+      )
+    ),
+    branch: branchOption,
+    mainBranch: mainBranchOption
+  },
+  (opts) => emit(runBegin(opts))
 ).pipe(
   Command_exports.withDescription(
-    "Edit a commit and cherry-pick following commits"
+    "Start editing a commit: park its diff in the working tree"
+  )
+);
+var continueCmd = Command_exports.make(
+  "continue",
+  {},
+  () => emit(runContinue())
+).pipe(
+  Command_exports.withDescription(
+    "Commit the working-tree edits and replay following commits (or resume after resolving conflicts)"
+  )
+);
+var status2 = Command_exports.make(
+  "status",
+  {},
+  () => emit(runStatus())
+).pipe(
+  Command_exports.withDescription(
+    "Report the current edit-commit session phase (read-only)"
+  )
+);
+var abort = Command_exports.make(
+  "abort",
+  {},
+  () => emit(runAbort())
+).pipe(
+  Command_exports.withDescription(
+    "Discard the session and restore the original branch"
+  )
+);
+var publish = Command_exports.make(
+  "publish",
+  {},
+  () => emit(runPublish())
+).pipe(
+  Command_exports.withDescription(
+    "Force-push the recomposed live branch to origin and clean up"
+  )
+);
+var editCommit = Command_exports.make("edit-commit").pipe(
+  Command_exports.withSubcommands([
+    begin,
+    continueCmd,
+    status2,
+    abort,
+    publish
+  ]),
+  Command_exports.withDescription(
+    "Agent-driven, resumable editing of a commit's contents"
   )
 );
-function resolveConflictLoop(gitService, promptService) {
-  return Effect_exports.gen(function* () {
-    const status2 = yield* gitService.getStatusShort();
-    if (status2) {
-      yield* Console_exports.log(status2);
-    }
-    const action = yield* promptService.selectCherryPickConflictAction();
-    if (action === "abort") {
-      yield* Console_exports.log(
-        "Cherry-pick aborted. Branch left as-is."
-      );
-      yield* gitService.cherryPickAbort();
-      return;
-    }
-    if (action === "skip") {
-      yield* Console_exports.log("\u2713 Skipping git command");
-      return;
-    }
-    const continueResult = yield* gitService.cherryPickContinue().pipe(
-      Effect_exports.map(() => ({ conflict: false })),
-      Effect_exports.catchTag(
-        "CherryPickConflictError",
-        () => Effect_exports.succeed({ conflict: true })
-      )
-    );
-    if (continueResult.conflict) {
-      yield* Console_exports.log(
-        "\n\u26A0\uFE0F  Another conflict detected during cherry-pick!"
-      );
-      yield* Console_exports.log("Resolve conflicts, then continue.\n");
-      yield* resolveConflictLoop(gitService, promptService);
-    } else {
-      yield* Console_exports.log("\u2713 Cherry-pick complete");
-    }
-  });
-}
 
 // src/internal/rebase-to-main.ts
 var rebaseToMain = Command_exports.make(
@@ -87933,12 +88027,12 @@ var init2 = Command_exports.make(
   },
   ({ base }) => Effect_exports.gen(function* () {
     const fs = yield* FileSystem_exports.FileSystem;
-    const path15 = yield* Path_exports.Path;
+    const path16 = yield* Path_exports.Path;
     const promptService = yield* PromptService;
     const entries2 = yield* fs.readDirectory(base);
     const subdirs = [];
     for (const entry of entries2) {
-      const fullPath = path15.join(base, entry);
+      const fullPath = path16.join(base, entry);
       const stat3 = yield* fs.stat(fullPath);
       if (stat3.type === "Directory") {
         subdirs.push(entry);
@@ -87952,7 +88046,7 @@ var init2 = Command_exports.make(
       "Select subdirectory:"
     );
     const repoName = yield* promptService.inputText("Enter repo name:");
-    const repoPath = path15.join(base, subdirectory, repoName);
+    const repoPath = path16.join(base, subdirectory, repoName);
     const exists4 = yield* fs.exists(repoPath);
     if (exists4) {
       return yield* new DirectoryExistsError({ path: repoPath });
@@ -87960,22 +88054,22 @@ var init2 = Command_exports.make(
     yield* fs.makeDirectory(repoPath, { recursive: true });
     yield* Console_exports.log(`Created directory: ${repoPath}`);
     yield* fs.writeFileString(
-      path15.join(repoPath, "package.json"),
+      path16.join(repoPath, "package.json"),
       createPackageJson(repoName)
     );
     yield* Console_exports.log("Created package.json");
     yield* fs.writeFileString(
-      path15.join(repoPath, "tsconfig.json"),
+      path16.join(repoPath, "tsconfig.json"),
       TSCONFIG
     );
     yield* Console_exports.log("Created tsconfig.json");
     yield* fs.writeFileString(
-      path15.join(repoPath, ".gitignore"),
+      path16.join(repoPath, ".gitignore"),
       GITIGNORE
     );
     yield* Console_exports.log("Created .gitignore");
     yield* fs.writeFileString(
-      path15.join(repoPath, ".prettierignore"),
+      path16.join(repoPath, ".prettierignore"),
       PRETTIERIGNORE
     );
     yield* Console_exports.log("Created .prettierignore");
@@ -88449,6 +88543,7 @@ var run9 = Command_exports.run(command, {
 var layerLive = Layer_exports.mergeAll(
   NodeContext_exports.layer,
   GitService.Default,
+  defaultGitServiceConfigLayer,
   LessonParserService.Default,
   PromptService.Default
 );