simplify code

Author: taskbot

pkg/vmcp/client/client.go

@@ -9,13 +9,11 @@ package client
 
 import (
 	"context"
-	"encoding/json"
 	"errors"
 	"fmt"
 	"io"
 	"net"
 	"net/http"
-	"strings"
 	"time"
 
 	"github.com/mark3labs/mcp-go/client"
@@ -28,6 +26,7 @@ import (
 	vmcpauth "github.com/stacklok/toolhive/pkg/vmcp/auth"
 	authtypes "github.com/stacklok/toolhive/pkg/vmcp/auth/types"
 	"github.com/stacklok/toolhive/pkg/vmcp/conversion"
+	"github.com/stacklok/toolhive/pkg/versions"
 )
 
 const (
@@ -329,7 +328,7 @@ func initializeClient(ctx context.Context, c *client.Client) (*mcp.ServerCapabil
 			ProtocolVersion: mcp.LATEST_PROTOCOL_VERSION,
 			ClientInfo: mcp.Implementation{
 				Name:    "toolhive-vmcp",
-				Version: "0.1.0",
+				Version: versions.Version,
 			},
 			Capabilities: mcp.ClientCapabilities{
 				// Virtual MCP acts as a client to backends
@@ -386,13 +385,6 @@ func queryPrompts(ctx context.Context, c *client.Client, supported bool, backend
 	return &mcp.ListPromptsResult{Prompts: []mcp.Prompt{}}, nil
 }
 
-// convertContent converts a single mcp.Content item to vmcp.Content.
-// Delegates to the shared conversion package; kept here for backward compatibility
-// with tests that call it directly.
-func convertContent(content mcp.Content) vmcp.Content {
-	return conversion.ConvertMCPContent(content)
-}
-
 // ListCapabilities queries a backend for its MCP capabilities.
 // Returns tools, resources, and prompts exposed by the backend.
 // Only queries capabilities that the server advertises during initialization.
@@ -445,25 +437,10 @@ func (h *httpBackendClient) ListCapabilities(ctx context.Context, target *vmcp.B
 
 	// Convert tools
 	for i, tool := range toolsResp.Tools {
-		// Use a JSON round-trip to capture all schema fields (type, properties,
-		// required, $defs, additionalProperties, etc.) rather than enumerating
-		// them manually. This is forward-safe: any fields the SDK adds in future
-		// versions are preserved automatically.
-		inputSchema := make(map[string]any)
-		if b, err := json.Marshal(tool.InputSchema); err == nil {
-			if jsonErr := json.Unmarshal(b, &inputSchema); jsonErr != nil {
-				logger.Debugf("Failed to decode tool input schema for %s; using type-only fallback: %v", tool.Name, jsonErr)
-				inputSchema = map[string]any{"type": tool.InputSchema.Type}
-			}
-		} else {
-			logger.Debugf("Failed to encode tool input schema for %s; using type-only fallback: %v", tool.Name, err)
-			inputSchema = map[string]any{"type": tool.InputSchema.Type}
-		}
-
 		capabilities.Tools[i] = vmcp.Tool{
 			Name:        tool.Name,
 			Description: tool.Description,
-			InputSchema: inputSchema,
+			InputSchema: conversion.ConvertToolInputSchema(tool.InputSchema),
 			BackendID:   target.WorkloadID,
 		}
 	}
@@ -702,11 +679,7 @@ func (h *httpBackendClient) GetPrompt(
 		logger.Debugf("Translating prompt name: %s (client-facing) → %s (backend)", name, backendPromptName)
 	}
 
-	// Convert map[string]any to map[string]string
-	stringArgs := make(map[string]string)
-	for k, v := range arguments {
-		stringArgs[k] = fmt.Sprintf("%v", v)
-	}
+	stringArgs := conversion.ConvertPromptArguments(arguments)
 
 	result, err := c.GetPrompt(ctx, mcp.GetPromptRequest{
 		Params: mcp.GetPromptParams{
@@ -718,27 +691,9 @@ func (h *httpBackendClient) GetPrompt(
 		return nil, fmt.Errorf("prompt get failed on backend %s: %w", target.WorkloadID, err)
 	}
 
-	// Concatenate all prompt messages into a single string.
-	// MCP prompts return messages with role and multi-modal content; only text
-	// chunks are captured (non-text content is silently discarded — Phase 1 limitation).
-	var sb strings.Builder
-	for _, msg := range result.Messages {
-		if msg.Role != "" {
-			fmt.Fprintf(&sb, "[%s] ", msg.Role)
-		}
-		if textContent, ok := mcp.AsTextContent(msg.Content); ok {
-			sb.WriteString(textContent.Text)
-			sb.WriteByte('\n')
-		}
-	}
-	prompt := sb.String()
-
-	// Extract _meta field from backend response
-	meta := conversion.FromMCPMeta(result.Meta)
-
 	return &vmcp.PromptGetResult{
-		Messages:    prompt,
+		Messages:    conversion.ConvertPromptMessages(result.Messages),
 		Description: result.Description,
-		Meta:        meta,
+		Meta:        conversion.FromMCPMeta(result.Meta),
 	}, nil
 }