@effect/language-service 0.17.1 → 0.19.0

package/index.js

@@ -5,7 +5,7 @@ var __export = (target, all3) => {
     __defProp(target, name, { get: all3[name], enumerable: true });
 };
 
-// node_modules/.pnpm/effect@3.12.5/node_modules/effect/dist/esm/Function.js
+// node_modules/.pnpm/effect@3.16.3/node_modules/effect/dist/esm/Function.js
 var isFunction = (input) => typeof input === "function";
 var dual = function(arity, body) {
   if (typeof arity === "function") {
@@ -102,7 +102,7 @@ function pipe(a, ab, bc, cd, de, ef, fg, gh, hi) {
   }
 }
 
-// node_modules/.pnpm/effect@3.12.5/node_modules/effect/dist/esm/Either.js
+// node_modules/.pnpm/effect@3.16.3/node_modules/effect/dist/esm/Either.js
 var Either_exports = {};
 __export(Either_exports, {
   Do: () => Do,
@@ -139,11 +139,14 @@ __export(Either_exports, {
   merge: () => merge,
   orElse: () => orElse,
   right: () => right2,
+  transposeMapOption: () => transposeMapOption,
+  transposeOption: () => transposeOption,
   try: () => try_,
+  void: () => void_,
   zipWith: () => zipWith
 });
 
-// node_modules/.pnpm/effect@3.12.5/node_modules/effect/dist/esm/Equivalence.js
+// node_modules/.pnpm/effect@3.16.3/node_modules/effect/dist/esm/Equivalence.js
 var make = (isEquivalent) => (self, that) => self === that || isEquivalent(self, that);
 var array = (item) => make((self, that) => {
   if (self.length !== that.length) {
@@ -158,7 +161,7 @@ var array = (item) => make((self, that) => {
   return true;
 });
 
-// node_modules/.pnpm/effect@3.12.5/node_modules/effect/dist/esm/internal/doNotation.js
+// node_modules/.pnpm/effect@3.16.3/node_modules/effect/dist/esm/internal/doNotation.js
 var let_ = (map5) => dual(3, (self, name, f) => map5(self, (a) => Object.assign({}, a, {
   [name]: f(a)
 })));
@@ -169,11 +172,11 @@ var bind = (map5, flatMap4) => dual(3, (self, name, f) => flatMap4(self, (a) =>
   [name]: b
 }))));
 
-// node_modules/.pnpm/effect@3.12.5/node_modules/effect/dist/esm/internal/version.js
-var moduleVersion = "3.12.5";
+// node_modules/.pnpm/effect@3.16.3/node_modules/effect/dist/esm/internal/version.js
+var moduleVersion = "3.16.3";
 var getCurrentVersion = () => moduleVersion;
 
-// node_modules/.pnpm/effect@3.12.5/node_modules/effect/dist/esm/GlobalValue.js
+// node_modules/.pnpm/effect@3.16.3/node_modules/effect/dist/esm/GlobalValue.js
 var globalStoreId = `effect/GlobalValue/globalStoreId/${/* @__PURE__ */ getCurrentVersion()}`;
 var globalStore;
 var globalValue = (id, compute) => {
@@ -187,16 +190,19 @@ var globalValue = (id, compute) => {
   return globalStore.get(id);
 };
 
-// node_modules/.pnpm/effect@3.12.5/node_modules/effect/dist/esm/Predicate.js
+// node_modules/.pnpm/effect@3.16.3/node_modules/effect/dist/esm/Predicate.js
+var isString = (input) => typeof input === "string";
+var isNumber = (input) => typeof input === "number";
+var isBoolean = (input) => typeof input === "boolean";
 var isFunction2 = isFunction;
 var isRecordOrArray = (input) => typeof input === "object" && input !== null;
 var isObject = (input) => isRecordOrArray(input) || isFunction2(input);
 var hasProperty = /* @__PURE__ */ dual(2, (self, property) => isObject(self) && property in self);
 
-// node_modules/.pnpm/effect@3.12.5/node_modules/effect/dist/esm/internal/errors.js
+// node_modules/.pnpm/effect@3.16.3/node_modules/effect/dist/esm/internal/errors.js
 var getBugErrorMessage = (message) => `BUG: ${message} - please report an issue at https://github.com/Effect-TS/effect/issues`;
 
-// node_modules/.pnpm/effect@3.12.5/node_modules/effect/dist/esm/Utils.js
+// node_modules/.pnpm/effect@3.16.3/node_modules/effect/dist/esm/Utils.js
 var GenKindTypeId = /* @__PURE__ */ Symbol.for("effect/Gen/GenKind");
 var isGenKind = (u) => isObject(u) && GenKindTypeId in u;
 var GenKindImpl = class {
@@ -314,10 +320,25 @@ var structuralRegionState = /* @__PURE__ */ globalValue("effect/Utils/isStructur
   enabled: false,
   tester: void 0
 }));
+var standard = {
+  effect_internal_function: (body) => {
+    return body();
+  }
+};
+var forced = {
+  effect_internal_function: (body) => {
+    try {
+      return body();
+    } finally {
+    }
+  }
+};
+var isNotOptimizedAway = /* @__PURE__ */ standard.effect_internal_function(() => new Error().stack)?.includes("effect_internal_function") === true;
+var internalCall = isNotOptimizedAway ? standard.effect_internal_function : forced.effect_internal_function;
 var genConstructor = function* () {
 }.constructor;
 
-// node_modules/.pnpm/effect@3.12.5/node_modules/effect/dist/esm/Hash.js
+// node_modules/.pnpm/effect@3.16.3/node_modules/effect/dist/esm/Hash.js
 var randomHashCache = /* @__PURE__ */ globalValue(/* @__PURE__ */ Symbol.for("effect/Hash/randomHashCache"), () => /* @__PURE__ */ new WeakMap());
 var symbol = /* @__PURE__ */ Symbol.for("effect/Hash");
 var hash = (self) => {
@@ -343,6 +364,8 @@ var hash = (self) => {
         return string("null");
       } else if (self instanceof Date) {
         return hash(self.toISOString());
+      } else if (self instanceof URL) {
+        return hash(self.href);
       } else if (isHash(self)) {
         return self[symbol]();
       } else {
@@ -414,7 +437,7 @@ var cached = function() {
   return hash2;
 };
 
-// node_modules/.pnpm/effect@3.12.5/node_modules/effect/dist/esm/Equal.js
+// node_modules/.pnpm/effect@3.16.3/node_modules/effect/dist/esm/Equal.js
 var symbol2 = /* @__PURE__ */ Symbol.for("effect/Equal");
 function equals() {
   if (arguments.length === 1) {
@@ -440,6 +463,8 @@ function compareBoth(self, that) {
         }
       } else if (self instanceof Date && that instanceof Date) {
         return self.toISOString() === that.toISOString();
+      } else if (self instanceof URL && that instanceof URL) {
+        return self.href === that.href;
       }
     }
     if (structuralRegionState.enabled) {
@@ -465,7 +490,7 @@ function compareBoth(self, that) {
 }
 var isEqual = (u) => hasProperty(u, symbol2);
 
-// node_modules/.pnpm/effect@3.12.5/node_modules/effect/dist/esm/Inspectable.js
+// node_modules/.pnpm/effect@3.16.3/node_modules/effect/dist/esm/Inspectable.js
 var NodeInspectSymbol = /* @__PURE__ */ Symbol.for("nodejs.util.inspect.custom");
 var toJSON = (x) => {
   try {
@@ -474,7 +499,7 @@ var toJSON = (x) => {
     } else if (Array.isArray(x)) {
       return x.map(toJSON);
     }
-  } catch (_) {
+  } catch {
     return {};
   }
   return redact(x);
@@ -517,7 +542,7 @@ var redact = (u) => {
   return u;
 };
 
-// node_modules/.pnpm/effect@3.12.5/node_modules/effect/dist/esm/Pipeable.js
+// node_modules/.pnpm/effect@3.16.3/node_modules/effect/dist/esm/Pipeable.js
 var pipeArguments = (self, args) => {
   switch (args.length) {
     case 0:
@@ -550,10 +575,10 @@ var pipeArguments = (self, args) => {
   }
 };
 
-// node_modules/.pnpm/effect@3.12.5/node_modules/effect/dist/esm/internal/opCodes/effect.js
+// node_modules/.pnpm/effect@3.16.3/node_modules/effect/dist/esm/internal/opCodes/effect.js
 var OP_COMMIT = "Commit";
 
-// node_modules/.pnpm/effect@3.12.5/node_modules/effect/dist/esm/internal/effectable.js
+// node_modules/.pnpm/effect@3.16.3/node_modules/effect/dist/esm/internal/effectable.js
 var EffectTypeId = /* @__PURE__ */ Symbol.for("effect/Effect");
 var StreamTypeId = /* @__PURE__ */ Symbol.for("effect/Stream");
 var SinkTypeId = /* @__PURE__ */ Symbol.for("effect/Sink");
@@ -640,7 +665,7 @@ var StructuralCommitPrototype = {
   ...StructuralPrototype
 };
 
-// node_modules/.pnpm/effect@3.12.5/node_modules/effect/dist/esm/internal/option.js
+// node_modules/.pnpm/effect@3.16.3/node_modules/effect/dist/esm/internal/option.js
 var TypeId = /* @__PURE__ */ Symbol.for("effect/Option");
 var CommonProto = {
   ...EffectPrototype,
@@ -698,7 +723,7 @@ var some = (value) => {
   return a;
 };
 
-// node_modules/.pnpm/effect@3.12.5/node_modules/effect/dist/esm/internal/either.js
+// node_modules/.pnpm/effect@3.16.3/node_modules/effect/dist/esm/internal/either.js
 var TypeId2 = /* @__PURE__ */ Symbol.for("effect/Either");
 var CommonProto2 = {
   ...EffectPrototype,
@@ -763,9 +788,10 @@ var getLeft = (self) => isRight(self) ? none : some(self.left);
 var getRight = (self) => isLeft(self) ? none : some(self.right);
 var fromOption = /* @__PURE__ */ dual(2, (self, onNone) => isNone(self) ? left(onNone()) : right(self.value));
 
-// node_modules/.pnpm/effect@3.12.5/node_modules/effect/dist/esm/Either.js
+// node_modules/.pnpm/effect@3.16.3/node_modules/effect/dist/esm/Either.js
 var TypeId3 = TypeId2;
 var right2 = right;
+var void_ = /* @__PURE__ */ right2(void 0);
 var left2 = left;
 var fromNullable = /* @__PURE__ */ dual(2, (self, onNullable) => self == null ? left2(onNullable(self)) : right2(self));
 var fromOption2 = fromOption;
@@ -854,47 +880,31 @@ var gen = (...args) => {
   const f = args.length === 1 ? args[0] : args[1].bind(args[0]);
   const iterator = f(adapter2);
   let state = iterator.next();
-  if (state.done) {
-    return right2(state.value);
-  } else {
-    let current = state.value;
-    if (isGenKind(current)) {
-      current = current.value;
-    } else {
-      current = yieldWrapGet(current);
-    }
+  while (!state.done) {
+    const current = isGenKind(state.value) ? state.value.value : yieldWrapGet(state.value);
     if (isLeft2(current)) {
       return current;
     }
-    while (!state.done) {
-      state = iterator.next(current.right);
-      if (!state.done) {
-        current = state.value;
-        if (isGenKind(current)) {
-          current = current.value;
-        } else {
-          current = yieldWrapGet(current);
-        }
-        if (isLeft2(current)) {
-          return current;
-        }
-      }
-    }
-    return right2(state.value);
+    state = iterator.next(current.right);
   }
+  return right2(state.value);
 };
 var Do = /* @__PURE__ */ right2({});
 var bind2 = /* @__PURE__ */ bind(map, flatMap);
 var bindTo2 = /* @__PURE__ */ bindTo(map);
 var let_2 = /* @__PURE__ */ let_(map);
+var transposeOption = (self) => {
+  return isNone(self) ? right2(none) : map(self.value, some);
+};
+var transposeMapOption = /* @__PURE__ */ dual(2, (self, f) => isNone(self) ? right2(none) : map(f(self.value), some));
 
-// node_modules/.pnpm/effect@3.12.5/node_modules/effect/dist/esm/internal/array.js
+// node_modules/.pnpm/effect@3.16.3/node_modules/effect/dist/esm/internal/array.js
 var isNonEmptyArray = (self) => self.length > 0;
 
-// node_modules/.pnpm/effect@3.12.5/node_modules/effect/dist/esm/Order.js
+// node_modules/.pnpm/effect@3.16.3/node_modules/effect/dist/esm/Order.js
 var make2 = (compare) => (self, that) => self === that ? 0 : compare(self, that);
 
-// node_modules/.pnpm/effect@3.12.5/node_modules/effect/dist/esm/Option.js
+// node_modules/.pnpm/effect@3.16.3/node_modules/effect/dist/esm/Option.js
 var none2 = () => none;
 var some2 = some;
 var isNone2 = isNone;
@@ -909,21 +919,22 @@ var fromNullable2 = (nullableValue) => nullableValue == null ? none2() : some2(n
 var getOrUndefined2 = /* @__PURE__ */ getOrElse2(constUndefined);
 var map2 = /* @__PURE__ */ dual(2, (self, f) => isNone2(self) ? none2() : some2(f(self.value)));
 
-// node_modules/.pnpm/effect@3.12.5/node_modules/effect/dist/esm/Array.js
+// node_modules/.pnpm/effect@3.16.3/node_modules/effect/dist/esm/Array.js
 var fromIterable = (collection) => Array.isArray(collection) ? collection : Array.from(collection);
 var append = /* @__PURE__ */ dual(2, (self, last) => [...self, last]);
+var appendAll = /* @__PURE__ */ dual(2, (self, that) => fromIterable(self).concat(fromIterable(that)));
 var isArray = Array.isArray;
 var isEmptyArray = (self) => self.length === 0;
 var isEmptyReadonlyArray = isEmptyArray;
 var isNonEmptyReadonlyArray = isNonEmptyArray;
-var isOutOfBound = (i, as) => i < 0 || i >= as.length;
+var isOutOfBounds = (i, as) => i < 0 || i >= as.length;
 var get = /* @__PURE__ */ dual(2, (self, index) => {
   const i = Math.floor(index);
-  return isOutOfBound(i, self) ? none2() : some2(self[i]);
+  return isOutOfBounds(i, self) ? none2() : some2(self[i]);
 });
 var unsafeGet = /* @__PURE__ */ dual(2, (self, index) => {
   const i = Math.floor(index);
-  if (isOutOfBound(i, self)) {
+  if (isOutOfBounds(i, self)) {
     throw new Error(`Index ${i} out of bounds`);
   }
   return self[i];
@@ -1414,7 +1425,10 @@ var parseDataForExtendsClassCompletion = fn(
   "AST.parseDataForExtendsClassCompletion"
 )(function* (sourceFile, position) {
   const ts = yield* service(TypeScriptApi);
-  const { accessedObject, outerNode, replacementSpan } = yield* parseAccessedExpressionForCompletion(sourceFile, position);
+  const { accessedObject, outerNode, replacementSpan } = yield* parseAccessedExpressionForCompletion(
+    sourceFile,
+    position
+  );
   if (!ts.isIdentifier(accessedObject)) return yield* fail(new NodeNotFoundError());
   let classDeclaration = outerNode.parent;
   while (ts.isExpressionWithTypeArguments(classDeclaration) || ts.isHeritageClause(classDeclaration)) {
@@ -1482,29 +1496,20 @@ function createRefactor(definition) {
 function createDiagnostic(definition) {
   return definition;
 }
-function parsePluginOptions(config) {
-  return {
-    diagnostics: config && "diagnostics" in config && typeof config.diagnostics === "boolean" ? config.diagnostics : true,
-    quickinfo: config && "quickinfo" in config && typeof config.quickinfo === "boolean" ? config.quickinfo : true,
-    completions: config && "completions" in config && typeof config.completions === "boolean" ? config.completions : true,
-    multipleEffectCheck: config && "multipleEffectCheck" in config && typeof config.multipleEffectCheck === "boolean" ? config.multipleEffectCheck : true
-  };
-}
 function createCompletion(definition) {
   return definition;
 }
-var PluginOptions = Tag("PluginOptions");
 var getSemanticDiagnosticsWithCodeFixes = fn(
   "LSP.getSemanticDiagnosticsWithCodeFixes"
 )(function* (rules, sourceFile) {
-  const effectDiagnostics = [];
-  const effectCodeFixes = [];
+  let effectDiagnostics = [];
+  let effectCodeFixes = [];
   const executor = yield* createDiagnosticExecutor(sourceFile);
   for (const rule of rules) {
     const result = yield* option(executor.execute(rule));
     if (isSome2(result)) {
-      effectDiagnostics.push(
-        ...pipe(
+      effectDiagnostics = effectDiagnostics.concat(
+        pipe(
           result.value,
           map3((_) => ({
             file: sourceFile,
@@ -1517,8 +1522,8 @@ var getSemanticDiagnosticsWithCodeFixes = fn(
           }))
         )
       );
-      effectCodeFixes.push(
-        ...pipe(
+      effectCodeFixes = effectCodeFixes.concat(
+        pipe(
           result.value,
           map3(
             (_) => map3(
@@ -1541,6 +1546,9 @@ var getSemanticDiagnosticsWithCodeFixes = fn(
     codeFixes: effectCodeFixes
   };
 });
+function refactorNameToFullyQualifiedName(name) {
+  return `@effect/language-service/refactors/${name}`;
+}
 var getApplicableRefactors = fn("LSP.getApplicableRefactors")(function* (refactors2, sourceFile, positionOrRange) {
   const textRange = typeof positionOrRange === "number" ? { pos: positionOrRange, end: positionOrRange } : positionOrRange;
   const effectRefactors = [];
@@ -1548,10 +1556,10 @@ var getApplicableRefactors = fn("LSP.getApplicableRefactors")(function* (refacto
     const result = yield* option(refactor.apply(sourceFile, textRange));
     if (isSome2(result)) {
       effectRefactors.push({
-        name: refactor.name,
+        name: refactorNameToFullyQualifiedName(refactor.name),
         description: refactor.description,
         actions: [{
-          name: refactor.name,
+          name: refactorNameToFullyQualifiedName(refactor.name),
           description: result.value.description,
           kind: result.value.kind
         }]
@@ -1561,7 +1569,7 @@ var getApplicableRefactors = fn("LSP.getApplicableRefactors")(function* (refacto
   return effectRefactors;
 });
 var getEditsForRefactor = fn("LSP.getEditsForRefactor")(function* (refactors2, sourceFile, positionOrRange, refactorName) {
-  const refactor = refactors2.find((refactor2) => refactor2.name === refactorName);
+  const refactor = refactors2.find((refactor2) => refactorNameToFullyQualifiedName(refactor2.name) === refactorName);
   if (!refactor) {
     return yield* fail(new RefactorNotApplicableError());
   }
@@ -1569,11 +1577,11 @@ var getEditsForRefactor = fn("LSP.getEditsForRefactor")(function* (refactors2, s
   return yield* refactor.apply(sourceFile, textRange);
 });
 var getCompletionsAtPosition = fn("LSP.getCompletionsAtPosition")(function* (completions2, sourceFile, position, options, formatCodeSettings) {
-  const effectCompletions = [];
+  let effectCompletions = [];
   for (const completion of completions2) {
     const result = yield* completion.apply(sourceFile, position, options, formatCodeSettings);
-    effectCompletions.push(
-      ...result.map((_) => ({ sortText: "11", ..._ }))
+    effectCompletions = effectCompletions.concat(
+      result.map((_) => ({ sortText: "11", ..._ }))
     );
   }
   return effectCompletions;
@@ -1581,27 +1589,74 @@ var getCompletionsAtPosition = fn("LSP.getCompletionsAtPosition")(function* (com
 var createDiagnosticExecutor = fn("LSP.createCommentDirectivesProcessor")(
   function* (sourceFile) {
     const ts = yield* service(TypeScriptApi);
-    const ruleOverrides = {};
+    function findNodeWithLeadingCommentAtPosition(position) {
+      const sourceText = sourceFile.text;
+      let result;
+      function find(node) {
+        const leading = ts.getLeadingCommentRanges(sourceText, node.getFullStart());
+        if (leading) {
+          for (const r of leading) {
+            if (r.pos <= position && position < r.end) {
+              result = node;
+              return;
+            }
+          }
+        }
+        if (node.getFullStart() <= position && position < node.getEnd()) {
+          node.forEachChild(find);
+        }
+      }
+      find(sourceFile);
+      return result;
+    }
+    function findParentStatementForDisableNextLine(node) {
+      let result;
+      function find(node2) {
+        if (ts.isStatement(node2)) {
+          result = node2;
+          return;
+        }
+        if (result) return;
+        if (node2.parent) find(node2.parent);
+      }
+      find(node);
+      return result || node;
+    }
+    const lineOverrides = {};
+    const sectionOverrides = {};
     const skippedRules = [];
-    const regex = /@effect-diagnostics((?:\s[a-zA-Z0-9/]+:(?:off|warning|error|message|suggestion|skip-file))+)?/gm;
+    const regex = /@effect-diagnostics(-next-line)?((?:\s[a-zA-Z0-9/]+:(?:off|warning|error|message|suggestion|skip-file))+)?/gm;
     let match3;
     while ((match3 = regex.exec(sourceFile.text)) !== null) {
-      const rulesCaptureGroup = match3[1];
+      const nextLineCaptureGroup = match3[1];
+      const rulesCaptureGroup = match3[2];
       if (rulesCaptureGroup) {
         const trimmedRuleString = rulesCaptureGroup.trim();
         if (trimmedRuleString) {
           const individualRules = trimmedRuleString.split(/\s+/);
           for (const rulePair of individualRules) {
-            const [ruleName, ruleLevel] = rulePair.toLowerCase().split(":");
+            const [rawRuleName, ruleLevel] = rulePair.toLowerCase().split(":");
+            const ruleName = rawRuleName.startsWith("effect/") ? rawRuleName.substring("effect/".length) : rawRuleName;
             if (ruleName && ruleLevel) {
               if (ruleLevel === "skip-file") skippedRules.push(ruleName);
-              ruleOverrides[ruleName] = ruleOverrides[ruleName] || [];
-              const newLength = ruleOverrides[ruleName].push({
-                start: match3.index,
-                end: Number.MAX_SAFE_INTEGER,
-                level: ruleLevel
-              });
-              if (newLength > 1) ruleOverrides[ruleName][newLength - 2].end = match3.index;
+              const isOverrideNextLine = nextLineCaptureGroup && nextLineCaptureGroup.trim().toLowerCase() === "-next-line";
+              if (isOverrideNextLine) {
+                const node = findNodeWithLeadingCommentAtPosition(match3.index);
+                if (node) {
+                  lineOverrides[ruleName] = lineOverrides[ruleName] || [];
+                  lineOverrides[ruleName].unshift({
+                    pos: node.getFullStart(),
+                    end: node.end,
+                    level: ruleLevel
+                  });
+                }
+              } else {
+                sectionOverrides[ruleName] = sectionOverrides[ruleName] || [];
+                sectionOverrides[ruleName].unshift({
+                  pos: match3.index,
+                  level: ruleLevel
+                });
+              }
             }
           }
         }
@@ -1617,22 +1672,46 @@ var createDiagnosticExecutor = fn("LSP.createCommentDirectivesProcessor")(
       const ruleNameLowered = rule.name.toLowerCase();
       if (skippedRules.indexOf(ruleNameLowered) > -1) return [];
       let modifiedDiagnostics = yield* rule.apply(sourceFile);
-      for (const override of ruleOverrides[ruleNameLowered] || []) {
-        if (override.level === "off") {
-          modifiedDiagnostics = modifiedDiagnostics.filter(
-            (_) => !(_.node.getStart(sourceFile) >= override.start && _.node.getEnd() <= override.end)
+      for (const emitted of modifiedDiagnostics.slice(0)) {
+        let newLevel = void 0;
+        if (!(ruleNameLowered in sectionOverrides || ruleNameLowered in lineOverrides)) continue;
+        const lineOverride = (lineOverrides[ruleNameLowered] || []).find(
+          (_) => _.pos < emitted.node.getStart(sourceFile) && _.end >= emitted.node.getEnd()
+        );
+        if (lineOverride) {
+          newLevel = lineOverride.level;
+        } else {
+          const sectionOverride = (sectionOverrides[ruleNameLowered] || []).find(
+            (_) => _.pos < emitted.node.getStart(sourceFile)
           );
+          if (sectionOverride) newLevel = sectionOverride.level;
+        }
+        if (newLevel === "off") {
+          modifiedDiagnostics = modifiedDiagnostics.filter((_) => _ !== emitted);
         } else {
-          for (const message of modifiedDiagnostics.filter(
-            (_) => _.node.getStart(sourceFile) >= override.start && _.node.getEnd() <= override.end
-          )) {
-            message.category = override.level in levelToDiagnosticCategory ? levelToDiagnosticCategory[override.level] : message.category;
-          }
+          emitted.category = newLevel && newLevel in levelToDiagnosticCategory ? levelToDiagnosticCategory[newLevel] : emitted.category;
         }
       }
+      const fixByDisableNextLine = (_) => ({
+        fixName: rule.name + "_skipNextLine",
+        description: "Disable " + rule.name + " for this line",
+        apply: flatMap3(
+          service(ChangeTracker),
+          (changeTracker) => sync(() => {
+            const disableAtNode = findParentStatementForDisableNextLine(_.node);
+            const { line } = ts.getLineAndCharacterOfPosition(sourceFile, disableAtNode.getStart());
+            changeTracker.insertCommentBeforeLine(
+              sourceFile,
+              line,
+              disableAtNode.getStart(),
+              ` @effect-diagnostics-next-line ${rule.name}:off`
+            );
+          })
+        )
+      });
       const fixByDisableEntireFile = {
         fixName: rule.name + "_skipFile",
-        description: "Disable " + rule.name + " for this file",
+        description: "Disable " + rule.name + " for this entire file",
         apply: flatMap3(
           service(ChangeTracker),
           (changeTracker) => sync(
@@ -1647,7 +1726,7 @@ var createDiagnosticExecutor = fn("LSP.createCommentDirectivesProcessor")(
       };
       const rulesWithDisableFix = modifiedDiagnostics.map((diagnostic) => ({
         ...diagnostic,
-        fixes: diagnostic.fixes.concat([fixByDisableEntireFile])
+        fixes: diagnostic.fixes.concat([fixByDisableNextLine(diagnostic), fixByDisableEntireFile])
       }));
       return rulesWithDisableFix;
     });
@@ -1657,7 +1736,7 @@ var createDiagnosticExecutor = fn("LSP.createCommentDirectivesProcessor")(
 
 // src/completions/contextSelfInClasses.ts
 var contextSelfInClasses = createCompletion({
-  name: "effect/contextSelfInClasses",
+  name: "contextSelfInClasses",
   apply: fn("contextSelfInClasses")(function* (sourceFile, position) {
     const ts = yield* service(TypeScriptApi);
     const maybeInfos = yield* option(
@@ -1690,7 +1769,7 @@ var contextSelfInClasses = createCompletion({
 
 // src/completions/effectDataClasses.ts
 var effectDataClasses = createCompletion({
-  name: "effect/effectDataClasses",
+  name: "effectDataClasses",
   apply: fn("effectDataClasses")(function* (sourceFile, position) {
     const ts = yield* service(TypeScriptApi);
     const maybeInfos = yield* option(
@@ -1729,7 +1808,7 @@ var effectDataClasses = createCompletion({
 
 // src/completions/effectSchemaSelfInClasses.ts
 var effectSchemaSelfInClasses = createCompletion({
-  name: "effect/effectSchemaSelfInClasses",
+  name: "effectSchemaSelfInClasses",
   apply: fn("effectSchemaSelfInClasses")(function* (sourceFile, position) {
     const ts = yield* service(TypeScriptApi);
     const maybeInfos = yield* option(
@@ -1780,7 +1859,7 @@ var effectSchemaSelfInClasses = createCompletion({
 
 // src/completions/effectSelfInClasses.ts
 var effectSelfInClasses = createCompletion({
-  name: "effect/effectSelfInClasses",
+  name: "effectSelfInClasses",
   apply: fn("effectSelfInClasses")(function* (sourceFile, position) {
     const ts = yield* service(TypeScriptApi);
     const maybeInfos = yield* option(
@@ -1835,12 +1914,12 @@ var getMissingTypeEntriesInTargetType = fn(
   function* (realType, expectedType) {
     const typeChecker = yield* service(TypeCheckerApi);
     const result = [];
-    const toTest = [realType];
+    let toTest = [realType];
     while (toTest.length > 0) {
       const type = toTest.pop();
       if (!type) return result;
       if (type.isUnion()) {
-        toTest.push(...type.types);
+        toTest = toTest.concat(type.types);
       } else {
         const assignable = typeChecker.isTypeAssignableTo(type, expectedType);
         if (!assignable) {
@@ -2016,6 +2095,51 @@ var expectedAndRealType = fn("TypeCheckerApi.expectedAndRealType")(function* (so
   cache.expectedAndRealType.set(sourceFile, result);
   return result;
 });
+var appendToUniqueTypesMap = fn(
+  "TypeCheckerApi.appendToUniqueTypesMap"
+)(
+  function* (memory, initialType, excludeNever) {
+    const ts = yield* service(TypeScriptApi);
+    const typeChecker = yield* service(TypeCheckerApi);
+    const newIndexes = /* @__PURE__ */ new Set();
+    const knownIndexes = /* @__PURE__ */ new Set();
+    let toTest = [initialType];
+    while (toTest.length > 0) {
+      const type = toTest.pop();
+      if (!type) break;
+      if (excludeNever && type.flags & ts.TypeFlags.Never) {
+        continue;
+      }
+      if (type.isUnion()) {
+        toTest = toTest.concat(type.types);
+      } else {
+        const foundMatch = [];
+        for (const [typeId, knownType] of memory.entries()) {
+          const areSame = typeChecker.isTypeAssignableTo(knownType, type) && typeChecker.isTypeAssignableTo(type, knownType);
+          if (areSame) {
+            foundMatch.push(typeId);
+            break;
+          }
+        }
+        if (foundMatch.length === 0) {
+          const newId = "t" + (memory.size + 1);
+          memory.set(newId, type);
+          newIndexes.add(newId);
+        } else {
+          knownIndexes.add(foundMatch[0]);
+        }
+      }
+    }
+    return {
+      newIndexes,
+      knownIndexes,
+      allIndexes: pipe(
+        fromIterable(newIndexes),
+        appendAll(fromIterable(knownIndexes))
+      )
+    };
+  }
+);
 
 // src/utils/TypeParser.ts
 var TypeParserIssue = class {
@@ -2036,6 +2160,13 @@ function covariantTypeArgument(type) {
   }
   return succeed(signatures[0].getReturnType());
 }
+function contravariantTypeArgument(type) {
+  const signatures = type.getCallSignatures();
+  if (signatures.length !== 1) {
+    return typeParserIssue("Contravariant type has no call signature", type);
+  }
+  return succeed(signatures[0].getTypeParameterAtPosition(0));
+}
 function invariantTypeArgument(type) {
   const signatures = type.getCallSignatures();
   if (signatures.length !== 1) {
@@ -2067,6 +2198,19 @@ var varianceStructCovariantType = fn("TypeParser.varianceStructCovariantType")(
     return yield* covariantTypeArgument(propertyType);
   }
 );
+var varianceStructContravariantType = fn(
+  "TypeParser.varianceStructContravariantType"
+)(
+  function* (type, atLocation, propertyName) {
+    const typeChecker = yield* service(TypeCheckerApi);
+    const propertySymbol = typeChecker.getPropertyOfType(type, propertyName);
+    if (!propertySymbol) {
+      return yield* typeParserIssue(`Type has no '${propertyName}' property`, type, atLocation);
+    }
+    const propertyType = typeChecker.getTypeOfSymbolAtLocation(propertySymbol, atLocation);
+    return yield* contravariantTypeArgument(propertyType);
+  }
+);
 var varianceStructInvariantType = fn("TypeParser.varianceStructInvariantType")(
   function* (type, atLocation, propertyName) {
     const typeChecker = yield* service(TypeCheckerApi);
@@ -2085,6 +2229,13 @@ var effectVarianceStruct = fn("TypeParser.effectVarianceStruct")(function* (type
     R: yield* varianceStructCovariantType(type, atLocation, "_R")
   };
 });
+var layerVarianceStruct = fn("TypeParser.layerVarianceStruct")(function* (type, atLocation) {
+  return {
+    ROut: yield* varianceStructContravariantType(type, atLocation, "_ROut"),
+    E: yield* varianceStructCovariantType(type, atLocation, "_E"),
+    RIn: yield* varianceStructCovariantType(type, atLocation, "_RIn")
+  };
+});
 var effectType = fn("TypeParser.effectType")(function* (type, atLocation) {
   const ts = yield* service(TypeScriptApi);
   const typeChecker = yield* service(TypeCheckerApi);
@@ -2105,6 +2256,26 @@ var effectType = fn("TypeParser.effectType")(function* (type, atLocation) {
   }
   return yield* typeParserIssue("Type has no effect variance struct", type, atLocation);
 });
+var layerType = fn("TypeParser.layerType")(function* (type, atLocation) {
+  const ts = yield* service(TypeScriptApi);
+  const typeChecker = yield* service(TypeCheckerApi);
+  yield* pipeableType(type, atLocation);
+  const propertiesSymbols = typeChecker.getPropertiesOfType(type).filter(
+    (_) => _.flags & ts.SymbolFlags.Property && !(_.flags & ts.SymbolFlags.Optional)
+  );
+  propertiesSymbols.sort((a, b) => b.name.indexOf("LayerTypeId") - a.name.indexOf("LayerTypeId"));
+  for (const propertySymbol of propertiesSymbols) {
+    const propertyType = typeChecker.getTypeOfSymbolAtLocation(propertySymbol, atLocation);
+    const varianceArgs = yield* option(layerVarianceStruct(
+      propertyType,
+      atLocation
+    ));
+    if (isSome2(varianceArgs)) {
+      return varianceArgs.value;
+    }
+  }
+  return yield* typeParserIssue("Type has no layer variance struct", type, atLocation);
+});
 var fiberType = fn("TypeParser.fiberType")(function* (type, atLocation) {
   const typeChecker = yield* service(TypeCheckerApi);
   const awaitSymbol = typeChecker.getPropertyOfType(type, "await");
@@ -2121,9 +2292,10 @@ var fiberType = fn("TypeParser.fiberType")(function* (type, atLocation) {
 var effectSubtype = fn("TypeParser.effectSubtype")(function* (type, atLocation) {
   const typeChecker = yield* service(TypeCheckerApi);
   const tagSymbol = typeChecker.getPropertyOfType(type, "_tag");
-  if (!tagSymbol) {
+  const getSymbol = typeChecker.getPropertyOfType(type, "get");
+  if (!(tagSymbol || getSymbol)) {
     return yield* typeParserIssue(
-      "Type is not a subtype of effect because it does not have '_tag' property",
+      "Type is not a subtype of effect because it does not have '_tag' or 'get' property",
       type,
       atLocation
     );
@@ -2269,19 +2441,68 @@ var effectFnGen = fn("TypeParser.effectFnGen")(function* (node) {
     functionStar: generatorFunction.getFirstToken()
   };
 });
-var returnYieldEffectBlock = fn("TypeParser.returnYieldEffectBlock")(function* (body) {
+var unnecessaryEffectGen = fn("TypeParser.unnecessaryEffectGen")(function* (node) {
   const ts = yield* service(TypeScriptApi);
   const typeChecker = yield* service(TypeCheckerApi);
-  if (ts.isBlock(body) && body.statements.length === 1 && ts.isReturnStatement(body.statements[0]) && body.statements[0].expression && ts.isYieldExpression(body.statements[0].expression) && body.statements[0].expression.expression) {
-    const nodeToCheck = body.statements[0].expression.expression;
-    const type = typeChecker.getTypeAtLocation(nodeToCheck);
-    yield* effectType(type, nodeToCheck);
-    return nodeToCheck;
+  const { body } = yield* effectGen(node);
+  if (body.statements.length !== 1) {
+    return yield* typeParserIssue(
+      "Generator body should have a single statement",
+      void 0,
+      node
+    );
+  }
+  let explicitReturn = false;
+  let nodeToCheck = body.statements[0];
+  while (nodeToCheck) {
+    if (ts.isReturnStatement(nodeToCheck) && nodeToCheck.expression) {
+      nodeToCheck = nodeToCheck.expression;
+      explicitReturn = true;
+      continue;
+    }
+    if (ts.isExpressionStatement(nodeToCheck)) {
+      nodeToCheck = nodeToCheck.expression;
+      continue;
+    }
+    if (ts.isYieldExpression(nodeToCheck) && nodeToCheck.asteriskToken && nodeToCheck.expression) {
+      const yieldedExpression = nodeToCheck.expression;
+      const type = typeChecker.getTypeAtLocation(yieldedExpression);
+      const { A: successType } = yield* effectType(type, yieldedExpression);
+      let replacementNode = succeed(yieldedExpression);
+      if (!explicitReturn && !(successType.flags & ts.TypeFlags.VoidLike)) {
+        replacementNode = pipe(
+          gen2(function* () {
+            const effectIdentifier = pipe(
+              yield* option(
+                findImportedModuleIdentifierByPackageAndNameOrBarrel(node.getSourceFile(), "effect", "Effect")
+              ),
+              match2({
+                onNone: () => "Effect",
+                onSome: (_) => _.text
+              })
+            );
+            return ts.factory.createCallExpression(
+              ts.factory.createPropertyAccessExpression(
+                ts.factory.createIdentifier(effectIdentifier),
+                "asVoid"
+              ),
+              void 0,
+              [
+                yieldedExpression
+              ]
+            );
+          }),
+          provideService(TypeScriptApi, ts)
+        );
+      }
+      return { node, body, yieldedExpression, replacementNode };
+    }
+    break;
   }
   return yield* typeParserIssue(
-    "Node is not a return statement with a yield expression",
+    "Not an handled node",
     void 0,
-    body
+    node
   );
 });
 var effectSchemaVarianceStruct = fn("TypeParser.effectSchemaVarianceStruct")(
@@ -2318,7 +2539,7 @@ var effectSchemaType = fn("TypeParser.effectSchemaType")(function* (type, atLoca
 
 // src/completions/fnFunctionStar.ts
 var fnFunctionStar = createCompletion({
-  name: "effect/fnFunctionStar",
+  name: "fnFunctionStar",
   apply: fn("fnFunctionStar")(function* (sourceFile, position) {
     const ts = yield* service(TypeScriptApi);
     const maybeInfos = yield* option(
@@ -2367,7 +2588,7 @@ var fnFunctionStar = createCompletion({
 
 // src/completions/genFunctionStar.ts
 var genFunctionStar = createCompletion({
-  name: "effect/genFunctionStar",
+  name: "genFunctionStar",
   apply: fn("genFunctionStar")(function* (sourceFile, position) {
     const ts = yield* service(TypeScriptApi);
     const typeChecker = yield* service(TypeCheckerApi);
@@ -2405,9 +2626,90 @@ var completions = [
   effectDataClasses
 ];
 
+// src/core/LanguageServicePluginOptions.ts
+var LanguageServicePluginOptions = Tag("PluginOptions");
+function parse(config) {
+  return {
+    diagnostics: isObject(config) && hasProperty(config, "diagnostics") && isBoolean(config.diagnostics) ? config.diagnostics : true,
+    quickinfo: isObject(config) && hasProperty(config, "quickinfo") && isBoolean(config.quickinfo) ? config.quickinfo : true,
+    completions: isObject(config) && hasProperty(config, "completions") && isBoolean(config.completions) ? config.completions : true,
+    allowedDuplicatedPackages: isObject(config) && hasProperty(config, "allowedDuplicatedPackages") && isArray(config.allowedDuplicatedPackages) && config.allowedDuplicatedPackages.every(isString) ? config.allowedDuplicatedPackages.map((_) => _.toLowerCase()) : []
+  };
+}
+
+// src/diagnostics/duplicatePackage.ts
+var checkedPackagesCache = /* @__PURE__ */ new Map();
+var programResolvedCacheSize = /* @__PURE__ */ new Map();
+function parsePackageContentNameAndVersion(v) {
+  if (!isObject(v)) return;
+  if (!hasProperty(v, "packageJsonScope")) return;
+  if (!v.packageJsonScope) return;
+  const packageJsonScope = v.packageJsonScope;
+  if (!hasProperty(packageJsonScope, "contents")) return;
+  if (!hasProperty(packageJsonScope.contents, "packageJsonContent")) return;
+  const packageJsonContent = packageJsonScope.contents.packageJsonContent;
+  if (!hasProperty(packageJsonContent, "name")) return;
+  if (!hasProperty(packageJsonContent, "version")) return;
+  const { name, version } = packageJsonContent;
+  if (!isString(name)) return;
+  if (!isString(version)) return;
+  const hasEffectInPeerDependencies = hasProperty(packageJsonContent, "peerDependencies") && isObject(packageJsonContent.peerDependencies) && hasProperty(packageJsonContent.peerDependencies, "effect");
+  return {
+    name: name.toLowerCase(),
+    version: version.toLowerCase(),
+    hasEffectInPeerDependencies,
+    contents: packageJsonContent
+  };
+}
+var duplicatePackage = createDiagnostic({
+  name: "duplicatePackage",
+  code: 6,
+  apply: fn("duplicatePackage.apply")(function* (sourceFile) {
+    const ts = yield* service(TypeScriptApi);
+    const program = yield* service(TypeScriptProgram);
+    const options = yield* service(LanguageServicePluginOptions);
+    const effectDiagnostics = [];
+    if (sourceFile.statements.length < 1) return [];
+    let resolvedPackages = checkedPackagesCache.get(sourceFile.fileName) || {};
+    const newResolvedModuleSize = hasProperty(program, "resolvedModules") && hasProperty(program.resolvedModules, "size") && isNumber(program.resolvedModules.size) ? program.resolvedModules.size : 0;
+    const oldResolvedSize = programResolvedCacheSize.get(sourceFile.fileName) || -1;
+    if (newResolvedModuleSize !== oldResolvedSize) {
+      const seenPackages = /* @__PURE__ */ new Set();
+      resolvedPackages = {};
+      program.getSourceFiles().map((_) => {
+        const packageInfo = parsePackageContentNameAndVersion(_);
+        if (!packageInfo) return;
+        const packageNameAndVersion = packageInfo.name + "@" + packageInfo.version;
+        if (seenPackages.has(packageNameAndVersion)) return;
+        seenPackages.add(packageNameAndVersion);
+        if (!(packageInfo.name === "effect" || packageInfo.hasEffectInPeerDependencies)) return;
+        if (options.allowedDuplicatedPackages.indexOf(packageInfo.name) > -1) return;
+        resolvedPackages[packageInfo.name] = resolvedPackages[packageInfo.name] || {};
+        resolvedPackages[packageInfo.name][packageInfo.version] = packageInfo.contents;
+      });
+      checkedPackagesCache.set(sourceFile.fileName, resolvedPackages);
+      programResolvedCacheSize.set(sourceFile.fileName, newResolvedModuleSize);
+    }
+    for (const packageName of Object.keys(resolvedPackages)) {
+      if (Object.keys(resolvedPackages[packageName]).length > 1) {
+        const versions = Object.keys(resolvedPackages[packageName]);
+        effectDiagnostics.push({
+          node: sourceFile.statements[0],
+          category: ts.DiagnosticCategory.Warning,
+          messageText: `Package ${packageName} is referenced multiple times with different versions (${versions.join(", ")}) and may cause unexpected type errors.
+Cleanup your dependencies and your package lockfile to avoid multiple instances of this package and reload the project.
+If this is intended set the LSP config "allowedDuplicatedPackages" to ${JSON.stringify(options.allowedDuplicatedPackages.concat([packageName]))}.`,
+          fixes: []
+        });
+      }
+    }
+    return effectDiagnostics;
+  })
+});
+
 // src/diagnostics/floatingEffect.ts
 var floatingEffect = createDiagnostic({
-  name: "effect/floatingEffect",
+  name: "floatingEffect",
   code: 3,
   apply: fn("floatingEffect.apply")(function* (sourceFile) {
     const ts = yield* service(TypeScriptApi);
@@ -2416,7 +2718,7 @@ var floatingEffect = createDiagnostic({
       if (!ts.isExpressionStatement(node)) return false;
       if (!(ts.isBlock(node.parent) || ts.isSourceFile(node.parent))) return false;
       const expression = node.expression;
-      if (ts.isBinaryExpression(expression) && expression.operatorToken && expression.operatorToken.kind === ts.SyntaxKind.EqualsToken) return false;
+      if (ts.isBinaryExpression(expression) && expression.operatorToken && (expression.operatorToken.kind === ts.SyntaxKind.EqualsToken || expression.operatorToken.kind === ts.SyntaxKind.QuestionQuestionEqualsToken || expression.operatorToken.kind === ts.SyntaxKind.AmpersandAmpersandEqualsToken || expression.operatorToken.kind === ts.SyntaxKind.BarBarEqualsToken)) return false;
       return true;
     }
     const effectDiagnostics = [];
@@ -2454,7 +2756,7 @@ var floatingEffect = createDiagnostic({
 
 // src/diagnostics/missingEffectContext.ts
 var missingEffectContext = createDiagnostic({
-  name: "effect/missingEffectContext",
+  name: "missingEffectContext",
   code: 1,
   apply: fn("missingEffectContext.apply")(function* (sourceFile) {
     const ts = yield* service(TypeScriptApi);
@@ -2506,7 +2808,7 @@ var missingEffectContext = createDiagnostic({
 
 // src/diagnostics/missingEffectError.ts
 var missingEffectError = createDiagnostic({
-  name: "effect/missingEffectError",
+  name: "missingEffectError",
   code: 1,
   apply: fn("missingEffectError.apply")(function* (sourceFile) {
     const ts = yield* service(TypeScriptApi);
@@ -2558,7 +2860,7 @@ var missingEffectError = createDiagnostic({
 
 // src/diagnostics/missingStarInYieldEffectGen.ts
 var missingStarInYieldEffectGen = createDiagnostic({
-  name: "effect/missingStarInYieldEffectGen",
+  name: "missingStarInYieldEffectGen",
   code: 4,
   apply: fn("missingStarInYieldEffectGen.apply")(function* (sourceFile) {
     const ts = yield* service(TypeScriptApi);
@@ -2577,7 +2879,7 @@ var missingStarInYieldEffectGen = createDiagnostic({
       if (ts.isYieldExpression(node) && node.expression && node.asteriskToken === void 0) {
         const functionStarNode = ts.findAncestor(
           node,
-          (_) => (ts.isFunctionExpression(_) || ts.isMethodDeclaration(_)) && _.asteriskToken !== void 0
+          (_) => ts.isFunctionExpression(_) || ts.isFunctionDeclaration(_) || ts.isMethodDeclaration(_)
         );
         if (functionStarNode && functionStarNode.parent) {
           const effectGenNode = functionStarNode.parent;
@@ -2631,51 +2933,9 @@ var missingStarInYieldEffectGen = createDiagnostic({
   })
 });
 
-// src/diagnostics/multipleEffectVersions.ts
-var effectVersionsCache = /* @__PURE__ */ new Map();
-var programResolvedCacheSize = /* @__PURE__ */ new Map();
-var multipleEffectVersions = createDiagnostic({
-  name: "effect/multipleEffectVersions",
-  code: 6,
-  apply: fn("multipleEffectVersions.apply")(function* (sourceFile) {
-    const ts = yield* service(TypeScriptApi);
-    const program = yield* service(TypeScriptProgram);
-    const options = yield* service(PluginOptions);
-    const effectDiagnostics = [];
-    if (!options.multipleEffectCheck) return [];
-    if (sourceFile.statements.length < 1) return [];
-    const effectVersions = effectVersionsCache.get(sourceFile.fileName) || {};
-    const newResolvedModuleSize = "resolvedModules" in program && typeof program.resolvedModules === "object" && "size" in program.resolvedModules ? program.resolvedModules.size : 0;
-    const oldResolvedSize = programResolvedCacheSize.get(sourceFile.fileName) || 0;
-    if (newResolvedModuleSize !== oldResolvedSize) {
-      if ("forEachResolvedModule" in program && typeof program.forEachResolvedModule === "function") {
-        program.forEachResolvedModule((_) => {
-          if (_ && _.resolvedModule && _.resolvedModule.packageId && _.resolvedModule.packageId.name === "effect" && !(_.resolvedModule.packageId.version in effectVersions)) {
-            effectVersions[_.resolvedModule.packageId.version] = {
-              resolvedFileName: _.resolvedModule.resolvedFileName
-            };
-          }
-        });
-      }
-      effectVersionsCache.set(sourceFile.fileName, effectVersions);
-      programResolvedCacheSize.set(sourceFile.fileName, newResolvedModuleSize);
-    }
-    if (Object.keys(effectVersions).length > 1) {
-      const versions = Object.keys(effectVersions).map((version) => `version ${version}`);
-      effectDiagnostics.push({
-        node: sourceFile.statements[0],
-        category: ts.DiagnosticCategory.Warning,
-        messageText: `Seems like in this project there are multiple effect versions loaded (${versions.join(", ")}). This may cause unexpected type errors and runtime behaviours. If you are ok with that, you can disable this warning by adding "multipleEffectCheck": false to the Effect LSP options inside your tsconfig.json`,
-        fixes: []
-      });
-    }
-    return effectDiagnostics;
-  })
-});
-
 // src/diagnostics/unnecessaryEffectGen.ts
-var unnecessaryEffectGen = createDiagnostic({
-  name: "effect/unnecessaryEffectGen",
+var unnecessaryEffectGen2 = createDiagnostic({
+  name: "unnecessaryEffectGen",
   code: 5,
   apply: fn("unnecessaryEffectGen.apply")(function* (sourceFile) {
     const ts = yield* service(TypeScriptApi);
@@ -2690,13 +2950,9 @@ var unnecessaryEffectGen = createDiagnostic({
     while (nodeToVisit.length > 0) {
       const node = nodeToVisit.shift();
       ts.forEachChild(node, appendNodeToVisit);
-      const maybeNode = yield* pipe(
-        effectGen(node),
-        flatMap3(({ body }) => returnYieldEffectBlock(body)),
-        option
-      );
+      const maybeNode = yield* option(unnecessaryEffectGen(node));
       if (isSome2(maybeNode)) {
-        unnecessaryGenerators.set(node, maybeNode.value);
+        unnecessaryGenerators.set(node, maybeNode.value.replacementNode);
       }
     }
     unnecessaryGenerators.forEach(
@@ -2711,7 +2967,7 @@ var unnecessaryEffectGen = createDiagnostic({
             const textChanges = yield* service(
               ChangeTracker
             );
-            textChanges.replaceNode(sourceFile, effectGenCall, yieldedResult);
+            textChanges.replaceNode(sourceFile, effectGenCall, yield* yieldedResult);
           })
         }]
       })
@@ -2722,31 +2978,31 @@ var unnecessaryEffectGen = createDiagnostic({
 
 // src/diagnostics.ts
 var diagnostics = [
-  multipleEffectVersions,
+  duplicatePackage,
   missingEffectContext,
   missingEffectError,
   floatingEffect,
   missingStarInYieldEffectGen,
-  unnecessaryEffectGen
+  unnecessaryEffectGen2
 ];
 
-// src/quickinfo.ts
-var SymbolDisplayPartEq = make(
-  (fa, fb) => fa.kind === fb.kind && fa.text === fb.text
-);
+// src/quickinfo/dedupeJsDocs.ts
+var SymbolDisplayPartEq = make((fa, fb) => fa.kind === fb.kind && fa.text === fb.text);
 var JSDocTagInfoEq = make(
   (fa, fb) => fa.name === fb.name && typeof fa.text === typeof fb.text && (typeof fa.text !== "undefined" ? array(SymbolDisplayPartEq)(fa.text, fb.text) : true)
 );
-function dedupeJsDocTags(quickInfo) {
-  if (!quickInfo) return quickInfo;
-  if (quickInfo.tags) {
-    return {
-      ...quickInfo,
-      tags: dedupeWith(quickInfo.tags, JSDocTagInfoEq)
-    };
+function dedupeJsDocs(quickInfo2) {
+  if (!quickInfo2) return succeed(quickInfo2);
+  if (quickInfo2.tags) {
+    return succeed({
+      ...quickInfo2,
+      tags: dedupeWith(quickInfo2.tags, JSDocTagInfoEq)
+    });
   }
-  return quickInfo;
+  return succeed(quickInfo2);
 }
+
+// src/quickinfo/effectTypeArgs.ts
 function formatTypeForQuickInfo(channelType, channelName) {
   return gen2(function* () {
     const ts = yield* service(TypeScriptApi);
@@ -2759,7 +3015,7 @@ function formatTypeForQuickInfo(channelType, channelName) {
     return `type ${channelName} = ${stringRepresentation}`;
   });
 }
-function prependEffectTypeArguments(sourceFile, position, quickInfo) {
+function effectTypeArgs(sourceFile, position, quickInfo2) {
   return pipe(
     gen2(function* () {
       const ts = yield* service(TypeScriptApi);
@@ -2768,11 +3024,11 @@ function prependEffectTypeArguments(sourceFile, position, quickInfo) {
         yield* getAncestorNodesInRange(sourceFile, toTextRange(position)),
         head
       );
-      if (isNone2(maybeNode)) return quickInfo;
+      if (isNone2(maybeNode)) return quickInfo2;
       const node = maybeNode.value;
-      const hasTruncationHappened = quickInfo && ts.displayPartsToString(quickInfo.displayParts).indexOf("...") > -1;
-      const nodeForType = !quickInfo && ts.isYieldExpression(node) && node.asteriskToken && node.expression ? node.expression : hasTruncationHappened ? node : void 0;
-      if (!nodeForType) return quickInfo;
+      const hasTruncationHappened = quickInfo2 && ts.displayPartsToString(quickInfo2.displayParts).indexOf("...") > -1;
+      const nodeForType = !quickInfo2 && ts.isYieldExpression(node) && node.asteriskToken && node.expression ? node.expression : hasTruncationHappened ? node : void 0;
+      if (!nodeForType) return quickInfo2;
       const effectType2 = yield* effectType(
         typeChecker.getTypeAtLocation(nodeForType),
         nodeForType
@@ -2781,7 +3037,7 @@ function prependEffectTypeArguments(sourceFile, position, quickInfo) {
         kind: "text",
         text: "```ts\n/* Effect Type Parameters */\n" + (yield* formatTypeForQuickInfo(effectType2.A, "Success")) + "\n" + (yield* formatTypeForQuickInfo(effectType2.E, "Failure")) + "\n" + (yield* formatTypeForQuickInfo(effectType2.R, "Requirements")) + "\n```\n"
       }];
-      if (!quickInfo) {
+      if (!quickInfo2) {
         const start = node.getStart();
         const end = node.getEnd();
         return {
@@ -2791,24 +3047,401 @@ function prependEffectTypeArguments(sourceFile, position, quickInfo) {
           documentation: effectTypeArgsDocumentation
         };
       }
-      if (quickInfo.documentation) {
+      if (quickInfo2.documentation) {
         return {
-          ...quickInfo,
-          documentation: effectTypeArgsDocumentation.concat(quickInfo.documentation)
+          ...quickInfo2,
+          documentation: effectTypeArgsDocumentation.concat(quickInfo2.documentation)
         };
       }
       return {
-        ...quickInfo,
+        ...quickInfo2,
         documentation: effectTypeArgsDocumentation
       };
     }),
-    orElse3(() => succeed(quickInfo))
+    orElse3(() => succeed(quickInfo2))
+  );
+}
+
+// src/quickinfo/layerInfo.ts
+var UnableToProduceLayerGraphError = class {
+  constructor(message, node) {
+    this.message = message;
+    this.node = node;
+  }
+  _tag = "@effect/language-service/UnableToProduceLayerGraphError";
+};
+var GraphNodeLeaf = class {
+  constructor(id, node, rout, rin) {
+    this.id = id;
+    this.node = node;
+    this.rout = rout;
+    this.rin = rin;
+  }
+  _tag = "GraphNodeLeaf";
+};
+var GraphNodeCompoundTransform = class {
+  constructor(id, node, args, rout, rin) {
+    this.id = id;
+    this.node = node;
+    this.args = args;
+    this.rout = rout;
+    this.rin = rin;
+  }
+  _tag = "GraphNodeCompoundTransform";
+};
+function processLayerGraphNode(ctx, node, pipedInGraphNode) {
+  return gen2(function* () {
+    const ts = yield* service(TypeScriptApi);
+    const typeChecker = yield* service(TypeCheckerApi);
+    if (ts.isCallExpression(node) && ts.isPropertyAccessExpression(node.expression) && node.expression.name.text === "pipe") {
+      let graphNode = yield* processLayerGraphNode(ctx, node.expression.expression, void 0);
+      for (const entry of node.arguments) {
+        graphNode = yield* processLayerGraphNode(ctx, entry, graphNode);
+      }
+      return graphNode;
+    }
+    if (ts.isCallExpression(node) && ts.isIdentifier(node.expression) && node.expression.text === "pipe" && node.arguments.length > 0) {
+      let graphNode = yield* processLayerGraphNode(ctx, node.arguments[0], void 0);
+      for (let i = 1; i < node.arguments.length; i++) {
+        graphNode = yield* processLayerGraphNode(ctx, node.arguments[i], graphNode);
+      }
+      return graphNode;
+    }
+    if (ts.isCallExpression(node)) {
+      const type = typeChecker.getTypeAtLocation(node);
+      const maybeLayer = yield* option(layerType(type, node));
+      if (isSome2(maybeLayer)) {
+        const argNodes = yield* option(
+          all2(...node.arguments.map((_) => processLayerGraphNode(ctx, _, void 0)))
+        );
+        if (isSome2(argNodes) && argNodes.value.length === node.arguments.length) {
+          const { allIndexes: outTypes } = yield* appendToUniqueTypesMap(
+            ctx.services,
+            maybeLayer.value.ROut,
+            true
+          );
+          const { allIndexes: inTypes } = yield* appendToUniqueTypesMap(
+            ctx.services,
+            maybeLayer.value.RIn,
+            true
+          );
+          return new GraphNodeCompoundTransform(
+            ctx.nextId(),
+            node,
+            argNodes.value,
+            outTypes,
+            inTypes
+          );
+        }
+      }
+    }
+    if (pipedInGraphNode && ts.isExpression(node)) {
+      const type = typeChecker.getContextualType(node);
+      if (type) {
+        const callSignatures = type.getCallSignatures();
+        if (callSignatures.length === 1) {
+          const [signature] = callSignatures;
+          const returnType = signature.getReturnType();
+          const maybeLayer = yield* option(layerType(returnType, node));
+          if (isSome2(maybeLayer)) {
+            const { allIndexes: outTypes } = yield* appendToUniqueTypesMap(
+              ctx.services,
+              maybeLayer.value.ROut,
+              true
+            );
+            const { allIndexes: inTypes } = yield* appendToUniqueTypesMap(
+              ctx.services,
+              maybeLayer.value.RIn,
+              true
+            );
+            if (ts.isCallExpression(node)) {
+              const argNodes = yield* option(
+                all2(...node.arguments.map((_) => processLayerGraphNode(ctx, _, void 0)))
+              );
+              if (isSome2(argNodes) && argNodes.value.length === node.arguments.length) {
+                return new GraphNodeCompoundTransform(
+                  ctx.nextId(),
+                  node,
+                  [pipedInGraphNode, ...argNodes.value],
+                  outTypes,
+                  inTypes
+                );
+              }
+            }
+            const argNode = yield* option(processLayerGraphNode(ctx, node, void 0));
+            if (isSome2(argNode)) {
+              return new GraphNodeCompoundTransform(
+                ctx.nextId(),
+                node,
+                [pipedInGraphNode, argNode.value],
+                outTypes,
+                inTypes
+              );
+            } else {
+              return new GraphNodeCompoundTransform(
+                ctx.nextId(),
+                node,
+                [pipedInGraphNode],
+                outTypes,
+                inTypes
+              );
+            }
+          }
+        }
+      }
+    }
+    if (ts.isExpression(node)) {
+      const type = typeChecker.getTypeAtLocation(node);
+      const maybeLayer = yield* option(layerType(type, node));
+      if (isSome2(maybeLayer)) {
+        const { allIndexes: outTypes } = yield* appendToUniqueTypesMap(
+          ctx.services,
+          maybeLayer.value.ROut,
+          true
+        );
+        const { allIndexes: inTypes } = yield* appendToUniqueTypesMap(
+          ctx.services,
+          maybeLayer.value.RIn,
+          true
+        );
+        return new GraphNodeLeaf(ctx.nextId(), node, outTypes, inTypes);
+      }
+    }
+    return yield* fail(new UnableToProduceLayerGraphError(node.getText()));
+  });
+}
+function findInnermostGraphEdge(graph, kind, key) {
+  switch (graph._tag) {
+    case "GraphNodeLeaf":
+      return graph[kind].indexOf(key) > -1 ? [graph] : [];
+    case "GraphNodeCompoundTransform": {
+      if (graph[kind].indexOf(key) > -1) {
+        let result = [];
+        for (const child of graph.args) {
+          result = result.concat(findInnermostGraphEdge(child, kind, key));
+        }
+        if (result.length > 0) return result;
+        return [graph];
+      }
+      return [];
+    }
+  }
+}
+function escapeMermaid(text) {
+  return text.replace(/"/mg, "#quot;").replace(/\n/mg, " ");
+}
+function processNodeMermaid(graph, ctx, ctxL) {
+  return gen2(function* () {
+    const ts = yield* service(TypeScriptApi);
+    const typeChecker = yield* service(TypeCheckerApi);
+    let subgraphDefs = [];
+    if (!ctx.seenIds.has(graph.id)) {
+      const subgraphsIn = [];
+      for (const serviceId of graph.rin) {
+        const type = ctxL.services.get(serviceId);
+        const typeString = typeChecker.typeToString(type, void 0, ts.TypeFormatFlags.NoTruncation);
+        subgraphsIn.push("subgraph " + graph.id + "_rin_" + serviceId + ' ["`' + escapeMermaid(typeString) + '`"]');
+        subgraphsIn.push("end");
+      }
+      const subgraphsOut = [];
+      for (const serviceId of graph.rout) {
+        const type = ctxL.services.get(serviceId);
+        const typeString = typeChecker.typeToString(type, void 0, ts.TypeFormatFlags.NoTruncation);
+        subgraphsOut.push("subgraph " + graph.id + "_rout_" + serviceId + ' ["`' + escapeMermaid(typeString) + '`"]');
+        subgraphsOut.push("end");
+      }
+      const sourceFile = graph.node.getSourceFile();
+      const nodePosition = graph.node.getStart(sourceFile, false);
+      const { character, line } = ts.getLineAndCharacterOfPosition(sourceFile, nodePosition);
+      if (subgraphsIn.length > 0) {
+        subgraphDefs = [
+          ...subgraphDefs,
+          "subgraph " + graph.id + "_rin [Requires]",
+          ...subgraphsIn,
+          "end",
+          "style " + graph.id + "_rin stroke:none"
+        ];
+      }
+      if (subgraphsOut.length > 0) {
+        subgraphDefs = [
+          ...subgraphDefs,
+          "subgraph " + graph.id + "_rout [Provides]",
+          ...subgraphsOut,
+          "end",
+          "style " + graph.id + "_rout stroke:none"
+        ];
+      }
+      subgraphDefs = [
+        "subgraph " + graph.id + ' ["`' + escapeMermaid(graph.node.getText()) + " _at ln " + (line + 1) + " col " + character + '_`"]',
+        ...subgraphDefs,
+        "end",
+        "style " + graph.id + " fill:transparent"
+      ];
+      ctx.seenIds.add(graph.id);
+    }
+    switch (graph._tag) {
+      case "GraphNodeLeaf": {
+        return subgraphDefs;
+      }
+      case "GraphNodeCompoundTransform": {
+        const childs = flatten(yield* all2(...graph.args.map((_) => processNodeMermaid(_, ctx, ctxL))));
+        let currentEdges = [];
+        const connectedNodes = /* @__PURE__ */ new Set();
+        for (const requiredServiceKey of graph.rin) {
+          for (const childNode of graph.args.filter((childNode2) => childNode2.rin.indexOf(requiredServiceKey) > -1)) {
+            currentEdges = [
+              ...currentEdges,
+              graph.id + "_rin_" + requiredServiceKey + " -.-> " + childNode.id + "_rin_" + requiredServiceKey
+            ];
+            connectedNodes.add(childNode.id);
+          }
+        }
+        for (const providedServiceKey of graph.rout) {
+          for (const childNode of graph.args.filter((childNode2) => childNode2.rout.indexOf(providedServiceKey) > -1)) {
+            currentEdges = [
+              ...currentEdges,
+              graph.id + "_rout_" + providedServiceKey + " -.-> " + childNode.id + "_rout_" + providedServiceKey
+            ];
+            connectedNodes.add(childNode.id);
+          }
+        }
+        for (const childNode of graph.args) {
+          if (!connectedNodes.has(childNode.id)) {
+            currentEdges = [...currentEdges, graph.id + " -.-x " + childNode.id];
+          }
+        }
+        return [...subgraphDefs, ...childs, ...currentEdges];
+      }
+    }
+  });
+}
+function generateMarmaidUri(graph, ctxL) {
+  return gen2(function* () {
+    const ctx = {
+      seenIds: /* @__PURE__ */ new Set()
+    };
+    const lines = yield* processNodeMermaid(graph, ctx, ctxL);
+    const code = "flowchart TB\n" + lines.join("\n");
+    const state = btoa(JSON.stringify({ code }));
+    return "https://www.mermaidchart.com/play#" + state;
+  });
+}
+function layerInfo(sourceFile, position, quickInfo2) {
+  return pipe(
+    gen2(function* () {
+      const ts = yield* service(TypeScriptApi);
+      const typeChecker = yield* service(TypeCheckerApi);
+      const range = toTextRange(position);
+      const maybeNode = pipe(
+        yield* getAncestorNodesInRange(sourceFile, range),
+        filter((_) => ts.isVariableDeclaration(_) || ts.isPropertyDeclaration(_)),
+        filter((_) => isNodeInRange(range)(_.name)),
+        head
+      );
+      if (isNone2(maybeNode)) return quickInfo2;
+      const node = maybeNode.value;
+      const layerNode = node.initializer ? node.initializer : node;
+      const layerType2 = typeChecker.getTypeAtLocation(layerNode);
+      const maybeLayer = yield* option(layerType(layerType2, layerNode));
+      if (isNone2(maybeLayer)) return quickInfo2;
+      let lastId = 0;
+      const graphCtx = {
+        services: /* @__PURE__ */ new Map(),
+        serviceTypeToString: /* @__PURE__ */ new Map(),
+        nextId: () => "id" + lastId++
+      };
+      const layerInfoDisplayParts = yield* pipe(
+        processLayerGraphNode(graphCtx, layerNode, void 0),
+        flatMap3(
+          (rootNode) => gen2(function* () {
+            yield* succeed(void 0);
+            const lines = [];
+            const appendInfo = (providesNode, type, kindText) => {
+              const typeString = typeChecker.typeToString(
+                type,
+                void 0,
+                ts.TypeFormatFlags.NoTruncation
+              );
+              const positions = providesNode.map((_) => {
+                const nodePosition = _.node.getStart(sourceFile, false);
+                const { character, line } = ts.getLineAndCharacterOfPosition(sourceFile, nodePosition);
+                const nodeText = _.node.getText().trim().substr(0, 100);
+                return "ln " + (line + 1) + " col " + character + " by `" + nodeText + "`";
+              });
+              lines.push("- " + typeString + " " + kindText + " at " + positions.join(", "));
+            };
+            for (const providesKey of rootNode.rout) {
+              const providesNode = findInnermostGraphEdge(rootNode, "rout", providesKey);
+              appendInfo(providesNode, graphCtx.services.get(providesKey), "provided");
+            }
+            lines.push("");
+            for (const requiresKey of rootNode.rin) {
+              const requiresNode = findInnermostGraphEdge(rootNode, "rin", requiresKey);
+              appendInfo(requiresNode, graphCtx.services.get(requiresKey), "required");
+            }
+            const mermaidUri = yield* option(generateMarmaidUri(rootNode, graphCtx));
+            const linkParts = [];
+            if (isSome2(mermaidUri)) {
+              linkParts.push({ kind: "space", text: "\n" });
+              linkParts.push({ kind: "link", text: "{@link " });
+              linkParts.push({ kind: "linkText", text: mermaidUri.value + " Show full Layer graph" });
+              linkParts.push({ kind: "link", text: "}" });
+              linkParts.push({ kind: "space", text: "\n" });
+            }
+            return [
+              {
+                kind: "text",
+                text: "```\n/**\n" + lines.map((l) => " * " + l).join("\n") + "\n */\n```\n"
+              },
+              ...linkParts
+            ];
+          })
+        ),
+        orElse3(
+          (e) => succeed([{
+            kind: "text",
+            text: "```\n/** layer graph not created: " + e.message + " */\n```\n"
+          }])
+        )
+      );
+      if (!quickInfo2) {
+        const start = node.getStart();
+        const end = node.getEnd();
+        return {
+          kind: ts.ScriptElementKind.callSignatureElement,
+          kindModifiers: "",
+          textSpan: { start, length: end - start },
+          documentation: layerInfoDisplayParts
+        };
+      }
+      if (quickInfo2.documentation) {
+        return {
+          ...quickInfo2,
+          documentation: quickInfo2.documentation.concat([{ kind: "space", text: "\n" }]).concat(layerInfoDisplayParts)
+        };
+      }
+      return {
+        ...quickInfo2,
+        documentation: layerInfoDisplayParts
+      };
+    }),
+    orElse3(() => succeed(quickInfo2))
   );
 }
 
+// src/quickinfo.ts
+function quickInfo(sourceFile, position, quickInfo2) {
+  return gen2(function* () {
+    const deduped = yield* dedupeJsDocs(quickInfo2);
+    const withEffectTypeArgs = yield* effectTypeArgs(sourceFile, position, deduped);
+    const withLayerInfo = yield* layerInfo(sourceFile, position, withEffectTypeArgs);
+    return withLayerInfo;
+  });
+}
+
 // src/refactors/asyncAwaitToGen.ts
 var asyncAwaitToGen = createRefactor({
-  name: "effect/asyncAwaitToGen",
+  name: "asyncAwaitToGen",
   description: "Convert to Effect.gen",
   apply: fn("asyncAwaitToGen.apply")(function* (sourceFile, textRange) {
     const ts = yield* service(TypeScriptApi);
@@ -2819,9 +3452,7 @@ var asyncAwaitToGen = createRefactor({
         (node2) => ts.isFunctionDeclaration(node2) || ts.isArrowFunction(node2) || ts.isFunctionExpression(node2)
       ),
       filter((node2) => !!node2.body),
-      filter(
-        (node2) => !!(ts.getCombinedModifierFlags(node2) & ts.ModifierFlags.Async)
-      ),
+      filter((node2) => !!(ts.getCombinedModifierFlags(node2) & ts.ModifierFlags.Async)),
       head
     );
     if (isNone2(maybeNode)) return yield* fail(new RefactorNotApplicableError());
@@ -2880,7 +3511,7 @@ var asyncAwaitToGen = createRefactor({
 
 // src/refactors/asyncAwaitToGenTryPromise.ts
 var asyncAwaitToGenTryPromise = createRefactor({
-  name: "effect/asyncAwaitToGenTryPromise",
+  name: "asyncAwaitToGenTryPromise",
   description: "Convert to Effect.gen with failures",
   apply: fn("asyncAwaitToGenTryPromise.apply")(function* (sourceFile, textRange) {
     const ts = yield* service(TypeScriptApi);
@@ -2891,9 +3522,7 @@ var asyncAwaitToGenTryPromise = createRefactor({
         (node2) => ts.isFunctionDeclaration(node2) || ts.isArrowFunction(node2) || ts.isFunctionExpression(node2)
       ),
       filter((node2) => !!node2.body),
-      filter(
-        (node2) => !!(ts.getCombinedModifierFlags(node2) & ts.ModifierFlags.Async)
-      ),
+      filter((node2) => !!(ts.getCombinedModifierFlags(node2) & ts.ModifierFlags.Async)),
       head
     );
     if (isNone2(maybeNode)) return yield* fail(new RefactorNotApplicableError());
@@ -2982,7 +3611,7 @@ var asyncAwaitToGenTryPromise = createRefactor({
 
 // src/refactors/effectGenToFn.ts
 var effectGenToFn = createRefactor({
-  name: "effect/effectGenToFn",
+  name: "effectGenToFn",
   description: "Convert to Effect.fn",
   apply: fn("effectGenToFn.apply")(function* (sourceFile, textRange) {
     const ts = yield* service(TypeScriptApi);
@@ -3072,7 +3701,7 @@ var effectGenToFn = createRefactor({
 
 // src/refactors/functionToArrow.ts
 var functionToArrow = createRefactor({
-  name: "effect/functionToArrow",
+  name: "functionToArrow",
   description: "Convert to arrow",
   apply: fn("functionToArrow.apply")(function* (sourceFile, textRange) {
     const ts = yield* service(TypeScriptApi);
@@ -3240,7 +3869,7 @@ var _createOpaqueTypes = fn("_createOpaqueTypes")(function* (effectSchemaName, i
   return { contextType, encodedType, opaqueType };
 });
 var makeSchemaOpaque = createRefactor({
-  name: "effect/makeSchemaOpaque",
+  name: "makeSchemaOpaque",
   description: "Make Schema opaque",
   apply: fn("makeSchemaOpaque.apply")(function* (sourceFile, textRange) {
     const ts = yield* service(TypeScriptApi);
@@ -3318,7 +3947,7 @@ var makeSchemaOpaque = createRefactor({
 
 // src/refactors/makeSchemaOpaqueWithNs.ts
 var makeSchemaOpaqueWithNs = createRefactor({
-  name: "effect/makeSchemaOpaqueWithNs",
+  name: "makeSchemaOpaqueWithNs",
   description: "Make Schema opaque with namespace",
   apply: fn("makeSchemaOpaqueWithNs.apply")(function* (sourceFile, textRange) {
     const ts = yield* service(TypeScriptApi);
@@ -3412,7 +4041,7 @@ var makeSchemaOpaqueWithNs = createRefactor({
 
 // src/refactors/pipeableToDatafirst.ts
 var pipeableToDatafirst = createRefactor({
-  name: "effect/pipeableToDatafirst",
+  name: "pipeableToDatafirst",
   description: "Rewrite to datafirst",
   apply: fn("pipeableToDatafirst.apply")(function* (sourceFile, textRange) {
     const ts = yield* service(TypeScriptApi);
@@ -3495,23 +4124,19 @@ var pipeableToDatafirst = createRefactor({
 
 // src/refactors/removeUnnecessaryEffectGen.ts
 var removeUnnecessaryEffectGen = createRefactor({
-  name: "effect/removeUnnecessaryEffectGen",
+  name: "removeUnnecessaryEffectGen",
   description: "Remove unnecessary Effect.gen",
   apply: fn("removeUnnecessaryEffectGen.apply")(function* (sourceFile, textRange) {
     for (const nodeToReplace of yield* getAncestorNodesInRange(sourceFile, textRange)) {
-      const maybeNode = yield* pipe(
-        effectGen(nodeToReplace),
-        flatMap3(({ body }) => returnYieldEffectBlock(body)),
-        option
-      );
+      const maybeNode = yield* option(unnecessaryEffectGen(nodeToReplace));
       if (isNone2(maybeNode)) continue;
-      const returnedYieldedEffect = maybeNode.value;
+      const replacementNode = maybeNode.value.replacementNode;
       return {
         kind: "refactor.rewrite.effect.removeUnnecessaryEffectGen",
         description: "Remove unnecessary Effect.gen",
         apply: gen2(function* () {
           const changeTracker = yield* service(ChangeTracker);
-          changeTracker.replaceNode(sourceFile, nodeToReplace, returnedYieldedEffect);
+          changeTracker.replaceNode(sourceFile, nodeToReplace, yield* replacementNode);
         })
       };
     }
@@ -3521,7 +4146,7 @@ var removeUnnecessaryEffectGen = createRefactor({
 
 // src/refactors/toggleLazyConst.ts
 var toggleLazyConst = createRefactor({
-  name: "effect/toggleLazyConst",
+  name: "toggleLazyConst",
   description: "Toggle lazy const",
   apply: fn("toggleLazyConst.apply")(function* (sourceFile, textRange) {
     const ts = yield* service(TypeScriptApi);
@@ -3561,7 +4186,7 @@ var toggleLazyConst = createRefactor({
 
 // src/refactors/toggleReturnTypeAnnotation.ts
 var toggleReturnTypeAnnotation = createRefactor({
-  name: "effect/toggleReturnTypeAnnotation",
+  name: "toggleReturnTypeAnnotation",
   description: "Toggle return type annotation",
   apply: fn("toggleReturnTypeAnnotation.apply")(function* (sourceFile, textRange) {
     const ts = yield* service(TypeScriptApi);
@@ -3611,16 +4236,14 @@ var toggleReturnTypeAnnotation = createRefactor({
 
 // src/refactors/toggleTypeAnnotation.ts
 var toggleTypeAnnotation = createRefactor({
-  name: "effect/toggleTypeAnnotation",
+  name: "toggleTypeAnnotation",
   description: "Toggle type annotation",
   apply: fn("toggleTypeAnnotation.apply")(function* (sourceFile, textRange) {
     const ts = yield* service(TypeScriptApi);
     const typeChecker = yield* service(TypeCheckerApi);
     const maybeNode = pipe(
       yield* getAncestorNodesInRange(sourceFile, textRange),
-      filter(
-        (node2) => ts.isVariableDeclaration(node2) || ts.isPropertyDeclaration(node2)
-      ),
+      filter((node2) => ts.isVariableDeclaration(node2) || ts.isPropertyDeclaration(node2)),
       filter((node2) => isNodeInRange(textRange)(node2.name)),
       filter((node2) => !!node2.initializer),
       head
@@ -4130,7 +4753,7 @@ var applyAtNode = fn("SchemaGen.applyAtNode")(
 
 // src/refactors/typeToEffectSchema.ts
 var typeToEffectSchema = createRefactor({
-  name: "effect/typeToEffectSchema",
+  name: "typeToEffectSchema",
   description: "Refactor to Schema",
   apply: fn("typeToEffectSchema.apply")(function* (sourceFile, textRange) {
     const ts = yield* service(TypeScriptApi);
@@ -4152,7 +4775,7 @@ var typeToEffectSchema = createRefactor({
 
 // src/refactors/typeToEffectSchemaClass.ts
 var typeToEffectSchemaClass = createRefactor({
-  name: "effect/typeToEffectSchemaClass",
+  name: "typeToEffectSchemaClass",
   description: "Refactor to Schema.Class",
   apply: fn("typeToEffectSchemaClass.apply")(function* (sourceFile, textRange) {
     const ts = yield* service(TypeScriptApi);
@@ -4174,7 +4797,7 @@ var typeToEffectSchemaClass = createRefactor({
 
 // src/refactors/wrapWithEffectGen.ts
 var wrapWithEffectGen = createRefactor({
-  name: "effect/wrapWithEffectGen",
+  name: "wrapWithEffectGen",
   description: "Wrap with Effect.gen",
   apply: fn("wrapWithEffectGen.apply")(function* (sourceFile, textRange) {
     const ts = yield* service(TypeScriptApi);
@@ -4239,7 +4862,7 @@ var getEffectModuleIdentifierName = fn("getEffectModuleIdentifierName")(
 
 // src/refactors/wrapWithPipe.ts
 var wrapWithPipe = createRefactor({
-  name: "effect/wrapWithPipe",
+  name: "wrapWithPipe",
   description: "Wrap with pipe",
   apply: fn("wrapWithPipe.apply")(function* (sourceFile, textRange) {
     if (textRange.end - textRange.pos === 0) {
@@ -4277,10 +4900,12 @@ var refactors = [
 ];
 
 // src/index.ts
+var LSP_INJECTED_URI = "@effect/language-service/injected";
 var init = (modules) => {
   function create(info) {
     const languageService = info.languageService;
-    const pluginOptions = parsePluginOptions(info.config);
+    if (languageService[LSP_INJECTED_URI]) return languageService;
+    const languageServicePluginOptions = parse(info.config);
     const diagnosticsErrorCodes = diagnostics.map((diagnostic) => diagnostic.code);
     try {
       ;
@@ -4291,28 +4916,38 @@ var init = (modules) => {
     } catch (_) {
     }
     const proxy = /* @__PURE__ */ Object.create(null);
+    proxy[LSP_INJECTED_URI] = true;
     for (const k of Object.keys(languageService)) {
       proxy[k] = (...args) => languageService[k].apply(languageService, args);
     }
+    function runNano(program) {
+      return (fa) => pipe(
+        fa,
+        provideService(TypeScriptProgram, program),
+        provideService(TypeCheckerApi, program.getTypeChecker()),
+        provideService(
+          TypeCheckerApiCache,
+          makeTypeCheckerApiCache()
+        ),
+        provideService(TypeScriptApi, modules.typescript),
+        provideService(
+          LanguageServicePluginOptions,
+          languageServicePluginOptions
+        ),
+        run
+      );
+    }
     const effectCodeFixesForFile = /* @__PURE__ */ new Map();
     proxy.getSemanticDiagnostics = (fileName, ...args) => {
       const applicableDiagnostics = languageService.getSemanticDiagnostics(fileName, ...args);
       const program = languageService.getProgram();
-      if (pluginOptions.diagnostics && program) {
+      if (languageServicePluginOptions.diagnostics && program) {
         effectCodeFixesForFile.delete(fileName);
         const sourceFile = program.getSourceFile(fileName);
         if (sourceFile) {
           return pipe(
             getSemanticDiagnosticsWithCodeFixes(diagnostics, sourceFile),
-            provideService(TypeScriptProgram, program),
-            provideService(TypeCheckerApi, program.getTypeChecker()),
-            provideService(
-              TypeCheckerApiCache,
-              makeTypeCheckerApiCache()
-            ),
-            provideService(TypeScriptApi, modules.typescript),
-            provideService(PluginOptions, pluginOptions),
-            run,
+            runNano(program),
             Either_exports.map(({ codeFixes, diagnostics: diagnostics2 }) => {
               effectCodeFixesForFile.set(fileName, codeFixes);
               return diagnostics2.concat(applicableDiagnostics);
@@ -4381,14 +5016,7 @@ var init = (modules) => {
         if (sourceFile) {
           return pipe(
             getApplicableRefactors(refactors, sourceFile, positionOrRange),
-            provideService(TypeCheckerApi, program.getTypeChecker()),
-            provideService(
-              TypeCheckerApiCache,
-              makeTypeCheckerApiCache()
-            ),
-            provideService(TypeScriptApi, modules.typescript),
-            provideService(PluginOptions, pluginOptions),
-            run,
+            runNano(program),
             Either_exports.map((effectRefactors) => applicableRefactors.concat(effectRefactors)),
             Either_exports.getOrElse(() => applicableRefactors)
           );
@@ -4427,14 +5055,7 @@ var init = (modules) => {
               );
               return { edits };
             }),
-            provideService(TypeCheckerApi, program.getTypeChecker()),
-            provideService(
-              TypeCheckerApiCache,
-              makeTypeCheckerApiCache()
-            ),
-            provideService(TypeScriptApi, modules.typescript),
-            provideService(PluginOptions, pluginOptions),
-            run
+            runNano(program)
           );
           if (Either_exports.isRight(result)) return result.right;
         }
@@ -4450,31 +5071,25 @@ var init = (modules) => {
       );
     };
     proxy.getQuickInfoAtPosition = (fileName, position, ...args) => {
-      const quickInfo = languageService.getQuickInfoAtPosition(fileName, position, ...args);
-      if (pluginOptions.quickinfo) {
-        const dedupedTagsQuickInfo = dedupeJsDocTags(quickInfo);
+      const applicableQuickInfo = languageService.getQuickInfoAtPosition(fileName, position, ...args);
+      if (languageServicePluginOptions.quickinfo) {
         const program = languageService.getProgram();
         if (program) {
           const sourceFile = program.getSourceFile(fileName);
           if (sourceFile) {
             return pipe(
-              prependEffectTypeArguments(
+              quickInfo(
                 sourceFile,
                 position,
-                dedupedTagsQuickInfo
+                applicableQuickInfo
               ),
-              provideService(TypeScriptProgram, program),
-              provideService(TypeCheckerApi, program.getTypeChecker()),
-              provideService(TypeScriptApi, modules.typescript),
-              provideService(PluginOptions, pluginOptions),
-              run,
-              Either_exports.getOrElse(() => dedupedTagsQuickInfo)
+              runNano(program),
+              Either_exports.getOrElse(() => applicableQuickInfo)
             );
           }
         }
-        return dedupedTagsQuickInfo;
       }
-      return quickInfo;
+      return applicableQuickInfo;
     };
     proxy.getCompletionsAtPosition = (fileName, position, options, formattingSettings, ...args) => {
       const applicableCompletions = languageService.getCompletionsAtPosition(
@@ -4484,7 +5099,7 @@ var init = (modules) => {
         formattingSettings,
         ...args
       );
-      if (pluginOptions.completions) {
+      if (languageServicePluginOptions.completions) {
         const program = languageService.getProgram();
         if (program) {
           const sourceFile = program.getSourceFile(fileName);
@@ -4497,15 +5112,7 @@ var init = (modules) => {
                 options,
                 formattingSettings
               ),
-              provideService(TypeScriptProgram, program),
-              provideService(TypeCheckerApi, program.getTypeChecker()),
-              provideService(
-                TypeCheckerApiCache,
-                makeTypeCheckerApiCache()
-              ),
-              provideService(TypeScriptApi, modules.typescript),
-              provideService(PluginOptions, pluginOptions),
-              run,
+              runNano(program),
               Either_exports.map(
                 (effectCompletions) => applicableCompletions ? {
                   ...applicableCompletions,