@bryan-thompson/inspector-assessment-cli 1.36.1 → 1.36.2

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

@@ -142,6 +142,71 @@ describe("JSONL Event Emission", () => {
             emitToolDiscovered(tool);
             expect(emittedEvents[0].annotations).toBeNull();
         });
+        // Issue #155: Test that direct properties are detected
+        it("should detect annotations from direct properties (Issue #155)", () => {
+            // Simulate a tool with readOnlyHint as a direct property (not in annotations object)
+            // This is how some MCP SDKs serialize annotations
+            const tool = {
+                name: "browse_subreddit",
+                description: "Browse a subreddit",
+                inputSchema: { type: "object" },
+                readOnlyHint: true, // Direct property, not in annotations object
+            };
+            emitToolDiscovered(tool);
+            const annotations = emittedEvents[0].annotations;
+            expect(annotations).not.toBeNull();
+            expect(annotations?.readOnlyHint).toBe(true);
+        });
+        it("should detect annotations from metadata object (Issue #155)", () => {
+            // Simulate a tool with annotations in metadata object
+            const tool = {
+                name: "get_data",
+                description: "Get data",
+                inputSchema: { type: "object" },
+                metadata: {
+                    readOnlyHint: true,
+                    destructiveHint: 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 annotations from _meta object (Issue #155)", () => {
+            // Simulate a tool with annotations in _meta object
+            const tool = {
+                name: "search_docs",
+                description: "Search documents",
+                inputSchema: { type: "object" },
+                _meta: {
+                    idempotentHint: true,
+                    openWorldHint: 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 tool.annotations over direct properties (Issue #155)", () => {
+            // When both exist, tool.annotations should take precedence
+            const tool = {
+                name: "conflicting_tool",
+                description: "Test priority",
+                inputSchema: { type: "object" },
+                annotations: {
+                    readOnlyHint: false, // In annotations object
+                },
+                readOnlyHint: true, // Direct property (should be ignored)
+            };
+            emitToolDiscovered(tool);
+            const annotations = emittedEvents[0].annotations;
+            expect(annotations).not.toBeNull();
+            expect(annotations?.readOnlyHint).toBe(false); // Should use annotations object value
+        });
     });
     describe("emitToolsDiscoveryComplete", () => {
         it("should emit tools_discovery_complete with count", () => {

package/build/lib/jsonl-events.js

@@ -60,16 +60,99 @@ export function extractToolParams(schema) {
 /**
  * Emit tool_discovered event for each tool found.
  * Includes annotations if the server provides them.
+ *
+ * Issue #155: Check multiple locations for annotations:
+ * 1. tool.annotations object (MCP 2024-11 spec)
+ * 2. Direct properties (tool.readOnlyHint, etc.)
+ * 3. tool.metadata object
+ * 4. tool._meta object
  */
 export function emitToolDiscovered(tool) {
     const params = extractToolParams(tool.inputSchema);
-    // Extract annotations, null if not present
-    const annotations = tool.annotations
+    // 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.
+    const toolAny = tool;
+    // Priority 1: Check tool.annotations object (MCP spec)
+    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;
+    }
+    // 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;
+    }
+    if (destructiveHint === undefined &&
+        typeof toolAny.destructiveHint === "boolean") {
+        destructiveHint = toolAny.destructiveHint;
+    }
+    if (idempotentHint === undefined &&
+        typeof toolAny.idempotentHint === "boolean") {
+        idempotentHint = toolAny.idempotentHint;
+    }
+    if (openWorldHint === undefined &&
+        typeof toolAny.openWorldHint === "boolean") {
+        openWorldHint = toolAny.openWorldHint;
+    }
+    // Priority 3: Check tool.metadata object
+    const metadata = toolAny.metadata;
+    if (metadata) {
+        if (readOnlyHint === undefined &&
+            typeof metadata.readOnlyHint === "boolean") {
+            readOnlyHint = metadata.readOnlyHint;
+        }
+        if (destructiveHint === undefined &&
+            typeof metadata.destructiveHint === "boolean") {
+            destructiveHint = metadata.destructiveHint;
+        }
+        if (idempotentHint === undefined &&
+            typeof metadata.idempotentHint === "boolean") {
+            idempotentHint = metadata.idempotentHint;
+        }
+        if (openWorldHint === undefined &&
+            typeof metadata.openWorldHint === "boolean") {
+            openWorldHint = metadata.openWorldHint;
+        }
+    }
+    // Priority 4: Check tool._meta object
+    const _meta = toolAny._meta;
+    if (_meta) {
+        if (readOnlyHint === undefined && typeof _meta.readOnlyHint === "boolean") {
+            readOnlyHint = _meta.readOnlyHint;
+        }
+        if (destructiveHint === undefined &&
+            typeof _meta.destructiveHint === "boolean") {
+            destructiveHint = _meta.destructiveHint;
+        }
+        if (idempotentHint === undefined &&
+            typeof _meta.idempotentHint === "boolean") {
+            idempotentHint = _meta.idempotentHint;
+        }
+        if (openWorldHint === undefined &&
+            typeof _meta.openWorldHint === "boolean") {
+            openWorldHint = _meta.openWorldHint;
+        }
+    }
+    // Build annotations object if any hints were found
+    const hasAnnotations = readOnlyHint !== undefined ||
+        destructiveHint !== undefined ||
+        idempotentHint !== undefined ||
+        openWorldHint !== undefined;
+    const annotations = hasAnnotations
         ? {
-            readOnlyHint: tool.annotations.readOnlyHint,
-            destructiveHint: tool.annotations.destructiveHint,
-            idempotentHint: tool.annotations.idempotentHint,
-            openWorldHint: tool.annotations.openWorldHint,
+            readOnlyHint,
+            destructiveHint,
+            idempotentHint,
+            openWorldHint,
         }
         : null;
     emitJSONL({

package/package.json

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