Do something maybe addresses Hoshino's goal

base/src/main/java/org/aya/resolve/StmtResolvers.java

@@ -27,7 +27,7 @@ private void resolveBind(@NotNull ImmutableSeq<ResolvingStmt> stmts) {
       binder.bind(rename.bindCtx(), rename.bind(), var));
   }
 
-  private void desugar(@NotNull ImmutableSeq<Stmt> stmts) {
+  public void desugar(@NotNull ImmutableSeq<Stmt> stmts) {
     var salt = new Desalt(info);
     stmts.forEach(stmt -> stmt.descentInPlace(salt, salt.pattern()));
   }
@@ -39,7 +39,6 @@ public void resolve(@NotNull ImmutableSeq<Stmt> stmts) {
     var resolving = fillContext(stmts);
     resolveStmts(resolving); // resolve mutates stmts
     resolveBind(resolving); // mutates bind blocks
-    desugar(stmts);
     info.opSet().reportIfCyclic();
   }
 }

base/src/main/java/org/aya/resolve/module/ModuleLoader.java

@@ -62,24 +62,26 @@ public interface ModuleLoader extends Problematic {
     @NotNull ModuleLoader recurseLoader
   ) {
     var opSet = new AyaBinOpSet(reporter());
-    return resolveModule(primFactory, new ShapeFactory(), opSet, context, program, recurseLoader);
+    var resolveInfo = new ResolveInfo(context, primFactory, new ShapeFactory(), opSet);
+    resolveModule(resolveInfo, program, recurseLoader);
+    return resolveInfo;
   }
 
   /**
    * Resolve a certain module.
    *
-   * @param context the context of the module
-   * @param program the statements of the module
+   * @param context       the context of the module
+   * @param program       the statements of the module
    * @param recurseLoader the module loader that used to resolve
    */
   @ApiStatus.Internal
-  default @NotNull ResolveInfo resolveModule(
-      @NotNull PrimFactory primFactory, @NotNull ShapeFactory shapeFactory, @NotNull AyaBinOpSet opSet,
-      @NotNull ModuleContext context, @NotNull ImmutableSeq<Stmt> program, @NotNull ModuleLoader recurseLoader
+  default void resolveModule(
+    @NotNull ResolveInfo resolveInfo, @NotNull ImmutableSeq<Stmt> program,
+    @NotNull ModuleLoader recurseLoader
   ) {
-    var resolveInfo = new ResolveInfo(context, primFactory, shapeFactory, opSet);
-    new StmtResolvers(recurseLoader, resolveInfo).resolve(program);
-    return resolveInfo;
+    var resolver = new StmtResolvers(recurseLoader, resolveInfo);
+    resolver.resolve(program);
+    resolver.desugar(program);
   }
 
   @Nullable ResolveInfo load(@NotNull ModulePath path, @NotNull ModuleLoader recurseLoader);

cli-impl/src/main/java/org/aya/cli/interactive/ReplCompiler.java

@@ -143,7 +143,8 @@ private void loadFile(@NotNull Path file) {
       return programOrExpr.map(
         program -> {
           var newDefs = MutableValue.<ImmutableSeq<TyckDef>>create();
-          var resolveInfo = loader.resolveModule(primFactory, shapeFactory, opSet, context.fork(), program, loader);
+          var resolveInfo = new ResolveInfo(context.fork(), primFactory, shapeFactory, opSet);
+          loader.resolveModule(resolveInfo, program, loader);
           resolveInfo.shapeFactory().discovered = shapeFactory.fork().discovered;
           loader.tyckModule(resolveInfo, ((_, defs) -> newDefs.set(defs)));
           if (reporter.anyError()) return ImmutableSeq.empty();

gradle/wrapper/gradle-wrapper.properties

@@ -2,7 +2,7 @@
 # Use of this source code is governed by the MIT license that can be found in the LICENSE.md file.
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-rc-1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME