@effect/language-service 0.63.1 → 0.64.0

package/cli.js

@@ -906,7 +906,7 @@ var require_dist = __commonJS({
       o[k2] = m[k];
     }));
     var __exportStar = exports2 && exports2.__exportStar || function(m, exports3) {
-      for (var p2 in m) if (p2 !== "default" && !Object.prototype.hasOwnProperty.call(exports3, p2)) __createBinding(exports3, m, p2);
+      for (var p3 in m) if (p3 !== "default" && !Object.prototype.hasOwnProperty.call(exports3, p3)) __createBinding(exports3, m, p3);
     };
     Object.defineProperty(exports2, "__esModule", { value: true });
     __exportStar(require_compilerOptions(), exports2);
@@ -942,7 +942,7 @@ var require_createProjectService = __commonJS({
       return mod && mod.__esModule ? mod : { "default": mod };
     };
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.createProjectService = createProjectService3;
+    exports2.createProjectService = createProjectService4;
     var debug_1 = __importDefault(require_src());
     var getParsedConfigFileFromTSServer_js_1 = require_getParsedConfigFileFromTSServer();
     var DEFAULT_PROJECT_MATCHED_FILES_THRESHOLD = 8;
@@ -956,7 +956,7 @@ var require_createProjectService = __commonJS({
     var createStubFileWatcher = () => ({
       close: doNothing
     });
-    function createProjectService3({ jsDocParsingMode, options: optionsRaw = {}, tsconfigRootDir } = {}) {
+    function createProjectService4({ jsDocParsingMode, options: optionsRaw = {}, tsconfigRootDir } = {}) {
       const options3 = {
         defaultProject: "tsconfig.json",
         ...optionsRaw
@@ -1071,7 +1071,7 @@ var require_dist2 = __commonJS({
       o[k2] = m[k];
     }));
     var __exportStar = exports2 && exports2.__exportStar || function(m, exports3) {
-      for (var p2 in m) if (p2 !== "default" && !Object.prototype.hasOwnProperty.call(exports3, p2)) __createBinding(exports3, m, p2);
+      for (var p3 in m) if (p3 !== "default" && !Object.prototype.hasOwnProperty.call(exports3, p3)) __createBinding(exports3, m, p3);
     };
     Object.defineProperty(exports2, "__esModule", { value: true });
     __exportStar(require_createProjectService(), exports2);
@@ -2127,6 +2127,13 @@ var make2 = (compare2) => (self, that) => self === that ? 0 : compare2(self, tha
 var string2 = /* @__PURE__ */ make2((self, that) => self < that ? -1 : 1);
 var number3 = /* @__PURE__ */ make2((self, that) => self < that ? -1 : 1);
 var boolean = /* @__PURE__ */ make2((self, that) => self < that ? -1 : 1);
+var combine2 = /* @__PURE__ */ dual(2, (self, that) => make2((a1, a2) => {
+  const out = self(a1, a2);
+  if (out !== 0) {
+    return out;
+  }
+  return that(a1, a2);
+}));
 var mapInput2 = /* @__PURE__ */ dual(2, (self, f) => make2((b1, b2) => self(f(b1), f(b2))));
 var greaterThan = (O) => dual(2, (self, that) => O(self, that) === 1);
 
@@ -3366,10 +3373,10 @@ function expand(edit, frag, child, bitmap, subNodes) {
   arr[frag] = child;
   return new ArrayNode(edit, count4 + 1, arr);
 }
-function mergeLeavesInner(edit, shift2, h12, n1, h2, n2) {
-  if (h12 === h2) return new CollisionNode(edit, h12, [n2, n1]);
+function mergeLeavesInner(edit, shift2, h12, n1, h22, n2) {
+  if (h12 === h22) return new CollisionNode(edit, h12, [n2, n1]);
   const subH1 = hashFragment(shift2, h12);
-  const subH2 = hashFragment(shift2, h2);
+  const subH2 = hashFragment(shift2, h22);
   if (subH1 === subH2) {
     return (child) => new IndexedNode(edit, toBitmap(subH1) | toBitmap(subH2), [child]);
   } else {
@@ -3377,11 +3384,11 @@ function mergeLeavesInner(edit, shift2, h12, n1, h2, n2) {
     return new IndexedNode(edit, toBitmap(subH1) | toBitmap(subH2), children2);
   }
 }
-function mergeLeaves(edit, shift2, h12, n1, h2, n2) {
+function mergeLeaves(edit, shift2, h12, n1, h22, n2) {
   let stack = void 0;
   let currentShift = shift2;
   while (true) {
-    const res = mergeLeavesInner(edit, currentShift, h12, n1, h2, n2);
+    const res = mergeLeavesInner(edit, currentShift, h12, n1, h22, n2);
     if (typeof res === "function") {
       stack = make8(res, stack);
       currentShift = currentShift + SIZE;
@@ -3851,6 +3858,7 @@ var isEmpty3 = (self) => {
     }
   });
 };
+var isDie = (self) => isSome2(dieOption(self));
 var isInterrupted = (self) => isSome2(interruptOption(self));
 var isInterruptedOnly = (self) => reduceWithContext(void 0, IsInterruptedOnlyCauseReducer)(self);
 var failures = (self) => reverse2(reduce6(self, empty5(), (list4, cause2) => cause2._tag === OP_FAIL ? some2(pipe(list4, prepend2(cause2.error))) : none2()));
@@ -3868,6 +3876,7 @@ var failureOrCause = (self) => {
     }
   }
 };
+var dieOption = (self) => find(self, (cause2) => cause2._tag === OP_DIE ? some2(cause2.defect) : none2());
 var flipCauseOption = (self) => match4(self, {
   onEmpty: some2(empty9),
   onFail: map2(fail),
@@ -4721,7 +4730,7 @@ var composite = (left3, right3) => {
   return new Composite(left3, right3);
 };
 var isFiberId = (self) => hasProperty(self, FiberIdTypeId);
-var combine2 = /* @__PURE__ */ dual(2, (self, that) => {
+var combine3 = /* @__PURE__ */ dual(2, (self, that) => {
   if (self._tag === OP_NONE) {
     return that;
   }
@@ -4731,7 +4740,7 @@ var combine2 = /* @__PURE__ */ dual(2, (self, that) => {
   return new Composite(self, that);
 });
 var combineAll = (fiberIds) => {
-  return pipe(fiberIds, reduce5(none3, (a, b) => combine2(b)(a)));
+  return pipe(fiberIds, reduce5(none3, (a, b) => combine3(b)(a)));
 };
 var ids = (self) => {
   switch (self._tag) {
@@ -4764,7 +4773,7 @@ var unsafeMake = () => {
 var none4 = none3;
 var runtime2 = runtime;
 var composite2 = composite;
-var combine3 = combine2;
+var combine4 = combine3;
 var combineAll2 = combineAll;
 var ids2 = ids;
 var make15 = make14;
@@ -5020,19 +5029,19 @@ var diff = (oldValue, newValue) => {
       const old = missingServices.get(tag4);
       missingServices.delete(tag4);
       if (!equals(old, newService)) {
-        patch10 = combine4(makeUpdateService(tag4, () => newService))(patch10);
+        patch10 = combine5(makeUpdateService(tag4, () => newService))(patch10);
       }
     } else {
       missingServices.delete(tag4);
-      patch10 = combine4(makeAddService(tag4, newService))(patch10);
+      patch10 = combine5(makeAddService(tag4, newService))(patch10);
     }
   }
   for (const [tag4] of missingServices.entries()) {
-    patch10 = combine4(makeRemoveService(tag4))(patch10);
+    patch10 = combine5(makeRemoveService(tag4))(patch10);
   }
   return patch10;
 };
-var combine4 = /* @__PURE__ */ dual(2, (self, that) => makeAndThen(self, that));
+var combine5 = /* @__PURE__ */ dual(2, (self, that) => makeAndThen(self, that));
 var patch = /* @__PURE__ */ dual(2, (self, context7) => {
   if (self._tag === "Empty") {
     return context7;
@@ -5134,11 +5143,11 @@ var diff2 = (oldValue, newValue) => {
     if (has3(value5)(set7)) {
       return [remove4(value5)(set7), patch11];
     }
-    return [set7, combine5(makeAdd(value5))(patch11)];
+    return [set7, combine6(makeAdd(value5))(patch11)];
   })(newValue);
-  return reduce5(patch10, (patch11, value5) => combine5(makeRemove(value5))(patch11))(removed);
+  return reduce5(patch10, (patch11, value5) => combine6(makeRemove(value5))(patch11))(removed);
 };
-var combine5 = /* @__PURE__ */ dual(2, (self, that) => makeAndThen2(self, that));
+var combine6 = /* @__PURE__ */ dual(2, (self, that) => makeAndThen2(self, that));
 var patch2 = /* @__PURE__ */ dual(2, (self, oldValue) => {
   if (self._tag === "Empty") {
     return oldValue;
@@ -5231,19 +5240,19 @@ var diff3 = (options3) => {
     const newElement = options3.newValue[i];
     const valuePatch = options3.differ.diff(oldElement, newElement);
     if (!equals(valuePatch, options3.differ.empty)) {
-      patch10 = combine6(patch10, makeUpdate(i, valuePatch));
+      patch10 = combine7(patch10, makeUpdate(i, valuePatch));
     }
     i = i + 1;
   }
   if (i < options3.oldValue.length) {
-    patch10 = combine6(patch10, makeSlice(0, i));
+    patch10 = combine7(patch10, makeSlice(0, i));
   }
   if (i < options3.newValue.length) {
-    patch10 = combine6(patch10, makeAppend(drop(i)(options3.newValue)));
+    patch10 = combine7(patch10, makeAppend(drop(i)(options3.newValue)));
   }
   return patch10;
 };
-var combine6 = /* @__PURE__ */ dual(2, (self, that) => makeAndThen3(self, that));
+var combine7 = /* @__PURE__ */ dual(2, (self, that) => makeAndThen3(self, that));
 var patch3 = /* @__PURE__ */ dual(3, (self, oldValue, differ3) => {
   if (self._tag === "Empty") {
     return oldValue;
@@ -5306,19 +5315,19 @@ var make17 = (params) => {
 };
 var environment = () => make17({
   empty: empty12(),
-  combine: (first3, second) => combine4(second)(first3),
+  combine: (first3, second) => combine5(second)(first3),
   diff: (oldValue, newValue) => diff(oldValue, newValue),
   patch: (patch10, oldValue) => patch(oldValue)(patch10)
 });
 var hashSet = () => make17({
   empty: empty13(),
-  combine: (first3, second) => combine5(second)(first3),
+  combine: (first3, second) => combine6(second)(first3),
   diff: (oldValue, newValue) => diff2(oldValue, newValue),
   patch: (patch10, oldValue) => patch2(oldValue)(patch10)
 });
 var readonlyArray = (differ3) => make17({
   empty: empty14(),
-  combine: (first3, second) => combine6(first3, second),
+  combine: (first3, second) => combine7(first3, second),
   diff: (oldValue, newValue) => diff3({
     oldValue,
     newValue,
@@ -5889,17 +5898,17 @@ var originalSymbol = /* @__PURE__ */ Symbol.for("effect/OriginalAnnotation");
 var capture = (obj, span2) => {
   if (isSome2(span2)) {
     return new Proxy(obj, {
-      has(target, p2) {
-        return p2 === spanSymbol || p2 === originalSymbol || p2 in target;
+      has(target, p3) {
+        return p3 === spanSymbol || p3 === originalSymbol || p3 in target;
       },
-      get(target, p2) {
-        if (p2 === spanSymbol) {
+      get(target, p3) {
+        if (p3 === spanSymbol) {
           return span2.value;
         }
-        if (p2 === originalSymbol) {
+        if (p3 === originalSymbol) {
           return obj;
         }
-        return target[p2];
+        return target[p3];
       }
     });
   }
@@ -7774,14 +7783,14 @@ var diff5 = (oldValue, newValue) => {
     if (old !== void 0) {
       const oldValue2 = headNonEmpty(old)[1];
       if (!equals(oldValue2, newValue2)) {
-        patch10 = combine7({
+        patch10 = combine8({
           _tag: OP_UPDATE,
           fiberRef,
           patch: fiberRef.diff(oldValue2, newValue2)
         })(patch10);
       }
     } else {
-      patch10 = combine7({
+      patch10 = combine8({
         _tag: OP_ADD,
         fiberRef,
         value: newValue2
@@ -7790,14 +7799,14 @@ var diff5 = (oldValue, newValue) => {
     missingLocals.delete(fiberRef);
   }
   for (const [fiberRef] of missingLocals.entries()) {
-    patch10 = combine7({
+    patch10 = combine8({
       _tag: OP_REMOVE,
       fiberRef
     })(patch10);
   }
   return patch10;
 };
-var combine7 = /* @__PURE__ */ dual(2, (self, that) => ({
+var combine8 = /* @__PURE__ */ dual(2, (self, that) => ({
   _tag: OP_AND_THEN,
   first: self,
   second: that
@@ -8968,7 +8977,7 @@ var diffFiberRefs = (self) => summarized(self, fiberRefs2, diff5);
 var bind2 = /* @__PURE__ */ bind(map11, flatMap7);
 var bindTo2 = /* @__PURE__ */ bindTo(map11);
 var filterOrDieMessage = /* @__PURE__ */ dual(3, (self, predicate, message) => filterOrElse(self, predicate, () => dieMessage(message)));
-var filterOrElse = /* @__PURE__ */ dual(3, (self, predicate, orElse15) => flatMap7(self, (a) => predicate(a) ? succeed(a) : orElse15(a)));
+var filterOrElse = /* @__PURE__ */ dual(3, (self, predicate, orElse16) => flatMap7(self, (a) => predicate(a) ? succeed(a) : orElse16(a)));
 var match8 = /* @__PURE__ */ dual(2, (self, options3) => matchEffect(self, {
   onFailure: (e) => succeed(options3.onFailure(e)),
   onSuccess: (a) => succeed(options3.onSuccess(a))
@@ -10806,35 +10815,35 @@ var insert = /* @__PURE__ */ dual(3, (self, key, value5) => {
     }
   }
   for (let s = n_stack.length - 1; s > 1; --s) {
-    const p2 = n_stack[s - 1];
+    const p3 = n_stack[s - 1];
     const n3 = n_stack[s];
-    if (p2.color === Color.Black || n3.color === Color.Black) {
+    if (p3.color === Color.Black || n3.color === Color.Black) {
       break;
     }
     const pp = n_stack[s - 2];
-    if (pp.left === p2) {
-      if (p2.left === n3) {
+    if (pp.left === p3) {
+      if (p3.left === n3) {
         const y = pp.right;
         if (y && y.color === Color.Red) {
-          p2.color = Color.Black;
+          p3.color = Color.Black;
           pp.right = repaint(y, Color.Black);
           pp.color = Color.Red;
           s -= 1;
         } else {
           pp.color = Color.Red;
-          pp.left = p2.right;
-          p2.color = Color.Black;
-          p2.right = pp;
-          n_stack[s - 2] = p2;
+          pp.left = p3.right;
+          p3.color = Color.Black;
+          p3.right = pp;
+          n_stack[s - 2] = p3;
           n_stack[s - 1] = n3;
           recount(pp);
-          recount(p2);
+          recount(p3);
           if (s >= 3) {
             const ppp = n_stack[s - 3];
             if (ppp.left === pp) {
-              ppp.left = p2;
+              ppp.left = p3;
             } else {
-              ppp.right = p2;
+              ppp.right = p3;
             }
           }
           break;
@@ -10842,21 +10851,21 @@ var insert = /* @__PURE__ */ dual(3, (self, key, value5) => {
       } else {
         const y = pp.right;
         if (y && y.color === Color.Red) {
-          p2.color = Color.Black;
+          p3.color = Color.Black;
           pp.right = repaint(y, Color.Black);
           pp.color = Color.Red;
           s -= 1;
         } else {
-          p2.right = n3.left;
+          p3.right = n3.left;
           pp.color = Color.Red;
           pp.left = n3.right;
           n3.color = Color.Black;
-          n3.left = p2;
+          n3.left = p3;
           n3.right = pp;
           n_stack[s - 2] = n3;
-          n_stack[s - 1] = p2;
+          n_stack[s - 1] = p3;
           recount(pp);
-          recount(p2);
+          recount(p3);
           recount(n3);
           if (s >= 3) {
             const ppp = n_stack[s - 3];
@@ -10870,28 +10879,28 @@ var insert = /* @__PURE__ */ dual(3, (self, key, value5) => {
         }
       }
     } else {
-      if (p2.right === n3) {
+      if (p3.right === n3) {
         const y = pp.left;
         if (y && y.color === Color.Red) {
-          p2.color = Color.Black;
+          p3.color = Color.Black;
           pp.left = repaint(y, Color.Black);
           pp.color = Color.Red;
           s -= 1;
         } else {
           pp.color = Color.Red;
-          pp.right = p2.left;
-          p2.color = Color.Black;
-          p2.left = pp;
-          n_stack[s - 2] = p2;
+          pp.right = p3.left;
+          p3.color = Color.Black;
+          p3.left = pp;
+          n_stack[s - 2] = p3;
           n_stack[s - 1] = n3;
           recount(pp);
-          recount(p2);
+          recount(p3);
           if (s >= 3) {
             const ppp = n_stack[s - 3];
             if (ppp.right === pp) {
-              ppp.right = p2;
+              ppp.right = p3;
             } else {
-              ppp.left = p2;
+              ppp.left = p3;
             }
           }
           break;
@@ -10899,21 +10908,21 @@ var insert = /* @__PURE__ */ dual(3, (self, key, value5) => {
       } else {
         const y = pp.left;
         if (y && y.color === Color.Red) {
-          p2.color = Color.Black;
+          p3.color = Color.Black;
           pp.left = repaint(y, Color.Black);
           pp.color = Color.Red;
           s -= 1;
         } else {
-          p2.left = n3.right;
+          p3.left = n3.right;
           pp.color = Color.Red;
           pp.right = n3.left;
           n3.color = Color.Black;
-          n3.right = p2;
+          n3.right = p3;
           n3.left = pp;
           n_stack[s - 2] = n3;
-          n_stack[s - 1] = p2;
+          n_stack[s - 1] = p3;
           recount(pp);
-          recount(p2);
+          recount(p3);
           recount(n3);
           if (s >= 3) {
             const ppp = n_stack[s - 3];
@@ -11050,11 +11059,11 @@ var removeFirst = /* @__PURE__ */ dual(2, (self, key) => {
   }
   n = cstack[cstack.length - 1];
   if (n.color === Color.Red) {
-    const p2 = cstack[cstack.length - 2];
-    if (p2.left === n) {
-      p2.left = void 0;
-    } else if (p2.right === n) {
-      p2.right = void 0;
+    const p3 = cstack[cstack.length - 2];
+    if (p3.left === n) {
+      p3.left = void 0;
+    } else if (p3.right === n) {
+      p3.right = void 0;
     }
     cstack.pop();
     for (let i = 0; i < cstack.length; ++i) {
@@ -11091,31 +11100,31 @@ var removeFirst = /* @__PURE__ */ dual(2, (self, key) => {
   return makeImpl3(ord, cstack[0]);
 });
 var fixDoubleBlack = (stack) => {
-  let n, p2, s, z;
+  let n, p3, s, z;
   for (let i = stack.length - 1; i >= 0; --i) {
     n = stack[i];
     if (i === 0) {
       n.color = Color.Black;
       return;
     }
-    p2 = stack[i - 1];
-    if (p2.left === n) {
-      s = p2.right;
+    p3 = stack[i - 1];
+    if (p3.left === n) {
+      s = p3.right;
       if (s !== void 0 && s.right !== void 0 && s.right.color === Color.Red) {
-        s = p2.right = clone(s);
+        s = p3.right = clone(s);
         z = s.right = clone(s.right);
-        p2.right = s.left;
-        s.left = p2;
+        p3.right = s.left;
+        s.left = p3;
         s.right = z;
-        s.color = p2.color;
+        s.color = p3.color;
         n.color = Color.Black;
-        p2.color = Color.Black;
+        p3.color = Color.Black;
         z.color = Color.Black;
-        recount(p2);
+        recount(p3);
         recount(s);
         if (i > 1) {
           const pp = stack[i - 2];
-          if (pp.left === p2) {
+          if (pp.left === p3) {
             pp.left = s;
           } else {
             pp.right = s;
@@ -11124,22 +11133,22 @@ var fixDoubleBlack = (stack) => {
         stack[i - 1] = s;
         return;
       } else if (s !== void 0 && s.left !== void 0 && s.left.color === Color.Red) {
-        s = p2.right = clone(s);
+        s = p3.right = clone(s);
         z = s.left = clone(s.left);
-        p2.right = z.left;
+        p3.right = z.left;
         s.left = z.right;
-        z.left = p2;
+        z.left = p3;
         z.right = s;
-        z.color = p2.color;
-        p2.color = Color.Black;
+        z.color = p3.color;
+        p3.color = Color.Black;
         s.color = Color.Black;
         n.color = Color.Black;
-        recount(p2);
+        recount(p3);
         recount(s);
         recount(z);
         if (i > 1) {
           const pp = stack[i - 2];
-          if (pp.left === p2) {
+          if (pp.left === p3) {
             pp.left = z;
           } else {
             pp.right = z;
@@ -11149,32 +11158,32 @@ var fixDoubleBlack = (stack) => {
         return;
       }
       if (s !== void 0 && s.color === Color.Black) {
-        if (p2.color === Color.Red) {
-          p2.color = Color.Black;
-          p2.right = repaint(s, Color.Red);
+        if (p3.color === Color.Red) {
+          p3.color = Color.Black;
+          p3.right = repaint(s, Color.Red);
           return;
         } else {
-          p2.right = repaint(s, Color.Red);
+          p3.right = repaint(s, Color.Red);
           continue;
         }
       } else if (s !== void 0) {
         s = clone(s);
-        p2.right = s.left;
-        s.left = p2;
-        s.color = p2.color;
-        p2.color = Color.Red;
-        recount(p2);
+        p3.right = s.left;
+        s.left = p3;
+        s.color = p3.color;
+        p3.color = Color.Red;
+        recount(p3);
         recount(s);
         if (i > 1) {
           const pp = stack[i - 2];
-          if (pp.left === p2) {
+          if (pp.left === p3) {
             pp.left = s;
           } else {
             pp.right = s;
           }
         }
         stack[i - 1] = s;
-        stack[i] = p2;
+        stack[i] = p3;
         if (i + 1 < stack.length) {
           stack[i + 1] = n;
         } else {
@@ -11183,22 +11192,22 @@ var fixDoubleBlack = (stack) => {
         i = i + 2;
       }
     } else {
-      s = p2.left;
+      s = p3.left;
       if (s !== void 0 && s.left !== void 0 && s.left.color === Color.Red) {
-        s = p2.left = clone(s);
+        s = p3.left = clone(s);
         z = s.left = clone(s.left);
-        p2.left = s.right;
-        s.right = p2;
+        p3.left = s.right;
+        s.right = p3;
         s.left = z;
-        s.color = p2.color;
+        s.color = p3.color;
         n.color = Color.Black;
-        p2.color = Color.Black;
+        p3.color = Color.Black;
         z.color = Color.Black;
-        recount(p2);
+        recount(p3);
         recount(s);
         if (i > 1) {
           const pp = stack[i - 2];
-          if (pp.right === p2) {
+          if (pp.right === p3) {
             pp.right = s;
           } else {
             pp.left = s;
@@ -11207,22 +11216,22 @@ var fixDoubleBlack = (stack) => {
         stack[i - 1] = s;
         return;
       } else if (s !== void 0 && s.right !== void 0 && s.right.color === Color.Red) {
-        s = p2.left = clone(s);
+        s = p3.left = clone(s);
         z = s.right = clone(s.right);
-        p2.left = z.right;
+        p3.left = z.right;
         s.right = z.left;
-        z.right = p2;
+        z.right = p3;
         z.left = s;
-        z.color = p2.color;
-        p2.color = Color.Black;
+        z.color = p3.color;
+        p3.color = Color.Black;
         s.color = Color.Black;
         n.color = Color.Black;
-        recount(p2);
+        recount(p3);
         recount(s);
         recount(z);
         if (i > 1) {
           const pp = stack[i - 2];
-          if (pp.right === p2) {
+          if (pp.right === p3) {
             pp.right = z;
           } else {
             pp.left = z;
@@ -11232,32 +11241,32 @@ var fixDoubleBlack = (stack) => {
         return;
       }
       if (s !== void 0 && s.color === Color.Black) {
-        if (p2.color === Color.Red) {
-          p2.color = Color.Black;
-          p2.left = repaint(s, Color.Red);
+        if (p3.color === Color.Red) {
+          p3.color = Color.Black;
+          p3.left = repaint(s, Color.Red);
           return;
         } else {
-          p2.left = repaint(s, Color.Red);
+          p3.left = repaint(s, Color.Red);
           continue;
         }
       } else if (s !== void 0) {
         s = clone(s);
-        p2.left = s.right;
-        s.right = p2;
-        s.color = p2.color;
-        p2.color = Color.Red;
-        recount(p2);
+        p3.left = s.right;
+        s.right = p3;
+        s.color = p3.color;
+        p3.color = Color.Red;
+        recount(p3);
         recount(s);
         if (i > 1) {
           const pp = stack[i - 2];
-          if (pp.right === p2) {
+          if (pp.right === p3) {
             pp.right = s;
           } else {
             pp.left = s;
           }
         }
         stack[i - 1] = s;
-        stack[i] = p2;
+        stack[i] = p3;
         if (i + 1 < stack.length) {
           stack[i + 1] = n;
         } else {
@@ -11499,7 +11508,7 @@ var OP_AND_THEN2 = "AndThen";
 var empty23 = {
   _tag: OP_EMPTY3
 };
-var combine8 = (self, that) => {
+var combine9 = (self, that) => {
   return {
     _tag: OP_AND_THEN2,
     first: self,
@@ -11565,20 +11574,20 @@ var diff7 = (oldValue, newValue) => {
   }
   const oldSupervisors = toSet2(oldValue);
   const newSupervisors = toSet2(newValue);
-  const added = pipe(newSupervisors, difference3(oldSupervisors), reduce5(empty23, (patch10, supervisor) => combine8(patch10, {
+  const added = pipe(newSupervisors, difference3(oldSupervisors), reduce5(empty23, (patch10, supervisor) => combine9(patch10, {
     _tag: OP_ADD_SUPERVISOR,
     supervisor
   })));
-  const removed = pipe(oldSupervisors, difference3(newSupervisors), reduce5(empty23, (patch10, supervisor) => combine8(patch10, {
+  const removed = pipe(oldSupervisors, difference3(newSupervisors), reduce5(empty23, (patch10, supervisor) => combine9(patch10, {
     _tag: OP_REMOVE_SUPERVISOR,
     supervisor
   })));
-  return combine8(added, removed);
+  return combine9(added, removed);
 };
 var differ2 = /* @__PURE__ */ make31({
   empty: empty23,
   patch: patch8,
-  combine: combine8,
+  combine: combine9,
   diff: diff7
 });
 
@@ -13174,7 +13183,7 @@ var raceFibersWith = /* @__PURE__ */ dual(3, (self, other, options3) => withFibe
     rightFiber.addObserver(() => completeRace(rightFiber, leftFiber, options3.onOtherWin, raceIndicator, cb));
     leftFiber.startFork(self);
     rightFiber.startFork(other);
-  }, combine3(leftFiber.id(), rightFiber.id()));
+  }, combine4(leftFiber.id(), rightFiber.id()));
 }));
 var completeRace = (winner, loser, cont, ab, cb) => {
   if (compareAndSet(true, false)(ab)) {
@@ -13243,9 +13252,11 @@ var sequential4 = sequential;
 var isCause2 = isCause;
 var isFailType2 = isFailType;
 var isDieType2 = isDieType;
+var isDie2 = isDie;
 var isInterrupted2 = isInterrupted;
 var isInterruptedOnly2 = isInterruptedOnly;
 var interruptors2 = interruptors;
+var failureOption2 = failureOption;
 var failureOrCause2 = failureOrCause;
 var flipCauseOption2 = flipCauseOption;
 var map14 = map9;
@@ -14163,6 +14174,9 @@ var TaggedError = (tag4) => {
   return O.BaseEffectError;
 };
 
+// node_modules/.pnpm/effect@3.19.13/node_modules/effect/dist/esm/String.js
+var Order4 = string2;
+
 // node_modules/.pnpm/effect@3.19.13/node_modules/effect/dist/esm/internal/schedule.js
 var ScheduleSymbolKey = "effect/Schedule";
 var ScheduleTypeId = /* @__PURE__ */ Symbol.for(ScheduleSymbolKey);
@@ -14370,15 +14384,15 @@ var repeat_combined = /* @__PURE__ */ dual(2, (self, options3) => {
   const withTimes = options3.times ? intersect5(withUntil, recurs(options3.times)).pipe(map16((intersectionPair) => intersectionPair[0])) : withUntil;
   return scheduleDefectRefail(repeat_Effect(self, withTimes));
 });
-var repeatOrElse_Effect = /* @__PURE__ */ dual(3, (self, schedule2, orElse15) => flatMap7(driver(schedule2), (driver2) => matchEffect(self, {
-  onFailure: (error4) => orElse15(error4, none2()),
-  onSuccess: (value5) => repeatOrElseEffectLoop(provideServiceEffect(self, CurrentIterationMetadata, get10(driver2.iterationMeta)), driver2, (error4, option5) => provideServiceEffect(orElse15(error4, option5), CurrentIterationMetadata, get10(driver2.iterationMeta)), value5)
+var repeatOrElse_Effect = /* @__PURE__ */ dual(3, (self, schedule2, orElse16) => flatMap7(driver(schedule2), (driver2) => matchEffect(self, {
+  onFailure: (error4) => orElse16(error4, none2()),
+  onSuccess: (value5) => repeatOrElseEffectLoop(provideServiceEffect(self, CurrentIterationMetadata, get10(driver2.iterationMeta)), driver2, (error4, option5) => provideServiceEffect(orElse16(error4, option5), CurrentIterationMetadata, get10(driver2.iterationMeta)), value5)
 })));
-var repeatOrElseEffectLoop = (self, driver2, orElse15, value5) => matchEffect(driver2.next(value5), {
+var repeatOrElseEffectLoop = (self, driver2, orElse16, value5) => matchEffect(driver2.next(value5), {
   onFailure: () => orDie(driver2.last),
   onSuccess: (b) => matchEffect(self, {
-    onFailure: (error4) => orElse15(error4, some2(b)),
-    onSuccess: (value6) => repeatOrElseEffectLoop(self, driver2, orElse15, value6)
+    onFailure: (error4) => orElse16(error4, some2(b)),
+    onSuccess: (value6) => repeatOrElseEffectLoop(self, driver2, orElse16, value6)
   })
 });
 var retry_Effect = /* @__PURE__ */ dual(2, (self, policy) => retryOrElse_Effect(self, policy, (e, _) => fail2(e)));
@@ -14406,11 +14420,11 @@ var fromRetryOptions = (options3) => {
   }) : withWhile;
   return options3.times ? intersect5(withUntil, recurs(options3.times)) : withUntil;
 };
-var retryOrElse_Effect = /* @__PURE__ */ dual(3, (self, policy, orElse15) => flatMap7(driver(policy), (driver2) => retryOrElse_EffectLoop(provideServiceEffect(self, CurrentIterationMetadata, get10(driver2.iterationMeta)), driver2, (e, out) => provideServiceEffect(orElse15(e, out), CurrentIterationMetadata, get10(driver2.iterationMeta)))));
-var retryOrElse_EffectLoop = (self, driver2, orElse15) => {
+var retryOrElse_Effect = /* @__PURE__ */ dual(3, (self, policy, orElse16) => flatMap7(driver(policy), (driver2) => retryOrElse_EffectLoop(provideServiceEffect(self, CurrentIterationMetadata, get10(driver2.iterationMeta)), driver2, (e, out) => provideServiceEffect(orElse16(e, out), CurrentIterationMetadata, get10(driver2.iterationMeta)))));
+var retryOrElse_EffectLoop = (self, driver2, orElse16) => {
   return catchAll(self, (e) => matchEffect(driver2.next(e), {
-    onFailure: () => pipe(driver2.last, orDie, flatMap7((out) => orElse15(e, out))),
-    onSuccess: () => retryOrElse_EffectLoop(self, driver2, orElse15)
+    onFailure: () => pipe(driver2.last, orDie, flatMap7((out) => orElse16(e, out))),
+    onSuccess: () => retryOrElse_EffectLoop(self, driver2, orElse16)
   }));
 };
 var forever2 = /* @__PURE__ */ unfold2(0, (n) => n + 1);
@@ -14922,8 +14936,8 @@ var struct3 = (F) => (fields) => {
 };
 
 // node_modules/.pnpm/@effect+typeclass@0.38.0_effect@3.19.13/node_modules/@effect/typeclass/dist/esm/Semigroup.js
-var make41 = (combine12, combineMany = (self, collection) => reduce11(self, combine12)(collection)) => ({
-  combine: combine12,
+var make41 = (combine13, combineMany = (self, collection) => reduce11(self, combine13)(collection)) => ({
+  combine: combine13,
   combineMany
 });
 var constant2 = (a) => make41(() => a, () => a);
@@ -15102,6 +15116,7 @@ var black2 = /* @__PURE__ */ color(black);
 var red3 = /* @__PURE__ */ color(red);
 var green2 = /* @__PURE__ */ color(green);
 var yellow2 = /* @__PURE__ */ color(yellow);
+var blue2 = /* @__PURE__ */ color(blue);
 var cyan3 = /* @__PURE__ */ color(cyan);
 var white3 = /* @__PURE__ */ color(white);
 var blackBright = /* @__PURE__ */ brightColor(black);
@@ -15196,7 +15211,7 @@ var eraseScreen = /* @__PURE__ */ make42({
   commands: /* @__PURE__ */ of(`${ESC}2J`)
 });
 var stringify = (self) => stringifyInternal(self);
-var combine9 = /* @__PURE__ */ dual(2, (self, that) => combineInternal(self, that));
+var combine10 = /* @__PURE__ */ dual(2, (self, that) => combineInternal(self, that));
 var combineInternal = (self, that) => AnsiSemigroup.combine(self, that);
 var stringifyInternal = (self) => {
   const displaySequence = toEscapeSequence(getSomes([some2(reset), self.foreground, self.background, self.bold, self.italicized, self.strikethrough, self.underlined]));
@@ -15214,6 +15229,7 @@ var black3 = black2;
 var red4 = red3;
 var green3 = green2;
 var yellow3 = yellow2;
+var blue3 = blue2;
 var cyan4 = cyan3;
 var white4 = white3;
 var blackBright2 = blackBright;
@@ -15223,7 +15239,7 @@ var bgYellow2 = bgYellow;
 var bgBlue2 = bgBlue;
 var bgCyan2 = bgCyan;
 var bgBlackBright2 = bgBlackBright;
-var combine10 = combine9;
+var combine11 = combine10;
 
 // node_modules/.pnpm/@effect+printer@0.47.0_@effect+typeclass@0.38.0_effect@3.19.13/node_modules/@effect/printer/dist/esm/internal/flatten.js
 var FlattenSymbolKey = "@effect/printer/Flatten";
@@ -16108,7 +16124,7 @@ var renderSafe = (self, stack) => {
     }
     case "PushAnnotationStream": {
       const currentStyle = unsafePeek(stack);
-      const nextStyle = combine9(self.annotation, currentStyle);
+      const nextStyle = combine10(self.annotation, currentStyle);
       return map17(suspend4(() => renderSafe(self.stream, cons(self.annotation, stack))), (rest) => stringify(nextStyle) + rest);
     }
     case "PopAnnotationStream": {
@@ -16389,6 +16405,9 @@ var toAnsiDocInternal = (self) => {
   }
 };
 
+// node_modules/.pnpm/@effect+cli@0.73.0_@effect+platform@0.94.0_@effect+printer-ansi@0.47.0_@effect+printer@0.47.0_effect@3.19.13/node_modules/@effect/cli/dist/esm/HelpDoc.js
+var p2 = p;
+
 // node_modules/.pnpm/effect@3.19.13/node_modules/effect/dist/esm/ConfigError.js
 var isConfigError2 = isConfigError;
 var isMissingDataOnly2 = isMissingDataOnly;
@@ -17706,9 +17725,9 @@ var typeAST = (ast) => {
       return elements === ast.elements && rest === restASTs ? ast : new TupleType(elements, rest.map((type2) => new Type(type2)), ast.isReadonly, ast.annotations);
     }
     case "TypeLiteral": {
-      const propertySignatures = changeMap(ast.propertySignatures, (p2) => {
-        const type2 = typeAST(p2.type);
-        return type2 === p2.type ? p2 : new PropertySignature(p2.name, type2, p2.isOptional, p2.isReadonly);
+      const propertySignatures = changeMap(ast.propertySignatures, (p3) => {
+        const type2 = typeAST(p3.type);
+        return type2 === p3.type ? p3 : new PropertySignature(p3.name, type2, p3.isOptional, p3.isReadonly);
       });
       const indexSignatures = changeMap(ast.indexSignatures, (is3) => {
         const type2 = typeAST(is3.type);
@@ -18019,7 +18038,7 @@ var mapBoth5 = /* @__PURE__ */ dual(2, (self, options3) => {
     onRight: options3.onSuccess
   }) : mapBoth4(self, options3);
 });
-var orElse6 = /* @__PURE__ */ dual(2, (self, f) => {
+var orElse7 = /* @__PURE__ */ dual(2, (self, f) => {
   return isEither3(self) ? match(self, {
     onLeft: f,
     onRight: right2
@@ -18078,7 +18097,7 @@ var goMemo = (ast, isDecoding) => {
   const parseOptionsAnnotation = getParseOptionsAnnotation(ast);
   const parserWithOptions = isSome2(parseOptionsAnnotation) ? (i, options3) => raw(i, mergeInternalOptions(options3, parseOptionsAnnotation.value)) : raw;
   const decodingFallbackAnnotation = getDecodingFallbackAnnotation(ast);
-  const parser = isDecoding && isSome2(decodingFallbackAnnotation) ? (i, options3) => handleForbidden(orElse6(parserWithOptions(i, options3), decodingFallbackAnnotation.value), ast, i, options3) : parserWithOptions;
+  const parser = isDecoding && isSome2(decodingFallbackAnnotation) ? (i, options3) => handleForbidden(orElse7(parserWithOptions(i, options3), decodingFallbackAnnotation.value), ast, i, options3) : parserWithOptions;
   memoMap.set(ast, parser);
   return parser;
 };
@@ -18092,7 +18111,7 @@ var go = (ast, isDecoding) => {
         return (i, options3) => {
           options3 = options3 ?? defaultParseOption;
           const allErrors = options3?.errors === "all";
-          const result = flatMap10(orElse6(from(i, options3), (ef) => {
+          const result = flatMap10(orElse7(from(i, options3), (ef) => {
             const issue = new Refinement2(ast, i, "From", ef);
             if (allErrors && hasStableFilter(ast) && isComposite2(ef)) {
               return match2(ast.filter(i, options3, ast), {
@@ -21839,14 +21858,14 @@ var ToPropertySignature = class extends OptionalType {
     this.defaultValue = defaultValue;
   }
 };
-var formatPropertyKey2 = (p2) => {
-  if (p2 === void 0) {
+var formatPropertyKey2 = (p3) => {
+  if (p3 === void 0) {
     return "never";
   }
-  if (isString(p2)) {
-    return JSON.stringify(p2);
+  if (isString(p3)) {
+    return JSON.stringify(p3);
   }
-  return String(p2);
+  return String(p3);
 };
 var PropertySignatureTransformation2 = class {
   from;
@@ -22412,7 +22431,7 @@ var TaggedError2 = (identifier2) => (tag4, fieldsOr, annotations2) => {
   if (!hasMessageField) {
     Object.defineProperty(TaggedErrorClass.prototype, "message", {
       get() {
-        return `{ ${Reflect.ownKeys(fields).map((p2) => `${formatPropertyKey(p2)}: ${formatUnknown(this[p2])}`).join(", ")} }`;
+        return `{ ${Reflect.ownKeys(fields).map((p3) => `${formatPropertyKey(p3)}: ${formatUnknown(this[p3])}`).join(", ")} }`;
       },
       enumerable: false,
       // mirrors the built-in Error.prototype.message, whose descriptor is also non-enumerable
@@ -22596,7 +22615,7 @@ var makeClass = ({
   if (disableToString !== true) {
     Object.defineProperty(klass.prototype, "toString", {
       value() {
-        return `${identifier2}({ ${Reflect.ownKeys(fields).map((p2) => `${formatPropertyKey(p2)}: ${formatUnknown(this[p2])}`).join(", ")} })`;
+        return `${identifier2}({ ${Reflect.ownKeys(fields).map((p3) => `${formatPropertyKey(p3)}: ${formatUnknown(this[p3])}`).join(", ")} })`;
       },
       configurable: true,
       writable: true
@@ -23149,7 +23168,7 @@ var makePredicate = (pattern2) => {
       return true;
     };
   } else if (pattern2 !== null && typeof pattern2 === "object") {
-    const keysAndPredicates = Object.entries(pattern2).map(([k, p2]) => [k, makePredicate(p2)]);
+    const keysAndPredicates = Object.entries(pattern2).map(([k, p3]) => [k, makePredicate(p3)]);
     const len = keysAndPredicates.length;
     return (u) => {
       if (typeof u !== "object" || u === null) {
@@ -23168,7 +23187,7 @@ var makePredicate = (pattern2) => {
 };
 var value3 = (i) => makeValueMatcher(i, left2(i));
 var when4 = (pattern2, f) => (self) => self.add(makeWhen(makePredicate(pattern2), f));
-var orElse11 = (f) => (self) => {
+var orElse12 = (f) => (self) => {
   const result = either6(self);
   if (isEither2(result)) {
     return result._tag === "Right" ? result.right : f(result.left);
@@ -23210,7 +23229,7 @@ var either6 = (self) => {
 // node_modules/.pnpm/effect@3.19.13/node_modules/effect/dist/esm/Match.js
 var value4 = value3;
 var when5 = when4;
-var orElse12 = orElse11;
+var orElse13 = orElse12;
 
 // node_modules/.pnpm/@effect+cli@0.73.0_@effect+platform@0.94.0_@effect+printer-ansi@0.47.0_@effect+printer@0.47.0_effect@3.19.13/node_modules/@effect/cli/dist/esm/internal/prompt/ansi-utils.js
 var defaultFigures = {
@@ -23245,7 +23264,7 @@ var windowsFigures = {
   line: /* @__PURE__ */ text3("\u2500"),
   pointer: /* @__PURE__ */ text3(">")
 };
-var figures = /* @__PURE__ */ map17(/* @__PURE__ */ sync4(() => process.platform === "win32"), (isWindows) => isWindows ? windowsFigures : defaultFigures);
+var figures = /* @__PURE__ */ map17(/* @__PURE__ */ sync4(() => process.platform === "win32"), (isWindows2) => isWindows2 ? windowsFigures : defaultFigures);
 function eraseText(text10, columns) {
   if (columns === 0) {
     return cat2(eraseLine3, cursorTo3(0));
@@ -23294,7 +23313,7 @@ function renderError(state, pointer) {
     onSome: (error4) => {
       const errorLines = error4.split(NEWLINE_REGEX);
       if (isNonEmptyReadonlyArray(errorLines)) {
-        const annotateLine = (line4) => annotate2(text3(line4), combine10(italicized2, red4));
+        const annotateLine = (line4) => annotate2(text3(line4), combine11(italicized2, red4));
         const prefix = cat2(annotate2(pointer, red4), space2);
         const lines3 = map4(errorLines, (str) => annotateLine(str));
         return cursorSavePosition3.pipe(cat2(hardLine2), cat2(prefix), cat2(align2(vsep2(lines3))), cat2(cursorRestorePosition3));
@@ -23307,7 +23326,7 @@ function renderParts(state, submitted = false) {
   return reduce(state.dateParts, empty32, (doc, part, currentIndex) => {
     const partDoc = text3(part.toString());
     if (currentIndex === state.cursor && !submitted) {
-      const annotation = combine10(underlined2, cyanBright2);
+      const annotation = combine11(underlined2, cyanBright2);
       return cat2(doc, annotate2(partDoc, annotation));
     }
     return cat2(doc, partDoc);
@@ -23328,12 +23347,12 @@ function renderNextFrame(state, options3) {
   return gen2(function* () {
     const terminal = yield* Terminal;
     const columns = yield* terminal.columns;
-    const figures3 = yield* figures;
+    const figures4 = yield* figures;
     const leadingSymbol = annotate2(text3("?"), cyanBright2);
-    const trailingSymbol = annotate2(figures3.pointerSmall, blackBright2);
+    const trailingSymbol = annotate2(figures4.pointerSmall, blackBright2);
     const parts2 = renderParts(state);
     const promptMsg = renderOutput(leadingSymbol, trailingSymbol, parts2, options3);
-    const errorMsg = renderError(state, figures3.pointerSmall);
+    const errorMsg = renderError(state, figures4.pointerSmall);
     return cursorHide3.pipe(cat2(promptMsg), cat2(errorMsg), optimize3(Deep), render3({
       style: "pretty",
       options: {
@@ -23346,9 +23365,9 @@ function renderSubmission(state, options3) {
   return gen2(function* () {
     const terminal = yield* Terminal;
     const columns = yield* terminal.columns;
-    const figures3 = yield* figures;
-    const leadingSymbol = annotate2(figures3.tick, green3);
-    const trailingSymbol = annotate2(figures3.ellipsis, blackBright2);
+    const figures4 = yield* figures;
+    const leadingSymbol = annotate2(figures4.tick, green3);
+    const trailingSymbol = annotate2(figures4.ellipsis, blackBright2);
     const parts2 = renderParts(state, true);
     const promptMsg = renderOutput(leadingSymbol, trailingSymbol, parts2, options3);
     return promptMsg.pipe(cat2(hardLine2), optimize3(Deep), render3({
@@ -23687,10 +23706,10 @@ var Day = class extends DatePart {
   toString() {
     const date5 = this.date.getDate();
     const day = this.date.getDay();
-    return value4(this.token).pipe(when5("DD", () => `${date5}`.padStart(2, "0")), when5("Do", () => `${date5}${this.ordinalIndicator(date5)}`), when5("d", () => `${day + 1}`), when5("ddd", () => this.locales.weekdaysShort[day]), when5("dddd", () => this.locales.weekdays[day]), orElse12(() => `${date5}`));
+    return value4(this.token).pipe(when5("DD", () => `${date5}`.padStart(2, "0")), when5("Do", () => `${date5}${this.ordinalIndicator(date5)}`), when5("d", () => `${day + 1}`), when5("ddd", () => this.locales.weekdaysShort[day]), when5("dddd", () => this.locales.weekdays[day]), orElse13(() => `${date5}`));
   }
   ordinalIndicator(day) {
-    return value4(day % 10).pipe(when5(1, () => "st"), when5(2, () => "nd"), when5(3, () => "rd"), orElse12(() => "th"));
+    return value4(day % 10).pipe(when5(1, () => "st"), when5(2, () => "nd"), when5(3, () => "rd"), orElse13(() => "th"));
   }
 };
 var Month = class extends DatePart {
@@ -23706,7 +23725,7 @@ var Month = class extends DatePart {
   }
   toString() {
     const month = this.date.getMonth();
-    return value4(this.token.length).pipe(when5(2, () => `${month + 1}`.padStart(2, "0")), when5(3, () => this.locales.monthsShort[month]), when5(4, () => this.locales.months[month]), orElse12(() => `${month + 1}`));
+    return value4(this.token.length).pipe(when5(2, () => `${month + 1}`.padStart(2, "0")), when5(3, () => this.locales.monthsShort[month]), when5(4, () => this.locales.months[month]), orElse13(() => `${month + 1}`));
   }
 };
 var Year = class extends DatePart {
@@ -24296,25 +24315,25 @@ function renderPrompt(confirm3, message, leadingSymbol, trailingSymbol) {
     }
   });
 }
-function renderPrefix(state, toDisplay, currentIndex, length3, figures3) {
+function renderPrefix(state, toDisplay, currentIndex, length3, figures4) {
   let prefix = space2;
   if (currentIndex === toDisplay.startIndex && toDisplay.startIndex > 0) {
-    prefix = figures3.arrowUp;
+    prefix = figures4.arrowUp;
   } else if (currentIndex === toDisplay.endIndex - 1 && toDisplay.endIndex < length3) {
-    prefix = figures3.arrowDown;
+    prefix = figures4.arrowDown;
   }
-  return state.cursor === currentIndex ? figures3.pointer.pipe(annotate2(cyanBright2), cat2(prefix)) : prefix.pipe(cat2(space2));
+  return state.cursor === currentIndex ? figures4.pointer.pipe(annotate2(cyanBright2), cat2(prefix)) : prefix.pipe(cat2(space2));
 }
 function renderFileName(file5, isSelected) {
-  return isSelected ? annotate2(text3(file5), combine10(underlined2, cyanBright2)) : text3(file5);
+  return isSelected ? annotate2(text3(file5), combine11(underlined2, cyanBright2)) : text3(file5);
 }
-function renderFiles(state, files, figures3, options3) {
+function renderFiles(state, files, figures4, options3) {
   const length3 = files.length;
   const toDisplay = entriesToDisplay(state.cursor, length3, options3.maxPerPage);
   const documents = [];
   for (let index = toDisplay.startIndex; index < toDisplay.endIndex; index++) {
     const isSelected = state.cursor === index;
-    const prefix = renderPrefix(state, toDisplay, index, length3, figures3);
+    const prefix = renderPrefix(state, toDisplay, index, length3, figures4);
     const fileName = renderFileName(files[index], isSelected);
     documents.push(cat2(prefix, fileName));
   }
@@ -24325,14 +24344,14 @@ function renderNextFrame2(state, options3) {
     const path2 = yield* Path2;
     const terminal = yield* Terminal;
     const columns = yield* terminal.columns;
-    const figures3 = yield* figures;
+    const figures4 = yield* figures;
     const currentPath = yield* resolveCurrentPath(state.path, options3);
     const selectedPath = state.files[state.cursor];
     const resolvedPath = path2.resolve(currentPath, selectedPath);
-    const resolvedPathMsg = figures3.pointerSmall.pipe(cat2(space2), cat2(text3(resolvedPath)), annotate2(blackBright2));
+    const resolvedPathMsg = figures4.pointerSmall.pipe(cat2(space2), cat2(text3(resolvedPath)), annotate2(blackBright2));
     if (showConfirmation(state.confirm)) {
       const leadingSymbol2 = annotate2(text3("?"), cyanBright2);
-      const trailingSymbol2 = annotate2(figures3.pointerSmall, blackBright2);
+      const trailingSymbol2 = annotate2(figures4.pointerSmall, blackBright2);
       const confirm3 = annotate2(text3("(Y/n)"), blackBright2);
       const promptMsg2 = renderPrompt(confirm3, CONFIRM_MESSAGE, leadingSymbol2, trailingSymbol2);
       return cursorHide3.pipe(cat2(promptMsg2), cat2(hardLine2), cat2(resolvedPathMsg), optimize3(Deep), render3({
@@ -24342,10 +24361,10 @@ function renderNextFrame2(state, options3) {
         }
       }));
     }
-    const leadingSymbol = annotate2(figures3.tick, green3);
-    const trailingSymbol = annotate2(figures3.ellipsis, blackBright2);
+    const leadingSymbol = annotate2(figures4.tick, green3);
+    const trailingSymbol = annotate2(figures4.ellipsis, blackBright2);
     const promptMsg = renderPrompt(empty32, options3.message, leadingSymbol, trailingSymbol);
-    const files = renderFiles(state, state.files, figures3, options3);
+    const files = renderFiles(state, state.files, figures4, options3);
     return cursorHide3.pipe(cat2(promptMsg), cat2(hardLine2), cat2(resolvedPathMsg), cat2(hardLine2), cat2(files), optimize3(Deep), render3({
       style: "pretty",
       options: {
@@ -24358,9 +24377,9 @@ function renderSubmission2(value5, options3) {
   return gen2(function* () {
     const terminal = yield* Terminal;
     const columns = yield* terminal.columns;
-    const figures3 = yield* figures;
-    const leadingSymbol = annotate2(figures3.tick, green3);
-    const trailingSymbol = annotate2(figures3.ellipsis, blackBright2);
+    const figures4 = yield* figures;
+    const leadingSymbol = annotate2(figures4.tick, green3);
+    const trailingSymbol = annotate2(figures4.ellipsis, blackBright2);
     const promptMsg = renderPrompt(empty32, options3.message, leadingSymbol, trailingSymbol);
     return promptMsg.pipe(cat2(space2), cat2(annotate2(text3(value5), white4)), cat2(hardLine2), render3({
       style: "pretty",
@@ -24545,7 +24564,7 @@ ${error4}`, columns)))
 }
 function renderInput(state, submitted) {
   const annotation = match2(state.error, {
-    onNone: () => combine10(underlined2, cyanBright2),
+    onNone: () => combine11(underlined2, cyanBright2),
     onSome: () => red4
   });
   const value5 = state.value === "" ? empty32 : text3(`${state.value}`);
@@ -24558,7 +24577,7 @@ function renderError2(state, pointer) {
     onSome: (error4) => match3(error4.split(NEWLINE_REGEX3), {
       onEmpty: () => empty32,
       onNonEmpty: (errorLines) => {
-        const annotateLine = (line4) => annotate2(text3(line4), combine10(italicized2, red4));
+        const annotateLine = (line4) => annotate2(text3(line4), combine11(italicized2, red4));
         const prefix = cat2(annotate2(pointer, red4), space2);
         const lines3 = map4(errorLines, (str) => annotateLine(str));
         return cursorSavePosition3.pipe(cat2(hardLine2), cat2(prefix), cat2(align2(vsep2(lines3))), cat2(cursorRestorePosition3));
@@ -24581,10 +24600,10 @@ function renderNextFrame3(state, options3) {
   return gen2(function* () {
     const terminal = yield* Terminal;
     const columns = yield* terminal.columns;
-    const figures3 = yield* figures;
+    const figures4 = yield* figures;
     const leadingSymbol = annotate2(text3("?"), cyanBright2);
-    const trailingSymbol = annotate2(figures3.pointerSmall, blackBright2);
-    const errorMsg = renderError2(state, figures3.pointerSmall);
+    const trailingSymbol = annotate2(figures4.pointerSmall, blackBright2);
+    const errorMsg = renderError2(state, figures4.pointerSmall);
     const promptMsg = renderOutput2(state, leadingSymbol, trailingSymbol, options3);
     return promptMsg.pipe(cat2(errorMsg), optimize3(Deep), render3({
       style: "pretty",
@@ -24598,9 +24617,9 @@ function renderSubmission3(nextState, options3) {
   return gen2(function* () {
     const terminal = yield* Terminal;
     const columns = yield* terminal.columns;
-    const figures3 = yield* figures;
-    const leadingSymbol = annotate2(figures3.tick, green3);
-    const trailingSymbol = annotate2(figures3.ellipsis, blackBright2);
+    const figures4 = yield* figures;
+    const leadingSymbol = annotate2(figures4.tick, green3);
+    const trailingSymbol = annotate2(figures4.ellipsis, blackBright2);
     const promptMsg = renderOutput2(nextState, leadingSymbol, trailingSymbol, options3, true);
     return promptMsg.pipe(cat2(hardLine2), optimize3(Deep), render3({
       style: "pretty",
@@ -24869,25 +24888,25 @@ function renderOutput3(leadingSymbol, trailingSymbol, options3) {
     }
   });
 }
-function renderChoicePrefix(state, choices, toDisplay, currentIndex, figures3) {
+function renderChoicePrefix(state, choices, toDisplay, currentIndex, figures4) {
   let prefix = space2;
   if (currentIndex === toDisplay.startIndex && toDisplay.startIndex > 0) {
-    prefix = figures3.arrowUp;
+    prefix = figures4.arrowUp;
   } else if (currentIndex === toDisplay.endIndex - 1 && toDisplay.endIndex < choices.length) {
-    prefix = figures3.arrowDown;
+    prefix = figures4.arrowDown;
   }
   if (choices[currentIndex].disabled) {
-    const annotation = combine10(bold2, blackBright2);
-    return state === currentIndex ? figures3.pointer.pipe(annotate2(annotation), cat2(prefix)) : prefix.pipe(cat2(space2));
+    const annotation = combine11(bold2, blackBright2);
+    return state === currentIndex ? figures4.pointer.pipe(annotate2(annotation), cat2(prefix)) : prefix.pipe(cat2(space2));
   }
-  return state === currentIndex ? figures3.pointer.pipe(annotate2(cyanBright2), cat2(prefix)) : prefix.pipe(cat2(space2));
+  return state === currentIndex ? figures4.pointer.pipe(annotate2(cyanBright2), cat2(prefix)) : prefix.pipe(cat2(space2));
 }
 function renderChoiceTitle(choice4, isSelected) {
   const title = text3(choice4.title);
   if (isSelected) {
-    return choice4.disabled ? annotate2(title, combine10(underlined2, blackBright2)) : annotate2(title, combine10(underlined2, cyanBright2));
+    return choice4.disabled ? annotate2(title, combine11(underlined2, blackBright2)) : annotate2(title, combine11(underlined2, cyanBright2));
   }
-  return choice4.disabled ? annotate2(title, combine10(strikethrough2, blackBright2)) : title;
+  return choice4.disabled ? annotate2(title, combine11(strikethrough2, blackBright2)) : title;
 }
 function renderChoiceDescription(choice4, isSelected) {
   if (!choice4.disabled && choice4.description && isSelected) {
@@ -24895,14 +24914,14 @@ function renderChoiceDescription(choice4, isSelected) {
   }
   return empty32;
 }
-function renderChoices(state, options3, figures3) {
+function renderChoices(state, options3, figures4) {
   const choices = options3.choices;
   const toDisplay = entriesToDisplay(state, choices.length, options3.maxPerPage);
   const documents = [];
   for (let index = toDisplay.startIndex; index < toDisplay.endIndex; index++) {
     const choice4 = choices[index];
     const isSelected = state === index;
-    const prefix = renderChoicePrefix(state, choices, toDisplay, index, figures3);
+    const prefix = renderChoicePrefix(state, choices, toDisplay, index, figures4);
     const title = renderChoiceTitle(choice4, isSelected);
     const description = renderChoiceDescription(choice4, isSelected);
     documents.push(prefix.pipe(cat2(title), cat2(space2), cat2(description)));
@@ -24913,10 +24932,10 @@ function renderNextFrame4(state, options3) {
   return gen2(function* () {
     const terminal = yield* Terminal;
     const columns = yield* terminal.columns;
-    const figures3 = yield* figures;
-    const choices = renderChoices(state, options3, figures3);
+    const figures4 = yield* figures;
+    const choices = renderChoices(state, options3, figures4);
     const leadingSymbol = annotate2(text3("?"), cyanBright2);
-    const trailingSymbol = annotate2(figures3.pointerSmall, blackBright2);
+    const trailingSymbol = annotate2(figures4.pointerSmall, blackBright2);
     const promptMsg = renderOutput3(leadingSymbol, trailingSymbol, options3);
     return cursorHide3.pipe(cat2(promptMsg), cat2(hardLine2), cat2(choices), render3({
       style: "pretty",
@@ -24930,10 +24949,10 @@ function renderSubmission4(state, options3) {
   return gen2(function* () {
     const terminal = yield* Terminal;
     const columns = yield* terminal.columns;
-    const figures3 = yield* figures;
+    const figures4 = yield* figures;
     const selected = text3(options3.choices[state].title);
-    const leadingSymbol = annotate2(figures3.tick, green3);
-    const trailingSymbol = annotate2(figures3.ellipsis, blackBright2);
+    const leadingSymbol = annotate2(figures4.tick, green3);
+    const trailingSymbol = annotate2(figures4.ellipsis, blackBright2);
     const promptMsg = renderOutput3(leadingSymbol, trailingSymbol, options3);
     return promptMsg.pipe(cat2(space2), cat2(annotate2(selected, white4)), cat2(hardLine2), render3({
       style: "pretty",
@@ -25094,7 +25113,7 @@ function renderInput2(nextState, options3, submitted) {
       if (nextState.value.length === 0) {
         return blackBright2;
       }
-      return combine10(underlined2, cyanBright2);
+      return combine11(underlined2, cyanBright2);
     },
     onSome: () => red4
   });
@@ -25116,7 +25135,7 @@ function renderError3(nextState, pointer) {
     onSome: (error4) => match3(error4.split(/\r?\n/), {
       onEmpty: () => empty32,
       onNonEmpty: (errorLines) => {
-        const annotateLine = (line4) => text3(line4).pipe(annotate2(combine10(italicized2, red4)));
+        const annotateLine = (line4) => text3(line4).pipe(annotate2(combine11(italicized2, red4)));
         const prefix = cat2(annotate2(pointer, red4), space2);
         const lines3 = map4(errorLines, (str) => annotateLine(str));
         return cursorSavePosition3.pipe(cat2(hardLine2), cat2(prefix), cat2(align2(vsep2(lines3))), cat2(cursorRestorePosition3));
@@ -25138,11 +25157,11 @@ function renderNextFrame5(state, options3) {
   return gen2(function* () {
     const terminal = yield* Terminal;
     const columns = yield* terminal.columns;
-    const figures3 = yield* figures;
+    const figures4 = yield* figures;
     const leadingSymbol = annotate2(text3("?"), cyanBright2);
-    const trailingSymbol = annotate2(figures3.pointerSmall, blackBright2);
+    const trailingSymbol = annotate2(figures4.pointerSmall, blackBright2);
     const promptMsg = renderOutput4(state, leadingSymbol, trailingSymbol, options3);
-    const errorMsg = renderError3(state, figures3.pointerSmall);
+    const errorMsg = renderError3(state, figures4.pointerSmall);
     const offset = state.cursor - state.value.length;
     return promptMsg.pipe(cat2(errorMsg), cat2(cursorMove3(offset)), optimize3(Deep), render3({
       style: "pretty",
@@ -25156,9 +25175,9 @@ function renderSubmission5(state, options3) {
   return gen2(function* () {
     const terminal = yield* Terminal;
     const columns = yield* terminal.columns;
-    const figures3 = yield* figures;
-    const leadingSymbol = annotate2(figures3.tick, green3);
-    const trailingSymbol = annotate2(figures3.ellipsis, blackBright2);
+    const figures4 = yield* figures;
+    const leadingSymbol = annotate2(figures4.tick, green3);
+    const trailingSymbol = annotate2(figures4.ellipsis, blackBright2);
     const promptMsg = renderOutput4(state, leadingSymbol, trailingSymbol, options3, true);
     return promptMsg.pipe(cat2(hardLine2), optimize3(Deep), render3({
       style: "pretty",
@@ -25335,7 +25354,7 @@ function handleClear6(options3) {
 }
 function renderToggle(value5, options3, submitted = false) {
   const separator = annotate2(char3("/"), blackBright2);
-  const selectedAnnotation = combine10(underlined2, submitted ? white4 : cyanBright2);
+  const selectedAnnotation = combine11(underlined2, submitted ? white4 : cyanBright2);
   const inactive = value5 ? text3(options3.inactive) : annotate2(text3(options3.inactive), selectedAnnotation);
   const active2 = value5 ? annotate2(text3(options3.active), selectedAnnotation) : text3(options3.active);
   return hsep2([active2, separator, inactive]);
@@ -25353,10 +25372,10 @@ function renderOutput5(toggle3, leadingSymbol, trailingSymbol, options3) {
 function renderNextFrame6(state, options3) {
   return gen2(function* () {
     const terminal = yield* Terminal;
-    const figures3 = yield* figures;
+    const figures4 = yield* figures;
     const columns = yield* terminal.columns;
     const leadingSymbol = annotate2(text3("?"), cyanBright2);
-    const trailingSymbol = annotate2(figures3.pointerSmall, blackBright2);
+    const trailingSymbol = annotate2(figures4.pointerSmall, blackBright2);
     const toggle3 = renderToggle(state, options3);
     const promptMsg = renderOutput5(toggle3, leadingSymbol, trailingSymbol, options3);
     return cursorHide3.pipe(cat2(promptMsg), optimize3(Deep), render3({
@@ -25370,10 +25389,10 @@ function renderNextFrame6(state, options3) {
 function renderSubmission6(value5, options3) {
   return gen2(function* () {
     const terminal = yield* Terminal;
-    const figures3 = yield* figures;
+    const figures4 = yield* figures;
     const columns = yield* terminal.columns;
-    const leadingSymbol = annotate2(figures3.tick, green3);
-    const trailingSymbol = annotate2(figures3.ellipsis, blackBright2);
+    const leadingSymbol = annotate2(figures4.tick, green3);
+    const trailingSymbol = annotate2(figures4.ellipsis, blackBright2);
     const toggle3 = renderToggle(value5, options3, true);
     const promptMsg = renderOutput5(toggle3, leadingSymbol, trailingSymbol, options3);
     return promptMsg.pipe(cat2(hardLine2), optimize3(Deep), render3({
@@ -26106,7 +26125,7 @@ var boolean4 = (name, options3) => {
     const head5 = headNonEmpty(negationNames);
     const tail = tailNonEmpty(negationNames);
     const negationOption = makeSingle(head5, tail, boolean3(some2(!ifPresent)));
-    return withDefault2(orElse13(option5, negationOption), !ifPresent);
+    return withDefault2(orElse14(option5, negationOption), !ifPresent);
   }
   return withDefault2(option5, !ifPresent);
 };
@@ -26127,7 +26146,7 @@ var getHelp3 = (self) => getHelpInternal2(self);
 var getUsage = (self) => getUsageInternal(self);
 var map29 = /* @__PURE__ */ dual(2, (self, f) => makeMap(self, (a) => right2(f(a))));
 var optional3 = (self) => withDefault2(map29(self, some2), none2());
-var orElse13 = /* @__PURE__ */ dual(2, (self, that) => orElseEither4(self, that).pipe(map29(merge)));
+var orElse14 = /* @__PURE__ */ dual(2, (self, that) => orElseEither4(self, that).pipe(map29(merge)));
 var orElseEither4 = /* @__PURE__ */ dual(2, (self, that) => makeOrElse(self, that));
 var processCommandLine = /* @__PURE__ */ dual(3, (self, args3, config2) => matchOptions(args3, toParseableInstruction(self), config2).pipe(flatMap9(([error4, commandArgs, matchedOptions]) => parseInternal(self, matchedOptions, config2).pipe(catchAll2((e) => match2(error4, {
   onNone: () => fail7(e),
@@ -27588,6 +27607,7 @@ var mapEffect7 = /* @__PURE__ */ dual(2, (self, f) => {
   return op;
 });
 var parse3 = /* @__PURE__ */ dual(3, (self, args3, config2) => parseInternal2(self, args3, config2));
+var withDescription4 = /* @__PURE__ */ dual(2, (self, help) => withDescriptionInternal(self, help));
 var withSubcommands = /* @__PURE__ */ dual(2, (self, subcommands) => {
   const op = Object.create(proto23);
   op._tag = "Subcommands";
@@ -27862,6 +27882,39 @@ var splitForcedArgs = (args3) => {
   const [remainingArgs, forcedArgs] = span(args3, (str) => str !== "--");
   return [remainingArgs, drop(forcedArgs, 1)];
 };
+var withDescriptionInternal = (self, description) => {
+  switch (self._tag) {
+    case "Standard": {
+      const helpDoc = typeof description === "string" ? p2(description) : description;
+      const op = Object.create(proto23);
+      op._tag = "Standard";
+      op.name = self.name;
+      op.description = helpDoc;
+      op.options = self.options;
+      op.args = self.args;
+      return op;
+    }
+    case "GetUserInput": {
+      const helpDoc = typeof description === "string" ? p2(description) : description;
+      const op = Object.create(proto23);
+      op._tag = "GetUserInput";
+      op.name = self.name;
+      op.description = helpDoc;
+      op.prompt = self.prompt;
+      return op;
+    }
+    case "Map": {
+      return mapEffect7(withDescriptionInternal(self.command, description), self.f);
+    }
+    case "Subcommands": {
+      const op = Object.create(proto23);
+      op._tag = "Subcommands";
+      op.parent = withDescriptionInternal(self.parent, description);
+      op.children = self.children.slice();
+      return op;
+    }
+  }
+};
 var argsWizardHeader = /* @__PURE__ */ code("Args Wizard - ");
 var optionsWizardHeader = /* @__PURE__ */ code("Options Wizard - ");
 var wizardInternal4 = (self, prefix, config2) => {
@@ -28354,6 +28407,10 @@ var makeDescriptor = (name, config2) => {
   }) => reconstructConfigTree(tree, args4, options4));
 };
 var make57 = (name, config2 = {}, handler) => fromDescriptor(makeDescriptor(name, config2), handler);
+var mapDescriptor = /* @__PURE__ */ dual(2, (self, f) => makeDerive(self, {
+  descriptor: f(self.descriptor)
+}));
+var withDescription5 = /* @__PURE__ */ dual(2, (self, help) => mapDescriptor(self, withDescription4(help)));
 var withSubcommands2 = /* @__PURE__ */ dual(2, (self, subcommands) => {
   const command = withSubcommands(self.descriptor, map4(subcommands, (_) => [_.tag, _.descriptor]));
   const subcommandMap = reduce(subcommands, /* @__PURE__ */ new Map(), (handlers, subcommand) => {
@@ -28387,6 +28444,7 @@ var run7 = /* @__PURE__ */ dual(2, (self, config2) => {
 
 // node_modules/.pnpm/@effect+cli@0.73.0_@effect+platform@0.94.0_@effect+printer-ansi@0.47.0_@effect+printer@0.47.0_effect@3.19.13/node_modules/@effect/cli/dist/esm/Command.js
 var make58 = make57;
+var withDescription6 = withDescription5;
 var withSubcommands3 = withSubcommands2;
 var run8 = run7;
 
@@ -29731,7 +29789,7 @@ var make63 = () => acquireRelease2(map17(make38(), (deferred) => unsafeMake8(/*
     _tag: "Closed"
   };
   const fibers = state.backing;
-  return interruptAllAs2(fibers, combine3(parent.id(), internalFiberId)).pipe(intoDeferred2(set7.deferred));
+  return interruptAllAs2(fibers, combine4(parent.id(), internalFiberId)).pipe(intoDeferred2(set7.deferred));
 }));
 var internalFiberIdId = -1;
 var internalFiberId = /* @__PURE__ */ make15(internalFiberIdId, 0);
@@ -29745,7 +29803,7 @@ var isInternalInterruption = /* @__PURE__ */ reduceWithContext3(void 0, {
 });
 var unsafeAdd = /* @__PURE__ */ dual((args3) => isFiberSet(args3[0]), (self, fiber, options3) => {
   if (self.state._tag === "Closed") {
-    fiber.unsafeInterruptAsFork(combine3(options3?.interruptAs ?? none4, internalFiberId));
+    fiber.unsafeInterruptAsFork(combine4(options3?.interruptAs ?? none4, internalFiberId));
     return;
   } else if (self.state.backing.has(fiber)) {
     return;
@@ -30361,13 +30419,13 @@ var match17 = (fa, opts) => {
   nano[contE] = opts.onFailure;
   return nano;
 };
-var orElse14 = (f) => (fa) => {
+var orElse15 = (f) => (fa) => {
   const nano = Object.create(MatchProto);
   nano[args2] = fa;
   nano[contE] = (_) => _ instanceof NanoDefectException ? fail18(_) : f(_);
   return nano;
 };
-var firstSuccessOf2 = (arr) => arr.slice(1).reduce((arr2, fa) => orElse14(() => fa)(arr2), arr[0]);
+var firstSuccessOf2 = (arr) => arr.slice(1).reduce((arr2, fa) => orElse15(() => fa)(arr2), arr[0]);
 var ProvideServiceProto = {
   ...PrimitiveProto,
   [evaluate2](fiber) {
@@ -30433,9 +30491,9 @@ var CachedProto = {
   }
 };
 function cachedBy(fa, type2, lookupKey) {
-  return (...p2) => {
+  return (...p3) => {
     const nano = Object.create(CachedProto);
-    nano[args2] = [fa(...p2), type2, lookupKey(...p2)];
+    nano[args2] = [fa(...p3), type2, lookupKey(...p3)];
     return nano;
   };
 }
@@ -31334,6 +31392,8 @@ var check2 = make58(
       }
     }
   })
+).pipe(
+  withDescription6("Check if the typescript package is patched with the effect-language-service.")
 );
 
 // src/cli/codegen.ts
@@ -31675,17 +31735,17 @@ var createDiagnosticExecutor = fn2("LSP.createCommentDirectivesProcessor")(
   }
 );
 var cyrb53 = (str, seed = 0) => {
-  let h12 = 3735928559 ^ seed, h2 = 1103547991 ^ seed;
+  let h12 = 3735928559 ^ seed, h22 = 1103547991 ^ seed;
   for (let i = 0, ch; i < str.length; i++) {
     ch = str.charCodeAt(i);
     h12 = Math.imul(h12 ^ ch, 2654435761);
-    h2 = Math.imul(h2 ^ ch, 1597334677);
+    h22 = Math.imul(h22 ^ ch, 1597334677);
   }
   h12 = Math.imul(h12 ^ h12 >>> 16, 2246822507);
-  h12 ^= Math.imul(h2 ^ h2 >>> 13, 3266489909);
-  h2 = Math.imul(h2 ^ h2 >>> 16, 2246822507);
-  h2 ^= Math.imul(h12 ^ h12 >>> 13, 3266489909);
-  return (h2 >>> 0).toString(16).padStart(8, "0") + (h12 >>> 0).toString(16).padStart(8, "0");
+  h12 ^= Math.imul(h22 ^ h22 >>> 13, 3266489909);
+  h22 = Math.imul(h22 ^ h22 >>> 16, 2246822507);
+  h22 ^= Math.imul(h12 ^ h12 >>> 13, 3266489909);
+  return (h22 >>> 0).toString(16).padStart(8, "0") + (h12 >>> 0).toString(16).padStart(8, "0");
 };
 var CodegenNotApplicableError = class {
   constructor(cause2) {
@@ -32279,9 +32339,15 @@ function make64(ts, tsUtils, typeChecker, typeCheckerUtils, program) {
   );
   const extendsCauseYieldableError = cachedBy(
     fn2("TypeParser.extendsCauseYieldableError")(function* (givenType) {
+      if (givenType.flags & ts.TypeFlags.Never) {
+        return yield* typeParserIssue("Type is never", givenType);
+      }
+      if (givenType.flags & ts.TypeFlags.Any) {
+        return yield* typeParserIssue("Type is any", givenType);
+      }
       const symbols = yield* findSymbolsMatchingPackageAndExportedName("effect", "YieldableError")();
       for (const [symbol3, sourceFile] of symbols) {
-        const causeFile = yield* pipe(isCauseTypeSourceFile(sourceFile), orElse14(() => void_8));
+        const causeFile = yield* pipe(isCauseTypeSourceFile(sourceFile), orElse15(() => void_8));
         if (!causeFile) continue;
         const type2 = typeChecker.getDeclaredTypeOfSymbol(symbol3);
         if (!type2) continue;
@@ -32373,18 +32439,19 @@ function make64(ts, tsUtils, typeChecker, typeCheckerUtils, program) {
   );
   const effectType = cachedBy(
     fn2("TypeParser.effectType")(function* (type2, atLocation) {
-      let result = typeParserIssue("Type has no effect variance struct", type2, atLocation);
       const propertiesSymbols = typeChecker.getPropertiesOfType(type2).filter(
-        (_) => _.flags & ts.SymbolFlags.Property && !(_.flags & ts.SymbolFlags.Optional) && _.valueDeclaration && ts.isPropertySignature(_.valueDeclaration) && ts.isComputedPropertyName(_.valueDeclaration.name)
+        (_) => _.flags & ts.SymbolFlags.Property && !(_.flags & ts.SymbolFlags.Optional) && _.valueDeclaration
       );
+      if (propertiesSymbols.length === 0) {
+        return yield* typeParserIssue("Type has no effect variance struct", type2, atLocation);
+      }
       propertiesSymbols.sort(
         (a, b) => ts.symbolName(b).indexOf("EffectTypeId") - ts.symbolName(a).indexOf("EffectTypeId")
       );
-      for (const propertySymbol of propertiesSymbols) {
+      return yield* firstSuccessOf2(propertiesSymbols.map((propertySymbol) => {
         const propertyType = typeChecker.getTypeOfSymbolAtLocation(propertySymbol, atLocation);
-        result = pipe(result, orElse14(() => effectVarianceStruct(propertyType, atLocation)));
-      }
-      return yield* result;
+        return effectVarianceStruct(propertyType, atLocation);
+      }));
     }),
     "TypeParser.effectType",
     (type2) => type2
@@ -32423,22 +32490,18 @@ function make64(ts, tsUtils, typeChecker, typeCheckerUtils, program) {
     fn2("TypeParser.layerType")(function* (type2, atLocation) {
       yield* pipeableType(type2, atLocation);
       const propertiesSymbols = typeChecker.getPropertiesOfType(type2).filter(
-        (_) => _.flags & ts.SymbolFlags.Property && !(_.flags & ts.SymbolFlags.Optional) && _.valueDeclaration && ts.isPropertySignature(_.valueDeclaration) && ts.isComputedPropertyName(_.valueDeclaration.name)
+        (_) => _.flags & ts.SymbolFlags.Property && !(_.flags & ts.SymbolFlags.Optional) && _.valueDeclaration
       );
+      if (propertiesSymbols.length === 0) {
+        return yield* typeParserIssue("Type has no layer variance struct", type2, atLocation);
+      }
       propertiesSymbols.sort(
         (a, b) => ts.symbolName(b).indexOf("LayerTypeId") - ts.symbolName(a).indexOf("LayerTypeId")
       );
-      for (const propertySymbol of propertiesSymbols) {
+      return yield* firstSuccessOf2(propertiesSymbols.map((propertySymbol) => {
         const propertyType = typeChecker.getTypeOfSymbolAtLocation(propertySymbol, atLocation);
-        const varianceArgs = yield* option4(layerVarianceStruct(
-          propertyType,
-          atLocation
-        ));
-        if (isSome2(varianceArgs)) {
-          return varianceArgs.value;
-        }
-      }
-      return yield* typeParserIssue("Type has no layer variance struct", type2, atLocation);
+        return layerVarianceStruct(propertyType, atLocation);
+      }));
     }),
     "TypeParser.layerType",
     (type2) => type2
@@ -32735,20 +32798,16 @@ function make64(ts, tsUtils, typeChecker, typeCheckerUtils, program) {
       const ast = typeChecker.getPropertyOfType(type2, "ast");
       if (!ast) return yield* typeParserIssue("Has no 'ast' property", type2, atLocation);
       const propertiesSymbols = typeChecker.getPropertiesOfType(type2).filter(
-        (_) => _.flags & ts.SymbolFlags.Property && !(_.flags & ts.SymbolFlags.Optional) && _.valueDeclaration && ts.isPropertySignature(_.valueDeclaration) && ts.isComputedPropertyName(_.valueDeclaration.name)
+        (_) => _.flags & ts.SymbolFlags.Property && !(_.flags & ts.SymbolFlags.Optional) && _.valueDeclaration
       );
+      if (propertiesSymbols.length === 0) {
+        return yield* typeParserIssue("Type has no schema variance struct", type2, atLocation);
+      }
       propertiesSymbols.sort((a, b) => ts.symbolName(b).indexOf("TypeId") - ts.symbolName(a).indexOf("TypeId"));
-      for (const propertySymbol of propertiesSymbols) {
+      return yield* firstSuccessOf2(propertiesSymbols.map((propertySymbol) => {
         const propertyType = typeChecker.getTypeOfSymbolAtLocation(propertySymbol, atLocation);
-        const varianceArgs = yield* option4(effectSchemaVarianceStruct(
-          propertyType,
-          atLocation
-        ));
-        if (isSome2(varianceArgs)) {
-          return varianceArgs.value;
-        }
-      }
-      return yield* typeParserIssue("Type has no schema variance struct", type2, atLocation);
+        return effectSchemaVarianceStruct(propertyType, atLocation);
+      }));
     }),
     "TypeParser.effectSchemaType",
     (type2) => type2
@@ -32784,33 +32843,54 @@ function make64(ts, tsUtils, typeChecker, typeCheckerUtils, program) {
     fn2("TypeParser.contextTag")(function* (type2, atLocation) {
       yield* pipeableType(type2, atLocation);
       const propertiesSymbols = typeChecker.getPropertiesOfType(type2).filter(
-        (_) => _.flags & ts.SymbolFlags.Property && !(_.flags & ts.SymbolFlags.Optional) && _.valueDeclaration && ts.isPropertySignature(_.valueDeclaration) && ts.isComputedPropertyName(_.valueDeclaration.name)
+        (_) => _.flags & ts.SymbolFlags.Property && !(_.flags & ts.SymbolFlags.Optional) && _.valueDeclaration
       );
+      if (propertiesSymbols.length === 0) {
+        return yield* typeParserIssue("Type has no tag variance struct", type2, atLocation);
+      }
       propertiesSymbols.sort((a, b) => ts.symbolName(b).indexOf("TypeId") - ts.symbolName(a).indexOf("TypeId"));
-      for (const propertySymbol of propertiesSymbols) {
+      return yield* firstSuccessOf2(propertiesSymbols.map((propertySymbol) => {
         const propertyType = typeChecker.getTypeOfSymbolAtLocation(propertySymbol, atLocation);
-        const varianceArgs = yield* option4(contextTagVarianceStruct(
-          propertyType,
-          atLocation
-        ));
-        if (isSome2(varianceArgs)) {
-          return varianceArgs.value;
-        }
-      }
-      return yield* typeParserIssue("Type has no tag variance struct", type2, atLocation);
+        return contextTagVarianceStruct(propertyType, atLocation);
+      }));
     }),
     "TypeParser.contextTag",
     (type2) => type2
   );
+  const effectFunctionImportedName = cachedBy(
+    fn2("TypeParser.effectFunctionImportedName")(function* (sourceFile) {
+      return tsUtils.findImportedModuleIdentifierByPackageAndNameOrBarrel(sourceFile, "effect", "Function");
+    }),
+    "TypeParser.effectFunctionImportedName",
+    (node) => node
+  );
   const pipeCall = cachedBy(
     function(node) {
       if (ts.isCallExpression(node) && ts.isPropertyAccessExpression(node.expression) && ts.isIdentifier(node.expression.name) && ts.idText(node.expression.name) === "pipe") {
-        return succeed17({
-          node,
-          subject: node.expression.expression,
-          args: Array.from(node.arguments),
-          kind: "pipeable"
-        });
+        const baseExpression = node.expression.expression;
+        return pipe(
+          effectFunctionImportedName(tsUtils.getSourceFileOfNode(node)),
+          flatMap18((functionIdentifier) => {
+            if (functionIdentifier && ts.isIdentifier(baseExpression) && ts.idText(baseExpression) === functionIdentifier) {
+              if (node.arguments.length === 0) {
+                return typeParserIssue("Node is not a pipe call", void 0, node);
+              }
+              const [subject, ...args3] = node.arguments;
+              return succeed17({
+                node,
+                subject,
+                args: args3,
+                kind: "pipe"
+              });
+            }
+            return succeed17({
+              node,
+              subject: baseExpression,
+              args: Array.from(node.arguments),
+              kind: "pipeable"
+            });
+          })
+        );
       }
       if (ts.isCallExpression(node) && ts.isIdentifier(node.expression) && ts.idText(node.expression) === "pipe" && node.arguments.length > 0) {
         const [subject, ...args3] = node.arguments;
@@ -32825,17 +32905,10 @@ function make64(ts, tsUtils, typeChecker, typeCheckerUtils, program) {
     fn2("TypeParser.scopeType")(function* (type2, atLocation) {
       yield* pipeableType(type2, atLocation);
       const propertiesSymbols = typeChecker.getPropertiesOfType(type2).filter(
-        (_) => _.flags & ts.SymbolFlags.Property && !(_.flags & ts.SymbolFlags.Optional) && _.valueDeclaration && ts.isPropertySignature(_.valueDeclaration) && ts.isComputedPropertyName(_.valueDeclaration.name)
+        (_) => _.flags & ts.SymbolFlags.Property && !(_.flags & ts.SymbolFlags.Optional) && _.valueDeclaration
       );
-      propertiesSymbols.sort(
-        (a, b) => ts.symbolName(b).indexOf("ScopeTypeId") - ts.symbolName(a).indexOf("ScopeTypeId")
-      );
-      for (const propertySymbol of propertiesSymbols) {
-        const computedPropertyExpression = propertySymbol.valueDeclaration.name;
-        const symbol3 = typeChecker.getSymbolAtLocation(computedPropertyExpression.expression);
-        if (symbol3 && ts.symbolName(symbol3) === "ScopeTypeId") {
-          return type2;
-        }
+      if (propertiesSymbols.some((s) => ts.symbolName(s).indexOf("ScopeTypeId") !== -1)) {
+        return type2;
       }
       return yield* typeParserIssue("Type has no scope type id", type2, atLocation);
     }),
@@ -33341,12 +33414,38 @@ function make64(ts, tsUtils, typeChecker, typeCheckerUtils, program) {
     "TypeParser.extendsEffectSqlModelClass",
     (atLocation) => atLocation
   );
+  const isEffectLayerTypeSourceFile = cachedBy(
+    fn2("TypeParser.isEffectLayerTypeSourceFile")(function* (sourceFile) {
+      const moduleSymbol = typeChecker.getSymbolAtLocation(sourceFile);
+      if (!moduleSymbol) return yield* typeParserIssue("Node has no symbol", void 0, sourceFile);
+      const layerTypeSymbol = typeChecker.tryGetMemberInModuleExports("Layer", moduleSymbol);
+      if (!layerTypeSymbol) return yield* typeParserIssue("Layer type not found", void 0, sourceFile);
+      const type2 = typeChecker.getDeclaredTypeOfSymbol(layerTypeSymbol);
+      yield* layerType(type2, sourceFile);
+      return sourceFile;
+    }),
+    "TypeParser.isEffectLayerTypeSourceFile",
+    (sourceFile) => sourceFile
+  );
+  const isNodeReferenceToEffectLayerModuleApi = (memberName) => cachedBy(
+    fn2("TypeParser.isNodeReferenceToEffectLayerModuleApi")(function* (node) {
+      return yield* isNodeReferenceToExportOfPackageModule(
+        node,
+        "effect",
+        isEffectLayerTypeSourceFile,
+        memberName
+      );
+    }),
+    `TypeParser.isNodeReferenceToEffectLayerModuleApi(${memberName})`,
+    (node) => node
+  );
   return {
     isNodeReferenceToEffectModuleApi,
     isNodeReferenceToEffectSchemaModuleApi,
     isNodeReferenceToEffectDataModuleApi,
     isNodeReferenceToEffectContextModuleApi,
     isNodeReferenceToEffectSqlModelModuleApi,
+    isNodeReferenceToEffectLayerModuleApi,
     effectType,
     strictEffectType,
     layerType,
@@ -33478,7 +33577,7 @@ var generate = fn2("writeTagClassAccessors.generate")(function* (sourceFile, ser
       );
       return succeed17(typeNode);
     }),
-    orElse14(
+    orElse15(
       () => pipe(
         typeParser.promiseLike(type2, atLocation2),
         flatMap18(({ type: type3 }) => {
@@ -33507,7 +33606,7 @@ var generate = fn2("writeTagClassAccessors.generate")(function* (sourceFile, ser
         })
       )
     ),
-    orElse14(() => {
+    orElse15(() => {
       const successType = typeChecker.typeToTypeNode(type2, atLocation2, ts.NodeBuilderFlags.NoTruncation);
       if (!successType) return fail18("error generating success type");
       const typeNode = ts.factory.createTypeReferenceNode(
@@ -33558,8 +33657,8 @@ var generate = fn2("writeTagClassAccessors.generate")(function* (sourceFile, ser
     const allSignatures = ts.factory.createIntersectionTypeNode(callSignatures);
     const type2 = tsUtils.simplifyTypeNode(allSignatures);
     propertyDeclaration = createFunctionProperty(className, ts.symbolName(property), type2, callSignatures.length > 1);
-    const oldProperty = atLocation.members.filter(ts.isPropertyDeclaration).find((p2) => {
-      const symbol3 = typeChecker.getSymbolAtLocation(p2.name);
+    const oldProperty = atLocation.members.filter(ts.isPropertyDeclaration).find((p3) => {
+      const symbol3 = typeChecker.getSymbolAtLocation(p3.name);
       return symbol3 && ts.symbolName(symbol3) === ts.symbolName(property);
     });
     if (oldProperty) {
@@ -33580,10 +33679,12 @@ var parse5 = fn2("writeTagClassAccessors.parse")(function* (node) {
   const typeParser = yield* service2(TypeParser);
   const typeCheckerUtils = yield* service2(TypeCheckerUtils);
   if (!ts.isClassDeclaration(node)) return yield* fail18("not a class declaration");
-  const { Service, accessors: accessors2, className } = yield* pipe(
-    typeParser.extendsEffectService(node),
-    orElse14(() => map34(typeParser.extendsEffectTag(node), (_) => ({ accessors: true, ..._ }))),
-    orElse14(() => fail18("not a class extending Effect.Service call"))
+  const { Service, accessors: accessors2, className, kind } = yield* pipe(
+    map34(typeParser.extendsEffectService(node), (_) => ({ kind: "effectService", ..._ })),
+    orElse15(
+      () => map34(typeParser.extendsEffectTag(node), (_) => ({ kind: "effectTag", accessors: true, ..._ }))
+    ),
+    orElse15(() => fail18("not a class extending Effect.Service call"))
   );
   if (accessors2 !== true) return yield* fail18("accessors are not enabled in the Effect.Service call");
   const involvedMembers = [];
@@ -33604,7 +33705,7 @@ var parse5 = fn2("writeTagClassAccessors.parse")(function* (node) {
   const hash2 = involvedMembers.map(({ property, propertyType }) => {
     return ts.symbolName(property) + ": " + typeChecker.typeToString(propertyType);
   }).concat([ts.idText(className)]).join("\n");
-  return { Service, className, atLocation: node, hash: cyrb53(hash2), involvedMembers };
+  return { Service, className, atLocation: node, hash: cyrb53(hash2), involvedMembers, kind };
 });
 var writeTagClassAccessors = createRefactor({
   name: "writeTagClassAccessors",
@@ -33631,7 +33732,7 @@ var writeTagClassAccessors = createRefactor({
     const parentNodes = tsUtils.getAncestorNodesInRange(sourceFile, textRange);
     return yield* pipe(
       firstSuccessOf2(parentNodes.map(parseNode)),
-      orElse14(() => fail18(new RefactorNotApplicableError()))
+      orElse15(() => fail18(new RefactorNotApplicableError()))
     );
   })
 });
@@ -33663,7 +33764,7 @@ var accessors = createCodegen({
           )
         })
       ),
-      orElse14((cause2) => fail18(new CodegenNotApplicableError(cause2)))
+      orElse15((cause2) => fail18(new CodegenNotApplicableError(cause2)))
     );
   })
 });
@@ -34197,7 +34298,7 @@ var process2 = fn2("StructuralSchemaGen.process")(
       if (type2) {
         const schemaType = yield* pipe(
           typeParser.effectSchemaType(type2, scope4),
-          orElse14(() => void_8)
+          orElse15(() => void_8)
         );
         if (schemaType) {
           ctx.hoistedSchemas.set(
@@ -34223,7 +34324,7 @@ var process2 = fn2("StructuralSchemaGen.process")(
         ...fromIterable(ctx.nameToType.entries()).map(
           ([name, type2]) => pipe(
             processType(type2),
-            orElse14(
+            orElse15(
               (error4) => succeed17(ts.addSyntheticLeadingComment(
                 ts.factory.createIdentifier(""),
                 ts.SyntaxKind.MultiLineCommentTrivia,
@@ -34496,7 +34597,7 @@ var codegen = make58(
               for (const { codegen: codegen2, hash: hash2, range: range3 } of codegensWithRanges) {
                 const applicable = yield* pipe(
                   getEditsForCodegen([codegen2], sourceFile, range3),
-                  orElse14(() => void_8)
+                  orElse15(() => void_8)
                 );
                 if (applicable && (applicable.hash !== hash2 || force3)) {
                   const changes2 = tsInstance.textChanges.ChangeTracker.with(
@@ -34556,6 +34657,8 @@ var codegen = make58(
 ${checkedFilesCount} checked and ${updatedFilesCount} updated.`
     );
   })
+).pipe(
+  withDescription6("Regenarate the outdated effect-codegens provided by the effect-language-service.")
 );
 
 // src/cli/diagnostics.ts
@@ -34594,8 +34697,8 @@ var anyUnknownInErrorContext = createDiagnostic({
           if (!type3) continue;
           const expectedEffect = yield* pipe(
             typeParser.strictEffectType(type3, node.type),
-            orElse14(() => typeParser.layerType(type3, typeNode)),
-            orElse14(() => void_8)
+            orElse15(() => typeParser.layerType(type3, typeNode)),
+            orElse15(() => void_8)
           );
           if (expectedEffect) continue;
         }
@@ -34612,7 +34715,7 @@ var anyUnknownInErrorContext = createDiagnostic({
       if (!type2) continue;
       yield* pipe(
         typeParser.strictEffectType(type2, node),
-        orElse14(() => pipe(typeParser.layerType(type2, node), map34(({ E, RIn }) => ({ E, R: RIn })))),
+        orElse15(() => pipe(typeParser.layerType(type2, node), map34(({ E, RIn }) => ({ E, R: RIn })))),
         map34((effectOrLayer) => {
           const { E, R } = effectOrLayer;
           const hasAnyUnknownR = isAnyOrUnknown(R);
@@ -34664,6 +34767,100 @@ var anyUnknownInErrorContext = createDiagnostic({
   })
 });
 
+// src/diagnostics/catchAllToMapError.ts
+var catchAllToMapError = createDiagnostic({
+  name: "catchAllToMapError",
+  code: 39,
+  description: "Suggests using Effect.mapError instead of Effect.catchAll when the callback only wraps the error with Effect.fail",
+  severity: "suggestion",
+  apply: fn2("catchAllToMapError.apply")(function* (sourceFile, report) {
+    const ts = yield* service2(TypeScriptApi);
+    const typeParser = yield* service2(TypeParser);
+    const getFunctionBody = (node) => {
+      if (ts.isArrowFunction(node)) {
+        return node.body;
+      }
+      if (ts.isFunctionExpression(node)) {
+        return node.body;
+      }
+      return void 0;
+    };
+    const getEffectFailCallInfo = (body) => {
+      return gen3(function* () {
+        if (ts.isCallExpression(body)) {
+          const isFailCall = yield* pipe(
+            typeParser.isNodeReferenceToEffectModuleApi("fail")(body.expression),
+            option4
+          );
+          if (isSome2(isFailCall) && body.arguments.length >= 1) {
+            return some2({ failCall: body, failArg: body.arguments[0] });
+          }
+        }
+        if (ts.isBlock(body)) {
+          const statements = body.statements;
+          if (statements.length === 1) {
+            const stmt = statements[0];
+            if (ts.isReturnStatement(stmt) && stmt.expression && ts.isCallExpression(stmt.expression)) {
+              const isFailCall = yield* pipe(
+                typeParser.isNodeReferenceToEffectModuleApi("fail")(stmt.expression.expression),
+                option4
+              );
+              if (isSome2(isFailCall) && stmt.expression.arguments.length >= 1) {
+                return some2({ failCall: stmt.expression, failArg: stmt.expression.arguments[0] });
+              }
+            }
+          }
+        }
+        return none2();
+      });
+    };
+    const nodeToVisit = [];
+    const appendNodeToVisit = (node) => {
+      nodeToVisit.push(node);
+      return void 0;
+    };
+    ts.forEachChild(sourceFile, appendNodeToVisit);
+    while (nodeToVisit.length > 0) {
+      const node = nodeToVisit.shift();
+      ts.forEachChild(node, appendNodeToVisit);
+      if (ts.isCallExpression(node)) {
+        const isCatchAllCall = yield* pipe(
+          typeParser.isNodeReferenceToEffectModuleApi("catchAll")(node.expression),
+          option4
+        );
+        if (isSome2(isCatchAllCall)) {
+          const callback = node.arguments[0];
+          if (!callback) continue;
+          const functionBody = getFunctionBody(callback);
+          if (!functionBody) continue;
+          const failCallInfo = yield* getEffectFailCallInfo(functionBody);
+          if (isNone2(failCallInfo)) continue;
+          const { failArg, failCall } = failCallInfo.value;
+          report({
+            location: node.expression,
+            messageText: `You can use Effect.mapError instead of Effect.catchAll + Effect.fail to transform the error type.`,
+            fixes: [{
+              fixName: "catchAllToMapError_fix",
+              description: "Replace with Effect.mapError",
+              apply: gen3(function* () {
+                const changeTracker = yield* service2(ChangeTracker);
+                if (ts.isPropertyAccessExpression(node.expression)) {
+                  changeTracker.replaceNode(
+                    sourceFile,
+                    node.expression.name,
+                    ts.factory.createIdentifier("mapError")
+                  );
+                }
+                changeTracker.replaceNode(sourceFile, failCall, failArg);
+              })
+            }]
+          });
+        }
+      }
+    }
+  })
+});
+
 // src/diagnostics/catchUnfailableEffect.ts
 var catchUnfailableEffect = createDiagnostic({
   name: "catchUnfailableEffect",
@@ -34760,14 +34957,14 @@ var classSelfMismatch = createDiagnostic({
       if (ts.isClassDeclaration(node) && node.name && node.heritageClauses) {
         const result = yield* pipe(
           typeParser.extendsEffectService(node),
-          orElse14(() => typeParser.extendsContextTag(node)),
-          orElse14(() => typeParser.extendsEffectTag(node)),
-          orElse14(() => typeParser.extendsSchemaClass(node)),
-          orElse14(() => typeParser.extendsSchemaTaggedClass(node)),
-          orElse14(() => typeParser.extendsSchemaTaggedError(node)),
-          orElse14(() => typeParser.extendsSchemaTaggedRequest(node)),
-          orElse14(() => typeParser.extendsEffectSqlModelClass(node)),
-          orElse14(() => void_8)
+          orElse15(() => typeParser.extendsContextTag(node)),
+          orElse15(() => typeParser.extendsEffectTag(node)),
+          orElse15(() => typeParser.extendsSchemaClass(node)),
+          orElse15(() => typeParser.extendsSchemaTaggedClass(node)),
+          orElse15(() => typeParser.extendsSchemaTaggedError(node)),
+          orElse15(() => typeParser.extendsSchemaTaggedRequest(node)),
+          orElse15(() => typeParser.extendsEffectSqlModelClass(node)),
+          orElse15(() => void_8)
         );
         if (result) {
           const { className, selfTypeNode } = result;
@@ -34949,19 +35146,19 @@ var deterministicKeys = createDiagnostic({
         const result = yield* pipe(
           pipe(
             typeParser.extendsEffectService(node),
-            orElse14(() => typeParser.extendsContextTag(node)),
-            orElse14(() => typeParser.extendsEffectTag(node)),
+            orElse15(() => typeParser.extendsContextTag(node)),
+            orElse15(() => typeParser.extendsEffectTag(node)),
             map34(({ className, keyStringLiteral }) => ({ keyStringLiteral, className, target: "service" }))
           ),
-          orElse14(
+          orElse15(
             () => pipe(
               typeParser.extendsDataTaggedError(node),
-              orElse14(() => typeParser.extendsSchemaTaggedError(node)),
+              orElse15(() => typeParser.extendsSchemaTaggedError(node)),
               map34(({ className, keyStringLiteral }) => ({ keyStringLiteral, className, target: "error" }))
             )
           ),
-          orElse14(() => parseExtendsCustom(node)),
-          orElse14(() => void_8)
+          orElse15(() => parseExtendsCustom(node)),
+          orElse15(() => void_8)
         );
         if (result && result.keyStringLiteral) {
           const { className, keyStringLiteral, target } = result;
@@ -35162,7 +35359,7 @@ var floatingEffect = createDiagnostic({
       if (isSome2(effect3)) {
         const allowedFloatingEffects = yield* pipe(
           typeParser.fiberType(type2, node.expression),
-          orElse14(() => typeParser.effectSubtype(type2, node.expression)),
+          orElse15(() => typeParser.effectSubtype(type2, node.expression)),
           option4
         );
         if (isNone2(allowedFloatingEffects)) {
@@ -35218,7 +35415,7 @@ var genericEffectServices = createDiagnostic({
               fixes: []
             });
           }),
-          orElse14(() => sync11(() => ts.forEachChild(node, appendNodeToVisit))),
+          orElse15(() => sync11(() => ts.forEachChild(node, appendNodeToVisit))),
           ignore3
         );
       }
@@ -35226,6 +35423,65 @@ var genericEffectServices = createDiagnostic({
   })
 });
 
+// src/diagnostics/globalErrorInEffectCatch.ts
+var globalErrorInEffectCatch = createDiagnostic({
+  name: "globalErrorInEffectCatch",
+  code: 36,
+  description: "Warns when catch callbacks return global Error type instead of typed errors",
+  severity: "warning",
+  apply: fn2("globalErrorInEffectCatch.apply")(function* (sourceFile, report) {
+    const ts = yield* service2(TypeScriptApi);
+    const typeParser = yield* service2(TypeParser);
+    const typeChecker = yield* service2(TypeCheckerApi);
+    const typeCheckerUtils = yield* service2(TypeCheckerUtils);
+    const nodeToVisit = [];
+    const appendNodeToVisit = (node) => {
+      nodeToVisit.push(node);
+      return void 0;
+    };
+    ts.forEachChild(sourceFile, appendNodeToVisit);
+    while (nodeToVisit.length > 0) {
+      const node = nodeToVisit.shift();
+      ts.forEachChild(node, appendNodeToVisit);
+      if (ts.isCallExpression(node)) {
+        const isEffectWithCatch = yield* pipe(
+          typeParser.isNodeReferenceToEffectModuleApi("tryPromise")(node.expression),
+          orElse15(() => typeParser.isNodeReferenceToEffectModuleApi("try")(node.expression)),
+          orElse15(() => typeParser.isNodeReferenceToEffectModuleApi("tryMap")(node.expression)),
+          orElse15(() => typeParser.isNodeReferenceToEffectModuleApi("tryMapPromise")(node.expression)),
+          orElse15(() => void_8)
+        );
+        if (isEffectWithCatch) {
+          const signature = typeChecker.getResolvedSignature(node);
+          if (signature) {
+            const objectType = typeChecker.getParameterType(signature, 0);
+            const catchFunctionSymbol = typeChecker.getPropertyOfType(objectType, "catch");
+            if (catchFunctionSymbol) {
+              const catchFunctionType = typeChecker.getTypeOfSymbolAtLocation(catchFunctionSymbol, node);
+              const signatures = typeChecker.getSignaturesOfType(catchFunctionType, ts.SignatureKind.Call);
+              if (signatures.length > 0) {
+                const returnType = typeChecker.getReturnTypeOfSignature(signatures[0]);
+                if (returnType && typeCheckerUtils.isGlobalErrorType(returnType)) {
+                  const nodeText = sourceFile.text.substring(
+                    ts.getTokenPosOfNode(node.expression, sourceFile),
+                    node.expression.end
+                  );
+                  report({
+                    location: node.expression,
+                    messageText: `The 'catch' callback in ${nodeText} returns the global Error type. It's not recommended to use the global Error type in Effect failures as they can get merged together.
+Instead, use tagged errors or custom errors with a discriminator property to get properly type-checked errors.`,
+                    fixes: []
+                  });
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  })
+});
+
 // src/diagnostics/globalErrorInEffectFailure.ts
 var globalErrorInEffectFailure = createDiagnostic({
   name: "globalErrorInEffectFailure",
@@ -35256,7 +35512,7 @@ var globalErrorInEffectFailure = createDiagnostic({
                 return sync11(
                   () => report({
                     location: node,
-                    messageText: `Effect.fail is called with the global Error type. It's not recommended to use the global Error type in Effect failures as they can get merged together. Instead, use tagged errors (Data.TaggedError) or custom errors with a discriminator property to get properly type-checked errors.`,
+                    messageText: `Effect.fail is called with the global Error type. It's not recommended to use the global Error type in Effect failures as they can get merged together. Instead, use tagged errors or custom errors with a discriminator property to get properly type-checked errors.`,
                     fixes: []
                   })
                 );
@@ -35411,6 +35667,119 @@ var importFromBarrel = createDiagnostic({
   })
 });
 
+// src/diagnostics/layerMergeAllWithDependencies.ts
+var layerMergeAllWithDependencies = createDiagnostic({
+  name: "layerMergeAllWithDependencies",
+  code: 37,
+  description: "Detects interdependencies in Layer.mergeAll calls where one layer provides a service that another layer requires",
+  severity: "warning",
+  apply: fn2("layerMergeAllWithDependencies.apply")(function* (sourceFile, report) {
+    const ts = yield* service2(TypeScriptApi);
+    const typeChecker = yield* service2(TypeCheckerApi);
+    const typeCheckerUtils = yield* service2(TypeCheckerUtils);
+    const typeParser = yield* service2(TypeParser);
+    const tsUtils = yield* service2(TypeScriptUtils);
+    const layerModuleIdentifier = tsUtils.findImportedModuleIdentifierByPackageAndNameOrBarrel(
+      sourceFile,
+      "effect",
+      "Layer"
+    ) || "Layer";
+    const nodeToVisit = [];
+    const appendNodeToVisit = (node) => {
+      nodeToVisit.push(node);
+      return void 0;
+    };
+    ts.forEachChild(sourceFile, appendNodeToVisit);
+    while (nodeToVisit.length > 0) {
+      const node = nodeToVisit.shift();
+      if (ts.isCallExpression(node)) {
+        const checkLayerMergeAll = yield* pipe(
+          typeParser.isNodeReferenceToEffectLayerModuleApi("mergeAll")(node.expression),
+          orElse15(() => void_8)
+        );
+        if (checkLayerMergeAll) {
+          const layerArgs = node.arguments;
+          if (layerArgs.length > 1) {
+            const layerInfos = [];
+            const actuallyProvidedMap = /* @__PURE__ */ new Map();
+            for (const arg of layerArgs) {
+              const argType = typeCheckerUtils.getTypeAtLocation(arg);
+              if (!argType) continue;
+              const layerTypeParsedOption = yield* option4(typeParser.layerType(argType, arg));
+              if (isNone2(layerTypeParsedOption)) continue;
+              const layerTypeParsed = layerTypeParsedOption.value;
+              const providedMembers = typeCheckerUtils.unrollUnionMembers(layerTypeParsed.ROut);
+              for (const providedType of providedMembers) {
+                if (providedType.flags & ts.TypeFlags.Never) continue;
+                const isPassThrough = typeChecker.isTypeAssignableTo(providedType, layerTypeParsed.RIn);
+                if (!isPassThrough) {
+                  actuallyProvidedMap.set(providedType, arg);
+                }
+              }
+              layerInfos.push({
+                arg,
+                requirementsType: layerTypeParsed.RIn
+              });
+            }
+            const providerToConsumers = /* @__PURE__ */ new Map();
+            for (const layer12 of layerInfos) {
+              for (const [providedType, providerArg] of actuallyProvidedMap) {
+                if (providerArg === layer12.arg) continue;
+                if (typeChecker.isTypeAssignableTo(providedType, layer12.requirementsType)) {
+                  const consumers = providerToConsumers.get(providerArg) || [];
+                  consumers.push({ consumer: layer12.arg, providedType });
+                  providerToConsumers.set(providerArg, consumers);
+                }
+              }
+            }
+            for (const [providerArg, consumers] of providerToConsumers) {
+              const providedTypes = Array.from(new Set(consumers.map((c) => typeChecker.typeToString(c.providedType)))).join(", ");
+              report({
+                location: providerArg,
+                messageText: `This layer provides ${providedTypes} which is required by another layer in the same Layer.mergeAll call. Layer.mergeAll creates layers in parallel, so dependencies between layers will not be satisfied. Consider moving this layer into a Layer.provideMerge after the Layer.mergeAll.`,
+                fixes: [{
+                  fixName: "layerMergeAllWithDependencies_fix",
+                  description: "Move layer to Layer.provideMerge",
+                  apply: gen3(function* () {
+                    const changeTracker = yield* service2(ChangeTracker);
+                    const providerIndex = layerArgs.indexOf(providerArg);
+                    if (providerIndex === -1) return;
+                    const providerArgNode = providerArg;
+                    if (providerIndex === 0 && layerArgs.length > 1) {
+                      changeTracker.deleteRange(sourceFile, {
+                        pos: providerArgNode.pos,
+                        end: layerArgs[1].pos
+                      });
+                    } else if (providerIndex > 0) {
+                      changeTracker.deleteRange(sourceFile, {
+                        pos: layerArgs[providerIndex - 1].end,
+                        end: providerArgNode.end
+                      });
+                    }
+                    const provideMergeCall = ts.factory.createCallExpression(
+                      ts.factory.createPropertyAccessExpression(
+                        ts.factory.createIdentifier(layerModuleIdentifier),
+                        ts.factory.createIdentifier("provideMerge")
+                      ),
+                      void 0,
+                      [providerArgNode]
+                    );
+                    changeTracker.insertNodeAt(sourceFile, node.end, provideMergeCall, {
+                      prefix: ".pipe("
+                    });
+                    changeTracker.insertText(sourceFile, node.end, ")");
+                  })
+                }]
+              });
+            }
+          }
+        }
+      }
+      ts.forEachChild(node, appendNodeToVisit);
+    }
+  })
+});
+
 // src/diagnostics/leakingRequirements.ts
 var leakingRequirements = createDiagnostic({
   name: "leakingRequirements",
@@ -35437,7 +35806,7 @@ var leakingRequirements = createDiagnostic({
             yield* pipe(
               typeParser.effectType(servicePropertyType, atLocation),
               map34((_) => effectContextType = _.R),
-              orElse14(() => {
+              orElse15(() => {
                 const servicePropertyCallSignatures = typeChecker.getSignaturesOfType(
                   servicePropertyType,
                   ts.SignatureKind.Call
@@ -35467,7 +35836,7 @@ var leakingRequirements = createDiagnostic({
                   return pipe(
                     typeParser.scopeType(type2, atLocation),
                     map34(() => true),
-                    orElse14(() => succeed17(false))
+                    orElse15(() => succeed17(false))
                   );
                 }
               );
@@ -35509,6 +35878,7 @@ var leakingRequirements = createDiagnostic({
         location: node,
         messageText: `This Service is leaking the ${requirements.map((_) => typeChecker.typeToString(_)).join(" | ")} requirement.
 If these requirements cannot be cached and are expected to be provided per method invocation (e.g. HttpServerRequest), you can either safely disable this diagnostic for this line through quickfixes or mark the service declaration with a JSDoc @effect-leakable-service.
+Services should usually be collected in the layer creation body, and then provided at each method that requires them.
 More info at https://effect.website/docs/requirements-management/layers/#avoiding-requirement-leakage`,
         fixes: []
       });
@@ -35546,7 +35916,7 @@ More info at https://effect.website/docs/requirements-management/layers/#avoidin
               )
             )
           ),
-          orElse14(() => sync11(() => ts.forEachChild(node, appendNodeToVisit))),
+          orElse15(() => sync11(() => ts.forEachChild(node, appendNodeToVisit))),
           ignore3
         );
       }
@@ -35575,7 +35945,7 @@ var missedPipeableOpportunity = createDiagnostic({
     while (nodeToVisit.length > 0) {
       const node = nodeToVisit.shift();
       if (ts.isCallExpression(node) && node.arguments.length === 1) {
-        const isPipeCall = yield* pipe(typeParser.pipeCall(node), orElse14(() => void_8));
+        const isPipeCall = yield* pipe(typeParser.pipeCall(node), orElse15(() => void_8));
         if (!isPipeCall) {
           const resolvedSignature = typeChecker.getResolvedSignature(node);
           if (resolvedSignature) {
@@ -35596,7 +35966,7 @@ var missedPipeableOpportunity = createDiagnostic({
           const subject = parentChain.pop();
           const resultType = typeCheckerUtils.getTypeAtLocation(subject);
           if (!resultType) continue;
-          const pipeableType = yield* pipe(typeParser.pipeableType(resultType, subject), orElse14(() => void_8));
+          const pipeableType = yield* pipe(typeParser.pipeableType(resultType, subject), orElse15(() => void_8));
           if (pipeableType) {
             report({
               location: parentChain[0],
@@ -35847,7 +36217,7 @@ var missingEffectServiceDependency = createDiagnostic({
       if (ts.isClassDeclaration(node) && node.name && node.heritageClauses) {
         const serviceResult = yield* pipe(
           typeParser.extendsEffectService(node),
-          orElse14(() => void_8)
+          orElse15(() => void_8)
         );
         if (serviceResult) {
           const { className, options: options3 } = serviceResult;
@@ -35860,7 +36230,7 @@ var missingEffectServiceDependency = createDiagnostic({
               const defaultType = typeChecker.getTypeOfSymbolAtLocation(defaultProperty, node);
               const layerResult = yield* pipe(
                 typeParser.layerType(defaultType, node),
-                orElse14(() => void_8)
+                orElse15(() => void_8)
               );
               if (layerResult) {
                 const servicesMemory = /* @__PURE__ */ new Map();
@@ -35884,7 +36254,7 @@ var missingEffectServiceDependency = createDiagnostic({
                 for (const depType of types) {
                   const depLayerResult = yield* pipe(
                     typeParser.layerType(depType, options3),
-                    orElse14(() => void_8)
+                    orElse15(() => void_8)
                   );
                   if (depLayerResult) {
                     const { allIndexes } = yield* typeCheckerUtils.appendToUniqueTypesMap(
@@ -35918,6 +36288,55 @@ var missingEffectServiceDependency = createDiagnostic({
   })
 });
 
+// src/diagnostics/missingLayerContext.ts
+var missingLayerContext = createDiagnostic({
+  name: "missingLayerContext",
+  code: 38,
+  description: "Reports missing service requirements in Layer context channel",
+  severity: "error",
+  apply: fn2("missingLayerContext.apply")(function* (sourceFile, report) {
+    const typeChecker = yield* service2(TypeCheckerApi);
+    const typeParser = yield* service2(TypeParser);
+    const typeCheckerUtils = yield* service2(TypeCheckerUtils);
+    const checkForMissingContextTypes = (node, expectedType, valueNode, realType) => pipe(
+      all9(
+        typeParser.layerType(expectedType, node),
+        typeParser.layerType(realType, valueNode)
+      ),
+      map34(
+        ([expectedLayer, realLayer]) => typeCheckerUtils.getMissingTypeEntriesInTargetType(
+          realLayer.RIn,
+          expectedLayer.RIn
+        )
+      )
+    );
+    const sortTypes = sort(typeCheckerUtils.deterministicTypeOrder);
+    const entries2 = getEffectLspPatchSourceFileMetadata(sourceFile)?.relationErrors || typeCheckerUtils.expectedAndRealType(sourceFile);
+    for (const [node, expectedType, valueNode, realType] of entries2) {
+      if (expectedType !== realType) {
+        yield* pipe(
+          checkForMissingContextTypes(
+            node,
+            expectedType,
+            valueNode,
+            realType
+          ),
+          map34(
+            (missingTypes) => missingTypes.length > 0 ? report(
+              {
+                location: node,
+                messageText: `Missing '${sortTypes(missingTypes).map((_) => typeChecker.typeToString(_)).join(" | ")}' in the expected Layer context.`,
+                fixes: []
+              }
+            ) : void 0
+          ),
+          ignore3
+        );
+      }
+    }
+  })
+});
+
 // src/diagnostics/missingReturnYieldStar.ts
 var missingReturnYieldStar = createDiagnostic({
   name: "missingReturnYieldStar",
@@ -35951,8 +36370,8 @@ var missingReturnYieldStar = createDiagnostic({
                 const effectGenNode = generatorFunctionOrReturnStatement.parent;
                 const effectGenLike = yield* pipe(
                   typeParser.effectGen(effectGenNode),
-                  orElse14(() => typeParser.effectFnUntracedGen(effectGenNode)),
-                  orElse14(() => typeParser.effectFnGen(effectGenNode)),
+                  orElse15(() => typeParser.effectFnUntracedGen(effectGenNode)),
+                  orElse15(() => typeParser.effectFnGen(effectGenNode)),
                   option4
                 );
                 if (isSome2(effectGenLike)) {
@@ -36015,8 +36434,8 @@ var missingStarInYieldEffectGen = createDiagnostic({
           const effectGenNode = functionStarNode.parent;
           yield* pipe(
             typeParser.effectGen(effectGenNode),
-            orElse14(() => typeParser.effectFnUntracedGen(effectGenNode)),
-            orElse14(() => typeParser.effectFnGen(effectGenNode)),
+            orElse15(() => typeParser.effectFnUntracedGen(effectGenNode)),
+            orElse15(() => typeParser.effectFnGen(effectGenNode)),
             map34(({ generatorFunction }) => {
               if (generatorFunction) {
                 brokenGenerators.add(ts.getTokenPosOfNode(generatorFunction, tsUtils.getSourceFileOfNode(node)));
@@ -36090,7 +36509,7 @@ var multipleEffectProvide = createDiagnostic({
           typeParser.isNodeReferenceToEffectModuleApi("provide")(node.expression),
           flatMap18(() => typeParser.layerType(type2, layer12)),
           map34(() => ({ layer: layer12, node })),
-          orElse14(() => void_8)
+          orElse15(() => void_8)
         );
       }
       return void_8;
@@ -36186,7 +36605,7 @@ var nonObjectEffectServiceType = createDiagnostic({
       if (ts.isClassDeclaration(node) && node.name && node.heritageClauses) {
         const serviceResult = yield* pipe(
           typeParser.extendsEffectService(node),
-          orElse14(() => void_8)
+          orElse15(() => void_8)
         );
         if (serviceResult && serviceResult.options && ts.isObjectLiteralExpression(serviceResult.options)) {
           const options3 = serviceResult.options;
@@ -36222,7 +36641,7 @@ var nonObjectEffectServiceType = createDiagnostic({
               if (!valueType) continue;
               const effectResult = yield* pipe(
                 typeParser.effectType(valueType, propertyValue),
-                orElse14(() => void_8)
+                orElse15(() => void_8)
               );
               if (effectResult) {
                 if (isPrimitiveType(effectResult.A)) {
@@ -36235,7 +36654,7 @@ var nonObjectEffectServiceType = createDiagnostic({
                   const returnType = typeChecker.getReturnTypeOfSignature(signature);
                   const effectReturnResult = yield* pipe(
                     typeParser.effectType(returnType, propertyValue),
-                    orElse14(() => void_8)
+                    orElse15(() => void_8)
                   );
                   if (effectReturnResult && isPrimitiveType(effectReturnResult.A)) {
                     report(errorToReport);
@@ -36283,7 +36702,7 @@ var outdatedEffectCodegen = createDiagnostic({
             });
           }
         }),
-        orElse14(
+        orElse15(
           (e) => sync11(() => {
             _report({
               location: range3,
@@ -36346,7 +36765,7 @@ var overriddenSchemaConstructor = createDiagnostic({
               const isSchema2 = yield* pipe(
                 typeParser.effectSchemaType(typeAtLocation, type2.expression),
                 map34(() => true),
-                orElse14(() => succeed17(false))
+                orElse15(() => succeed17(false))
               );
               if (isSchema2) {
                 extendsSchema = true;
@@ -36469,8 +36888,8 @@ var returnEffectInGen = createDiagnostic({
             const effectGenNode = generatorOrRegularFunction.parent;
             yield* pipe(
               typeParser.effectGen(effectGenNode),
-              orElse14(() => typeParser.effectFnUntracedGen(effectGenNode)),
-              orElse14(() => typeParser.effectFnGen(effectGenNode)),
+              orElse15(() => typeParser.effectFnUntracedGen(effectGenNode)),
+              orElse15(() => typeParser.effectFnGen(effectGenNode)),
               map34(() => {
                 const fix = node.expression ? [{
                   fixName: "returnEffectInGen_fix",
@@ -36531,9 +36950,9 @@ var runEffectInsideEffect = createDiagnostic({
       if (node.arguments.length === 0) continue;
       const isEffectRunCall = yield* pipe(
         parseEffectMethod(node.expression, "runPromise"),
-        orElse14(() => parseEffectMethod(node.expression, "runSync")),
-        orElse14(() => parseEffectMethod(node.expression, "runFork")),
-        orElse14(() => parseEffectMethod(node.expression, "runCallback")),
+        orElse15(() => parseEffectMethod(node.expression, "runSync")),
+        orElse15(() => parseEffectMethod(node.expression, "runFork")),
+        orElse15(() => parseEffectMethod(node.expression, "runCallback")),
         option4
       );
       if (isNone2(isEffectRunCall)) continue;
@@ -36549,8 +36968,8 @@ var runEffectInsideEffect = createDiagnostic({
         }
         const isInEffectGen = yield* pipe(
           typeParser.effectGen(possiblyEffectGen),
-          orElse14(() => typeParser.effectFnUntracedGen(possiblyEffectGen)),
-          orElse14(() => typeParser.effectFnGen(possiblyEffectGen)),
+          orElse15(() => typeParser.effectFnUntracedGen(possiblyEffectGen)),
+          orElse15(() => typeParser.effectFnGen(possiblyEffectGen)),
           option4
         );
         if (isSome2(isInEffectGen) && isInEffectGen.value.body.statements.length > 0) {
@@ -36664,7 +37083,7 @@ var schemaStructWithTag = createDiagnostic({
       if (ts.isCallExpression(node)) {
         const isSchemaStructCall = yield* pipe(
           typeParser.isNodeReferenceToEffectSchemaModuleApi("Struct")(node.expression),
-          orElse14(() => void_8)
+          orElse15(() => void_8)
         );
         if (isSchemaStructCall && node.arguments.length === 1) {
           const arg = node.arguments[0];
@@ -36744,7 +37163,7 @@ var schemaUnionOfLiterals = createDiagnostic({
       if (ts.isCallExpression(node)) {
         const isSchemaUnionCall = yield* pipe(
           typeParser.isNodeReferenceToEffectSchemaModuleApi("Union")(node.expression),
-          orElse14(() => void_8)
+          orElse15(() => void_8)
         );
         if (isSchemaUnionCall) {
           const args3 = fromIterable(node.arguments);
@@ -37038,8 +37457,8 @@ var tryCatchInEffectGen = createDiagnostic({
           const effectGenNode = generatorOrRegularFunction.parent;
           yield* pipe(
             typeParser.effectGen(effectGenNode),
-            orElse14(() => typeParser.effectFnUntracedGen(effectGenNode)),
-            orElse14(() => typeParser.effectFnGen(effectGenNode)),
+            orElse15(() => typeParser.effectFnUntracedGen(effectGenNode)),
+            orElse15(() => typeParser.effectFnGen(effectGenNode)),
             map34(() => {
               report({
                 location: node,
@@ -37077,10 +37496,10 @@ var unknownInEffectCatch = createDiagnostic({
       if (ts.isCallExpression(node)) {
         const isEffectWithCatch = yield* pipe(
           typeParser.isNodeReferenceToEffectModuleApi("tryPromise")(node.expression),
-          orElse14(() => typeParser.isNodeReferenceToEffectModuleApi("try")(node.expression)),
-          orElse14(() => typeParser.isNodeReferenceToEffectModuleApi("tryMap")(node.expression)),
-          orElse14(() => typeParser.isNodeReferenceToEffectModuleApi("tryMapPromise")(node.expression)),
-          orElse14(() => void_8)
+          orElse15(() => typeParser.isNodeReferenceToEffectModuleApi("try")(node.expression)),
+          orElse15(() => typeParser.isNodeReferenceToEffectModuleApi("tryMap")(node.expression)),
+          orElse15(() => typeParser.isNodeReferenceToEffectModuleApi("tryMapPromise")(node.expression)),
+          orElse15(() => void_8)
         );
         if (isEffectWithCatch) {
           const signature = typeChecker.getResolvedSignature(node);
@@ -37357,7 +37776,7 @@ var unsupportedServiceAccessors = createDiagnostic({
       if (ts.isClassDeclaration(node)) {
         const parseResult = yield* pipe(
           parse5(node),
-          orElse14(() => succeed17(null))
+          orElse15(() => succeed17(null))
         );
         if (parseResult && parseResult.involvedMembers.length > 0) {
           const existingStaticMembers = /* @__PURE__ */ new Set();
@@ -37373,9 +37792,10 @@ var unsupportedServiceAccessors = createDiagnostic({
           );
           if (missingMembers.length > 0) {
             const memberNames = missingMembers.map(({ property }) => `'${ts.symbolName(property)}'`).join(", ");
+            const suggestedFix = parseResult.kind === "effectTag" ? "\nEffect.Tag does not allow to disable accessors, so you may want to use Context.Tag instead." : "";
             report({
               location: parseResult.className,
-              messageText: `Even if accessors are enabled, accessors for ${memberNames} won't be available because the signature have generic type parameters or multiple call signatures.`,
+              messageText: `Even if accessors are enabled, accessors for ${memberNames} won't be available because the signature have generic type parameters or multiple call signatures.${suggestedFix}`,
               fixes: [{
                 fixName: "unsupportedServiceAccessors_enableCodegen",
                 description: "Enable accessors codegen",
@@ -37396,6 +37816,7 @@ var unsupportedServiceAccessors = createDiagnostic({
 // src/diagnostics.ts
 var diagnostics = [
   anyUnknownInErrorContext,
+  catchAllToMapError,
   catchUnfailableEffect,
   classSelfMismatch,
   duplicatePackage,
@@ -37403,6 +37824,7 @@ var diagnostics = [
   missingEffectContext,
   missingEffectError,
   missingEffectServiceDependency,
+  missingLayerContext,
   floatingEffect,
   missingStarInYieldEffectGen,
   unnecessaryEffectGen,
@@ -37430,7 +37852,9 @@ var diagnostics = [
   runEffectInsideEffect,
   schemaUnionOfLiterals,
   schemaStructWithTag,
-  globalErrorInEffectFailure
+  globalErrorInEffectCatch,
+  globalErrorInEffectFailure,
+  layerMergeAllWithDependencies
 ];
 
 // src/cli/diagnostics.ts
@@ -37749,6 +38173,422 @@ var diagnostics2 = make58(
     const hasFailures = state.errorsCount > 0 || strict2 && state.warningsCount > 0;
     if (hasFailures) return yield* sync4(() => process.exit(1));
   })
+).pipe(
+  withDescription6("Gets the effect-language-service diagnostics on the given files or project.")
+);
+
+// src/cli/overview.ts
+var import_project_service3 = __toESM(require_dist2());
+
+// src/cli/utils/Spinner.ts
+var DEFAULT_FRAMES = [
+  "\u280B",
+  "\u2819",
+  "\u2839",
+  "\u2838",
+  "\u283C",
+  "\u2834",
+  "\u2826",
+  "\u2827",
+  "\u2807",
+  "\u280F"
+];
+var isWindows = typeof process !== "undefined" && process.platform === "win32";
+var figures2 = {
+  tick: isWindows ? "\u221A" : "\u2714",
+  cross: isWindows ? "\xD7" : "\u2716"
+};
+var CLEAR_LINE = cat2(eraseLine3, cursorLeft3);
+var CURSOR_HIDE = render3(cursorHide3, { style: "pretty" });
+var CURSOR_SHOW = render3(cursorShow3, { style: "pretty" });
+var renderDoc = (columns, doc, addNewline = false) => {
+  const prepared = addNewline ? cat2(doc, hardLine2) : doc;
+  return render3(prepared, { style: "pretty", options: { lineWidth: columns } });
+};
+var spinner = dual(
+  2,
+  (effect3, options3) => acquireUseRelease2(
+    // acquire
+    gen2(function* () {
+      const terminal = yield* Terminal;
+      yield* orDie2(terminal.display(CURSOR_HIDE));
+      let index = 0;
+      let currentMessage = options3.message;
+      const frames = options3.frames ?? DEFAULT_FRAMES;
+      const frameCount = frames.length;
+      const displayDoc = (doc, addNewline = false) => gen2(function* () {
+        const columns = yield* terminal.columns;
+        const out = renderDoc(columns, doc, addNewline);
+        yield* orDie2(terminal.display(out));
+      });
+      const renderFrame = gen2(function* () {
+        const i = index;
+        index = index + 1;
+        const spinnerDoc = annotate2(text3(frames[i % frameCount]), blue3);
+        const messageDoc = annotate2(text3(currentMessage), bold2);
+        const line4 = hsep2([spinnerDoc, messageDoc]);
+        yield* displayDoc(cat2(CLEAR_LINE, line4));
+      });
+      const computeFinalMessage = (exit4) => match9(exit4, {
+        onFailure: (cause2) => {
+          let baseMessage = currentMessage;
+          if (options3.onFailure) {
+            const failureOption3 = failureOption2(cause2);
+            if (isSome2(failureOption3)) {
+              baseMessage = options3.onFailure(failureOption3.value);
+            }
+          }
+          if (isInterrupted2(cause2)) {
+            return `${baseMessage} (interrupted)`;
+          } else if (isDie2(cause2)) {
+            return `${baseMessage} (died)`;
+          } else {
+            return baseMessage;
+          }
+        },
+        onSuccess: (value5) => options3.onSuccess ? options3.onSuccess(value5) : currentMessage
+      });
+      const renderFinal = (exit4) => gen2(function* () {
+        const icon = isSuccess(exit4) ? annotate2(text3(figures2.tick), green3) : annotate2(text3(figures2.cross), red4);
+        const finalMessage = computeFinalMessage(exit4);
+        const msgDoc = annotate2(text3(finalMessage), bold2);
+        const line4 = hsep2([icon, msgDoc]);
+        yield* displayDoc(cat2(CLEAR_LINE, line4), true);
+      });
+      const handle = {
+        updateMessage: (message) => gen2(function* () {
+          currentMessage = message;
+          yield* renderFrame;
+        })
+      };
+      return {
+        terminal,
+        handle,
+        renderFinal
+      };
+    }),
+    // use
+    ({ handle }) => effect3(handle),
+    // release
+    ({ renderFinal, terminal }, exitValue) => gen2(function* () {
+      yield* renderFinal(exitValue);
+    }).pipe(
+      // Ensure cursor is shown even if something above failed.
+      ensuring2(orDie2(terminal.display(CURSOR_SHOW)))
+    )
+  )
+);
+
+// src/cli/overview.ts
+var itemOrder = combine2(
+  mapInput2(Order4, (_) => _.filePath),
+  combine2(
+    mapInput2(Order, (_) => _.line),
+    combine2(
+      mapInput2(Order, (_) => _.column),
+      mapInput2(Order4, (_) => _.name)
+    )
+  )
+);
+var NoFilesToCheckError2 = class extends TaggedError("NoFilesToCheckError") {
+  get message() {
+    return "No files to check. Please provide an existing .ts file or a project tsconfig.json";
+  }
+};
+var BATCH_SIZE3 = 50;
+var typeToString = (typeChecker, tsInstance, type2) => typeChecker.typeToString(type2, void 0, tsInstance.TypeFormatFlags.NoTruncation);
+var getLocationFromDeclaration = (declaration, tsInstance) => {
+  const sourceFile = declaration.getSourceFile();
+  if (!sourceFile) return void 0;
+  const { character, line: line4 } = tsInstance.getLineAndCharacterOfPosition(sourceFile, declaration.getStart());
+  return {
+    filePath: sourceFile.fileName,
+    line: line4 + 1,
+    column: character + 1
+  };
+};
+var collectExportedItems = (sourceFile, tsInstance, typeChecker) => gen3(function* () {
+  const typeParser = yield* service2(TypeParser);
+  const services = [];
+  const layers = [];
+  const errors = [];
+  const moduleSymbol = typeChecker.getSymbolAtLocation(sourceFile);
+  if (!moduleSymbol) {
+    return { services, layers, errors };
+  }
+  const exports2 = typeChecker.getExportsOfModule(moduleSymbol);
+  const workQueue = exports2.map((s) => {
+    const declarations = s.getDeclarations();
+    const location = declarations && declarations.length > 0 ? getLocationFromDeclaration(declarations[0], tsInstance) : void 0;
+    return [s, tsInstance.symbolName(s), location];
+  });
+  const exploded = /* @__PURE__ */ new WeakSet();
+  while (workQueue.length > 0) {
+    const [symbol3, name, location] = workQueue.shift();
+    if (!location) continue;
+    const type2 = typeChecker.getTypeOfSymbol(symbol3);
+    if (!exploded.has(symbol3)) {
+      exploded.add(symbol3);
+      const properties = typeChecker.getPropertiesOfType(type2);
+      for (const propSymbol of properties) {
+        const propName = tsInstance.symbolName(propSymbol);
+        if (propName === "prototype") continue;
+        const childName = `${name}.${propName}`;
+        workQueue.push([propSymbol, childName, location]);
+      }
+    }
+    const declarations = symbol3.getDeclarations();
+    const declaration = declarations && declarations.length > 0 ? declarations[0] : sourceFile;
+    const docComment = symbol3.getDocumentationComment(typeChecker);
+    const description = docComment.length > 0 ? docComment.map((part) => part.text).join("") : void 0;
+    const contextTagResult = yield* pipe(
+      typeParser.contextTag(type2, declaration),
+      option4
+    );
+    if (isSome2(contextTagResult)) {
+      const serviceType = typeToString(typeChecker, tsInstance, contextTagResult.value.Service);
+      services.push({
+        name,
+        ...location,
+        serviceType,
+        description
+      });
+    }
+    let isLayer2 = false;
+    const directLayerResult = yield* pipe(
+      typeParser.layerType(type2, declaration),
+      option4
+    );
+    if (isSome2(directLayerResult)) {
+      isLayer2 = true;
+    } else {
+      const callSignatures = typeChecker.getSignaturesOfType(type2, tsInstance.SignatureKind.Call);
+      for (const sig of callSignatures) {
+        const returnType = typeChecker.getReturnTypeOfSignature(sig);
+        const returnLayerResult = yield* pipe(
+          typeParser.layerType(returnType, declaration),
+          option4
+        );
+        if (isSome2(returnLayerResult)) {
+          isLayer2 = true;
+          break;
+        }
+      }
+    }
+    if (isLayer2) {
+      layers.push({
+        name,
+        ...location,
+        layerType: typeToString(typeChecker, tsInstance, type2),
+        description
+      });
+    }
+    let isError = false;
+    let errorType = type2;
+    const directErrorResult = yield* pipe(
+      typeParser.extendsCauseYieldableError(type2),
+      option4
+    );
+    if (isSome2(directErrorResult)) {
+      isError = true;
+      errorType = type2;
+    } else {
+      const constructSignatures = typeChecker.getSignaturesOfType(type2, tsInstance.SignatureKind.Construct);
+      for (const sig of constructSignatures) {
+        const instanceType = typeChecker.getReturnTypeOfSignature(sig);
+        const instanceErrorResult = yield* pipe(
+          typeParser.extendsCauseYieldableError(instanceType),
+          option4
+        );
+        if (isSome2(instanceErrorResult)) {
+          isError = true;
+          errorType = instanceType;
+          break;
+        }
+      }
+    }
+    if (isError) {
+      errors.push({
+        name,
+        ...location,
+        errorType: typeToString(typeChecker, tsInstance, errorType),
+        description
+      });
+    }
+  }
+  return { services, layers, errors };
+});
+var toRelativePath = (absolutePath, cwd) => {
+  if (absolutePath.startsWith(cwd)) {
+    const relative = absolutePath.slice(cwd.length);
+    return relative.startsWith("/") ? `.${relative}` : `./${relative}`;
+  }
+  return absolutePath;
+};
+var dimLine = (text10) => annotate2(text3(text10), blackBright2);
+var renderService = (svc, cwd) => {
+  const relativePath = toRelativePath(svc.filePath, cwd);
+  const details = [
+    dimLine(`${relativePath}:${svc.line}:${svc.column}`),
+    dimLine(svc.serviceType)
+  ];
+  if (svc.description) {
+    details.push(dimLine(svc.description));
+  }
+  return vsep2([
+    text3(svc.name),
+    indent2(vsep2(details), 2),
+    empty32
+  ]);
+};
+var renderLayer = (layer12, cwd) => {
+  const relativePath = toRelativePath(layer12.filePath, cwd);
+  const details = [
+    dimLine(`${relativePath}:${layer12.line}:${layer12.column}`),
+    dimLine(layer12.layerType)
+  ];
+  if (layer12.description) {
+    details.push(dimLine(layer12.description));
+  }
+  return vsep2([
+    text3(layer12.name),
+    indent2(vsep2(details), 2),
+    empty32
+  ]);
+};
+var renderError4 = (error4, cwd) => {
+  const relativePath = toRelativePath(error4.filePath, cwd);
+  const details = [
+    dimLine(`${relativePath}:${error4.line}:${error4.column}`),
+    dimLine(error4.errorType)
+  ];
+  if (error4.description) {
+    details.push(dimLine(error4.description));
+  }
+  return vsep2([
+    text3(error4.name),
+    indent2(vsep2(details), 2),
+    empty32
+  ]);
+};
+var renderOverview = (result, cwd) => {
+  const lines3 = [];
+  if (result.errors.length > 0) {
+    lines3.push(empty32);
+    lines3.push(annotate2(text3(`Yieldable Errors (${result.errors.length})`), bold2));
+    const sortedErrors = sort(result.errors, itemOrder);
+    const errorDocs = sortedErrors.map((error4) => renderError4(error4, cwd));
+    lines3.push(indent2(vsep2(errorDocs), 2));
+  }
+  if (result.services.length > 0) {
+    lines3.push(empty32);
+    lines3.push(annotate2(text3(`Services (${result.services.length})`), bold2));
+    const sortedServices = sort(result.services, itemOrder);
+    const serviceDocs = sortedServices.map((svc) => renderService(svc, cwd));
+    lines3.push(indent2(vsep2(serviceDocs), 2));
+  }
+  if (result.layers.length > 0) {
+    lines3.push(empty32);
+    lines3.push(annotate2(text3(`Layers (${result.layers.length})`), bold2));
+    const sortedLayers = sort(result.layers, itemOrder);
+    const layerDocs = sortedLayers.map((layer12) => renderLayer(layer12, cwd));
+    lines3.push(indent2(vsep2(layerDocs), 2));
+  }
+  if (result.services.length === 0 && result.layers.length === 0 && result.errors.length === 0) {
+    lines3.push(empty32);
+    lines3.push(text3("No exported services, layers, or errors found."));
+  }
+  return vsep2(lines3);
+};
+var collectAllItems = (filesToCheck, tsInstance, onProgress) => gen2(function* () {
+  const services = [];
+  const layers = [];
+  const errors = [];
+  const totalFiles = filesToCheck.size;
+  let processedFiles = 0;
+  for (const batch of chunksOf(filesToCheck, BATCH_SIZE3)) {
+    const { service: service3 } = (0, import_project_service3.createProjectService)({ options: { loadTypeScriptPlugins: false } });
+    for (const filePath of batch) {
+      processedFiles++;
+      yield* onProgress(processedFiles, totalFiles);
+      service3.openClientFile(filePath);
+      try {
+        const scriptInfo = service3.getScriptInfo(filePath);
+        if (!scriptInfo) continue;
+        const projectInfo = scriptInfo.getDefaultProject();
+        const languageService = projectInfo.getLanguageService(true);
+        const program = languageService.getProgram();
+        if (!program) continue;
+        const sourceFile = program.getSourceFile(filePath);
+        if (!sourceFile) continue;
+        const result = pipe(
+          collectExportedItems(sourceFile, tsInstance, program.getTypeChecker()),
+          nanoLayer3,
+          nanoLayer2,
+          nanoLayer,
+          provideService7(TypeCheckerApi, program.getTypeChecker()),
+          provideService7(TypeScriptProgram, program),
+          provideService7(TypeScriptApi, tsInstance),
+          run9,
+          getOrElse(() => ({ services: [], layers: [], errors: [] }))
+        );
+        for (const svc of result.services) {
+          services.push(svc);
+        }
+        for (const layer12 of result.layers) {
+          layers.push(layer12);
+        }
+        for (const error4 of result.errors) {
+          errors.push(error4);
+        }
+      } finally {
+        service3.closeClientFile(filePath);
+      }
+    }
+    yield* yieldNow4();
+  }
+  return { services, layers, errors };
+});
+var overview = make58(
+  "overview",
+  {
+    file: file3("file").pipe(
+      optional4,
+      withDescription3("The full path of the file to analyze.")
+    ),
+    project: file3("project").pipe(
+      optional4,
+      withDescription3("The full path of the project tsconfig.json file to analyze.")
+    )
+  },
+  fn("overview")(function* ({ file: file5, project: project3 }) {
+    const path2 = yield* Path2;
+    const cwd = path2.resolve(".");
+    const tsInstance = yield* TypeScriptContext;
+    const filesToCheck = isSome2(project3) ? yield* getFileNamesInTsConfig(project3.value) : /* @__PURE__ */ new Set();
+    if (isSome2(file5)) {
+      filesToCheck.add(path2.resolve(file5.value));
+    }
+    if (filesToCheck.size === 0) {
+      return yield* new NoFilesToCheckError2();
+    }
+    const totalFiles = filesToCheck.size;
+    const { errors, layers, services } = yield* spinner(
+      (handle) => collectAllItems(
+        filesToCheck,
+        tsInstance,
+        (current, total) => handle.updateMessage(`Processing file ${current}/${total}...`)
+      ),
+      {
+        message: `Processing ${totalFiles} file(s)...`,
+        onSuccess: () => `Processed ${totalFiles} file(s)`
+      }
+    );
+    const doc = renderOverview({ services, layers, errors, totalFilesCount: filesToCheck.size }, cwd);
+    yield* log3(render3(doc, { style: "pretty" }));
+  })
+).pipe(
+  withDescription6("Provides an overview of Effect-related exports in the given files or project.")
 );
 
 // src/cli/patch.ts
@@ -38002,6 +38842,10 @@ var patch9 = make58(
     yield* printRememberDeleteTsbuildinfo();
     yield* printRememberPrepareScript();
   })
+).pipe(
+  withDescription6(
+    "Patches the typescript package with the effect-language-service, so that effect diagnostics are available at build time with tsc."
+  )
 );
 
 // node_modules/.pnpm/@effect+cli@0.73.0_@effect+platform@0.94.0_@effect+printer-ansi@0.47.0_@effect+printer@0.47.0_effect@3.19.13/node_modules/@effect/cli/dist/esm/internal/prompt/confirm.js
@@ -38038,9 +38882,9 @@ function renderNextFrame7(state, options3) {
   return gen2(function* () {
     const terminal = yield* Terminal;
     const columns = yield* terminal.columns;
-    const figures3 = yield* figures;
+    const figures4 = yield* figures;
     const leadingSymbol = annotate2(text3("?"), cyanBright2);
-    const trailingSymbol = annotate2(figures3.pointerSmall, blackBright2);
+    const trailingSymbol = annotate2(figures4.pointerSmall, blackBright2);
     const confirmMessage = state.value ? options3.placeholder.defaultConfirm : options3.placeholder.defaultDeny;
     const confirm3 = annotate2(text3(confirmMessage), blackBright2);
     const promptMsg = renderOutput6(confirm3, leadingSymbol, trailingSymbol, options3);
@@ -38056,9 +38900,9 @@ function renderSubmission7(value5, options3) {
   return gen2(function* () {
     const terminal = yield* Terminal;
     const columns = yield* terminal.columns;
-    const figures3 = yield* figures;
-    const leadingSymbol = annotate2(figures3.tick, green3);
-    const trailingSymbol = annotate2(figures3.ellipsis, blackBright2);
+    const figures4 = yield* figures;
+    const leadingSymbol = annotate2(figures4.tick, green3);
+    const trailingSymbol = annotate2(figures4.ellipsis, blackBright2);
     const confirmMessage = value5 ? options3.label.confirm : options3.label.deny;
     const confirm3 = text3(confirmMessage);
     const promptMsg = renderOutput6(confirm3, leadingSymbol, trailingSymbol, options3);
@@ -38145,13 +38989,13 @@ function renderOutput7(leadingSymbol, trailingSymbol, options3) {
     }
   });
 }
-function renderError4(state, pointer) {
+function renderError5(state, pointer) {
   return match2(state.error, {
     onNone: () => empty32,
     onSome: (error4) => match3(error4.split(NEWLINE_REGEX6), {
       onEmpty: () => empty32,
       onNonEmpty: (errorLines) => {
-        const annotateLine = (line4) => annotate2(text3(line4), combine10(italicized2, red4));
+        const annotateLine = (line4) => annotate2(text3(line4), combine11(italicized2, red4));
         const prefix = cat2(annotate2(pointer, red4), space2);
         const lines3 = map4(errorLines, (str) => annotateLine(str));
         return cursorSavePosition3.pipe(cat2(hardLine2), cat2(prefix), cat2(align2(vsep2(lines3))), cat2(cursorRestorePosition3));
@@ -38166,7 +39010,7 @@ function renderChoiceDescription2(choice4, isHighlighted) {
   return empty32;
 }
 var metaOptionsCount = 2;
-function renderChoices2(state, options3, figures3) {
+function renderChoices2(state, options3, figures4) {
   const choices = options3.choices;
   const totalChoices = choices.length;
   const selectedCount = state.selectedIndices.size;
@@ -38186,9 +39030,9 @@ function renderChoices2(state, options3, figures3) {
     const isHighlighted = state.index === index;
     let prefix = space2;
     if (index === toDisplay.startIndex && toDisplay.startIndex > 0) {
-      prefix = figures3.arrowUp;
+      prefix = figures4.arrowUp;
     } else if (index === toDisplay.endIndex - 1 && toDisplay.endIndex < allChoices.length) {
-      prefix = figures3.arrowDown;
+      prefix = figures4.arrowDown;
     }
     if (index < metaOptions.length) {
       const title = isHighlighted ? annotate2(text3(choice4.title), cyanBright2) : text3(choice4.title);
@@ -38196,7 +39040,7 @@ function renderChoices2(state, options3, figures3) {
     } else {
       const choiceIndex = index - metaOptions.length;
       const isSelected = state.selectedIndices.has(choiceIndex);
-      const checkbox = isSelected ? figures3.checkboxOn : figures3.checkboxOff;
+      const checkbox = isSelected ? figures4.checkboxOn : figures4.checkboxOff;
       const annotatedCheckbox = isHighlighted ? annotate2(checkbox, cyanBright2) : checkbox;
       const title = text3(choice4.title);
       const description = renderChoiceDescription2(choice4, isHighlighted);
@@ -38209,12 +39053,12 @@ function renderNextFrame8(state, options3) {
   return gen2(function* () {
     const terminal = yield* Terminal;
     const columns = yield* terminal.columns;
-    const figures3 = yield* figures;
-    const choices = renderChoices2(state, options3, figures3);
+    const figures4 = yield* figures;
+    const choices = renderChoices2(state, options3, figures4);
     const leadingSymbol = annotate2(text3("?"), cyanBright2);
-    const trailingSymbol = annotate2(figures3.pointerSmall, blackBright2);
+    const trailingSymbol = annotate2(figures4.pointerSmall, blackBright2);
     const promptMsg = renderOutput7(leadingSymbol, trailingSymbol, options3);
-    const error4 = renderError4(state, figures3.pointer);
+    const error4 = renderError5(state, figures4.pointer);
     return cursorHide3.pipe(cat2(promptMsg), cat2(hardLine2), cat2(choices), cat2(error4), render3({
       style: "pretty",
       options: {
@@ -38227,12 +39071,12 @@ function renderSubmission8(state, options3) {
   return gen2(function* () {
     const terminal = yield* Terminal;
     const columns = yield* terminal.columns;
-    const figures3 = yield* figures;
+    const figures4 = yield* figures;
     const selectedChoices = Array.from(state.selectedIndices).sort(Order).map((index) => options3.choices[index].title);
     const selectedText = selectedChoices.join(", ");
     const selected = text3(selectedText);
-    const leadingSymbol = annotate2(figures3.tick, green3);
-    const trailingSymbol = annotate2(figures3.ellipsis, blackBright2);
+    const leadingSymbol = annotate2(figures4.tick, green3);
+    const trailingSymbol = annotate2(figures4.ellipsis, blackBright2);
     const promptMsg = renderOutput7(leadingSymbol, trailingSymbol, options3);
     return promptMsg.pipe(cat2(space2), cat2(annotate2(selected, white4)), cat2(hardLine2), render3({
       style: "pretty",
@@ -38404,7 +39248,7 @@ var text9 = text5;
 // package.json
 var package_default = {
   name: "@effect/language-service",
-  version: "0.63.1",
+  version: "0.64.0",
   packageManager: "pnpm@8.11.0",
   publishConfig: {
     access: "public",
@@ -39310,15 +40154,15 @@ var defaultFigures2 = {
   tick: text3("\u2714"),
   pointerSmall: text3("\u203A")
 };
-var figures2 = succeed7(defaultFigures2);
+var figures3 = succeed7(defaultFigures2);
 var renderBeep9 = render3(beep3, { style: "pretty" });
 function getSeverityStyle(severity) {
   const styles = {
-    off: combine10(white4, bgBlackBright2),
-    suggestion: combine10(white4, bgCyan2),
-    message: combine10(white4, bgBlue2),
-    warning: combine10(white4, bgYellow2),
-    error: combine10(white4, bgRed2)
+    off: combine11(white4, bgBlackBright2),
+    suggestion: combine11(white4, bgCyan2),
+    message: combine11(white4, bgBlue2),
+    warning: combine11(white4, bgYellow2),
+    error: combine11(white4, bgRed2)
   };
   return styles[severity];
 }
@@ -39338,7 +40182,7 @@ function renderOutput8(leadingSymbol, trailingSymbol, options3) {
     }
   });
 }
-function renderDiagnostics(state, options3, figures3, columns) {
+function renderDiagnostics(state, options3, figures4, columns) {
   const diagnostics3 = options3.diagnostics;
   const toDisplay = entriesToDisplay2(state.index, diagnostics3.length, options3.maxPerPage);
   const documents = [];
@@ -39349,9 +40193,9 @@ function renderDiagnostics(state, options3, figures3, columns) {
     const hasChanged = currentSeverity !== diagnostic.defaultSeverity;
     let prefix = space2;
     if (index === toDisplay.startIndex && toDisplay.startIndex > 0) {
-      prefix = figures3.arrowUp;
+      prefix = figures4.arrowUp;
     } else if (index === toDisplay.endIndex - 1 && toDisplay.endIndex < diagnostics3.length) {
-      prefix = figures3.arrowDown;
+      prefix = figures4.arrowDown;
     }
     const shortName = getSeverityShortName(currentSeverity);
     const paddedSeverity = shortName.padEnd(MAX_SEVERITY_LENGTH, " ");
@@ -39387,7 +40231,7 @@ function renderNextFrame9(state, options3) {
   return gen2(function* () {
     const terminal = yield* Terminal;
     const columns = yield* terminal.columns;
-    const figs = yield* figures2;
+    const figs = yield* figures3;
     const diagnosticsDoc = renderDiagnostics(state, options3, figs, columns);
     const leadingSymbol = annotate2(text3("?"), cyanBright2);
     const trailingSymbol = figs.pointerSmall;
@@ -39410,7 +40254,7 @@ function renderSubmission9(state, options3) {
   return gen2(function* () {
     const terminal = yield* Terminal;
     const columns = yield* terminal.columns;
-    const figs = yield* figures2;
+    const figs = yield* figures3;
     const changedCount = Object.entries(state.severities).filter(([name, severity]) => {
       const diagnostic = options3.diagnostics.find((d) => d.name === name);
       return diagnostic && severity !== diagnostic.defaultSeverity;
@@ -39652,6 +40496,7 @@ var findTsConfigFiles = (currentDir) => gen2(function* () {
 });
 var selectTsConfigFile = (currentDir) => gen2(function* () {
   const fs = yield* FileSystem;
+  const path2 = yield* Path2;
   const tsconfigFiles = yield* findTsConfigFiles(currentDir);
   let selectedTsconfigPath;
   if (tsconfigFiles.length === 0) {
@@ -39681,11 +40526,10 @@ var selectTsConfigFile = (currentDir) => gen2(function* () {
       selectedTsconfigPath = selected;
     }
   }
+  selectedTsconfigPath = path2.resolve(selectedTsconfigPath);
   const tsconfigExists = yield* fs.exists(selectedTsconfigPath);
   if (!tsconfigExists) {
-    return yield* fail7(
-      new TsConfigNotFoundError({ path: selectedTsconfigPath })
-    );
+    return yield* new TsConfigNotFoundError({ path: selectedTsconfigPath });
   }
   const tsconfigText = yield* fs.readFileString(selectedTsconfigPath).pipe(
     mapError2((cause2) => new FileReadError({ path: selectedTsconfigPath, cause: cause2 }))
@@ -39703,9 +40547,7 @@ var createAssessmentInput = (currentDir, tsconfigInput) => gen2(function* () {
   const packageJsonPath = path2.join(currentDir, "package.json");
   const packageJsonExists = yield* fs.exists(packageJsonPath);
   if (!packageJsonExists) {
-    return yield* fail7(
-      new PackageJsonNotFoundError({ path: packageJsonPath })
-    );
+    return yield* new PackageJsonNotFoundError({ path: packageJsonPath });
   }
   const packageJsonText = yield* fs.readFileString(packageJsonPath).pipe(
     mapError2((cause2) => new FileReadError({ path: packageJsonPath, cause: cause2 }))
@@ -39737,7 +40579,7 @@ var setup = make58(
   {},
   () => gen2(function* () {
     const path2 = yield* Path2;
-    const currentDir = path2.resolve(".");
+    const currentDir = path2.resolve(process.cwd());
     const tsconfigInput = yield* selectTsConfigFile(currentDir);
     const assessmentInput = yield* createAssessmentInput(currentDir, tsconfigInput);
     const assessmentState = yield* assess(assessmentInput);
@@ -39791,6 +40633,8 @@ var setup = make58(
       yield* log3(message);
     }
   })
+).pipe(
+  withDescription6("Setup the effect-language-service for the given project using an interactive cli.")
 );
 
 // src/cli/unpatch.ts
@@ -39824,6 +40668,8 @@ var unpatch = make58(
       yield* logInfo2(`${filePath} unpatched successfully.`);
     }
   })
+).pipe(
+  withDescription6("Unpatches the typescript package from the effect-language-service.")
 );
 
 // src/cli.ts
@@ -39831,7 +40677,7 @@ var cliCommand = make58(
   "effect-language-service",
   {},
   () => log3("Please select a command or run --help.")
-).pipe(withSubcommands3([setup, patch9, unpatch, check2, diagnostics2, codegen]));
+).pipe(withSubcommands3([setup, patch9, unpatch, check2, diagnostics2, codegen, overview]));
 var main = run8(cliCommand, {
   name: "effect-language-service",
   version: "0.0.2"