@adhisang/minecraft-modding-mcp 4.2.1 → 6.0.0

package/dist/entry-tools/analyze-mod-service.d.ts

@@ -75,8 +75,7 @@ export declare const analyzeModSchema: z.ZodEffects<z.ZodObject<{
     include: z.ZodOptional<z.ZodArray<z.ZodEnum<[string, ...string[]]>, "many">>;
 }, "strip", z.ZodTypeAny, {
     limit: number;
-    searchType: "class" | "field" | "method" | "all" | "content";
-    task: "search" | "remap" | "summary" | "class-source" | "decompile";
+    task: "search" | "summary" | "class-source" | "remap" | "decompile";
     subject: {
         kind: "jar";
         jarPath: string;
@@ -85,18 +84,19 @@ export declare const analyzeModSchema: z.ZodEffects<z.ZodObject<{
         jarPath: string;
         className: string;
     };
-    includeFiles: boolean;
+    searchType: "class" | "field" | "method" | "all" | "content";
     executionMode: "preview" | "apply";
+    includeFiles: boolean;
     maxLines?: number | undefined;
     maxChars?: number | undefined;
+    detail?: "summary" | "standard" | "full" | undefined;
+    include?: string[] | undefined;
+    query?: string | undefined;
     targetMapping?: "mojang" | "yarn" | undefined;
     outputJar?: string | undefined;
-    query?: string | undefined;
-    detail?: "full" | "summary" | "standard" | undefined;
-    include?: string[] | undefined;
     maxFiles?: number | undefined;
 }, {
-    task: "search" | "remap" | "summary" | "class-source" | "decompile";
+    task: "search" | "summary" | "class-source" | "remap" | "decompile";
     subject: {
         kind: "jar";
         jarPath: string;
@@ -108,19 +108,18 @@ export declare const analyzeModSchema: z.ZodEffects<z.ZodObject<{
     limit?: number | undefined;
     maxLines?: number | undefined;
     maxChars?: number | undefined;
-    targetMapping?: "mojang" | "yarn" | undefined;
-    outputJar?: string | undefined;
+    detail?: "summary" | "standard" | "full" | undefined;
+    include?: string[] | undefined;
     query?: string | undefined;
     searchType?: "class" | "field" | "method" | "all" | "content" | undefined;
-    detail?: "full" | "summary" | "standard" | undefined;
-    include?: string[] | undefined;
+    targetMapping?: "mojang" | "yarn" | undefined;
+    outputJar?: string | undefined;
+    executionMode?: "preview" | "apply" | undefined;
     includeFiles?: boolean | undefined;
     maxFiles?: number | undefined;
-    executionMode?: "preview" | "apply" | undefined;
 }>, {
     limit: number;
-    searchType: "class" | "field" | "method" | "all" | "content";
-    task: "search" | "remap" | "summary" | "class-source" | "decompile";
+    task: "search" | "summary" | "class-source" | "remap" | "decompile";
     subject: {
         kind: "jar";
         jarPath: string;
@@ -129,18 +128,19 @@ export declare const analyzeModSchema: z.ZodEffects<z.ZodObject<{
         jarPath: string;
         className: string;
     };
-    includeFiles: boolean;
+    searchType: "class" | "field" | "method" | "all" | "content";
     executionMode: "preview" | "apply";
+    includeFiles: boolean;
     maxLines?: number | undefined;
     maxChars?: number | undefined;
+    detail?: "summary" | "standard" | "full" | undefined;
+    include?: string[] | undefined;
+    query?: string | undefined;
     targetMapping?: "mojang" | "yarn" | undefined;
     outputJar?: string | undefined;
-    query?: string | undefined;
-    detail?: "full" | "summary" | "standard" | undefined;
-    include?: string[] | undefined;
     maxFiles?: number | undefined;
 }, {
-    task: "search" | "remap" | "summary" | "class-source" | "decompile";
+    task: "search" | "summary" | "class-source" | "remap" | "decompile";
     subject: {
         kind: "jar";
         jarPath: string;
@@ -152,15 +152,15 @@ export declare const analyzeModSchema: z.ZodEffects<z.ZodObject<{
     limit?: number | undefined;
     maxLines?: number | undefined;
     maxChars?: number | undefined;
-    targetMapping?: "mojang" | "yarn" | undefined;
-    outputJar?: string | undefined;
+    detail?: "summary" | "standard" | "full" | undefined;
+    include?: string[] | undefined;
     query?: string | undefined;
     searchType?: "class" | "field" | "method" | "all" | "content" | undefined;
-    detail?: "full" | "summary" | "standard" | undefined;
-    include?: string[] | undefined;
+    targetMapping?: "mojang" | "yarn" | undefined;
+    outputJar?: string | undefined;
+    executionMode?: "preview" | "apply" | undefined;
     includeFiles?: boolean | undefined;
     maxFiles?: number | undefined;
-    executionMode?: "preview" | "apply" | undefined;
 }>;
 export type AnalyzeModInput = z.infer<typeof analyzeModSchema>;
 type AnalyzeModDeps = {

package/dist/entry-tools/analyze-mod-service.js

@@ -248,7 +248,8 @@ export class AnalyzeModService {
                                             jarPath: input.subject.jarPath
                                         },
                                         executionMode: "apply",
-                                        targetMapping: input.targetMapping
+                                        targetMapping: input.targetMapping,
+                                        ...(input.outputJar !== undefined ? { outputJar } : {})
                                     })
                                 ]
                             },

package/dist/entry-tools/analyze-symbol-service.d.ts

@@ -19,6 +19,11 @@ export declare const analyzeSymbolShape: {
         owner?: string | undefined;
     }>;
     version: z.ZodOptional<z.ZodString>;
+    fromVersion: z.ZodOptional<z.ZodString>;
+    toVersion: z.ZodOptional<z.ZodString>;
+    maxVersions: z.ZodOptional<z.ZodNumber>;
+    includeTimeline: z.ZodOptional<z.ZodBoolean>;
+    includeSnapshots: z.ZodOptional<z.ZodBoolean>;
     sourceMapping: z.ZodOptional<z.ZodEnum<["obfuscated", "mojang", "intermediary", "yarn"]>>;
     targetMapping: z.ZodOptional<z.ZodEnum<["obfuscated", "mojang", "intermediary", "yarn"]>>;
     classNameMapping: z.ZodOptional<z.ZodEnum<["obfuscated", "mojang", "intermediary", "yarn"]>>;
@@ -51,6 +56,11 @@ export declare const analyzeSymbolSchema: z.ZodEffects<z.ZodObject<{
         owner?: string | undefined;
     }>;
     version: z.ZodOptional<z.ZodString>;
+    fromVersion: z.ZodOptional<z.ZodString>;
+    toVersion: z.ZodOptional<z.ZodString>;
+    maxVersions: z.ZodOptional<z.ZodNumber>;
+    includeTimeline: z.ZodOptional<z.ZodBoolean>;
+    includeSnapshots: z.ZodOptional<z.ZodBoolean>;
     sourceMapping: z.ZodOptional<z.ZodEnum<["obfuscated", "mojang", "intermediary", "yarn"]>>;
     targetMapping: z.ZodOptional<z.ZodEnum<["obfuscated", "mojang", "intermediary", "yarn"]>>;
     classNameMapping: z.ZodOptional<z.ZodEnum<["obfuscated", "mojang", "intermediary", "yarn"]>>;
@@ -64,7 +74,7 @@ export declare const analyzeSymbolSchema: z.ZodEffects<z.ZodObject<{
     detail: z.ZodOptional<z.ZodEnum<["summary", "standard", "full"]>>;
     include: z.ZodOptional<z.ZodArray<z.ZodEnum<[string, ...string[]]>, "many">>;
 }, "strip", z.ZodTypeAny, {
-    nameMode: "auto" | "fqcn";
+    maxCandidates: number;
     task: "map" | "workspace" | "exists" | "exact-map" | "lifecycle" | "api-overview";
     subject: {
         name: string;
@@ -72,18 +82,23 @@ export declare const analyzeSymbolSchema: z.ZodEffects<z.ZodObject<{
         descriptor?: string | undefined;
         owner?: string | undefined;
     };
+    nameMode: "auto" | "fqcn";
     signatureMode: "exact" | "name-only";
-    maxCandidates: number;
     version?: string | undefined;
     projectPath?: string | undefined;
-    sourceMapping?: "obfuscated" | "mojang" | "intermediary" | "yarn" | undefined;
+    maxRows?: number | undefined;
+    detail?: "summary" | "standard" | "full" | undefined;
+    include?: string[] | undefined;
     targetMapping?: "obfuscated" | "mojang" | "intermediary" | "yarn" | undefined;
+    maxVersions?: number | undefined;
+    sourceMapping?: "obfuscated" | "mojang" | "intermediary" | "yarn" | undefined;
     classNameMapping?: "obfuscated" | "mojang" | "intermediary" | "yarn" | undefined;
     gradleUserHome?: string | undefined;
-    detail?: "full" | "summary" | "standard" | undefined;
-    include?: string[] | undefined;
+    includeSnapshots?: boolean | undefined;
+    fromVersion?: string | undefined;
+    toVersion?: string | undefined;
+    includeTimeline?: boolean | undefined;
     includeKinds?: ("class" | "field" | "method")[] | undefined;
-    maxRows?: number | undefined;
 }, {
     task: "map" | "workspace" | "exists" | "exact-map" | "lifecycle" | "api-overview";
     subject: {
@@ -94,19 +109,24 @@ export declare const analyzeSymbolSchema: z.ZodEffects<z.ZodObject<{
     };
     version?: string | undefined;
     projectPath?: string | undefined;
-    sourceMapping?: "obfuscated" | "mojang" | "intermediary" | "yarn" | undefined;
+    maxRows?: number | undefined;
+    maxCandidates?: number | undefined;
+    detail?: "summary" | "standard" | "full" | undefined;
+    include?: string[] | undefined;
     targetMapping?: "obfuscated" | "mojang" | "intermediary" | "yarn" | undefined;
+    maxVersions?: number | undefined;
+    sourceMapping?: "obfuscated" | "mojang" | "intermediary" | "yarn" | undefined;
     classNameMapping?: "obfuscated" | "mojang" | "intermediary" | "yarn" | undefined;
     gradleUserHome?: string | undefined;
     nameMode?: "auto" | "fqcn" | undefined;
-    detail?: "full" | "summary" | "standard" | undefined;
-    include?: string[] | undefined;
+    includeSnapshots?: boolean | undefined;
+    fromVersion?: string | undefined;
+    toVersion?: string | undefined;
+    includeTimeline?: boolean | undefined;
     signatureMode?: "exact" | "name-only" | undefined;
     includeKinds?: ("class" | "field" | "method")[] | undefined;
-    maxRows?: number | undefined;
-    maxCandidates?: number | undefined;
 }>, {
-    nameMode: "auto" | "fqcn";
+    maxCandidates: number;
     task: "map" | "workspace" | "exists" | "exact-map" | "lifecycle" | "api-overview";
     subject: {
         name: string;
@@ -114,18 +134,23 @@ export declare const analyzeSymbolSchema: z.ZodEffects<z.ZodObject<{
         descriptor?: string | undefined;
         owner?: string | undefined;
     };
+    nameMode: "auto" | "fqcn";
     signatureMode: "exact" | "name-only";
-    maxCandidates: number;
     version?: string | undefined;
     projectPath?: string | undefined;
-    sourceMapping?: "obfuscated" | "mojang" | "intermediary" | "yarn" | undefined;
+    maxRows?: number | undefined;
+    detail?: "summary" | "standard" | "full" | undefined;
+    include?: string[] | undefined;
     targetMapping?: "obfuscated" | "mojang" | "intermediary" | "yarn" | undefined;
+    maxVersions?: number | undefined;
+    sourceMapping?: "obfuscated" | "mojang" | "intermediary" | "yarn" | undefined;
     classNameMapping?: "obfuscated" | "mojang" | "intermediary" | "yarn" | undefined;
     gradleUserHome?: string | undefined;
-    detail?: "full" | "summary" | "standard" | undefined;
-    include?: string[] | undefined;
+    includeSnapshots?: boolean | undefined;
+    fromVersion?: string | undefined;
+    toVersion?: string | undefined;
+    includeTimeline?: boolean | undefined;
     includeKinds?: ("class" | "field" | "method")[] | undefined;
-    maxRows?: number | undefined;
 }, {
     task: "map" | "workspace" | "exists" | "exact-map" | "lifecycle" | "api-overview";
     subject: {
@@ -136,17 +161,22 @@ export declare const analyzeSymbolSchema: z.ZodEffects<z.ZodObject<{
     };
     version?: string | undefined;
     projectPath?: string | undefined;
-    sourceMapping?: "obfuscated" | "mojang" | "intermediary" | "yarn" | undefined;
+    maxRows?: number | undefined;
+    maxCandidates?: number | undefined;
+    detail?: "summary" | "standard" | "full" | undefined;
+    include?: string[] | undefined;
     targetMapping?: "obfuscated" | "mojang" | "intermediary" | "yarn" | undefined;
+    maxVersions?: number | undefined;
+    sourceMapping?: "obfuscated" | "mojang" | "intermediary" | "yarn" | undefined;
     classNameMapping?: "obfuscated" | "mojang" | "intermediary" | "yarn" | undefined;
     gradleUserHome?: string | undefined;
     nameMode?: "auto" | "fqcn" | undefined;
-    detail?: "full" | "summary" | "standard" | undefined;
-    include?: string[] | undefined;
+    includeSnapshots?: boolean | undefined;
+    fromVersion?: string | undefined;
+    toVersion?: string | undefined;
+    includeTimeline?: boolean | undefined;
     signatureMode?: "exact" | "name-only" | undefined;
     includeKinds?: ("class" | "field" | "method")[] | undefined;
-    maxRows?: number | undefined;
-    maxCandidates?: number | undefined;
 }>;
 export type AnalyzeSymbolInput = z.infer<typeof analyzeSymbolSchema>;
 type AnalyzeSymbolDeps = {
@@ -172,6 +202,7 @@ type AnalyzeSymbolDeps = {
         sourceMapping: "obfuscated" | "mojang" | "intermediary" | "yarn";
         targetMapping: "obfuscated" | "mojang" | "intermediary" | "yarn";
         gradleUserHome?: string;
+        nameMode?: "fqcn" | "auto";
         signatureMode?: "exact" | "name-only";
         maxCandidates?: number;
     }) => Promise<FindMappingOutput>;
@@ -189,9 +220,13 @@ type AnalyzeSymbolDeps = {
         symbol: string;
         descriptor?: string;
         mapping?: "obfuscated" | "mojang" | "intermediary" | "yarn";
+        sourcePriority?: "loom-first" | "maven-first";
         gradleUserHome?: string;
+        fromVersion?: string;
         toVersion?: string;
         maxVersions?: number;
+        includeSnapshots?: boolean;
+        includeTimeline?: boolean;
     }) => Promise<TraceSymbolLifecycleOutput>;
     resolveWorkspaceSymbol: (input: {
         projectPath: string;

package/dist/entry-tools/analyze-symbol-service.js

@@ -3,7 +3,21 @@ import { createError, ERROR_CODES } from "../errors.js";
 import { buildIncludeSchema, detailSchema, positiveIntSchema } from "./entry-tool-schema.js";
 import { buildEntryToolResult, createSummarySubject } from "./response-contract.js";
 import { resolveDetail, resolveInclude } from "./request-normalizers.js";
+import { compactMappingResponse } from "../response-utils.js";
 const nonEmptyString = z.string().trim().min(1);
+/**
+ * Reuse the expert-tool compactMappingResponse candidate projection so the entry
+ * tool is as terse as the low-level one: drop the lone exact candidate that just
+ * duplicates `match` (resolved-exact), and slim the tail of unresolved candidate
+ * lists. Returns block fields to spread into buildEntryToolResult's `blocks`.
+ */
+function projectMappingCandidates(output) {
+    const projected = compactMappingResponse(output);
+    return {
+        candidates: projected.candidates,
+        ...(projected.candidateDetailsTruncated === true ? { candidateDetailsTruncated: true } : {})
+    };
+}
 // Descriptor field that treats empty/whitespace strings as omitted so callers can pass
 // `descriptor: ""` interchangeably with omitting the field when signatureMode="name-only".
 const optionalDescriptorString = z
@@ -15,38 +29,114 @@ const optionalDescriptorString = z
     const trimmed = value.trim();
     return trimmed.length === 0 ? undefined : trimmed;
 });
+/**
+ * Resolve subject.kind to a concrete kind. `"symbol"` is auto-detected from the
+ * selector (owner+descriptor => method, owner only => field, otherwise => class)
+ * and the inference is surfaced as a warning so the caller can see what ran.
+ */
+function inferSubjectKind(subject) {
+    if (subject.kind !== "symbol") {
+        return { kind: subject.kind };
+    }
+    let inferred;
+    if (subject.owner && subject.descriptor) {
+        inferred = "method";
+    }
+    else if (subject.owner) {
+        inferred = "field";
+    }
+    else {
+        inferred = "class";
+    }
+    const selectorNote = subject.owner
+        ? subject.descriptor
+            ? "owner+descriptor"
+            : "owner only"
+        : "no owner/descriptor";
+    return {
+        kind: inferred,
+        warning: `subject.kind="symbol" was auto-detected as "${inferred}" (${selectorNote}). Pass an explicit kind to override.`
+    };
+}
 const INCLUDE_GROUPS = ["warnings", "candidates", "matrix", "workspace", "timings"];
 const TASKS = ["exists", "map", "exact-map", "lifecycle", "workspace", "api-overview"];
 export const analyzeSymbolShape = {
     task: z.enum(TASKS),
     subject: z.object({
-        kind: z.enum(["class", "method", "field", "symbol"]),
+        kind: z
+            .enum(["class", "method", "field", "symbol"])
+            .describe("Symbol kind. Use 'symbol' to auto-detect from the selector: owner+descriptor => method, owner only => field, otherwise => class. The inferred kind is reported as a warning. For task=api-overview the inferred kind must be class."),
         name: nonEmptyString,
         owner: nonEmptyString.optional(),
         descriptor: optionalDescriptorString
     }),
-    version: nonEmptyString.optional(),
+    version: nonEmptyString
+        .optional()
+        .describe("Point-in-time MC version for task=exists/map/exact-map/workspace/api-overview. For task=lifecycle it is accepted as a back-compat alias for toVersion (range end)."),
+    fromVersion: nonEmptyString
+        .optional()
+        .describe("task=lifecycle only: range start (oldest) version; defaults to the oldest version in the manifest."),
+    toVersion: nonEmptyString
+        .optional()
+        .describe("task=lifecycle only: range end (newest) version; takes precedence over version. Defaults to latest."),
+    maxVersions: positiveIntSchema
+        .max(400)
+        .optional()
+        .describe("task=lifecycle only: cap on scanned versions (service default 120, max 400)."),
+    includeTimeline: z
+        .boolean()
+        .optional()
+        .describe("task=lifecycle only: include per-version timeline entries."),
+    includeSnapshots: z
+        .boolean()
+        .optional()
+        .describe("task=lifecycle only: include snapshot versions in the scan."),
     sourceMapping: z.enum(["obfuscated", "mojang", "intermediary", "yarn"]).optional(),
     targetMapping: z.enum(["obfuscated", "mojang", "intermediary", "yarn"]).optional(),
     classNameMapping: z.enum(["obfuscated", "mojang", "intermediary", "yarn"]).optional(),
     projectPath: nonEmptyString.optional(),
     gradleUserHome: nonEmptyString.optional(),
     signatureMode: z.enum(["exact", "name-only"]).default("exact"),
-    nameMode: z.enum(["fqcn", "auto"]).default("fqcn"),
+    nameMode: z.enum(["fqcn", "auto"]).default("auto"),
     includeKinds: z.array(z.enum(["class", "field", "method"])).optional(),
     maxRows: positiveIntSchema.optional(),
     maxCandidates: positiveIntSchema.default(5),
     detail: detailSchema.optional(),
     include: buildIncludeSchema(INCLUDE_GROUPS)
 };
+const LIFECYCLE_ONLY_FIELDS = [
+    "fromVersion",
+    "toVersion",
+    "maxVersions",
+    "includeTimeline",
+    "includeSnapshots"
+];
 export const analyzeSymbolSchema = z.object(analyzeSymbolShape).superRefine((value, ctx) => {
-    if (value.task !== "workspace" && !value.version) {
+    if (value.task !== "lifecycle" && !value.version) {
         ctx.addIssue({
             code: z.ZodIssueCode.custom,
             path: ["version"],
-            message: "version is required for non-workspace tasks."
+            message: "version is required for non-lifecycle tasks."
+        });
+    }
+    if (value.task === "lifecycle" && !value.version && !value.toVersion) {
+        ctx.addIssue({
+            code: z.ZodIssueCode.custom,
+            path: ["toVersion"],
+            message: "task=lifecycle requires toVersion (or version as a back-compat alias) as the range end."
         });
     }
+    if (value.task !== "lifecycle") {
+        for (const field of LIFECYCLE_ONLY_FIELDS) {
+            if (value[field] !== undefined) {
+                ctx.addIssue({
+                    code: z.ZodIssueCode.custom,
+                    path: [field],
+                    message: `${field} is only supported for task=lifecycle.`
+                });
+            }
+        }
+    }
     if (value.task === "workspace" && !value.projectPath) {
         ctx.addIssue({
             code: z.ZodIssueCode.custom,
@@ -54,11 +144,13 @@ export const analyzeSymbolSchema = z.object(analyzeSymbolShape).superRefine((val
             message: "projectPath is required for task=workspace."
         });
     }
-    if (value.task === "api-overview" && value.subject.kind !== "class") {
+    if (value.task === "api-overview" &&
+        value.subject.kind !== "class" &&
+        value.subject.kind !== "symbol") {
         ctx.addIssue({
             code: z.ZodIssueCode.custom,
             path: ["subject", "kind"],
-            message: "task=api-overview requires subject.kind=class."
+            message: "task=api-overview requires subject.kind=class (or 'symbol', which infers class)."
         });
     }
     if (value.task === "api-overview" && value.subject.owner) {
@@ -96,9 +188,7 @@ export class AnalyzeSymbolService {
     async execute(input) {
         const detail = resolveDetail(input.detail);
         const include = resolveInclude(input.include);
-        const subjectKind = input.subject.kind === "symbol"
-            ? "class"
-            : input.subject.kind;
+        const { kind: subjectKind, warning: inferenceWarning } = inferSubjectKind(input.subject);
         switch (input.task) {
             case "exists": {
                 const output = await this.deps.checkSymbolExists({
@@ -125,7 +215,7 @@ export class AnalyzeSymbolService {
                                 : `The symbol could not be resolved in ${output.mappingContext.version}.`,
                             subject: createSummarySubject({
                                 task: "exists",
-                                kind: input.subject.kind,
+                                kind: subjectKind,
                                 name: input.subject.name,
                                 owner: input.subject.owner,
                                 descriptor: input.subject.descriptor,
@@ -138,11 +228,11 @@ export class AnalyzeSymbolService {
                         },
                         blocks: {
                             match: output.resolvedSymbol ?? output.querySymbol,
-                            candidates: output.candidates,
+                            ...projectMappingCandidates(output),
                             ambiguity: output.ambiguityReasons ? { reasons: output.ambiguityReasons } : undefined
                         }
                     }),
-                    warnings: output.warnings
+                    warnings: inferenceWarning ? [inferenceWarning, ...output.warnings] : output.warnings
                 };
             }
             case "map": {
@@ -155,6 +245,7 @@ export class AnalyzeSymbolService {
                     sourceMapping: input.sourceMapping ?? "obfuscated",
                     targetMapping: input.targetMapping ?? "mojang",
                     ...(input.gradleUserHome !== undefined ? { gradleUserHome: input.gradleUserHome } : {}),
+                    nameMode: input.nameMode,
                     signatureMode: input.signatureMode,
                     maxCandidates: input.maxCandidates
                 });
@@ -170,7 +261,7 @@ export class AnalyzeSymbolService {
                                 : `Found ${output.candidateCount} candidate mappings.`,
                             subject: createSummarySubject({
                                 task: "map",
-                                kind: input.subject.kind,
+                                kind: subjectKind,
                                 name: input.subject.name,
                                 owner: input.subject.owner,
                                 descriptor: input.subject.descriptor,
@@ -184,11 +275,11 @@ export class AnalyzeSymbolService {
                         },
                         blocks: {
                             match: output.resolvedSymbol,
-                            candidates: output.candidates,
+                            ...projectMappingCandidates(output),
                             ambiguity: output.ambiguityReasons ? { reasons: output.ambiguityReasons } : undefined
                         }
                     }),
-                    warnings: output.warnings
+                    warnings: inferenceWarning ? [inferenceWarning, ...output.warnings] : output.warnings
                 };
             }
             case "exact-map": {
@@ -220,7 +311,7 @@ export class AnalyzeSymbolService {
                                 : "Could not resolve the exact method mapping.",
                             subject: createSummarySubject({
                                 task: "exact-map",
-                                kind: input.subject.kind,
+                                kind: subjectKind,
                                 name: input.subject.name,
                                 owner: input.subject.owner,
                                 descriptor: input.subject.descriptor,
@@ -234,10 +325,10 @@ export class AnalyzeSymbolService {
                         },
                         blocks: {
                             match: output.resolvedSymbol,
-                            candidates: output.candidates
+                            ...projectMappingCandidates(output)
                         }
                     }),
-                    warnings: output.warnings
+                    warnings: inferenceWarning ? [inferenceWarning, ...output.warnings] : output.warnings
                 };
             }
             case "lifecycle": {
@@ -248,8 +339,11 @@ export class AnalyzeSymbolService {
                     descriptor: input.subject.descriptor,
                     mapping: input.sourceMapping,
                     ...(input.gradleUserHome !== undefined ? { gradleUserHome: input.gradleUserHome } : {}),
-                    toVersion: input.version,
-                    maxVersions: 5
+                    ...(input.fromVersion !== undefined ? { fromVersion: input.fromVersion } : {}),
+                    toVersion: input.toVersion ?? input.version,
+                    ...(input.maxVersions !== undefined ? { maxVersions: input.maxVersions } : {}),
+                    ...(input.includeSnapshots !== undefined ? { includeSnapshots: input.includeSnapshots } : {}),
+                    ...(input.includeTimeline !== undefined ? { includeTimeline: input.includeTimeline } : {})
                 });
                 return {
                     ...buildEntryToolResult({
@@ -263,11 +357,11 @@ export class AnalyzeSymbolService {
                                 : "The symbol was not found in the scanned version range.",
                             subject: createSummarySubject({
                                 task: "lifecycle",
-                                kind: input.subject.kind,
+                                kind: subjectKind,
                                 name: input.subject.name,
                                 owner: input.subject.owner,
                                 descriptor: input.subject.descriptor,
-                                version: input.version,
+                                version: input.toVersion ?? input.version,
                                 sourceMapping: input.sourceMapping ?? "obfuscated"
                             }),
                             counts: {
@@ -279,13 +373,13 @@ export class AnalyzeSymbolService {
                             timeline: output.timeline
                         }
                     }),
-                    warnings: output.warnings
+                    warnings: inferenceWarning ? [inferenceWarning, ...output.warnings] : output.warnings
                 };
             }
             case "workspace": {
                 const output = await this.deps.resolveWorkspaceSymbol({
                     projectPath: input.projectPath,
-                    version: input.version ?? "unknown",
+                    version: input.version,
                     kind: subjectKind,
                     name: input.subject.name,
                     owner: input.subject.owner,
@@ -306,12 +400,12 @@ export class AnalyzeSymbolService {
                                 : "Workspace compile mapping could not be detected confidently.",
                             subject: createSummarySubject({
                                 task: "workspace",
-                                kind: input.subject.kind,
+                                kind: subjectKind,
                                 name: input.subject.name,
                                 owner: input.subject.owner,
                                 descriptor: input.subject.descriptor,
                                 projectPath: input.projectPath,
-                                version: input.version ?? "unknown",
+                                version: input.version,
                                 sourceMapping: input.sourceMapping ?? "obfuscated"
                             }),
                             counts: {
@@ -320,11 +414,13 @@ export class AnalyzeSymbolService {
                         },
                         blocks: {
                             match: output.resolvedSymbol,
-                            candidates: output.candidates,
+                            ...projectMappingCandidates(output),
                             workspace: output.workspaceDetection
                         }
                     }),
-                    warnings: [...output.warnings, ...output.workspaceDetection.warnings]
+                    warnings: inferenceWarning
+                        ? [inferenceWarning, ...output.warnings, ...output.workspaceDetection.warnings]
+                        : [...output.warnings, ...output.workspaceDetection.warnings]
                 };
             }
             case "api-overview": {
@@ -337,6 +433,11 @@ export class AnalyzeSymbolService {
                     ...(input.gradleUserHome !== undefined ? { gradleUserHome: input.gradleUserHome } : {}),
                     maxRows: input.maxRows
                 });
+                const includeMatrix = include.includes("matrix") || detail !== "summary";
+                const matrixRowCap = input.maxRows ?? 25;
+                const matrixCapWarning = includeMatrix && output.rows.length > matrixRowCap
+                    ? `Matrix rows were truncated to ${matrixRowCap} of ${output.rowCount}. Raise maxRows to include more rows.`
+                    : undefined;
                 return {
                     ...buildEntryToolResult({
                         task: "api-overview",
@@ -347,7 +448,7 @@ export class AnalyzeSymbolService {
                             headline: `Built an API overview for ${output.className}.`,
                             subject: createSummarySubject({
                                 task: "api-overview",
-                                kind: input.subject.kind,
+                                kind: subjectKind,
                                 name: input.subject.name,
                                 version: input.version,
                                 classNameMapping
@@ -362,16 +463,20 @@ export class AnalyzeSymbolService {
                                 className: output.className,
                                 classIdentity: output.classIdentity
                             },
-                            matrix: include.includes("matrix") || detail !== "summary"
+                            matrix: includeMatrix
                                 ? {
                                     rowCount: output.rowCount,
-                                    rowsTruncated: output.rowsTruncated,
-                                    rows: output.rows.slice(0, 25)
+                                    rowsTruncated: output.rowsTruncated || output.rows.length > matrixRowCap,
+                                    rows: output.rows.slice(0, matrixRowCap)
                                 }
                                 : undefined
                         }
                     }),
-                    warnings: output.warnings
+                    warnings: [
+                        ...(inferenceWarning ? [inferenceWarning] : []),
+                        ...output.warnings,
+                        ...(matrixCapWarning ? [matrixCapWarning] : [])
+                    ]
                 };
             }
         }