Unify data structures to eliminate complexity

- Remove rawFormat parameter from listPrimitives - single consistent return format
- Eliminate buildPrimitivesArray helper function
- Interactive mode now directly iterates over data.tools, data.prompts, etc.
- Single source of truth: {capabilities, tools, prompts, resources, resourceTemplates}
- Maintains exact same functionality with simpler architecture
- No more dual-mode complexity or unnecessary data transformations

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <[email protected]>

Author: technicalpickles

src/mcp.js

@@ -45,7 +45,7 @@ function shouldInclude(filter, type) {
   return !filter || filter === type || filter === 'all'
 }
 
-async function listPrimitives(client, filter = null, rawFormat = false) {
+async function listPrimitives(client, filter = null) {
   const capabilities = client.getServerCapabilities()
   const promises = []
 
@@ -78,52 +78,27 @@ async function listPrimitives(client, filter = null, rawFormat = false) {
     rawData[type] = data
   })
 
-  if (rawFormat) {
-    // Always return consistent structure with empty arrays for unfiltered types
-    const result = {
-      capabilities: rawData.capabilities,
-      tools: [],
-      prompts: [],
-      resources: [],
-      resourceTemplates: []
-    }
-    
-    if (filter === 'all' || filter === 'tools') {
-      result.tools = rawData.tools
-    }
-    if (filter === 'all' || filter === 'prompts') {
-      result.prompts = rawData.prompts
-    }
-    if (filter === 'all' || filter === 'resources') {
-      result.resources = rawData.resources
-      result.resourceTemplates = rawData.resourceTemplates
-    }
-    
-    return result
+  // Always return consistent structure with empty arrays for unfiltered types
+  const result = {
+    capabilities: rawData.capabilities,
+    tools: [],
+    prompts: [],
+    resources: [],
+    resourceTemplates: []
   }
-
-  // Build primitives array from rawData for interactive mode
-  const primitives = []
 
-  if (shouldInclude(filter, 'tools') && rawData.tools.length > 0) {
-    rawData.tools.forEach((item) => primitives.push({ type: 'tool', value: item }))
+  if (filter === 'all' || filter === 'tools') {
+    result.tools = rawData.tools
   }
-  
-  if (shouldInclude(filter, 'resources')) {
-    rawData.resources.forEach((item) => primitives.push({ type: 'resource', value: item }))
-    rawData.resourceTemplates.forEach((item) =>
-      primitives.push({
-        type: 'resource-template', 
-        value: item,
-      })
-    )
+  if (filter === 'all' || filter === 'prompts') {
+    result.prompts = rawData.prompts
   }
-  
-  if (shouldInclude(filter, 'prompts') && rawData.prompts.length > 0) {
-    rawData.prompts.forEach((item) => primitives.push({ type: 'prompt', value: item }))
+  if (filter === 'all' || filter === 'resources') {
+    result.resources = rawData.resources
+    result.resourceTemplates = rawData.resourceTemplates
   }
-
-  return primitives
+  
+  return result
 }
 
 // Command mapping for list operations
@@ -140,7 +115,7 @@ async function executeListCommand(client, command, options = {}) {
   if (!filter) {
     throw new Error(`Unknown list command: ${command}`)
   }
-  return await listPrimitives(client, filter, true)
+  return await listPrimitives(client, filter)
 }
 
 async function connectServer(transport, options = {}) {
@@ -155,20 +130,43 @@ async function connectServer(transport, options = {}) {
     throw err
   }
 
-  const primitives = await listPrimitives(client)
+  const data = await listPrimitives(client)
   spinner.success(`Connected, server capabilities: ${Object.keys(client.getServerCapabilities()).join(', ')}`)
 
+  // Build choices array from the consistent data structure
+  const choices = []
+  data.tools.forEach((item) => choices.push({ 
+    type: 'tool', 
+    value: item,
+    title: colors.bold('tool(' + item.name + ')'),
+    description: formatDescription(item.description, options.compact)
+  }))
+  data.resources.forEach((item) => choices.push({ 
+    type: 'resource', 
+    value: item,
+    title: colors.bold('resource(' + item.name + ')'),
+    description: formatDescription(item.description, options.compact)
+  }))
+  data.resourceTemplates.forEach((item) => choices.push({ 
+    type: 'resource-template', 
+    value: item,
+    title: colors.bold('resource-template(' + item.name + ')'),
+    description: formatDescription(item.description, options.compact)
+  }))
+  data.prompts.forEach((item) => choices.push({ 
+    type: 'prompt', 
+    value: item,
+    title: colors.bold('prompt(' + item.name + ')'),
+    description: formatDescription(item.description, options.compact)
+  }))
+
   while (true) {
     const { primitive } = await prompts(
       {
         name: 'primitive',
         type: 'autocomplete',
         message: 'Pick a primitive',
-        choices: primitives.map((p) => ({
-          title: colors.bold(p.type + '(' + p.value.name + ')'),
-          description: formatDescription(p.value.description, options.compact),
-          value: p,
-        })),
+        choices: choices,
       },
       {
         onCancel: async () => {