@bryan-thompson/inspector-assessment-cli 1.36.3 → 1.36.5

package/build/__tests__/assessment-runner/tools-with-hints.test.js

@@ -5,7 +5,7 @@
  * from raw MCP transport responses, even when the SDK's Zod validation would
  * normally strip them.
  */
-import { jest, describe, it, expect, beforeEach, afterEach } from "@jest/globals";
+import { jest, describe, it, expect, beforeEach, afterEach, } from "@jest/globals";
 import { getToolsWithPreservedHints, } from "../../lib/assessment-runner/tools-with-hints.js";
 describe("getToolsWithPreservedHints", () => {
     let mockClient;
@@ -198,6 +198,96 @@ describe("getToolsWithPreservedHints", () => {
         const tools = await getToolsWithPreservedHints(mockClient);
         expect(tools[0].destructiveHint).toBe(true);
     });
+    // Issue #160: Non-suffixed property preservation tests
+    it("should preserve non-suffixed readOnly from annotations object (Issue #160)", async () => {
+        mockClient.listTools.mockImplementation(async () => {
+            if (mockTransport.onmessage) {
+                mockTransport.onmessage({
+                    result: {
+                        tools: [
+                            {
+                                name: "domain_search",
+                                annotations: { readOnly: true }, // Non-suffixed version
+                            },
+                        ],
+                    },
+                });
+            }
+            // SDK returns tool without annotations (stripped by Zod)
+            return { tools: [{ name: "domain_search" }] };
+        });
+        const tools = await getToolsWithPreservedHints(mockClient);
+        // Should be mapped to readOnlyHint
+        expect(tools[0].readOnlyHint).toBe(true);
+    });
+    it("should preserve all non-suffixed annotations from annotations object (Issue #160)", async () => {
+        mockClient.listTools.mockImplementation(async () => {
+            if (mockTransport.onmessage) {
+                mockTransport.onmessage({
+                    result: {
+                        tools: [
+                            {
+                                name: "full_tool",
+                                annotations: {
+                                    readOnly: true,
+                                    destructive: false,
+                                    idempotent: true,
+                                    openWorld: false,
+                                },
+                            },
+                        ],
+                    },
+                });
+            }
+            return { tools: [{ name: "full_tool" }] };
+        });
+        const tools = await getToolsWithPreservedHints(mockClient);
+        expect(tools[0].readOnlyHint).toBe(true);
+        expect(tools[0].destructiveHint).toBe(false);
+        expect(tools[0].idempotentHint).toBe(true);
+        expect(tools[0].openWorldHint).toBe(false);
+    });
+    it("should preserve non-suffixed readOnly from direct property (Issue #160)", async () => {
+        mockClient.listTools.mockImplementation(async () => {
+            if (mockTransport.onmessage) {
+                mockTransport.onmessage({
+                    result: {
+                        tools: [
+                            {
+                                name: "direct_tool",
+                                readOnly: true, // Direct non-suffixed property
+                            },
+                        ],
+                    },
+                });
+            }
+            return { tools: [{ name: "direct_tool" }] };
+        });
+        const tools = await getToolsWithPreservedHints(mockClient);
+        expect(tools[0].readOnlyHint).toBe(true);
+    });
+    it("should prioritize *Hint over non-suffixed versions (Issue #160)", async () => {
+        mockClient.listTools.mockImplementation(async () => {
+            if (mockTransport.onmessage) {
+                mockTransport.onmessage({
+                    result: {
+                        tools: [
+                            {
+                                name: "priority_tool",
+                                annotations: {
+                                    readOnlyHint: false, // *Hint should win
+                                    readOnly: true, // Should be ignored
+                                },
+                            },
+                        ],
+                    },
+                });
+            }
+            return { tools: [{ name: "priority_tool" }] };
+        });
+        const tools = await getToolsWithPreservedHints(mockClient);
+        expect(tools[0].readOnlyHint).toBe(false); // *Hint takes priority
+    });
     it("should restore original onmessage handler after call", async () => {
         const originalHandler = jest.fn();
         mockTransport.onmessage = originalHandler;

package/build/__tests__/jsonl-events.test.js

@@ -207,6 +207,105 @@ describe("JSONL Event Emission", () => {
             expect(annotations).not.toBeNull();
             expect(annotations?.readOnlyHint).toBe(false); // Should use annotations object value
         });
+        // Issue #160: Test non-suffixed annotation property detection
+        it("should detect non-suffixed readOnly from annotations object (Issue #160)", () => {
+            const tool = {
+                name: "domain_search",
+                description: "Search emails based on domain name",
+                inputSchema: { type: "object" },
+                annotations: { readOnly: true }, // Non-suffixed version
+            };
+            emitToolDiscovered(tool);
+            const annotations = emittedEvents[0].annotations;
+            expect(annotations).not.toBeNull();
+            expect(annotations?.readOnlyHint).toBe(true);
+        });
+        it("should detect all non-suffixed annotations from annotations object (Issue #160)", () => {
+            const tool = {
+                name: "full_annotations",
+                inputSchema: { type: "object" },
+                annotations: {
+                    readOnly: true,
+                    destructive: false,
+                    idempotent: true,
+                    openWorld: false,
+                },
+            };
+            emitToolDiscovered(tool);
+            const annotations = emittedEvents[0].annotations;
+            expect(annotations).not.toBeNull();
+            expect(annotations?.readOnlyHint).toBe(true);
+            expect(annotations?.destructiveHint).toBe(false);
+            expect(annotations?.idempotentHint).toBe(true);
+            expect(annotations?.openWorldHint).toBe(false);
+        });
+        it("should detect non-suffixed readOnly from direct properties (Issue #160)", () => {
+            const tool = {
+                name: "email_finder",
+                inputSchema: { type: "object" },
+                readOnly: true, // Direct non-suffixed property
+            };
+            emitToolDiscovered(tool);
+            const annotations = emittedEvents[0].annotations;
+            expect(annotations).not.toBeNull();
+            expect(annotations?.readOnlyHint).toBe(true);
+        });
+        it("should detect non-suffixed annotations from metadata object (Issue #160)", () => {
+            const tool = {
+                name: "metadata_tool",
+                inputSchema: { type: "object" },
+                metadata: {
+                    readOnly: true,
+                    destructive: false,
+                },
+            };
+            emitToolDiscovered(tool);
+            const annotations = emittedEvents[0].annotations;
+            expect(annotations).not.toBeNull();
+            expect(annotations?.readOnlyHint).toBe(true);
+            expect(annotations?.destructiveHint).toBe(false);
+        });
+        it("should detect non-suffixed annotations from _meta object (Issue #160)", () => {
+            const tool = {
+                name: "meta_tool",
+                inputSchema: { type: "object" },
+                _meta: {
+                    idempotent: true,
+                    openWorld: false,
+                },
+            };
+            emitToolDiscovered(tool);
+            const annotations = emittedEvents[0].annotations;
+            expect(annotations).not.toBeNull();
+            expect(annotations?.idempotentHint).toBe(true);
+            expect(annotations?.openWorldHint).toBe(false);
+        });
+        it("should prioritize *Hint over non-suffixed in annotations object (Issue #160)", () => {
+            const tool = {
+                name: "priority_tool",
+                inputSchema: { type: "object" },
+                annotations: {
+                    readOnlyHint: false, // *Hint version should win
+                    readOnly: true, // Should be ignored
+                },
+            };
+            emitToolDiscovered(tool);
+            const annotations = emittedEvents[0].annotations;
+            expect(annotations).not.toBeNull();
+            expect(annotations?.readOnlyHint).toBe(false); // *Hint takes priority
+        });
+        it("should prioritize *Hint over non-suffixed in direct properties (Issue #160)", () => {
+            const tool = {
+                name: "direct_priority_tool",
+                inputSchema: { type: "object" },
+                destructiveHint: true, // *Hint version should win
+                destructive: false, // Should be ignored
+            };
+            emitToolDiscovered(tool);
+            const annotations = emittedEvents[0].annotations;
+            expect(annotations).not.toBeNull();
+            expect(annotations?.destructiveHint).toBe(true);
+        });
     });
     describe("emitToolsDiscoveryComplete", () => {
         it("should emit tools_discovery_complete with count", () => {

package/build/lib/assessment-runner/tools-with-hints.js

@@ -6,15 +6,33 @@
  * as a direct property on tools). This module intercepts the raw transport
  * response to preserve these properties.
  *
+ * Issue #160: Also preserves non-suffixed annotation property names (readOnly,
+ * destructive, idempotent, openWorld) for servers that use the shorter names
+ * instead of the *Hint suffix versions required by MCP spec.
+ *
  * @module cli/lib/assessment-runner/tools-with-hints
  */
-// Hint property names we want to preserve
+// Hint property names we want to preserve (*Hint suffix - MCP spec)
 const HINT_PROPERTIES = [
     "readOnlyHint",
     "destructiveHint",
     "idempotentHint",
     "openWorldHint",
 ];
+// Issue #160: Non-suffixed property names (fallback for servers using shorter names)
+const NON_SUFFIXED_PROPERTIES = [
+    "readOnly",
+    "destructive",
+    "idempotent",
+    "openWorld",
+];
+// Mapping from non-suffixed to *Hint versions
+const NON_SUFFIXED_TO_HINT = {
+    readOnly: "readOnlyHint",
+    destructive: "destructiveHint",
+    idempotent: "idempotentHint",
+    openWorld: "openWorldHint",
+};
 /**
  * Get tools from MCP server with hint properties preserved.
  *
@@ -74,23 +92,45 @@ export async function getToolsWithPreservedHints(client) {
                     continue;
                 }
                 // Check raw tool locations in priority order:
-                // 1. Direct property on raw tool
-                // 2. annotations object
-                // 3. metadata object
-                // 4. _meta object
+                // 1. Direct property on raw tool (*Hint)
+                // 2. Direct property on raw tool (non-suffixed, Issue #160)
+                // 3. annotations object (*Hint)
+                // 4. annotations object (non-suffixed, Issue #160)
+                // 5. metadata object (*Hint)
+                // 6. metadata object (non-suffixed, Issue #160)
+                // 7. _meta object (*Hint)
+                // 8. _meta object (non-suffixed, Issue #160)
                 let value;
+                // Get the non-suffixed equivalent (e.g., readOnlyHint -> readOnly)
+                const nonSuffixed = hint.replace("Hint", "");
+                // Check direct properties
                 if (typeof rawTool[hint] === "boolean") {
                     value = rawTool[hint];
                 }
+                else if (typeof rawTool[nonSuffixed] === "boolean") {
+                    value = rawTool[nonSuffixed];
+                }
+                // Check annotations object
                 else if (typeof rawTool.annotations?.[hint] === "boolean") {
                     value = rawTool.annotations[hint];
                 }
+                else if (typeof rawTool.annotations?.[nonSuffixed] === "boolean") {
+                    value = rawTool.annotations[nonSuffixed];
+                }
+                // Check metadata object
                 else if (typeof rawTool.metadata?.[hint] === "boolean") {
                     value = rawTool.metadata[hint];
                 }
+                else if (typeof rawTool.metadata?.[nonSuffixed] === "boolean") {
+                    value = rawTool.metadata[nonSuffixed];
+                }
+                // Check _meta object
                 else if (typeof rawTool._meta?.[hint] === "boolean") {
                     value = rawTool._meta[hint];
                 }
+                else if (typeof rawTool._meta?.[nonSuffixed] === "boolean") {
+                    value = rawTool._meta[nonSuffixed];
+                }
                 if (value !== undefined) {
                     enrichedTool[hint] = value;
                 }

package/build/lib/jsonl-events.js

@@ -70,76 +70,150 @@ export function extractToolParams(schema) {
 export function emitToolDiscovered(tool) {
     const params = extractToolParams(tool.inputSchema);
     // Issue #155: Extract annotations from multiple sources (priority order)
-    // NOTE: This is a simplified version of AlignmentChecker.extractAnnotations()
-    // that only checks *Hint-suffixed properties (readOnlyHint, destructiveHint, etc.),
-    // not non-suffixed variants like readOnly, destructive, idempotent, openWorld.
-    // See AlignmentChecker.resolveAnnotationValue() for full implementation with fallbacks.
+    // Issue #160: Also check non-suffixed variants (readOnly, destructive, etc.)
+    // for servers that use the shorter property names instead of *Hint versions.
     const toolAny = tool;
+    const annotationsAny = tool.annotations;
     // Priority 1: Check tool.annotations object (MCP spec)
+    // Issue #160: Use nullish coalescing to fall back to non-suffixed versions
     let readOnlyHint;
     let destructiveHint;
     let idempotentHint;
     let openWorldHint;
-    if (tool.annotations) {
-        readOnlyHint = tool.annotations.readOnlyHint;
-        destructiveHint = tool.annotations.destructiveHint;
-        idempotentHint = tool.annotations.idempotentHint;
-        openWorldHint = tool.annotations.openWorldHint;
+    if (annotationsAny) {
+        // Check *Hint version first, fall back to non-suffixed (Issue #160)
+        if (typeof annotationsAny.readOnlyHint === "boolean") {
+            readOnlyHint = annotationsAny.readOnlyHint;
+        }
+        else if (typeof annotationsAny.readOnly === "boolean") {
+            readOnlyHint = annotationsAny.readOnly;
+        }
+        if (typeof annotationsAny.destructiveHint === "boolean") {
+            destructiveHint = annotationsAny.destructiveHint;
+        }
+        else if (typeof annotationsAny.destructive === "boolean") {
+            destructiveHint = annotationsAny.destructive;
+        }
+        if (typeof annotationsAny.idempotentHint === "boolean") {
+            idempotentHint = annotationsAny.idempotentHint;
+        }
+        else if (typeof annotationsAny.idempotent === "boolean") {
+            idempotentHint = annotationsAny.idempotent;
+        }
+        if (typeof annotationsAny.openWorldHint === "boolean") {
+            openWorldHint = annotationsAny.openWorldHint;
+        }
+        else if (typeof annotationsAny.openWorld === "boolean") {
+            openWorldHint = annotationsAny.openWorld;
+        }
     }
     // Priority 2: Check direct properties on tool object
     // Only use if not already found in annotations
-    if (readOnlyHint === undefined && typeof toolAny.readOnlyHint === "boolean") {
-        readOnlyHint = toolAny.readOnlyHint;
+    // Issue #160: Check both *Hint and non-suffixed versions
+    if (readOnlyHint === undefined) {
+        if (typeof toolAny.readOnlyHint === "boolean") {
+            readOnlyHint = toolAny.readOnlyHint;
+        }
+        else if (typeof toolAny.readOnly === "boolean") {
+            readOnlyHint = toolAny.readOnly;
+        }
     }
-    if (destructiveHint === undefined &&
-        typeof toolAny.destructiveHint === "boolean") {
-        destructiveHint = toolAny.destructiveHint;
+    if (destructiveHint === undefined) {
+        if (typeof toolAny.destructiveHint === "boolean") {
+            destructiveHint = toolAny.destructiveHint;
+        }
+        else if (typeof toolAny.destructive === "boolean") {
+            destructiveHint = toolAny.destructive;
+        }
     }
-    if (idempotentHint === undefined &&
-        typeof toolAny.idempotentHint === "boolean") {
-        idempotentHint = toolAny.idempotentHint;
+    if (idempotentHint === undefined) {
+        if (typeof toolAny.idempotentHint === "boolean") {
+            idempotentHint = toolAny.idempotentHint;
+        }
+        else if (typeof toolAny.idempotent === "boolean") {
+            idempotentHint = toolAny.idempotent;
+        }
     }
-    if (openWorldHint === undefined &&
-        typeof toolAny.openWorldHint === "boolean") {
-        openWorldHint = toolAny.openWorldHint;
+    if (openWorldHint === undefined) {
+        if (typeof toolAny.openWorldHint === "boolean") {
+            openWorldHint = toolAny.openWorldHint;
+        }
+        else if (typeof toolAny.openWorld === "boolean") {
+            openWorldHint = toolAny.openWorld;
+        }
     }
     // Priority 3: Check tool.metadata object
+    // Issue #160: Check both *Hint and non-suffixed versions
     const metadata = toolAny.metadata;
     if (metadata) {
-        if (readOnlyHint === undefined &&
-            typeof metadata.readOnlyHint === "boolean") {
-            readOnlyHint = metadata.readOnlyHint;
+        if (readOnlyHint === undefined) {
+            if (typeof metadata.readOnlyHint === "boolean") {
+                readOnlyHint = metadata.readOnlyHint;
+            }
+            else if (typeof metadata.readOnly === "boolean") {
+                readOnlyHint = metadata.readOnly;
+            }
         }
-        if (destructiveHint === undefined &&
-            typeof metadata.destructiveHint === "boolean") {
-            destructiveHint = metadata.destructiveHint;
+        if (destructiveHint === undefined) {
+            if (typeof metadata.destructiveHint === "boolean") {
+                destructiveHint = metadata.destructiveHint;
+            }
+            else if (typeof metadata.destructive === "boolean") {
+                destructiveHint = metadata.destructive;
+            }
         }
-        if (idempotentHint === undefined &&
-            typeof metadata.idempotentHint === "boolean") {
-            idempotentHint = metadata.idempotentHint;
+        if (idempotentHint === undefined) {
+            if (typeof metadata.idempotentHint === "boolean") {
+                idempotentHint = metadata.idempotentHint;
+            }
+            else if (typeof metadata.idempotent === "boolean") {
+                idempotentHint = metadata.idempotent;
+            }
         }
-        if (openWorldHint === undefined &&
-            typeof metadata.openWorldHint === "boolean") {
-            openWorldHint = metadata.openWorldHint;
+        if (openWorldHint === undefined) {
+            if (typeof metadata.openWorldHint === "boolean") {
+                openWorldHint = metadata.openWorldHint;
+            }
+            else if (typeof metadata.openWorld === "boolean") {
+                openWorldHint = metadata.openWorld;
+            }
         }
     }
     // Priority 4: Check tool._meta object
+    // Issue #160: Check both *Hint and non-suffixed versions
     const _meta = toolAny._meta;
     if (_meta) {
-        if (readOnlyHint === undefined && typeof _meta.readOnlyHint === "boolean") {
-            readOnlyHint = _meta.readOnlyHint;
+        if (readOnlyHint === undefined) {
+            if (typeof _meta.readOnlyHint === "boolean") {
+                readOnlyHint = _meta.readOnlyHint;
+            }
+            else if (typeof _meta.readOnly === "boolean") {
+                readOnlyHint = _meta.readOnly;
+            }
         }
-        if (destructiveHint === undefined &&
-            typeof _meta.destructiveHint === "boolean") {
-            destructiveHint = _meta.destructiveHint;
+        if (destructiveHint === undefined) {
+            if (typeof _meta.destructiveHint === "boolean") {
+                destructiveHint = _meta.destructiveHint;
+            }
+            else if (typeof _meta.destructive === "boolean") {
+                destructiveHint = _meta.destructive;
+            }
         }
-        if (idempotentHint === undefined &&
-            typeof _meta.idempotentHint === "boolean") {
-            idempotentHint = _meta.idempotentHint;
+        if (idempotentHint === undefined) {
+            if (typeof _meta.idempotentHint === "boolean") {
+                idempotentHint = _meta.idempotentHint;
+            }
+            else if (typeof _meta.idempotent === "boolean") {
+                idempotentHint = _meta.idempotent;
+            }
         }
-        if (openWorldHint === undefined &&
-            typeof _meta.openWorldHint === "boolean") {
-            openWorldHint = _meta.openWorldHint;
+        if (openWorldHint === undefined) {
+            if (typeof _meta.openWorldHint === "boolean") {
+                openWorldHint = _meta.openWorldHint;
+            }
+            else if (typeof _meta.openWorld === "boolean") {
+                openWorldHint = _meta.openWorld;
+            }
         }
     }
     // Build annotations object if any hints were found

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bryan-thompson/inspector-assessment-cli",
-  "version": "1.36.3",
+  "version": "1.36.5",
   "description": "CLI for the Enhanced MCP Inspector with assessment capabilities",
   "license": "MIT",
   "author": "Bryan Thompson <bryan@triepod.ai>",