@iqai/adk 0.0.10 → 0.0.12

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @iqai/adk
 
+## 0.0.12
+
+### Patch Changes
+
+- 948b0a1: Fixes sampling handler type to include promise
+
+## 0.0.11
+
+### Patch Changes
+
+- 9c7a7a7: Adds proper input and output conversion from LLMRequest and LLMResponse types
+
 ## 0.0.10
 
 ### Patch Changes

package/dist/index.d.mts

@@ -2703,7 +2703,7 @@ type McpConfig = {
      * Sampling handler for processing MCP sampling requests.
      * This allows MCP servers to request LLM completions through your ADK agent.
      */
-    samplingHandler?: ADKSamplingHandler;
+    samplingHandler?: SamplingHandler;
 };
 type McpTransportType = {
     mode: "stdio";
@@ -2735,41 +2735,9 @@ declare class McpError extends Error {
     originalError?: Error;
     constructor(message: string, type: McpErrorType, originalError?: Error);
 }
-type SamplingRequest = z.infer<typeof CreateMessageRequestSchema>;
-type SamplingResponse = z.infer<typeof CreateMessageResultSchema>;
-type SamplingHandler = (request: SamplingRequest) => Promise<SamplingResponse>;
-/**
- * ADK sampling request format - what we pass to the user's handler
- */
-interface ADKSamplingRequest {
-    messages: Message[];
-    systemPrompt?: string;
-    modelPreferences?: {
-        hints?: Array<{
-            name?: string;
-        }>;
-        costPriority?: number;
-        speedPriority?: number;
-        intelligencePriority?: number;
-    };
-    includeContext?: "none" | "thisServer" | "allServers";
-    temperature?: number;
-    maxTokens: number;
-    stopSequences?: string[];
-    metadata?: Record<string, unknown>;
-}
-/**
- * ADK sampling response format - what we expect from the user's handler
- */
-interface ADKSamplingResponse {
-    model: string;
-    stopReason?: "endTurn" | "stopSequence" | "maxTokens" | string;
-    content: string | null;
-}
-/**
- * ADK sampling handler function type - receives ADK formatted messages
- */
-type ADKSamplingHandler = (request: ADKSamplingRequest) => Promise<ADKSamplingResponse>;
+type McpSamplingRequest = z.infer<typeof CreateMessageRequestSchema>;
+type McpSamplingResponse = z.infer<typeof CreateMessageResultSchema>;
+type SamplingHandler = (messages: LLMRequest) => Promise<LLMResponse>;
 
 declare class McpClientService {
     private config;
@@ -2816,7 +2784,7 @@ declare class McpClientService {
     /**
      * Set a new ADK sampling handler
      */
-    setSamplingHandler(handler: ADKSamplingHandler): void;
+    setSamplingHandler(handler: SamplingHandler): void;
     /**
      * Remove the sampling handler
      */
@@ -2849,16 +2817,24 @@ declare function mcpSchemaToParameters(mcpTool: Tool): JSONSchema;
  */
 declare class McpSamplingHandler {
     private logger;
-    private adkHandler;
-    constructor(adkHandler: ADKSamplingHandler);
+    private samplingHandler;
+    constructor(samplingHandler: SamplingHandler);
     /**
      * Handle MCP sampling request and convert between formats
      */
-    handleSamplingRequest(request: SamplingRequest): Promise<SamplingResponse>;
+    handleSamplingRequest(request: McpSamplingRequest): Promise<McpSamplingResponse>;
     /**
      * Convert MCP messages to ADK message format
      */
     private convertMcpMessagesToADK;
+    /**
+     * Convert a single MCP message to ADK message format
+     */
+    private convertSingleMcpMessageToADK;
+    /**
+     * Convert MCP message content to ADK content format
+     */
+    private convertMcpContentToADK;
     /**
      * Convert ADK response to MCP response format
      */
@@ -2866,7 +2842,7 @@ declare class McpSamplingHandler {
     /**
      * Update the ADK handler
      */
-    updateHandler(handler: ADKSamplingHandler): void;
+    updateHandler(handler: SamplingHandler): void;
 }
 /**
  * Helper function to create a sampling handler with proper TypeScript types.
@@ -2903,7 +2879,7 @@ declare class McpSamplingHandler {
  * });
  * ```
  */
-declare function createSamplingHandler(handler: (request: ADKSamplingRequest) => Promise<ADKSamplingResponse>): ADKSamplingHandler;
+declare function createSamplingHandler(handler: SamplingHandler): SamplingHandler;
 
 /**
  * A class for managing MCP tools similar to Python's MCPToolset.
@@ -2931,7 +2907,7 @@ declare class McpToolset {
      *
      * @param handler - ADK sampling handler that receives ADK-formatted messages
      */
-    setSamplingHandler(handler: ADKSamplingHandler): void;
+    setSamplingHandler(handler: SamplingHandler): void;
     /**
      * Remove the sampling handler
      */
@@ -2975,9 +2951,6 @@ declare function getMcpTools(config: McpConfig, toolFilter?: string[] | ((tool:
  * Tools module exports
  */
 
-type index$2_ADKSamplingHandler = ADKSamplingHandler;
-type index$2_ADKSamplingRequest = ADKSamplingRequest;
-type index$2_ADKSamplingResponse = ADKSamplingResponse;
 type index$2_BaseTool = BaseTool;
 declare const index$2_BaseTool: typeof BaseTool;
 type index$2_BuildFunctionDeclarationOptions = BuildFunctionDeclarationOptions;
@@ -3003,12 +2976,12 @@ type index$2_McpErrorType = McpErrorType;
 declare const index$2_McpErrorType: typeof McpErrorType;
 type index$2_McpSamplingHandler = McpSamplingHandler;
 declare const index$2_McpSamplingHandler: typeof McpSamplingHandler;
+type index$2_McpSamplingRequest = McpSamplingRequest;
+type index$2_McpSamplingResponse = McpSamplingResponse;
 type index$2_McpToolset = McpToolset;
 declare const index$2_McpToolset: typeof McpToolset;
 type index$2_McpTransportType = McpTransportType;
 type index$2_SamplingHandler = SamplingHandler;
-type index$2_SamplingRequest = SamplingRequest;
-type index$2_SamplingResponse = SamplingResponse;
 type index$2_ToolConfig = ToolConfig;
 type index$2_ToolContext = ToolContext;
 declare const index$2_ToolContext: typeof ToolContext;
@@ -3025,7 +2998,7 @@ declare const index$2_jsonSchemaToDeclaration: typeof jsonSchemaToDeclaration;
 declare const index$2_mcpSchemaToParameters: typeof mcpSchemaToParameters;
 declare const index$2_normalizeJsonSchema: typeof normalizeJsonSchema;
 declare namespace index$2 {
-  export { type index$2_ADKSamplingHandler as ADKSamplingHandler, type index$2_ADKSamplingRequest as ADKSamplingRequest, type index$2_ADKSamplingResponse as ADKSamplingResponse, index$2_BaseTool as BaseTool, type index$2_BuildFunctionDeclarationOptions as BuildFunctionDeclarationOptions, index$2_ExitLoopTool as ExitLoopTool, index$2_FileOperationsTool as FileOperationsTool, index$2_FunctionTool as FunctionTool, index$2_GetUserChoiceTool as GetUserChoiceTool, index$2_GoogleSearch as GoogleSearch, index$2_HttpRequestTool as HttpRequestTool, type index$2_IToolContext as IToolContext, index$2_LoadMemoryTool as LoadMemoryTool, type index$2_McpConfig as McpConfig, index$2_McpError as McpError, index$2_McpErrorType as McpErrorType, index$2_McpSamplingHandler as McpSamplingHandler, index$2_McpToolset as McpToolset, type index$2_McpTransportType as McpTransportType, type index$2_SamplingHandler as SamplingHandler, type index$2_SamplingRequest as SamplingRequest, type index$2_SamplingResponse as SamplingResponse, type index$2_ToolConfig as ToolConfig, index$2_ToolContext as ToolContext, index$2_TransferToAgentTool as TransferToAgentTool, index$2_UserInteractionTool as UserInteractionTool, index$2_adkToMcpToolType as adkToMcpToolType, index$2_buildFunctionDeclaration as buildFunctionDeclaration, index$2_createFunctionTool as createFunctionTool, index$2_createSamplingHandler as createSamplingHandler, index$2_getMcpTools as getMcpTools, index$2_jsonSchemaToDeclaration as jsonSchemaToDeclaration, index$2_mcpSchemaToParameters as mcpSchemaToParameters, index$2_normalizeJsonSchema as normalizeJsonSchema };
+  export { index$2_BaseTool as BaseTool, type index$2_BuildFunctionDeclarationOptions as BuildFunctionDeclarationOptions, index$2_ExitLoopTool as ExitLoopTool, index$2_FileOperationsTool as FileOperationsTool, index$2_FunctionTool as FunctionTool, index$2_GetUserChoiceTool as GetUserChoiceTool, index$2_GoogleSearch as GoogleSearch, index$2_HttpRequestTool as HttpRequestTool, type index$2_IToolContext as IToolContext, index$2_LoadMemoryTool as LoadMemoryTool, type index$2_McpConfig as McpConfig, index$2_McpError as McpError, index$2_McpErrorType as McpErrorType, index$2_McpSamplingHandler as McpSamplingHandler, type index$2_McpSamplingRequest as McpSamplingRequest, type index$2_McpSamplingResponse as McpSamplingResponse, index$2_McpToolset as McpToolset, type index$2_McpTransportType as McpTransportType, type index$2_SamplingHandler as SamplingHandler, type index$2_ToolConfig as ToolConfig, index$2_ToolContext as ToolContext, index$2_TransferToAgentTool as TransferToAgentTool, index$2_UserInteractionTool as UserInteractionTool, index$2_adkToMcpToolType as adkToMcpToolType, index$2_buildFunctionDeclaration as buildFunctionDeclaration, index$2_createFunctionTool as createFunctionTool, index$2_createSamplingHandler as createSamplingHandler, index$2_getMcpTools as getMcpTools, index$2_jsonSchemaToDeclaration as jsonSchemaToDeclaration, index$2_mcpSchemaToParameters as mcpSchemaToParameters, index$2_normalizeJsonSchema as normalizeJsonSchema };
 }
 
 /**
@@ -3584,4 +3557,4 @@ declare class InMemoryRunner extends Runner {
 
 declare const VERSION = "0.1.0";
 
-export { type ADKSamplingHandler, type ADKSamplingRequest, type ADKSamplingResponse, Agent, type AgentConfig, index$3 as Agents, AnthropicLLM, type AnthropicLLMConfig, AnthropicLLMConnection, ApiKeyCredential, ApiKeyScheme, type AudioTranscriptionConfig, AuthConfig, AuthCredential, AuthCredentialType, AuthHandler, AuthScheme, AuthSchemeType, BaseAgent, BaseLLM, BaseLLMConnection, type BaseMemoryService, BaseTool, BasicAuthCredential, BearerTokenCredential, type BuildFunctionDeclarationOptions, ExitLoopTool, FileOperationsTool, type FunctionCall, type FunctionDeclaration, FunctionTool, GetUserChoiceTool, GoogleLLM, type GoogleLLMConfig, GoogleSearch, HttpRequestTool, HttpScheme, type IToolContext, type ImageContent, InMemoryMemoryService, InMemoryRunner, InMemorySessionService, InvocationContext, type JSONSchema, LLMRegistry, LLMRequest, type LLMRequestConfig, LLMResponse, LangGraphAgent, type LangGraphAgentConfig, type LangGraphNode, type ListSessionOptions, LoadMemoryTool, LoopAgent, type LoopAgentConfig, type McpConfig, McpError, McpErrorType, McpSamplingHandler, McpToolset, type McpTransportType, index$1 as Memory, type MemoryResult, type Message, type MessageContent, type MessageRole, index$4 as Models, OAuth2Credential, OAuth2Scheme, type OAuthFlow, type OAuthFlows, OpenAILLM, type OpenAILLMConfig, OpenAILLMConnection, OpenIdConnectScheme, ParallelAgent, type ParallelAgentConfig, PersistentMemoryService, PgLiteSessionService, PostgresSessionService, RunConfig, Runner, type SamplingHandler, type SamplingRequest, type SamplingResponse, type SearchMemoryOptions, type SearchMemoryResponse, SequentialAgent, type SequentialAgentConfig, type Session, type SessionService, SessionState, index as Sessions, type SpeechConfig, SqliteSessionService, StreamingMode, type TextContent, type ToolCall, type ToolConfig, ToolContext, index$2 as Tools, TransferToAgentTool, UserInteractionTool, VERSION, adkToMcpToolType, buildFunctionDeclaration, cloneSession, createFunctionTool, createSamplingHandler, generateSessionId, getMcpTools, jsonSchemaToDeclaration, mcpSchemaToParameters, normalizeJsonSchema, registerProviders, validateSession };
+export { Agent, type AgentConfig, index$3 as Agents, AnthropicLLM, type AnthropicLLMConfig, AnthropicLLMConnection, ApiKeyCredential, ApiKeyScheme, type AudioTranscriptionConfig, AuthConfig, AuthCredential, AuthCredentialType, AuthHandler, AuthScheme, AuthSchemeType, BaseAgent, BaseLLM, BaseLLMConnection, type BaseMemoryService, BaseTool, BasicAuthCredential, BearerTokenCredential, type BuildFunctionDeclarationOptions, ExitLoopTool, FileOperationsTool, type FunctionCall, type FunctionDeclaration, FunctionTool, GetUserChoiceTool, GoogleLLM, type GoogleLLMConfig, GoogleSearch, HttpRequestTool, HttpScheme, type IToolContext, type ImageContent, InMemoryMemoryService, InMemoryRunner, InMemorySessionService, InvocationContext, type JSONSchema, LLMRegistry, LLMRequest, type LLMRequestConfig, LLMResponse, LangGraphAgent, type LangGraphAgentConfig, type LangGraphNode, type ListSessionOptions, LoadMemoryTool, LoopAgent, type LoopAgentConfig, type McpConfig, McpError, McpErrorType, McpSamplingHandler, type McpSamplingRequest, type McpSamplingResponse, McpToolset, type McpTransportType, index$1 as Memory, type MemoryResult, type Message, type MessageContent, type MessageRole, index$4 as Models, OAuth2Credential, OAuth2Scheme, type OAuthFlow, type OAuthFlows, OpenAILLM, type OpenAILLMConfig, OpenAILLMConnection, OpenIdConnectScheme, ParallelAgent, type ParallelAgentConfig, PersistentMemoryService, PgLiteSessionService, PostgresSessionService, RunConfig, Runner, type SamplingHandler, type SearchMemoryOptions, type SearchMemoryResponse, SequentialAgent, type SequentialAgentConfig, type Session, type SessionService, SessionState, index as Sessions, type SpeechConfig, SqliteSessionService, StreamingMode, type TextContent, type ToolCall, type ToolConfig, ToolContext, index$2 as Tools, TransferToAgentTool, UserInteractionTool, VERSION, adkToMcpToolType, buildFunctionDeclaration, cloneSession, createFunctionTool, createSamplingHandler, generateSessionId, getMcpTools, jsonSchemaToDeclaration, mcpSchemaToParameters, normalizeJsonSchema, registerProviders, validateSession };

package/dist/index.d.ts

@@ -2703,7 +2703,7 @@ type McpConfig = {
      * Sampling handler for processing MCP sampling requests.
      * This allows MCP servers to request LLM completions through your ADK agent.
      */
-    samplingHandler?: ADKSamplingHandler;
+    samplingHandler?: SamplingHandler;
 };
 type McpTransportType = {
     mode: "stdio";
@@ -2735,41 +2735,9 @@ declare class McpError extends Error {
     originalError?: Error;
     constructor(message: string, type: McpErrorType, originalError?: Error);
 }
-type SamplingRequest = z.infer<typeof CreateMessageRequestSchema>;
-type SamplingResponse = z.infer<typeof CreateMessageResultSchema>;
-type SamplingHandler = (request: SamplingRequest) => Promise<SamplingResponse>;
-/**
- * ADK sampling request format - what we pass to the user's handler
- */
-interface ADKSamplingRequest {
-    messages: Message[];
-    systemPrompt?: string;
-    modelPreferences?: {
-        hints?: Array<{
-            name?: string;
-        }>;
-        costPriority?: number;
-        speedPriority?: number;
-        intelligencePriority?: number;
-    };
-    includeContext?: "none" | "thisServer" | "allServers";
-    temperature?: number;
-    maxTokens: number;
-    stopSequences?: string[];
-    metadata?: Record<string, unknown>;
-}
-/**
- * ADK sampling response format - what we expect from the user's handler
- */
-interface ADKSamplingResponse {
-    model: string;
-    stopReason?: "endTurn" | "stopSequence" | "maxTokens" | string;
-    content: string | null;
-}
-/**
- * ADK sampling handler function type - receives ADK formatted messages
- */
-type ADKSamplingHandler = (request: ADKSamplingRequest) => Promise<ADKSamplingResponse>;
+type McpSamplingRequest = z.infer<typeof CreateMessageRequestSchema>;
+type McpSamplingResponse = z.infer<typeof CreateMessageResultSchema>;
+type SamplingHandler = (messages: LLMRequest) => Promise<LLMResponse>;
 
 declare class McpClientService {
     private config;
@@ -2816,7 +2784,7 @@ declare class McpClientService {
     /**
      * Set a new ADK sampling handler
      */
-    setSamplingHandler(handler: ADKSamplingHandler): void;
+    setSamplingHandler(handler: SamplingHandler): void;
     /**
      * Remove the sampling handler
      */
@@ -2849,16 +2817,24 @@ declare function mcpSchemaToParameters(mcpTool: Tool): JSONSchema;
  */
 declare class McpSamplingHandler {
     private logger;
-    private adkHandler;
-    constructor(adkHandler: ADKSamplingHandler);
+    private samplingHandler;
+    constructor(samplingHandler: SamplingHandler);
     /**
      * Handle MCP sampling request and convert between formats
      */
-    handleSamplingRequest(request: SamplingRequest): Promise<SamplingResponse>;
+    handleSamplingRequest(request: McpSamplingRequest): Promise<McpSamplingResponse>;
     /**
      * Convert MCP messages to ADK message format
      */
     private convertMcpMessagesToADK;
+    /**
+     * Convert a single MCP message to ADK message format
+     */
+    private convertSingleMcpMessageToADK;
+    /**
+     * Convert MCP message content to ADK content format
+     */
+    private convertMcpContentToADK;
     /**
      * Convert ADK response to MCP response format
      */
@@ -2866,7 +2842,7 @@ declare class McpSamplingHandler {
     /**
      * Update the ADK handler
      */
-    updateHandler(handler: ADKSamplingHandler): void;
+    updateHandler(handler: SamplingHandler): void;
 }
 /**
  * Helper function to create a sampling handler with proper TypeScript types.
@@ -2903,7 +2879,7 @@ declare class McpSamplingHandler {
  * });
  * ```
  */
-declare function createSamplingHandler(handler: (request: ADKSamplingRequest) => Promise<ADKSamplingResponse>): ADKSamplingHandler;
+declare function createSamplingHandler(handler: SamplingHandler): SamplingHandler;
 
 /**
  * A class for managing MCP tools similar to Python's MCPToolset.
@@ -2931,7 +2907,7 @@ declare class McpToolset {
      *
      * @param handler - ADK sampling handler that receives ADK-formatted messages
      */
-    setSamplingHandler(handler: ADKSamplingHandler): void;
+    setSamplingHandler(handler: SamplingHandler): void;
     /**
      * Remove the sampling handler
      */
@@ -2975,9 +2951,6 @@ declare function getMcpTools(config: McpConfig, toolFilter?: string[] | ((tool:
  * Tools module exports
  */
 
-type index$2_ADKSamplingHandler = ADKSamplingHandler;
-type index$2_ADKSamplingRequest = ADKSamplingRequest;
-type index$2_ADKSamplingResponse = ADKSamplingResponse;
 type index$2_BaseTool = BaseTool;
 declare const index$2_BaseTool: typeof BaseTool;
 type index$2_BuildFunctionDeclarationOptions = BuildFunctionDeclarationOptions;
@@ -3003,12 +2976,12 @@ type index$2_McpErrorType = McpErrorType;
 declare const index$2_McpErrorType: typeof McpErrorType;
 type index$2_McpSamplingHandler = McpSamplingHandler;
 declare const index$2_McpSamplingHandler: typeof McpSamplingHandler;
+type index$2_McpSamplingRequest = McpSamplingRequest;
+type index$2_McpSamplingResponse = McpSamplingResponse;
 type index$2_McpToolset = McpToolset;
 declare const index$2_McpToolset: typeof McpToolset;
 type index$2_McpTransportType = McpTransportType;
 type index$2_SamplingHandler = SamplingHandler;
-type index$2_SamplingRequest = SamplingRequest;
-type index$2_SamplingResponse = SamplingResponse;
 type index$2_ToolConfig = ToolConfig;
 type index$2_ToolContext = ToolContext;
 declare const index$2_ToolContext: typeof ToolContext;
@@ -3025,7 +2998,7 @@ declare const index$2_jsonSchemaToDeclaration: typeof jsonSchemaToDeclaration;
 declare const index$2_mcpSchemaToParameters: typeof mcpSchemaToParameters;
 declare const index$2_normalizeJsonSchema: typeof normalizeJsonSchema;
 declare namespace index$2 {
-  export { type index$2_ADKSamplingHandler as ADKSamplingHandler, type index$2_ADKSamplingRequest as ADKSamplingRequest, type index$2_ADKSamplingResponse as ADKSamplingResponse, index$2_BaseTool as BaseTool, type index$2_BuildFunctionDeclarationOptions as BuildFunctionDeclarationOptions, index$2_ExitLoopTool as ExitLoopTool, index$2_FileOperationsTool as FileOperationsTool, index$2_FunctionTool as FunctionTool, index$2_GetUserChoiceTool as GetUserChoiceTool, index$2_GoogleSearch as GoogleSearch, index$2_HttpRequestTool as HttpRequestTool, type index$2_IToolContext as IToolContext, index$2_LoadMemoryTool as LoadMemoryTool, type index$2_McpConfig as McpConfig, index$2_McpError as McpError, index$2_McpErrorType as McpErrorType, index$2_McpSamplingHandler as McpSamplingHandler, index$2_McpToolset as McpToolset, type index$2_McpTransportType as McpTransportType, type index$2_SamplingHandler as SamplingHandler, type index$2_SamplingRequest as SamplingRequest, type index$2_SamplingResponse as SamplingResponse, type index$2_ToolConfig as ToolConfig, index$2_ToolContext as ToolContext, index$2_TransferToAgentTool as TransferToAgentTool, index$2_UserInteractionTool as UserInteractionTool, index$2_adkToMcpToolType as adkToMcpToolType, index$2_buildFunctionDeclaration as buildFunctionDeclaration, index$2_createFunctionTool as createFunctionTool, index$2_createSamplingHandler as createSamplingHandler, index$2_getMcpTools as getMcpTools, index$2_jsonSchemaToDeclaration as jsonSchemaToDeclaration, index$2_mcpSchemaToParameters as mcpSchemaToParameters, index$2_normalizeJsonSchema as normalizeJsonSchema };
+  export { index$2_BaseTool as BaseTool, type index$2_BuildFunctionDeclarationOptions as BuildFunctionDeclarationOptions, index$2_ExitLoopTool as ExitLoopTool, index$2_FileOperationsTool as FileOperationsTool, index$2_FunctionTool as FunctionTool, index$2_GetUserChoiceTool as GetUserChoiceTool, index$2_GoogleSearch as GoogleSearch, index$2_HttpRequestTool as HttpRequestTool, type index$2_IToolContext as IToolContext, index$2_LoadMemoryTool as LoadMemoryTool, type index$2_McpConfig as McpConfig, index$2_McpError as McpError, index$2_McpErrorType as McpErrorType, index$2_McpSamplingHandler as McpSamplingHandler, type index$2_McpSamplingRequest as McpSamplingRequest, type index$2_McpSamplingResponse as McpSamplingResponse, index$2_McpToolset as McpToolset, type index$2_McpTransportType as McpTransportType, type index$2_SamplingHandler as SamplingHandler, type index$2_ToolConfig as ToolConfig, index$2_ToolContext as ToolContext, index$2_TransferToAgentTool as TransferToAgentTool, index$2_UserInteractionTool as UserInteractionTool, index$2_adkToMcpToolType as adkToMcpToolType, index$2_buildFunctionDeclaration as buildFunctionDeclaration, index$2_createFunctionTool as createFunctionTool, index$2_createSamplingHandler as createSamplingHandler, index$2_getMcpTools as getMcpTools, index$2_jsonSchemaToDeclaration as jsonSchemaToDeclaration, index$2_mcpSchemaToParameters as mcpSchemaToParameters, index$2_normalizeJsonSchema as normalizeJsonSchema };
 }
 
 /**
@@ -3584,4 +3557,4 @@ declare class InMemoryRunner extends Runner {
 
 declare const VERSION = "0.1.0";
 
-export { type ADKSamplingHandler, type ADKSamplingRequest, type ADKSamplingResponse, Agent, type AgentConfig, index$3 as Agents, AnthropicLLM, type AnthropicLLMConfig, AnthropicLLMConnection, ApiKeyCredential, ApiKeyScheme, type AudioTranscriptionConfig, AuthConfig, AuthCredential, AuthCredentialType, AuthHandler, AuthScheme, AuthSchemeType, BaseAgent, BaseLLM, BaseLLMConnection, type BaseMemoryService, BaseTool, BasicAuthCredential, BearerTokenCredential, type BuildFunctionDeclarationOptions, ExitLoopTool, FileOperationsTool, type FunctionCall, type FunctionDeclaration, FunctionTool, GetUserChoiceTool, GoogleLLM, type GoogleLLMConfig, GoogleSearch, HttpRequestTool, HttpScheme, type IToolContext, type ImageContent, InMemoryMemoryService, InMemoryRunner, InMemorySessionService, InvocationContext, type JSONSchema, LLMRegistry, LLMRequest, type LLMRequestConfig, LLMResponse, LangGraphAgent, type LangGraphAgentConfig, type LangGraphNode, type ListSessionOptions, LoadMemoryTool, LoopAgent, type LoopAgentConfig, type McpConfig, McpError, McpErrorType, McpSamplingHandler, McpToolset, type McpTransportType, index$1 as Memory, type MemoryResult, type Message, type MessageContent, type MessageRole, index$4 as Models, OAuth2Credential, OAuth2Scheme, type OAuthFlow, type OAuthFlows, OpenAILLM, type OpenAILLMConfig, OpenAILLMConnection, OpenIdConnectScheme, ParallelAgent, type ParallelAgentConfig, PersistentMemoryService, PgLiteSessionService, PostgresSessionService, RunConfig, Runner, type SamplingHandler, type SamplingRequest, type SamplingResponse, type SearchMemoryOptions, type SearchMemoryResponse, SequentialAgent, type SequentialAgentConfig, type Session, type SessionService, SessionState, index as Sessions, type SpeechConfig, SqliteSessionService, StreamingMode, type TextContent, type ToolCall, type ToolConfig, ToolContext, index$2 as Tools, TransferToAgentTool, UserInteractionTool, VERSION, adkToMcpToolType, buildFunctionDeclaration, cloneSession, createFunctionTool, createSamplingHandler, generateSessionId, getMcpTools, jsonSchemaToDeclaration, mcpSchemaToParameters, normalizeJsonSchema, registerProviders, validateSession };
+export { Agent, type AgentConfig, index$3 as Agents, AnthropicLLM, type AnthropicLLMConfig, AnthropicLLMConnection, ApiKeyCredential, ApiKeyScheme, type AudioTranscriptionConfig, AuthConfig, AuthCredential, AuthCredentialType, AuthHandler, AuthScheme, AuthSchemeType, BaseAgent, BaseLLM, BaseLLMConnection, type BaseMemoryService, BaseTool, BasicAuthCredential, BearerTokenCredential, type BuildFunctionDeclarationOptions, ExitLoopTool, FileOperationsTool, type FunctionCall, type FunctionDeclaration, FunctionTool, GetUserChoiceTool, GoogleLLM, type GoogleLLMConfig, GoogleSearch, HttpRequestTool, HttpScheme, type IToolContext, type ImageContent, InMemoryMemoryService, InMemoryRunner, InMemorySessionService, InvocationContext, type JSONSchema, LLMRegistry, LLMRequest, type LLMRequestConfig, LLMResponse, LangGraphAgent, type LangGraphAgentConfig, type LangGraphNode, type ListSessionOptions, LoadMemoryTool, LoopAgent, type LoopAgentConfig, type McpConfig, McpError, McpErrorType, McpSamplingHandler, type McpSamplingRequest, type McpSamplingResponse, McpToolset, type McpTransportType, index$1 as Memory, type MemoryResult, type Message, type MessageContent, type MessageRole, index$4 as Models, OAuth2Credential, OAuth2Scheme, type OAuthFlow, type OAuthFlows, OpenAILLM, type OpenAILLMConfig, OpenAILLMConnection, OpenIdConnectScheme, ParallelAgent, type ParallelAgentConfig, PersistentMemoryService, PgLiteSessionService, PostgresSessionService, RunConfig, Runner, type SamplingHandler, type SearchMemoryOptions, type SearchMemoryResponse, SequentialAgent, type SequentialAgentConfig, type Session, type SessionService, SessionState, index as Sessions, type SpeechConfig, SqliteSessionService, StreamingMode, type TextContent, type ToolCall, type ToolConfig, ToolContext, index$2 as Tools, TransferToAgentTool, UserInteractionTool, VERSION, adkToMcpToolType, buildFunctionDeclaration, cloneSession, createFunctionTool, createSamplingHandler, generateSessionId, getMcpTools, jsonSchemaToDeclaration, mcpSchemaToParameters, normalizeJsonSchema, registerProviders, validateSession };

package/dist/index.js

@@ -2982,8 +2982,8 @@ var McpError = class extends Error {
 var McpSamplingHandler = (_class17 = class {
   __init20() {this.logger = new Logger({ name: "McpSamplingHandler" })}
   
-  constructor(adkHandler) {;_class17.prototype.__init20.call(this);
-    this.adkHandler = adkHandler;
+  constructor(samplingHandler) {;_class17.prototype.__init20.call(this);
+    this.samplingHandler = samplingHandler;
   }
   /**
    * Handle MCP sampling request and convert between formats
@@ -3024,19 +3024,19 @@ var McpSamplingHandler = (_class17 = class {
         );
       }
       this.logger.debug("Converting MCP request to ADK format");
-      const adkMessages = this.convertMcpMessagesToADK(mcpParams.messages);
+      const adkMessages = this.convertMcpMessagesToADK(
+        mcpParams.messages,
+        mcpParams.systemPrompt
+      );
       const adkRequest = {
         messages: adkMessages,
-        systemPrompt: mcpParams.systemPrompt,
-        modelPreferences: mcpParams.modelPreferences,
-        includeContext: mcpParams.includeContext,
-        temperature: mcpParams.temperature,
-        maxTokens: mcpParams.maxTokens,
-        stopSequences: mcpParams.stopSequences,
-        metadata: mcpParams.metadata
+        config: {
+          temperature: mcpParams.temperature,
+          max_tokens: mcpParams.maxTokens
+        }
       };
       this.logger.debug("Calling ADK sampling handler");
-      const adkResponse = await this.adkHandler(adkRequest);
+      const adkResponse = await this.samplingHandler(adkRequest);
       this.logger.debug("Converting ADK response to MCP format");
       const mcpResponse = this.convertADKResponseToMcp(adkResponse);
       const responseValidation = _typesjs.CreateMessageResultSchema.safeParse(mcpResponse);
@@ -3066,54 +3066,66 @@ var McpSamplingHandler = (_class17 = class {
   /**
    * Convert MCP messages to ADK message format
    */
-  convertMcpMessagesToADK(mcpMessages) {
-    return mcpMessages.map((mcpMessage) => {
-      const adkRole = mcpMessage.role === "assistant" ? "assistant" : "user";
-      let adkContent;
-      if (mcpMessage.content.type === "text") {
-        adkContent = mcpMessage.content.text || "";
-      } else if (mcpMessage.content.type === "image") {
-        const contentParts = [];
-        if (mcpMessage.content.text) {
-          contentParts.push({
-            type: "text",
-            text: mcpMessage.content.text
-          });
-        }
-        if (mcpMessage.content.data) {
-          const mimeType = mcpMessage.content.mimeType || "image/jpeg";
-          const dataUrl = `data:${mimeType};base64,${mcpMessage.content.data}`;
-          contentParts.push({
-            type: "image",
-            image_url: {
-              url: dataUrl
-            }
-          });
-        }
-        adkContent = contentParts.length > 0 ? contentParts : "";
-      } else {
-        this.logger.warn(
-          `Unknown MCP content type: ${mcpMessage.content.type}`
-        );
-        adkContent = mcpMessage.content.data || "";
-      }
-      const adkMessage = {
-        role: adkRole,
-        content: adkContent
-      };
-      this.logger.debug(
-        `Converted MCP message - role: ${mcpMessage.role} -> ${adkRole}, content type: ${mcpMessage.content.type}`
-      );
-      return adkMessage;
+  convertMcpMessagesToADK(mcpMessages, systemPrompt) {
+    const transformedMessages = mcpMessages.map(
+      (mcpMessage) => this.convertSingleMcpMessageToADK(mcpMessage)
+    );
+    transformedMessages.unshift({
+      role: "system",
+      content: systemPrompt
     });
+    return transformedMessages;
+  }
+  /**
+   * Convert a single MCP message to ADK message format
+   */
+  convertSingleMcpMessageToADK(mcpMessage) {
+    const adkRole = mcpMessage.role === "assistant" ? "assistant" : "user";
+    const adkContent = this.convertMcpContentToADK(mcpMessage.content);
+    const adkMessage = {
+      role: adkRole,
+      content: adkContent
+    };
+    this.logger.debug(
+      `Converted MCP message - role: ${mcpMessage.role} -> ${adkRole}, content type: ${mcpMessage.content.type}`
+    );
+    return adkMessage;
+  }
+  /**
+   * Convert MCP message content to ADK content format
+   */
+  convertMcpContentToADK(mcpContent) {
+    if (mcpContent.type === "text") {
+      return mcpContent.text || "";
+    }
+    if (mcpContent.type === "image") {
+      const contentParts = [];
+      if (mcpContent.text) {
+        contentParts.push({
+          type: "text",
+          text: mcpContent.text
+        });
+      }
+      if (mcpContent.data) {
+        const mimeType = mcpContent.mimeType || "image/jpeg";
+        const dataUrl = `data:${mimeType};base64,${mcpContent.data}`;
+        contentParts.push({
+          type: "image",
+          image_url: {
+            url: dataUrl
+          }
+        });
+      }
+      return contentParts.length > 0 ? contentParts : "";
+    }
+    this.logger.warn(`Unknown MCP content type: ${mcpContent.type}`);
+    return mcpContent.data || "";
   }
   /**
    * Convert ADK response to MCP response format
    */
   convertADKResponseToMcp(adkResponse) {
     const mcpResponse = {
-      model: adkResponse.model,
-      stopReason: adkResponse.stopReason,
       role: "assistant",
       // ADK responses are always from assistant
       content: {
@@ -3121,16 +3133,14 @@ var McpSamplingHandler = (_class17 = class {
         text: adkResponse.content || ""
       }
     };
-    this.logger.debug(
-      `Converted ADK response - model: ${adkResponse.model}, content length: ${_optionalChain([adkResponse, 'access', _39 => _39.content, 'optionalAccess', _40 => _40.length]) || 0}`
-    );
+    this.logger.debug(`Received content: ${adkResponse.content}`);
     return mcpResponse;
   }
   /**
    * Update the ADK handler
    */
   updateHandler(handler) {
-    this.adkHandler = handler;
+    this.samplingHandler = handler;
     this.logger.debug("ADK sampling handler updated");
   }
 }, _class17);
@@ -3350,7 +3360,7 @@ var McpClientService = (_class18 = class {
         },
         this,
         async (instance) => await instance.reinitialize(),
-        _optionalChain([this, 'access', _41 => _41.config, 'access', _42 => _42.retryOptions, 'optionalAccess', _43 => _43.maxRetries]) || 2
+        _optionalChain([this, 'access', _39 => _39.config, 'access', _40 => _40.retryOptions, 'optionalAccess', _41 => _41.maxRetries]) || 2
       );
       return await wrappedCall();
     } catch (error) {
@@ -3432,7 +3442,7 @@ var McpClientService = (_class18 = class {
     this.mcpSamplingHandler = null;
     if (this.client) {
       try {
-        _optionalChain([this, 'access', _44 => _44.client, 'access', _45 => _45.removeRequestHandler, 'optionalCall', _46 => _46("sampling/createMessage")]);
+        _optionalChain([this, 'access', _42 => _42.client, 'access', _43 => _43.removeRequestHandler, 'optionalCall', _44 => _44("sampling/createMessage")]);
       } catch (error) {
         console.error("Failed to remove sampling handler:", error);
       }
@@ -3810,7 +3820,7 @@ var McpToolset = (_class20 = class {
           "resource_closed_error" /* RESOURCE_CLOSED_ERROR */
         );
       }
-      if (this.tools.length > 0 && !_optionalChain([this, 'access', _47 => _47.config, 'access', _48 => _48.cacheConfig, 'optionalAccess', _49 => _49.enabled]) === false) {
+      if (this.tools.length > 0 && !_optionalChain([this, 'access', _45 => _45.config, 'access', _46 => _46.cacheConfig, 'optionalAccess', _47 => _47.enabled]) === false) {
         return this.tools;
       }
       if (!this.clientService) {
@@ -3836,7 +3846,7 @@ var McpToolset = (_class20 = class {
           }
         }
       }
-      if (_optionalChain([this, 'access', _50 => _50.config, 'access', _51 => _51.cacheConfig, 'optionalAccess', _52 => _52.enabled]) !== false) {
+      if (_optionalChain([this, 'access', _48 => _48.config, 'access', _49 => _49.cacheConfig, 'optionalAccess', _50 => _50.enabled]) !== false) {
         this.tools = tools;
       }
       return tools;
@@ -4140,7 +4150,7 @@ ${typeof message.content === "string" ? message.content : JSON.stringify(message
    * Convert Anthropic tool calls to ADK tool calls
    */
   convertToolCalls(toolUses) {
-    if (!_optionalChain([toolUses, 'optionalAccess', _53 => _53.length])) {
+    if (!_optionalChain([toolUses, 'optionalAccess', _51 => _51.length])) {
       return void 0;
     }
     return toolUses.map((toolUse) => ({
@@ -4155,7 +4165,7 @@ ${typeof message.content === "string" ? message.content : JSON.stringify(message
    * Extract tool uses from response content
    */
   extractToolUses(content) {
-    if (!_optionalChain([content, 'optionalAccess', _54 => _54.length])) return [];
+    if (!_optionalChain([content, 'optionalAccess', _52 => _52.length])) return [];
     const toolUses = [];
     for (const block of content) {
       this.logger.debug(`Processing content block of type: ${block.type}`);
@@ -4271,17 +4281,17 @@ ${typeof message.content === "string" ? message.content : JSON.stringify(message
       const toolUses = this.extractToolUses(apiResponse.content);
       const toolCalls = this.convertToolCalls(toolUses);
       this.logger.debug(
-        `- Extracted ${toolUses.length} tool uses in content and converted ${_optionalChain([toolCalls, 'optionalAccess', _55 => _55.length]) || 0} tool calls`
+        `- Extracted ${toolUses.length} tool uses in content and converted ${_optionalChain([toolCalls, 'optionalAccess', _53 => _53.length]) || 0} tool calls`
       );
       const llmResponse = new LLMResponse({
         role: "assistant",
         content,
-        tool_calls: _optionalChain([toolCalls, 'optionalAccess', _56 => _56.length]) ? toolCalls : void 0,
+        tool_calls: _optionalChain([toolCalls, 'optionalAccess', _54 => _54.length]) ? toolCalls : void 0,
         raw_response: apiResponse
       });
       const logObject = {
         role: llmResponse.role,
-        content: _optionalChain([llmResponse, 'access', _57 => _57.content, 'optionalAccess', _58 => _58.substring, 'call', _59 => _59(0, 50)]) + (llmResponse.content && llmResponse.content.length > 50 ? "..." : ""),
+        content: _optionalChain([llmResponse, 'access', _55 => _55.content, 'optionalAccess', _56 => _56.substring, 'call', _57 => _57(0, 50)]) + (llmResponse.content && llmResponse.content.length > 50 ? "..." : ""),
         tool_calls: llmResponse.tool_calls ? `[${llmResponse.tool_calls.length} calls]` : "undefined"
       };
       this.logger.debug(
@@ -4316,17 +4326,17 @@ var AnthropicLLM = (_class23 = class extends BaseLLM {
    */
   constructor(model, config) {
     super(model);_class23.prototype.__init34.call(this);;
-    this.apiKey = _optionalChain([config, 'optionalAccess', _60 => _60.apiKey]) || process.env.ANTHROPIC_API_KEY || "";
-    this.baseURL = _optionalChain([config, 'optionalAccess', _61 => _61.baseURL]) || "https://api.anthropic.com/v1";
+    this.apiKey = _optionalChain([config, 'optionalAccess', _58 => _58.apiKey]) || process.env.ANTHROPIC_API_KEY || "";
+    this.baseURL = _optionalChain([config, 'optionalAccess', _59 => _59.baseURL]) || "https://api.anthropic.com/v1";
     if (!this.apiKey) {
       throw new Error(
         "Anthropic API key is required. Provide it in config or set ANTHROPIC_API_KEY environment variable."
       );
     }
     this.defaultParams = {
-      temperature: _nullishCoalesce(_optionalChain([config, 'optionalAccess', _62 => _62.defaultParams, 'optionalAccess', _63 => _63.temperature]), () => ( 0.7)),
-      top_p: _nullishCoalesce(_optionalChain([config, 'optionalAccess', _64 => _64.defaultParams, 'optionalAccess', _65 => _65.top_p]), () => ( 1)),
-      max_tokens: _nullishCoalesce(_optionalChain([config, 'optionalAccess', _66 => _66.defaultParams, 'optionalAccess', _67 => _67.max_tokens]), () => ( 1024))
+      temperature: _nullishCoalesce(_optionalChain([config, 'optionalAccess', _60 => _60.defaultParams, 'optionalAccess', _61 => _61.temperature]), () => ( 0.7)),
+      top_p: _nullishCoalesce(_optionalChain([config, 'optionalAccess', _62 => _62.defaultParams, 'optionalAccess', _63 => _63.top_p]), () => ( 1)),
+      max_tokens: _nullishCoalesce(_optionalChain([config, 'optionalAccess', _64 => _64.defaultParams, 'optionalAccess', _65 => _65.max_tokens]), () => ( 1024))
     };
   }
   /**
@@ -4412,7 +4422,7 @@ ${typeof message.content === "string" ? message.content : JSON.stringify(message
    * Convert ADK function declarations to Anthropic tool format
    */
   convertFunctionsToTools(functions) {
-    if (!_optionalChain([functions, 'optionalAccess', _68 => _68.length])) {
+    if (!_optionalChain([functions, 'optionalAccess', _66 => _66.length])) {
       return [];
     }
     return functions.map((func) => ({
@@ -4425,7 +4435,7 @@ ${typeof message.content === "string" ? message.content : JSON.stringify(message
    * Convert Anthropic tool calls to ADK tool calls
    */
   convertToolUses(toolUses) {
-    if (!_optionalChain([toolUses, 'optionalAccess', _69 => _69.length])) {
+    if (!_optionalChain([toolUses, 'optionalAccess', _67 => _67.length])) {
       return [];
     }
     return toolUses.map((toolUse) => ({
@@ -4440,7 +4450,7 @@ ${typeof message.content === "string" ? message.content : JSON.stringify(message
    * Extract tool uses from response content
    */
   extractToolUses(content) {
-    if (!_optionalChain([content, 'optionalAccess', _70 => _70.length])) return [];
+    if (!_optionalChain([content, 'optionalAccess', _68 => _68.length])) return [];
     const toolUses = [];
     for (const block of content) {
       this.logger.debug(`Processing content block of type: ${block.type}`);
@@ -4511,7 +4521,7 @@ ${typeof message.content === "string" ? message.content : JSON.stringify(message
         temperature: _nullishCoalesce(llmRequest.config.temperature, () => ( this.defaultParams.temperature)),
         max_tokens: _nullishCoalesce(llmRequest.config.max_tokens, () => ( this.defaultParams.max_tokens)),
         top_p: _nullishCoalesce(llmRequest.config.top_p, () => ( this.defaultParams.top_p)),
-        tools: _optionalChain([tools, 'optionalAccess', _71 => _71.length]) ? tools : void 0
+        tools: _optionalChain([tools, 'optionalAccess', _69 => _69.length]) ? tools : void 0
       };
       this.logger.debug("API Request:", {
         model: params.model,
@@ -4542,7 +4552,7 @@ ${typeof message.content === "string" ? message.content : JSON.stringify(message
       });
       const logObject = {
         role: llmResponse.role,
-        content: _optionalChain([llmResponse, 'access', _72 => _72.content, 'optionalAccess', _73 => _73.substring, 'call', _74 => _74(0, 50)]) + (llmResponse.content && llmResponse.content.length > 50 ? "..." : ""),
+        content: _optionalChain([llmResponse, 'access', _70 => _70.content, 'optionalAccess', _71 => _71.substring, 'call', _72 => _72(0, 50)]) + (llmResponse.content && llmResponse.content.length > 50 ? "..." : ""),
         tool_calls: llmResponse.tool_calls ? `[${llmResponse.tool_calls.length} calls]` : "undefined"
       };
       this.logger.debug(
@@ -4595,9 +4605,9 @@ var GoogleLLM = class extends BaseLLM {
   constructor(model, config) {
     super(model);
     const apiKey = process.env.GOOGLE_API_KEY;
-    const projectId = _optionalChain([config, 'optionalAccess', _75 => _75.projectId]) || process.env.GOOGLE_CLOUD_PROJECT;
-    const location = _optionalChain([config, 'optionalAccess', _76 => _76.location]) || process.env.GOOGLE_CLOUD_LOCATION;
-    const useVertexAI = _optionalChain([process, 'access', _77 => _77.env, 'access', _78 => _78.USE_VERTEX_AI, 'optionalAccess', _79 => _79.toLowerCase, 'call', _80 => _80()]) === "true";
+    const projectId = _optionalChain([config, 'optionalAccess', _73 => _73.projectId]) || process.env.GOOGLE_CLOUD_PROJECT;
+    const location = _optionalChain([config, 'optionalAccess', _74 => _74.location]) || process.env.GOOGLE_CLOUD_LOCATION;
+    const useVertexAI = _optionalChain([process, 'access', _75 => _75.env, 'access', _76 => _76.USE_VERTEX_AI, 'optionalAccess', _77 => _77.toLowerCase, 'call', _78 => _78()]) === "true";
     if (!useVertexAI && !apiKey) {
       throw new Error(
         "Google API Key is required. Provide via config or GOOGLE_API_KEY env var."
@@ -4622,9 +4632,9 @@ var GoogleLLM = class extends BaseLLM {
     }
     this.ai = new (0, _genai.GoogleGenAI)(options);
     this.defaultParams = {
-      temperature: _nullishCoalesce(_optionalChain([config, 'optionalAccess', _81 => _81.defaultParams, 'optionalAccess', _82 => _82.temperature]), () => ( 0.7)),
-      topP: _nullishCoalesce(_optionalChain([config, 'optionalAccess', _83 => _83.defaultParams, 'optionalAccess', _84 => _84.top_p]), () => ( 1)),
-      maxOutputTokens: _nullishCoalesce(_optionalChain([config, 'optionalAccess', _85 => _85.defaultParams, 'optionalAccess', _86 => _86.maxOutputTokens]), () => ( 1024))
+      temperature: _nullishCoalesce(_optionalChain([config, 'optionalAccess', _79 => _79.defaultParams, 'optionalAccess', _80 => _80.temperature]), () => ( 0.7)),
+      topP: _nullishCoalesce(_optionalChain([config, 'optionalAccess', _81 => _81.defaultParams, 'optionalAccess', _82 => _82.top_p]), () => ( 1)),
+      maxOutputTokens: _nullishCoalesce(_optionalChain([config, 'optionalAccess', _83 => _83.defaultParams, 'optionalAccess', _84 => _84.maxOutputTokens]), () => ( 1024))
     };
   }
   /**
@@ -4762,7 +4772,7 @@ var GoogleLLM = class extends BaseLLM {
       );
       parts.push({ text: "" });
     }
-    if (googleRole === "function" && (parts.length !== 1 || !_optionalChain([parts, 'access', _87 => _87[0], 'optionalAccess', _88 => _88.functionResponse]))) {
+    if (googleRole === "function" && (parts.length !== 1 || !_optionalChain([parts, 'access', _85 => _85[0], 'optionalAccess', _86 => _86.functionResponse]))) {
       console.error(
         `[GoogleLLM] convertMessage - Invalid parts for 'function' role. Expected 1 functionResponse part. Got:`,
         JSON.stringify(parts),
@@ -4870,13 +4880,13 @@ var GoogleLLM = class extends BaseLLM {
       role: "assistant",
       content: null
     });
-    if (typeof _optionalChain([response, 'optionalAccess', _89 => _89.candidates, 'optionalAccess', _90 => _90[0], 'optionalAccess', _91 => _91.content, 'optionalAccess', _92 => _92.parts, 'optionalAccess', _93 => _93[0], 'optionalAccess', _94 => _94.text]) === "string") {
+    if (typeof _optionalChain([response, 'optionalAccess', _87 => _87.candidates, 'optionalAccess', _88 => _88[0], 'optionalAccess', _89 => _89.content, 'optionalAccess', _90 => _90.parts, 'optionalAccess', _91 => _91[0], 'optionalAccess', _92 => _92.text]) === "string") {
       result.content = response.candidates[0].content.parts[0].text;
     }
-    if (_optionalChain([response, 'optionalAccess', _95 => _95.candidates, 'optionalAccess', _96 => _96[0], 'optionalAccess', _97 => _97.content, 'optionalAccess', _98 => _98.parts, 'optionalAccess', _99 => _99[0], 'optionalAccess', _100 => _100.text])) {
+    if (_optionalChain([response, 'optionalAccess', _93 => _93.candidates, 'optionalAccess', _94 => _94[0], 'optionalAccess', _95 => _95.content, 'optionalAccess', _96 => _96.parts, 'optionalAccess', _97 => _97[0], 'optionalAccess', _98 => _98.text])) {
       result.content = response.candidates[0].content.parts[0].text;
     }
-    if (_optionalChain([response, 'optionalAccess', _101 => _101.candidates, 'optionalAccess', _102 => _102[0], 'optionalAccess', _103 => _103.content, 'optionalAccess', _104 => _104.parts, 'optionalAccess', _105 => _105[0], 'optionalAccess', _106 => _106.functionCall])) {
+    if (_optionalChain([response, 'optionalAccess', _99 => _99.candidates, 'optionalAccess', _100 => _100[0], 'optionalAccess', _101 => _101.content, 'optionalAccess', _102 => _102.parts, 'optionalAccess', _103 => _103[0], 'optionalAccess', _104 => _104.functionCall])) {
       const functionCall = response.candidates[0].content.parts[0].functionCall;
       result.function_call = {
         name: functionCall.name,
@@ -4923,10 +4933,10 @@ var GoogleLLM = class extends BaseLLM {
       if (stream) {
         const streamingResult = await this.ai.models.generateContentStream(requestOptions);
         for await (const chunk of streamingResult) {
-          if (!_optionalChain([chunk, 'access', _107 => _107.candidates, 'optionalAccess', _108 => _108[0], 'optionalAccess', _109 => _109.content, 'optionalAccess', _110 => _110.parts, 'optionalAccess', _111 => _111[0], 'optionalAccess', _112 => _112.text])) {
+          if (!_optionalChain([chunk, 'access', _105 => _105.candidates, 'optionalAccess', _106 => _106[0], 'optionalAccess', _107 => _107.content, 'optionalAccess', _108 => _108.parts, 'optionalAccess', _109 => _109[0], 'optionalAccess', _110 => _110.text])) {
             continue;
           }
-          const partialText = _optionalChain([chunk, 'access', _113 => _113.candidates, 'access', _114 => _114[0], 'optionalAccess', _115 => _115.content, 'optionalAccess', _116 => _116.parts, 'access', _117 => _117[0], 'optionalAccess', _118 => _118.text]) || "";
+          const partialText = _optionalChain([chunk, 'access', _111 => _111.candidates, 'access', _112 => _112[0], 'optionalAccess', _113 => _113.content, 'optionalAccess', _114 => _114.parts, 'access', _115 => _115[0], 'optionalAccess', _116 => _116.text]) || "";
           const partialResponse = new LLMResponse({
             content: partialText,
             role: "assistant",
@@ -5067,10 +5077,10 @@ var OpenAILLMConnection = (_class24 = class extends BaseLLMConnection {
       for await (const chunk of stream) {
         if (chunk.choices.length === 0) continue;
         const delta = chunk.choices[0].delta;
-        if (_optionalChain([delta, 'optionalAccess', _119 => _119.content])) {
+        if (_optionalChain([delta, 'optionalAccess', _117 => _117.content])) {
           responseContent += delta.content;
         }
-        if (_optionalChain([delta, 'optionalAccess', _120 => _120.function_call])) {
+        if (_optionalChain([delta, 'optionalAccess', _118 => _118.function_call])) {
           if (!functionCall) {
             functionCall = {
               name: delta.function_call.name || "",
@@ -5081,7 +5091,7 @@ var OpenAILLMConnection = (_class24 = class extends BaseLLMConnection {
             functionCall.arguments += delta.function_call.arguments || "";
           }
         }
-        if (_optionalChain([delta, 'optionalAccess', _121 => _121.tool_calls])) {
+        if (_optionalChain([delta, 'optionalAccess', _119 => _119.tool_calls])) {
           for (const toolDelta of delta.tool_calls) {
             const id = toolDelta.id || "";
             let tool = toolCalls.find((t) => t.id === id);
@@ -5089,20 +5099,20 @@ var OpenAILLMConnection = (_class24 = class extends BaseLLMConnection {
               tool = {
                 id,
                 function: {
-                  name: _optionalChain([toolDelta, 'access', _122 => _122.function, 'optionalAccess', _123 => _123.name]) || "",
-                  arguments: _optionalChain([toolDelta, 'access', _124 => _124.function, 'optionalAccess', _125 => _125.arguments]) || ""
+                  name: _optionalChain([toolDelta, 'access', _120 => _120.function, 'optionalAccess', _121 => _121.name]) || "",
+                  arguments: _optionalChain([toolDelta, 'access', _122 => _122.function, 'optionalAccess', _123 => _123.arguments]) || ""
                 }
               };
               toolCalls.push(tool);
             } else {
-              tool.function.name += _optionalChain([toolDelta, 'access', _126 => _126.function, 'optionalAccess', _127 => _127.name]) || "";
-              tool.function.arguments += _optionalChain([toolDelta, 'access', _128 => _128.function, 'optionalAccess', _129 => _129.arguments]) || "";
+              tool.function.name += _optionalChain([toolDelta, 'access', _124 => _124.function, 'optionalAccess', _125 => _125.name]) || "";
+              tool.function.arguments += _optionalChain([toolDelta, 'access', _126 => _126.function, 'optionalAccess', _127 => _127.arguments]) || "";
             }
           }
         }
         if (this.responseCallback) {
           const response = new LLMResponse({
-            content: _optionalChain([delta, 'optionalAccess', _130 => _130.content]) || null,
+            content: _optionalChain([delta, 'optionalAccess', _128 => _128.content]) || null,
             role: "assistant",
             function_call: functionCall,
             tool_calls: toolCalls.length > 0 ? toolCalls : void 0,
@@ -5213,16 +5223,16 @@ var OpenAILLM = (_class25 = class extends BaseLLM {
   constructor(model, config) {
     super(model);_class25.prototype.__init36.call(this);;
     this.client = new (0, _openai2.default)({
-      apiKey: _optionalChain([config, 'optionalAccess', _131 => _131.apiKey]) || process.env.OPENAI_API_KEY,
-      baseURL: _optionalChain([config, 'optionalAccess', _132 => _132.baseURL]),
-      organization: _optionalChain([config, 'optionalAccess', _133 => _133.organization])
+      apiKey: _optionalChain([config, 'optionalAccess', _129 => _129.apiKey]) || process.env.OPENAI_API_KEY,
+      baseURL: _optionalChain([config, 'optionalAccess', _130 => _130.baseURL]),
+      organization: _optionalChain([config, 'optionalAccess', _131 => _131.organization])
     });
     this.defaultParams = {
-      temperature: _nullishCoalesce(_optionalChain([config, 'optionalAccess', _134 => _134.defaultParams, 'optionalAccess', _135 => _135.temperature]), () => ( 0.7)),
-      top_p: _nullishCoalesce(_optionalChain([config, 'optionalAccess', _136 => _136.defaultParams, 'optionalAccess', _137 => _137.top_p]), () => ( 1)),
-      max_tokens: _optionalChain([config, 'optionalAccess', _138 => _138.defaultParams, 'optionalAccess', _139 => _139.max_tokens]),
-      frequency_penalty: _nullishCoalesce(_optionalChain([config, 'optionalAccess', _140 => _140.defaultParams, 'optionalAccess', _141 => _141.frequency_penalty]), () => ( 0)),
-      presence_penalty: _nullishCoalesce(_optionalChain([config, 'optionalAccess', _142 => _142.defaultParams, 'optionalAccess', _143 => _143.presence_penalty]), () => ( 0))
+      temperature: _nullishCoalesce(_optionalChain([config, 'optionalAccess', _132 => _132.defaultParams, 'optionalAccess', _133 => _133.temperature]), () => ( 0.7)),
+      top_p: _nullishCoalesce(_optionalChain([config, 'optionalAccess', _134 => _134.defaultParams, 'optionalAccess', _135 => _135.top_p]), () => ( 1)),
+      max_tokens: _optionalChain([config, 'optionalAccess', _136 => _136.defaultParams, 'optionalAccess', _137 => _137.max_tokens]),
+      frequency_penalty: _nullishCoalesce(_optionalChain([config, 'optionalAccess', _138 => _138.defaultParams, 'optionalAccess', _139 => _139.frequency_penalty]), () => ( 0)),
+      presence_penalty: _nullishCoalesce(_optionalChain([config, 'optionalAccess', _140 => _140.defaultParams, 'optionalAccess', _141 => _141.presence_penalty]), () => ( 0))
     };
   }
   /**
@@ -5332,16 +5342,16 @@ var OpenAILLM = (_class25 = class extends BaseLLM {
    */
   convertResponse(response) {
     const result = new LLMResponse({
-      content: _optionalChain([response, 'access', _144 => _144.message, 'optionalAccess', _145 => _145.content]) || null,
-      role: _optionalChain([response, 'access', _146 => _146.message, 'optionalAccess', _147 => _147.role]) || "assistant"
+      content: _optionalChain([response, 'access', _142 => _142.message, 'optionalAccess', _143 => _143.content]) || null,
+      role: _optionalChain([response, 'access', _144 => _144.message, 'optionalAccess', _145 => _145.role]) || "assistant"
     });
-    if (_optionalChain([response, 'access', _148 => _148.message, 'optionalAccess', _149 => _149.function_call])) {
+    if (_optionalChain([response, 'access', _146 => _146.message, 'optionalAccess', _147 => _147.function_call])) {
       result.function_call = {
         name: response.message.function_call.name,
         arguments: response.message.function_call.arguments
       };
     }
-    if (_optionalChain([response, 'access', _150 => _150.message, 'optionalAccess', _151 => _151.tool_calls])) {
+    if (_optionalChain([response, 'access', _148 => _148.message, 'optionalAccess', _149 => _149.tool_calls])) {
       result.tool_calls = response.message.tool_calls.map((tool) => ({
         id: tool.id,
         function: {
@@ -5359,24 +5369,24 @@ var OpenAILLM = (_class25 = class extends BaseLLM {
     this.logger.debug(
       `Converting chunk - delta: ${JSON.stringify(chunk.delta || {})}`
     );
-    const content = _optionalChain([chunk, 'access', _152 => _152.delta, 'optionalAccess', _153 => _153.content]);
+    const content = _optionalChain([chunk, 'access', _150 => _150.delta, 'optionalAccess', _151 => _151.content]);
     const result = new LLMResponse({
       content: content !== void 0 ? content : null,
-      role: _optionalChain([chunk, 'access', _154 => _154.delta, 'optionalAccess', _155 => _155.role]) || "assistant",
+      role: _optionalChain([chunk, 'access', _152 => _152.delta, 'optionalAccess', _153 => _153.role]) || "assistant",
       is_partial: true
     });
-    if (_optionalChain([chunk, 'access', _156 => _156.delta, 'optionalAccess', _157 => _157.function_call])) {
+    if (_optionalChain([chunk, 'access', _154 => _154.delta, 'optionalAccess', _155 => _155.function_call])) {
       result.function_call = {
         name: chunk.delta.function_call.name || "",
         arguments: chunk.delta.function_call.arguments || ""
       };
     }
-    if (_optionalChain([chunk, 'access', _158 => _158.delta, 'optionalAccess', _159 => _159.tool_calls])) {
+    if (_optionalChain([chunk, 'access', _156 => _156.delta, 'optionalAccess', _157 => _157.tool_calls])) {
       result.tool_calls = chunk.delta.tool_calls.map((tool) => ({
         id: tool.id || "",
         function: {
-          name: _optionalChain([tool, 'access', _160 => _160.function, 'optionalAccess', _161 => _161.name]) || "",
-          arguments: _optionalChain([tool, 'access', _162 => _162.function, 'optionalAccess', _163 => _163.arguments]) || ""
+          name: _optionalChain([tool, 'access', _158 => _158.function, 'optionalAccess', _159 => _159.name]) || "",
+          arguments: _optionalChain([tool, 'access', _160 => _160.function, 'optionalAccess', _161 => _161.arguments]) || ""
         }
       }));
     }
@@ -5425,7 +5435,7 @@ var OpenAILLM = (_class25 = class extends BaseLLM {
             accumulatedContent += responseChunk.content;
           }
           this.logger.debug(
-            `Chunk received - delta: "${_optionalChain([choice, 'access', _164 => _164.delta, 'optionalAccess', _165 => _165.content]) || ""}"`,
+            `Chunk received - delta: "${_optionalChain([choice, 'access', _162 => _162.delta, 'optionalAccess', _163 => _163.content]) || ""}"`,
             `responseChunk content: "${responseChunk.content || ""}"`,
             `is_partial: ${responseChunk.is_partial}`,
             `accumulated: "${accumulatedContent.substring(0, 30)}${accumulatedContent.length > 30 ? "..." : ""}"`
@@ -5691,7 +5701,7 @@ var OAuth2Credential = class extends AuthCredential {
         "Cannot refresh token: no refresh token or refresh function"
       );
     }
-    const result = await _optionalChain([this, 'access', _166 => _166.refreshFunction, 'optionalCall', _167 => _167(this.refreshToken)]);
+    const result = await _optionalChain([this, 'access', _164 => _164.refreshFunction, 'optionalCall', _165 => _165(this.refreshToken)]);
     if (!result) {
       throw new Error("Failed to refresh token");
     }
@@ -5745,7 +5755,7 @@ var AuthHandler = class {
    * Gets the authentication token
    */
   getToken() {
-    return _optionalChain([this, 'access', _168 => _168.credential, 'optionalAccess', _169 => _169.getToken, 'call', _170 => _170()]);
+    return _optionalChain([this, 'access', _166 => _166.credential, 'optionalAccess', _167 => _167.getToken, 'call', _168 => _168()]);
   }
   /**
    * Gets headers for HTTP requests
@@ -5760,7 +5770,7 @@ var AuthHandler = class {
    * Refreshes the token if necessary
    */
   async refreshToken() {
-    if (_optionalChain([this, 'access', _171 => _171.credential, 'optionalAccess', _172 => _172.canRefresh, 'call', _173 => _173()])) {
+    if (_optionalChain([this, 'access', _169 => _169.credential, 'optionalAccess', _170 => _170.canRefresh, 'call', _171 => _171()])) {
       await this.credential.refresh();
     }
   }
@@ -5986,7 +5996,7 @@ var InMemoryMemoryService = class {
     };
     const normalizedQuery = query.toLowerCase().trim();
     const queryTerms = normalizedQuery.split(/\s+/);
-    const sessionsToSearch = _optionalChain([options, 'optionalAccess', _174 => _174.sessionId]) ? this.sessions.has(options.sessionId) ? [this.sessions.get(options.sessionId)] : [] : Array.from(this.sessions.values());
+    const sessionsToSearch = _optionalChain([options, 'optionalAccess', _172 => _172.sessionId]) ? this.sessions.has(options.sessionId) ? [this.sessions.get(options.sessionId)] : [] : Array.from(this.sessions.values());
     for (const session of sessionsToSearch) {
       const matchedEvents = [];
       const scores = [];
@@ -6012,7 +6022,7 @@ var InMemoryMemoryService = class {
           }
         }
         const score = queryTerms.length > 0 ? termMatches / queryTerms.length : 0;
-        if (_optionalChain([options, 'optionalAccess', _175 => _175.threshold]) !== void 0 && score < options.threshold) {
+        if (_optionalChain([options, 'optionalAccess', _173 => _173.threshold]) !== void 0 && score < options.threshold) {
           continue;
         }
         if (score > 0) {
@@ -6032,7 +6042,7 @@ var InMemoryMemoryService = class {
     response.memories.sort(
       (a, b) => (_nullishCoalesce(b.relevanceScore, () => ( 0))) - (_nullishCoalesce(a.relevanceScore, () => ( 0)))
     );
-    if (_optionalChain([options, 'optionalAccess', _176 => _176.limit]) !== void 0 && options.limit > 0) {
+    if (_optionalChain([options, 'optionalAccess', _174 => _174.limit]) !== void 0 && options.limit > 0) {
       response.memories = response.memories.slice(0, options.limit);
     }
     return response;
@@ -6298,17 +6308,17 @@ var InMemorySessionService = class {
     let sessions = Array.from(this.sessions.values()).filter(
       (session) => session.userId === userId
     );
-    if (_optionalChain([options, 'optionalAccess', _177 => _177.createdAfter])) {
+    if (_optionalChain([options, 'optionalAccess', _175 => _175.createdAfter])) {
       sessions = sessions.filter(
         (session) => session.createdAt >= options.createdAfter
       );
     }
-    if (_optionalChain([options, 'optionalAccess', _178 => _178.updatedAfter])) {
+    if (_optionalChain([options, 'optionalAccess', _176 => _176.updatedAfter])) {
       sessions = sessions.filter(
         (session) => session.updatedAt >= options.updatedAfter
       );
     }
-    if (_optionalChain([options, 'optionalAccess', _179 => _179.metadataFilter])) {
+    if (_optionalChain([options, 'optionalAccess', _177 => _177.metadataFilter])) {
       sessions = sessions.filter((session) => {
         for (const [key, value] of Object.entries(options.metadataFilter)) {
           if (session.metadata[key] !== value) {
@@ -6319,7 +6329,7 @@ var InMemorySessionService = class {
       });
     }
     sessions.sort((a, b) => b.updatedAt.getTime() - a.updatedAt.getTime());
-    if (_optionalChain([options, 'optionalAccess', _180 => _180.limit]) !== void 0 && options.limit > 0) {
+    if (_optionalChain([options, 'optionalAccess', _178 => _178.limit]) !== void 0 && options.limit > 0) {
       sessions = sessions.slice(0, options.limit);
     }
     return sessions;
@@ -6354,7 +6364,7 @@ var InMemorySessionService = class {
     if (event.is_partial) {
       return event;
     }
-    if (_optionalChain([event, 'access', _181 => _181.actions, 'optionalAccess', _182 => _182.stateDelta])) {
+    if (_optionalChain([event, 'access', _179 => _179.actions, 'optionalAccess', _180 => _180.stateDelta])) {
       for (const [key, value] of Object.entries(event.actions.stateDelta)) {
         if (key.startsWith("_temp_")) {
           continue;
@@ -6460,7 +6470,7 @@ var PostgresSessionService = class {
   }
   async listSessions(userId, options) {
     let query = this.db.select().from(this.sessionsTable).where(_drizzleorm.eq.call(void 0, this.sessionsTable.userId, userId));
-    if (_optionalChain([options, 'optionalAccess', _183 => _183.limit]) !== void 0 && options.limit > 0) {
+    if (_optionalChain([options, 'optionalAccess', _181 => _181.limit]) !== void 0 && options.limit > 0) {
       query = query.limit(options.limit);
     }
     const results = await query;
@@ -6487,12 +6497,12 @@ var PostgresSessionService = class {
     if (event.is_partial) {
       return event;
     }
-    if (_optionalChain([event, 'access', _184 => _184.actions, 'optionalAccess', _185 => _185.stateDelta])) {
+    if (_optionalChain([event, 'access', _182 => _182.actions, 'optionalAccess', _183 => _183.stateDelta])) {
       for (const [key, value] of Object.entries(event.actions.stateDelta)) {
         if (key.startsWith("_temp_")) {
           continue;
         }
-        _optionalChain([session, 'access', _186 => _186.state, 'optionalAccess', _187 => _187.set, 'call', _188 => _188(key, value)]);
+        _optionalChain([session, 'access', _184 => _184.state, 'optionalAccess', _185 => _185.set, 'call', _186 => _186(key, value)]);
       }
     }
     if (!session.events) {
@@ -6636,7 +6646,7 @@ var PgLiteSessionService = (_class27 = class {
   async listSessions(userId, options) {
     await this.ensureInitialized();
     let query = this.db.select().from(this.sessionsTable).where(_drizzleorm.eq.call(void 0, this.sessionsTable.userId, userId));
-    if (_optionalChain([options, 'optionalAccess', _189 => _189.limit]) !== void 0 && options.limit > 0) {
+    if (_optionalChain([options, 'optionalAccess', _187 => _187.limit]) !== void 0 && options.limit > 0) {
       query = query.limit(options.limit);
     }
     const results = await query;
@@ -6659,12 +6669,12 @@ var PgLiteSessionService = (_class27 = class {
     if (event.is_partial) {
       return event;
     }
-    if (_optionalChain([event, 'access', _190 => _190.actions, 'optionalAccess', _191 => _191.stateDelta])) {
+    if (_optionalChain([event, 'access', _188 => _188.actions, 'optionalAccess', _189 => _189.stateDelta])) {
       for (const [key, value] of Object.entries(event.actions.stateDelta)) {
         if (key.startsWith("_temp_")) {
           continue;
         }
-        _optionalChain([session, 'access', _192 => _192.state, 'optionalAccess', _193 => _193.set, 'call', _194 => _194(key, value)]);
+        _optionalChain([session, 'access', _190 => _190.state, 'optionalAccess', _191 => _191.set, 'call', _192 => _192(key, value)]);
       }
     }
     if (!session.events) {
@@ -6821,7 +6831,7 @@ var SqliteSessionService = (_class28 = class {
   async listSessions(userId, options) {
     await this.ensureInitialized();
     let query = this.db.select().from(this.sessionsTable).where(_drizzleorm.eq.call(void 0, this.sessionsTable.userId, userId));
-    if (_optionalChain([options, 'optionalAccess', _195 => _195.limit]) !== void 0 && options.limit > 0) {
+    if (_optionalChain([options, 'optionalAccess', _193 => _193.limit]) !== void 0 && options.limit > 0) {
       query = query.limit(options.limit);
     }
     const results = await query;
@@ -6844,12 +6854,12 @@ var SqliteSessionService = (_class28 = class {
     if (event.is_partial) {
       return event;
     }
-    if (_optionalChain([event, 'access', _196 => _196.actions, 'optionalAccess', _197 => _197.stateDelta])) {
+    if (_optionalChain([event, 'access', _194 => _194.actions, 'optionalAccess', _195 => _195.stateDelta])) {
       for (const [key, value] of Object.entries(event.actions.stateDelta)) {
         if (key.startsWith("_temp_")) {
           continue;
         }
-        _optionalChain([session, 'access', _198 => _198.state, 'optionalAccess', _199 => _199.set, 'call', _200 => _200(key, value)]);
+        _optionalChain([session, 'access', _196 => _196.state, 'optionalAccess', _197 => _197.set, 'call', _198 => _198(key, value)]);
       }
     }
     if (!session.events) {

package/dist/index.mjs

@@ -2981,9 +2981,9 @@ var McpError = class extends Error {
 // src/tools/mcp/sampling-handler.ts
 var McpSamplingHandler = class {
   logger = new Logger({ name: "McpSamplingHandler" });
-  adkHandler;
-  constructor(adkHandler) {
-    this.adkHandler = adkHandler;
+  samplingHandler;
+  constructor(samplingHandler) {
+    this.samplingHandler = samplingHandler;
   }
   /**
    * Handle MCP sampling request and convert between formats
@@ -3024,19 +3024,19 @@ var McpSamplingHandler = class {
         );
       }
       this.logger.debug("Converting MCP request to ADK format");
-      const adkMessages = this.convertMcpMessagesToADK(mcpParams.messages);
+      const adkMessages = this.convertMcpMessagesToADK(
+        mcpParams.messages,
+        mcpParams.systemPrompt
+      );
       const adkRequest = {
         messages: adkMessages,
-        systemPrompt: mcpParams.systemPrompt,
-        modelPreferences: mcpParams.modelPreferences,
-        includeContext: mcpParams.includeContext,
-        temperature: mcpParams.temperature,
-        maxTokens: mcpParams.maxTokens,
-        stopSequences: mcpParams.stopSequences,
-        metadata: mcpParams.metadata
+        config: {
+          temperature: mcpParams.temperature,
+          max_tokens: mcpParams.maxTokens
+        }
       };
       this.logger.debug("Calling ADK sampling handler");
-      const adkResponse = await this.adkHandler(adkRequest);
+      const adkResponse = await this.samplingHandler(adkRequest);
       this.logger.debug("Converting ADK response to MCP format");
       const mcpResponse = this.convertADKResponseToMcp(adkResponse);
       const responseValidation = CreateMessageResultSchema.safeParse(mcpResponse);
@@ -3066,54 +3066,66 @@ var McpSamplingHandler = class {
   /**
    * Convert MCP messages to ADK message format
    */
-  convertMcpMessagesToADK(mcpMessages) {
-    return mcpMessages.map((mcpMessage) => {
-      const adkRole = mcpMessage.role === "assistant" ? "assistant" : "user";
-      let adkContent;
-      if (mcpMessage.content.type === "text") {
-        adkContent = mcpMessage.content.text || "";
-      } else if (mcpMessage.content.type === "image") {
-        const contentParts = [];
-        if (mcpMessage.content.text) {
-          contentParts.push({
-            type: "text",
-            text: mcpMessage.content.text
-          });
-        }
-        if (mcpMessage.content.data) {
-          const mimeType = mcpMessage.content.mimeType || "image/jpeg";
-          const dataUrl = `data:${mimeType};base64,${mcpMessage.content.data}`;
-          contentParts.push({
-            type: "image",
-            image_url: {
-              url: dataUrl
-            }
-          });
-        }
-        adkContent = contentParts.length > 0 ? contentParts : "";
-      } else {
-        this.logger.warn(
-          `Unknown MCP content type: ${mcpMessage.content.type}`
-        );
-        adkContent = mcpMessage.content.data || "";
-      }
-      const adkMessage = {
-        role: adkRole,
-        content: adkContent
-      };
-      this.logger.debug(
-        `Converted MCP message - role: ${mcpMessage.role} -> ${adkRole}, content type: ${mcpMessage.content.type}`
-      );
-      return adkMessage;
+  convertMcpMessagesToADK(mcpMessages, systemPrompt) {
+    const transformedMessages = mcpMessages.map(
+      (mcpMessage) => this.convertSingleMcpMessageToADK(mcpMessage)
+    );
+    transformedMessages.unshift({
+      role: "system",
+      content: systemPrompt
     });
+    return transformedMessages;
+  }
+  /**
+   * Convert a single MCP message to ADK message format
+   */
+  convertSingleMcpMessageToADK(mcpMessage) {
+    const adkRole = mcpMessage.role === "assistant" ? "assistant" : "user";
+    const adkContent = this.convertMcpContentToADK(mcpMessage.content);
+    const adkMessage = {
+      role: adkRole,
+      content: adkContent
+    };
+    this.logger.debug(
+      `Converted MCP message - role: ${mcpMessage.role} -> ${adkRole}, content type: ${mcpMessage.content.type}`
+    );
+    return adkMessage;
+  }
+  /**
+   * Convert MCP message content to ADK content format
+   */
+  convertMcpContentToADK(mcpContent) {
+    if (mcpContent.type === "text") {
+      return mcpContent.text || "";
+    }
+    if (mcpContent.type === "image") {
+      const contentParts = [];
+      if (mcpContent.text) {
+        contentParts.push({
+          type: "text",
+          text: mcpContent.text
+        });
+      }
+      if (mcpContent.data) {
+        const mimeType = mcpContent.mimeType || "image/jpeg";
+        const dataUrl = `data:${mimeType};base64,${mcpContent.data}`;
+        contentParts.push({
+          type: "image",
+          image_url: {
+            url: dataUrl
+          }
+        });
+      }
+      return contentParts.length > 0 ? contentParts : "";
+    }
+    this.logger.warn(`Unknown MCP content type: ${mcpContent.type}`);
+    return mcpContent.data || "";
   }
   /**
    * Convert ADK response to MCP response format
    */
   convertADKResponseToMcp(adkResponse) {
     const mcpResponse = {
-      model: adkResponse.model,
-      stopReason: adkResponse.stopReason,
       role: "assistant",
       // ADK responses are always from assistant
       content: {
@@ -3121,16 +3133,14 @@ var McpSamplingHandler = class {
         text: adkResponse.content || ""
       }
     };
-    this.logger.debug(
-      `Converted ADK response - model: ${adkResponse.model}, content length: ${adkResponse.content?.length || 0}`
-    );
+    this.logger.debug(`Received content: ${adkResponse.content}`);
     return mcpResponse;
   }
   /**
    * Update the ADK handler
    */
   updateHandler(handler) {
-    this.adkHandler = handler;
+    this.samplingHandler = handler;
     this.logger.debug("ADK sampling handler updated");
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iqai/adk",
-  "version": "0.0.10",
+  "version": "0.0.12",
   "description": "Agent Development Kit for TypeScript with multi-provider LLM support",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",