@adhisang/minecraft-modding-mcp 4.1.1 → 4.2.1

package/dist/mapping-service.js

@@ -3,6 +3,7 @@ import { mkdir, writeFile } from "node:fs/promises";
 import { dirname, join } from "node:path";
 import { buildSuggestedCall } from "./build-suggested-call.js";
 import { createError, ERROR_CODES } from "./errors.js";
+import { resolveGradleUserHomePath } from "./gradle-paths.js";
 import { defaultDownloadPath, downloadToCache } from "./repo-downloader.js";
 import { collectMatchedJarEntriesAsUtf8 } from "./source-jar-reader.js";
 import { VersionService, isUnobfuscatedVersion } from "./version-service.js";
@@ -112,7 +113,7 @@ export class MappingService {
                 warnings: []
             };
         }
-        const graph = await this.loadGraph(version, priority, requiresOnlyObfuscatedMojangGraph(sourceMapping, targetMapping) ? "obfuscated-mojang-only" : "full", input.projectPath);
+        const graph = await this.loadGraph(version, priority, requiresOnlyObfuscatedMojangGraph(sourceMapping, targetMapping) ? "obfuscated-mojang-only" : "full", input.projectPath, input.gradleUserHome);
         const path = namespacePath(graph, sourceMapping, targetMapping);
         if (!path) {
             return {
@@ -254,7 +255,7 @@ export class MappingService {
                 warnings: []
             };
         }
-        const graph = await this.loadGraph(version, priority, requiresOnlyObfuscatedMojangGraph(sourceMapping, targetMapping) ? "obfuscated-mojang-only" : "full", input.projectPath);
+        const graph = await this.loadGraph(version, priority, requiresOnlyObfuscatedMojangGraph(sourceMapping, targetMapping) ? "obfuscated-mojang-only" : "full", input.projectPath, input.gradleUserHome);
         const path = namespacePath(graph, sourceMapping, targetMapping);
         if (!path) {
             throw createError({
@@ -338,7 +339,7 @@ export class MappingService {
                 warnings: []
             };
         }
-        const graph = await this.loadGraph(version, priority, requiresOnlyObfuscatedMojangGraph(sourceMapping, targetMapping) ? "obfuscated-mojang-only" : "full", input.projectPath);
+        const graph = await this.loadGraph(version, priority, requiresOnlyObfuscatedMojangGraph(sourceMapping, targetMapping) ? "obfuscated-mojang-only" : "full", input.projectPath, input.gradleUserHome);
         const path = namespacePath(graph, sourceMapping, targetMapping);
         if (!path) {
             return {
@@ -448,7 +449,7 @@ export class MappingService {
             });
         }
         const priority = mappingPriorityFromInput(this.config.mappingSourcePriority, input.sourcePriority);
-        const graph = await this.loadGraph(version, priority, "full");
+        const graph = await this.loadGraph(version, priority, "full", undefined, input.gradleUserHome);
         const warnings = [...graph.warnings];
         const includeKinds = normalizeIncludedKinds(input.includeKinds);
         const pathCache = new Map();
@@ -669,7 +670,7 @@ export class MappingService {
                     querySymbol
                 };
             })();
-        const graph = await this.loadGraph(version, priority, sourceMapping === "mojang" ? "obfuscated-mojang-only" : "full");
+        const graph = await this.loadGraph(version, priority, sourceMapping === "mojang" ? "obfuscated-mojang-only" : "full", undefined, input.gradleUserHome);
         const warnings = [...graph.warnings];
         const records = collectTargetRecords(graph, sourceMapping);
         if (records.length === 0) {
@@ -950,7 +951,7 @@ export class MappingService {
         }
         let graph;
         try {
-            graph = await this.loadGraph(input.version, priority, needsTinyMappings ? "full" : "obfuscated-mojang-only");
+            graph = await this.loadGraph(input.version, priority, needsTinyMappings ? "full" : "obfuscated-mojang-only", undefined, input.gradleUserHome);
         }
         catch {
             return {
@@ -994,9 +995,10 @@ export class MappingService {
             degradations
         };
     }
-    async loadGraph(version, priority, mode, projectPath) {
+    async loadGraph(version, priority, mode, projectPath, gradleUserHome) {
         const effectiveProjectPath = effectiveLoomSearchProjectPath(projectPath);
-        const cacheKey = `${version}|${priority}|${mode}|${effectiveProjectPath ?? ""}`;
+        const effectiveGradleUserHome = resolveGradleUserHomePath(gradleUserHome);
+        const cacheKey = `${version}|${priority}|${mode}|${effectiveProjectPath ?? ""}|${effectiveGradleUserHome}`;
         const cached = this.graphCache.get(cacheKey);
         if (cached) {
             this.graphCache.delete(cacheKey);
@@ -1007,7 +1009,7 @@ export class MappingService {
         if (existingLock) {
             return existingLock;
         }
-        const buildPromise = this.buildGraph(version, priority, mode, effectiveProjectPath);
+        const buildPromise = this.buildGraph(version, priority, mode, effectiveProjectPath, effectiveGradleUserHome);
         this.buildLocks.set(cacheKey, buildPromise);
         try {
             const built = await buildPromise;
@@ -1019,7 +1021,7 @@ export class MappingService {
             this.buildLocks.delete(cacheKey);
         }
     }
-    async buildGraph(version, priority, mode, projectPath) {
+    async buildGraph(version, priority, mode, projectPath, gradleUserHome) {
         if (isUnobfuscatedVersion(version)) {
             return {
                 version,
@@ -1052,7 +1054,7 @@ export class MappingService {
             const deferredTinyWarnings = [];
             for (const source of mappingSourceOrder(priority)) {
                 const tinyLoad = source === "loom-cache"
-                    ? await this.loadTinyPairsFromLoom(version, projectPath)
+                    ? await this.loadTinyPairsFromLoom(version, projectPath, gradleUserHome)
                     : await this.loadTinyPairsFromMaven(version);
                 if (tinyLoad.pairs.size === 0) {
                     deferredTinyWarnings.push(...tinyLoad.warnings);
@@ -1095,8 +1097,8 @@ export class MappingService {
     async loadMojangPairs(version) {
         return loadMojangPairs(this.loaderDeps(), version);
     }
-    async loadTinyPairsFromLoom(version, projectPath) {
-        return loadTinyPairsFromLoom(version, projectPath);
+    async loadTinyPairsFromLoom(version, projectPath, gradleUserHome) {
+        return loadTinyPairsFromLoom(version, projectPath, gradleUserHome);
     }
     async loadTinyPairsFromMaven(version) {
         return loadTinyPairsFromMaven(this.loaderDeps(), version);
@@ -1152,6 +1154,7 @@ export class MappingService {
             input.targetMapping,
             input.sourcePriority ?? "",
             effectiveLoomSearchProjectPath(input.projectPath) ?? "",
+            resolveGradleUserHomePath(input.gradleUserHome),
             effectiveSignatureMode,
             String(input.maxCandidates ?? ""),
             JSON.stringify(input.disambiguation ?? "")

package/dist/mixin-validator.d.ts

@@ -1,7 +1,7 @@
 /**
  * Public barrel for the mixin validation engine. The implementation lives
  * under `src/mixin/`; this file preserves the historical entry point used
- * by source-service, entry tools, and tests.
+ * by source-service, top-level workflow tools, and tests.
  */
 export type { AccessTransformerValidationResult, AccessWidenerValidationResult, AggregatedWarningGroup, ConfidenceBreakdown, ConfidencePenalty, IssueCategory, IssueConfidence, MappingHealthReport, MixinStageBudgets, MixinValidationProvenance, MixinValidationResult, ResolutionPath, ResolvedMember, ResolvedTargetMembers, StructuredWarning, TargetOutcome, ValidationIssue, ValidationStatus, ValidationSummary } from "./mixin/types.js";
 export { loadMixinStageBudgets } from "./mixin/types.js";

package/dist/mixin-validator.js

@@ -1,7 +1,7 @@
 /**
  * Public barrel for the mixin validation engine. The implementation lives
  * under `src/mixin/`; this file preserves the historical entry point used
- * by source-service, entry tools, and tests.
+ * by source-service, top-level workflow tools, and tests.
  */
 export { loadMixinStageBudgets } from "./mixin/types.js";
 export { accessLevelFromFlags, buildQuickSummary, computeConfidenceBreakdown, computeFalsePositiveRisk, computeValidationStatus, extractMethodDescriptor, extractMethodName, levenshteinDistance, refreshMixinValidationOutcome, suggestSimilar, summarizeResolvedMembers } from "./mixin/helpers.js";

package/dist/nbt/java-nbt-codec.js

@@ -37,6 +37,85 @@ function resolveTagName(tagId, pointer) {
     }
     return tagName;
 }
+// Java NBT TAG_String uses MUTF-8 (Mojang's on-disk format matches the JVM
+// `DataInput/OutputStream.{read,write}UTF` contract), which differs from UTF-8
+// for two ranges: `U+0000` encodes as `C0 80`, and supplementary code points
+// (`U+10000`+) encode as two 3-byte sequences for the UTF-16 surrogate pair
+// (6 bytes total). All other characters share the UTF-8 byte sequence.
+function mutf8ByteLength(value) {
+    let length = 0;
+    for (let i = 0; i < value.length; i += 1) {
+        const c = value.charCodeAt(i);
+        if (c === 0x0000) {
+            length += 2;
+        }
+        else if (c <= 0x007f) {
+            length += 1;
+        }
+        else if (c <= 0x07ff) {
+            length += 2;
+        }
+        else {
+            length += 3;
+        }
+    }
+    return length;
+}
+function encodeMutf8(value) {
+    const buffer = Buffer.allocUnsafe(mutf8ByteLength(value));
+    let offset = 0;
+    for (let i = 0; i < value.length; i += 1) {
+        const c = value.charCodeAt(i);
+        if (c === 0x0000) {
+            buffer[offset++] = 0xc0;
+            buffer[offset++] = 0x80;
+        }
+        else if (c <= 0x007f) {
+            buffer[offset++] = c;
+        }
+        else if (c <= 0x07ff) {
+            buffer[offset++] = 0xc0 | (c >> 6);
+            buffer[offset++] = 0x80 | (c & 0x3f);
+        }
+        else {
+            buffer[offset++] = 0xe0 | (c >> 12);
+            buffer[offset++] = 0x80 | ((c >> 6) & 0x3f);
+            buffer[offset++] = 0x80 | (c & 0x3f);
+        }
+    }
+    return buffer;
+}
+function decodeMutf8(buffer, start, end) {
+    const codeUnits = [];
+    let i = start;
+    while (i < end) {
+        const b0 = buffer[i++];
+        if ((b0 & 0x80) === 0) {
+            codeUnits.push(b0);
+        }
+        else if ((b0 & 0xe0) === 0xc0) {
+            if (i >= end) {
+                throw parseError("Truncated MUTF-8 2-byte sequence.", { offset: i - 1 });
+            }
+            const b1 = buffer[i++];
+            codeUnits.push(((b0 & 0x1f) << 6) | (b1 & 0x3f));
+        }
+        else if ((b0 & 0xf0) === 0xe0) {
+            if (i + 1 >= end) {
+                throw parseError("Truncated MUTF-8 3-byte sequence.", { offset: i - 1 });
+            }
+            const b1 = buffer[i++];
+            const b2 = buffer[i++];
+            codeUnits.push(((b0 & 0x0f) << 12) | ((b1 & 0x3f) << 6) | (b2 & 0x3f));
+        }
+        else {
+            throw parseError("Invalid MUTF-8 lead byte.", { byte: b0, offset: i - 1 });
+        }
+    }
+    // NBT TAG_String is bounded by uint16 length so codeUnits.length <= 65535,
+    // safely within String.fromCharCode's argument cap.
+    return String.fromCharCode(...codeUnits);
+}
 class NbtReader {
     buffer;
     offset = 0;
@@ -103,7 +182,7 @@ class NbtReader {
     readString() {
         const byteLength = this.readUInt16();
         this.ensure(byteLength);
-        const value = this.buffer.toString("utf8", this.offset, this.offset + byteLength);
+        const value = decodeMutf8(this.buffer, this.offset, this.offset + byteLength);
         this.offset += byteLength;
         return value;
     }
@@ -154,7 +233,7 @@ class NbtWriter {
         this.chunks.push(chunk);
     }
     writeString(value) {
-        const encoded = Buffer.from(value, "utf8");
+        const encoded = encodeMutf8(value);
         if (encoded.length > 0xffff) {
             throw encodeError("NBT string length exceeds uint16.", { byteLength: encoded.length });
         }

package/dist/source/access-validate.js

@@ -56,6 +56,7 @@ export async function validateAccessWidener(svc, input) {
             version,
             awNamespace,
             projectPath: input.projectPath,
+            gradleUserHome: input.gradleUserHome,
             scope: input.scope,
             preferProjectVersion: input.preferProjectVersion
         });
@@ -85,7 +86,8 @@ export async function validateAccessWidener(svc, input) {
                     sourceMapping: awNamespace,
                     targetMapping: lookupMapping,
                     sourcePriority: input.sourcePriority,
-                    projectPath: input.projectPath
+                    projectPath: input.projectPath,
+                    gradleUserHome: input.gradleUserHome
                 });
                 if (mapped.resolved && mapped.resolvedSymbol) {
                     lookupFqn = mapped.resolvedSymbol.name;
@@ -110,9 +112,9 @@ export async function validateAccessWidener(svc, input) {
             let fields = sig.fields;
             if (needsLookupMapping) {
                 const [ctorResult, methodResult, fieldResult] = await Promise.all([
-                    svc.remapSignatureMembers(sig.constructors, "method", resolvedVersion, lookupMapping, awNamespace, input.sourcePriority, warnings, input.projectPath),
-                    svc.remapSignatureMembers(sig.methods, "method", resolvedVersion, lookupMapping, awNamespace, input.sourcePriority, warnings, input.projectPath),
-                    svc.remapSignatureMembers(sig.fields, "field", resolvedVersion, lookupMapping, awNamespace, input.sourcePriority, warnings, input.projectPath)
+                    svc.remapSignatureMembers(sig.constructors, "method", resolvedVersion, lookupMapping, awNamespace, input.sourcePriority, warnings, input.projectPath, input.gradleUserHome),
+                    svc.remapSignatureMembers(sig.methods, "method", resolvedVersion, lookupMapping, awNamespace, input.sourcePriority, warnings, input.projectPath, input.gradleUserHome),
+                    svc.remapSignatureMembers(sig.fields, "field", resolvedVersion, lookupMapping, awNamespace, input.sourcePriority, warnings, input.projectPath, input.gradleUserHome)
                 ]);
                 constructors = ctorResult.members;
                 methods = methodResult.members;
@@ -163,6 +165,7 @@ export async function validateAccessTransformer(svc, input) {
             version,
             atNamespace,
             projectPath: input.projectPath,
+            gradleUserHome: input.gradleUserHome,
             scope: input.scope,
             preferProjectVersion: input.preferProjectVersion
         });
@@ -197,7 +200,8 @@ export async function validateAccessTransformer(svc, input) {
                         sourceMapping: atNamespace,
                         targetMapping: lookupMapping,
                         sourcePriority: input.sourcePriority,
-                        projectPath: input.projectPath
+                        projectPath: input.projectPath,
+                        gradleUserHome: input.gradleUserHome
                     });
                     if (mapped.resolved && mapped.resolvedSymbol) {
                         lookupFqn = mapped.resolvedSymbol.name;
@@ -223,9 +227,9 @@ export async function validateAccessTransformer(svc, input) {
             let fields = sig.fields;
             if (needsLookupMapping && isSourceMappingNamespace(atNamespace) && isSourceMappingNamespace(lookupMapping)) {
                 const [ctorResult, methodResult, fieldResult] = await Promise.all([
-                    svc.remapSignatureMembers(sig.constructors, "method", resolvedVersion, lookupMapping, atNamespace, input.sourcePriority, warnings, input.projectPath),
-                    svc.remapSignatureMembers(sig.methods, "method", resolvedVersion, lookupMapping, atNamespace, input.sourcePriority, warnings, input.projectPath),
-                    svc.remapSignatureMembers(sig.fields, "field", resolvedVersion, lookupMapping, atNamespace, input.sourcePriority, warnings, input.projectPath)
+                    svc.remapSignatureMembers(sig.constructors, "method", resolvedVersion, lookupMapping, atNamespace, input.sourcePriority, warnings, input.projectPath, input.gradleUserHome),
+                    svc.remapSignatureMembers(sig.methods, "method", resolvedVersion, lookupMapping, atNamespace, input.sourcePriority, warnings, input.projectPath, input.gradleUserHome),
+                    svc.remapSignatureMembers(sig.fields, "field", resolvedVersion, lookupMapping, atNamespace, input.sourcePriority, warnings, input.projectPath, input.gradleUserHome)
                 ]);
                 constructors = ctorResult.members;
                 methods = methodResult.members;

package/dist/source/artifact-resolver.d.ts

@@ -32,11 +32,13 @@ export declare function hasExactVersionToken(path: string, version: string): boo
 export declare function discoverVersionSourceJar(_svc: SourceService, input: {
     version: string;
     projectPath?: string;
+    gradleUserHome?: string;
 }): Promise<VersionSourceDiscovery>;
 export declare function probeMinecraftArtifact(svc: SourceService, input: ProbeMinecraftArtifactInput): Promise<ProbeMinecraftArtifactOutput>;
 export declare function discoverAccessWidenerRuntimeCandidates(_svc: SourceService, input: {
     version: string;
     projectPath?: string;
+    gradleUserHome?: string;
     requestedScope: ArtifactScope;
 }): Promise<{
     searchedPaths: string[];
@@ -46,6 +48,7 @@ export declare function discoverAccessWidenerRuntimeCandidates(_svc: SourceServi
 export declare function discoverAccessTransformerRuntimeCandidates(_svc: SourceService, input: {
     version: string;
     projectPath?: string;
+    gradleUserHome?: string;
     requestedScope: ArtifactScope;
     atNamespace: AccessTransformerNamespace;
     loader: WorkspaceProjectLoader | "unknown";
@@ -58,6 +61,7 @@ export declare function resolveAccessWidenerRuntimeArtifact(svc: SourceService,
     version: string;
     awNamespace: SourceMapping;
     projectPath?: string;
+    gradleUserHome?: string;
     scope?: ArtifactScope;
     preferProjectVersion?: boolean;
 }): Promise<RuntimeValidationProvenance<SourceMapping>>;
@@ -69,6 +73,7 @@ export declare function resolveAccessTransformerRuntimeArtifact(svc: SourceServi
     version: string;
     atNamespace: AccessTransformerNamespace;
     projectPath?: string;
+    gradleUserHome?: string;
     scope?: ArtifactScope;
     preferProjectVersion?: boolean;
 }): Promise<RuntimeValidationProvenance<AccessTransformerNamespace>>;

package/dist/source/artifact-resolver.js

@@ -138,7 +138,10 @@ function buildProvenance(input) {
 }
 export async function discoverVersionSourceJar(_svc, input) {
     const normalizedProjectPath = normalizeOptionalProjectPath(input.projectPath);
-    const searchRoots = buildVersionSourceSearchRoots(normalizedProjectPath);
+    const searchRoots = buildVersionSourceSearchRoots({
+        projectPath: normalizedProjectPath,
+        gradleUserHome: input.gradleUserHome
+    });
     const searchedPaths = [];
     const candidates = [];
     const seen = new Set();
@@ -267,7 +270,8 @@ export async function probeMinecraftArtifact(svc, input) {
         }
         const versionSourceDiscovery = await svc.discoverVersionSourceJar({
             version: resolvedVersion,
-            projectPath: input.projectPath
+            projectPath: input.projectPath,
+            gradleUserHome: input.gradleUserHome
         });
         if (!versionSourceDiscovery.selectedSourceJarPath) {
             throw createError({
@@ -311,7 +315,10 @@ export async function discoverAccessWidenerRuntimeCandidates(_svc, input) {
     const normalizedProjectPathLower = normalizedProjectPath
         ? normalizePathStyle(normalizedProjectPath).toLowerCase()
         : undefined;
-    const searchRoots = buildVersionSourceSearchRoots(normalizedProjectPath);
+    const searchRoots = buildVersionSourceSearchRoots({
+        projectPath: normalizedProjectPath,
+        gradleUserHome: input.gradleUserHome
+    });
     const searchedPaths = [];
     const candidates = [];
     const seen = new Set();
@@ -381,7 +388,10 @@ export async function discoverAccessTransformerRuntimeCandidates(_svc, input) {
     const normalizedProjectPathLower = normalizedProjectPath
         ? normalizePathStyle(normalizedProjectPath).toLowerCase()
         : undefined;
-    const searchRoots = buildLoaderRuntimeSearchRoots(normalizedProjectPath);
+    const searchRoots = buildLoaderRuntimeSearchRoots({
+        projectPath: normalizedProjectPath,
+        gradleUserHome: input.gradleUserHome
+    });
     const searchedPaths = [];
     const candidates = [];
     const seen = new Set();
@@ -491,6 +501,7 @@ export async function resolveAccessWidenerRuntimeArtifact(svc, input) {
     const discovery = await svc.discoverAccessWidenerRuntimeCandidates({
         version,
         projectPath: normalizedProjectPath,
+        gradleUserHome: input.gradleUserHome,
         requestedScope
     });
     if (!discovery.selected) {
@@ -622,6 +633,7 @@ export async function resolveAccessTransformerRuntimeArtifact(svc, input) {
     const discovery = await svc.discoverAccessTransformerRuntimeCandidates({
         version,
         projectPath: normalizedProjectPath,
+        gradleUserHome: input.gradleUserHome,
         requestedScope,
         atNamespace: input.atNamespace,
         loader
@@ -790,7 +802,8 @@ async function computeBinaryRemapGate(svc, input) {
         const health = await svc.mappingService.checkMappingHealth({
             version: input.version,
             requestedMapping: "mojang",
-            sourcePriority: input.sourcePriority
+            sourcePriority: input.sourcePriority,
+            gradleUserHome: input.gradleUserHome
         });
         mojangAvailable = health.mojangMappingsAvailable;
     }
@@ -1026,7 +1039,8 @@ export async function resolveArtifact(svc, input) {
             scope !== "vanilla") {
             versionSourceDiscovery = await svc.discoverVersionSourceJar({
                 version: resolvedVersion,
-                projectPath: input.projectPath
+                projectPath: input.projectPath,
+                gradleUserHome: input.gradleUserHome
             });
             if (versionSourceDiscovery.selectedSourceJarPath) {
                 resolvedTarget = {
@@ -1045,6 +1059,7 @@ export async function resolveArtifact(svc, input) {
                 version: resolvedVersion,
                 targetKind: kind,
                 sourcePriority: input.sourcePriority,
+                gradleUserHome: input.gradleUserHome,
                 forceBinaryRemapDisabled: dependencyOrigin
             });
         if (binaryRemapGate.warnings.length > 0) {
@@ -1137,7 +1152,8 @@ export async function resolveArtifact(svc, input) {
                 version: resolved.version,
                 sourceMapping: "obfuscated",
                 targetMapping: effectiveMapping,
-                sourcePriority: input.sourcePriority
+                sourcePriority: input.sourcePriority,
+                gradleUserHome: input.gradleUserHome
             });
             additionalTransformChain.push(...mappingAvailability.transformChain);
             if (mappingAvailability.warnings.length > 0) {

package/dist/source/cache-metrics.js

@@ -1,4 +1,4 @@
-import { existsSync, readdirSync, statSync, unlinkSync } from "node:fs";
+import { existsSync, readdirSync, rmSync, statSync } from "node:fs";
 import { join } from "node:path";
 import { log } from "../logger.js";
 export function hasAnyFiles(svc, artifactId) {
@@ -17,7 +17,7 @@ export function unlinkRemappedJarForArtifact(svc, artifactId) {
     const remappedJarPath = join(svc.config.cacheDir, "remapped", `${artifactId}.jar`);
     try {
         if (existsSync(remappedJarPath)) {
-            unlinkSync(remappedJarPath);
+            rmSync(remappedJarPath, { recursive: true, force: true });
         }
     }
     catch {

package/dist/source/class-source/members-builder.d.ts

@@ -20,6 +20,7 @@ export type RemapMembersInput = {
     mappingApplied: SourceMapping;
     requestedMapping: SourceMapping;
     sourcePriority: MappingSourcePriority | undefined;
+    gradleUserHome?: string;
     memberPattern: string | undefined;
     warnings: string[];
 };

package/dist/source/class-source/members-builder.js

@@ -3,7 +3,7 @@ export async function remapAndCountMembers(svc, input) {
         if (input.version == null) {
             return members;
         }
-        const result = await svc.remapSignatureMembers(members, kind, input.version, input.mappingApplied, input.requestedMapping, input.sourcePriority, input.warnings);
+        const result = await svc.remapSignatureMembers(members, kind, input.version, input.mappingApplied, input.requestedMapping, input.sourcePriority, input.warnings, undefined, input.gradleUserHome);
         return result.members;
     };
     let constructors = await remap(input.signatureConstructors, "method");

package/dist/source/class-source.d.ts

@@ -9,6 +9,7 @@ export declare function resolveClassNameForLookup(svc: SourceService, input: {
     sourceMapping: SourceMapping;
     targetMapping: SourceMapping;
     sourcePriority: MappingSourcePriority | undefined;
+    gradleUserHome?: string;
     warnings: string[];
     context: string;
 }): Promise<string>;

package/dist/source/class-source.js

@@ -108,7 +108,8 @@ export async function resolveClassNameForLookup(svc, input) {
             name: input.className,
             sourceMapping: input.sourceMapping,
             targetMapping: input.targetMapping,
-            sourcePriority: input.sourcePriority
+            sourcePriority: input.sourcePriority,
+            gradleUserHome: input.gradleUserHome
         });
         if (mapped.resolved && mapped.resolvedSymbol) {
             return mapped.resolvedSymbol.name;
@@ -401,6 +402,7 @@ export async function getClassSource(svc, input) {
             sourcePriority: input.sourcePriority,
             allowDecompile: input.allowDecompile,
             projectPath: input.projectPath,
+            gradleUserHome: input.gradleUserHome,
             scope: input.scope,
             preferProjectVersion: input.preferProjectVersion,
             strictVersion: input.strictVersion
@@ -488,6 +490,7 @@ export async function getClassSource(svc, input) {
         sourceMapping: requestedMapping,
         targetMapping: activeMappingApplied,
         sourcePriority: input.sourcePriority,
+        gradleUserHome: input.gradleUserHome,
         warnings,
         context: "source lookup"
     });
@@ -499,6 +502,7 @@ export async function getClassSource(svc, input) {
             sourceMapping: requestedMapping,
             targetMapping: activeMappingApplied,
             sourcePriority: input.sourcePriority,
+            gradleUserHome: input.gradleUserHome,
             warnings,
             context: "source lookup"
         });
@@ -528,6 +532,7 @@ export async function getClassSource(svc, input) {
             sourceMapping: requestedMapping,
             targetMapping: activeMappingApplied,
             sourcePriority: input.sourcePriority,
+            gradleUserHome: input.gradleUserHome,
             warnings,
             context: "source lookup"
         });
@@ -659,6 +664,7 @@ export async function getClassMembers(svc, input) {
             sourcePriority: input.sourcePriority,
             allowDecompile: input.allowDecompile,
             projectPath: input.projectPath,
+            gradleUserHome: input.gradleUserHome,
             scope: input.scope,
             preferProjectVersion: input.preferProjectVersion,
             strictVersion: input.strictVersion
@@ -726,6 +732,7 @@ export async function getClassMembers(svc, input) {
         sourceMapping: requestedMapping,
         targetMapping: mappingApplied,
         sourcePriority: input.sourcePriority,
+        gradleUserHome: input.gradleUserHome,
         warnings,
         context: "binary lookup"
     });
@@ -775,6 +782,7 @@ export async function getClassMembers(svc, input) {
         mappingApplied,
         requestedMapping,
         sourcePriority: input.sourcePriority,
+        gradleUserHome: input.gradleUserHome,
         memberPattern,
         warnings
     });

package/dist/source/indexer.d.ts

@@ -1,7 +1,22 @@
+import { resolveMojangTinyFile } from "../mojang-tiny-mapping-service.js";
 import type { SourceService } from "../source-service.js";
 import type { ArtifactIndexMetaRow } from "../storage/index-meta-repo.js";
 import type { ArtifactRow, ResolvedSourceArtifact } from "../types.js";
+import { remapJar } from "../tiny-remapper-service.js";
+import { resolveTinyRemapperJar } from "../tiny-remapper-resolver.js";
 export declare const INDEX_SCHEMA_VERSION = 1;
+/**
+ * Injectable dependencies let remap-cache regression tests run without Java.
+ * Production callers use `defaultBinaryRemapDeps`; this is not a public MCP
+ * extension point.
+ */
+export type BinaryRemapDeps = {
+    resolveTinyRemapperJar: typeof resolveTinyRemapperJar;
+    resolveMojangTinyFile: typeof resolveMojangTinyFile;
+    remapJar: typeof remapJar;
+    now: () => number;
+    randomSuffix: () => string;
+};
 export type IndexRebuildReason = "force" | "missing_meta" | "schema_mismatch" | "signature_mismatch" | "already_current";
 export interface IndexedFileRecord {
     filePath: string;
@@ -57,13 +72,12 @@ export declare function ingestIfNeeded(svc: SourceService, resolved: ResolvedSou
  * binary remap, run tiny-remapper now and return the remapped jar path.
  * Otherwise return the original binaryJarPath unchanged.
  *
- * Cache safety: writes to a per-attempt temp file then atomic-renames into
- * <cacheDir>/remapped/<artifactId>.jar. A per-target inflight Promise map
- * collapses concurrent calls so two simultaneous resolveArtifact calls for
- * the same artifactId share one tiny-remapper run instead of racing on the
- * same output path.
+ * Cache safety: writes to a per-attempt `.jar` temp path, validates ZIP magic,
+ * then atomic-renames into <cacheDir>/remapped/<artifactId>.jar. A per-target
+ * inflight Promise map collapses concurrent calls so simultaneous
+ * resolveArtifact calls for the same artifactId share one tiny-remapper run.
  */
-export declare function maybeRemapBinaryForMojang(svc: SourceService, resolved: ResolvedSourceArtifact): Promise<string>;
+export declare function maybeRemapBinaryForMojang(svc: SourceService, resolved: ResolvedSourceArtifact, deps?: BinaryRemapDeps): Promise<string>;
 export declare function recordRemappedJarBytesFromDisk(svc: SourceService, artifactId: string, path: string): Promise<void>;
 /**
  * Best-effort structural check that `path` is a non-empty file beginning with
@@ -73,10 +87,21 @@ export declare function recordRemappedJarBytesFromDisk(svc: SourceService, artif
  * are not (a corrupt cache hit must be evicted).
  */
 export declare function isUsableJarFile(path: string): Promise<boolean>;
+export declare function buildBinaryRemapTempPath(remappedJarPath: string, input: {
+    pid: number;
+    now: number;
+    randomSuffix: string;
+}): string;
 export declare function runBinaryRemap(svc: SourceService, input: {
     version: string;
     inputJar: string;
     remappedDir: string;
     remappedJarPath: string;
 }): Promise<string>;
+export declare function runBinaryRemapWithDeps(svc: SourceService, input: {
+    version: string;
+    inputJar: string;
+    remappedDir: string;
+    remappedJarPath: string;
+}, deps: BinaryRemapDeps): Promise<string>;
 export declare function loadFromSourceJar(svc: SourceService, sourceJarPath: string): Promise<IndexedFileRecord[]>;