@aws/lsp-codewhisperer 0.0.84 → 0.0.85

package/out/shared/codeWhispererService.d.ts

@@ -1,25 +1,19 @@
 import { CredentialsProvider, CredentialsType, Workspace, Logging, SDKInitializator, CancellationToken, TextDocument, Position, WorkspaceFolder, InlineCompletionWithReferencesParams } from '@aws/language-server-runtimes/server-interface';
-import { AWSError, ConfigurationOptions } from 'aws-sdk';
-import { PromiseResult } from 'aws-sdk/lib/request';
-import { RequestExtras } from '../client/token/codewhisperer';
-import CodeWhispererSigv4Client = require('../client/sigv4/codewhisperersigv4client');
-import CodeWhispererTokenClient = require('../client/token/codewhispererbearertokenclient');
+import { CodeWhispererSigv4Client } from '../client/sigv4/codewhisperer';
+import { CodeWhispererTokenClient } from '../client/token/codewhisperer';
 import { CodewhispererLanguage } from './languageDetection';
 import { RecentEditTracker } from '../language-server/inline-completion/tracker/codeEditTracker';
 import { CodeWhispererSupplementalContext } from './models/model';
-export declare function isTokenRequest(request: BaseGenerateSuggestionsRequest): request is GenerateTokenSuggestionsRequest;
-export declare function isIAMRequest(request: BaseGenerateSuggestionsRequest): request is GenerateIAMSuggestionsRequest;
-export interface Suggestion extends CodeWhispererTokenClient.Completion, CodeWhispererSigv4Client.Recommendation {
+import { Completion, CreateSubscriptionTokenRequest, CreateSubscriptionTokenResponse, CreateUploadUrlRequest, CreateWorkspaceRequest, DeleteWorkspaceRequest, GenerateCompletionsRequest, GetCodeAnalysisRequest, GetProfileRequest, GetTransformationPlanRequest, GetTransformationRequest, ListAvailableCustomizationsRequest, ListAvailableModelsRequest, ListAvailableProfilesRequest, ListCodeAnalysisFindingsRequest, ListFeatureEvaluationsRequest, ListWorkspaceMetadataRequest, SendTelemetryEventRequest, StartCodeAnalysisRequest, StartTransformationRequest, StopTransformationRequest, SupplementalContext } from '@amzn/codewhisperer-runtime';
+import { GenerateRecommendationsRequest, Recommendation } from '@amzn/codewhisperer';
+export declare function isTokenRequest(request: GenerateSuggestionsRequest): request is GenerateTokenSuggestionsRequest;
+export declare function isIAMRequest(request: GenerateSuggestionsRequest): request is GenerateIAMSuggestionsRequest;
+export interface Suggestion extends Completion, Recommendation {
     itemId: string;
 }
-export interface BaseGenerateSuggestionsRequest {
-    fileContext: FileContext;
-    maxResults?: number;
-    nextToken?: string;
-}
-export interface GenerateIAMSuggestionsRequest extends CodeWhispererSigv4Client.GenerateRecommendationsRequest {
+export interface GenerateIAMSuggestionsRequest extends GenerateRecommendationsRequest {
 }
-export interface GenerateTokenSuggestionsRequest extends CodeWhispererTokenClient.GenerateCompletionsRequest {
+export interface GenerateTokenSuggestionsRequest extends GenerateCompletionsRequest {
 }
 export type GenerateSuggestionsRequest = GenerateIAMSuggestionsRequest | GenerateTokenSuggestionsRequest;
 export type FileContext = {
@@ -32,7 +26,7 @@ export type FileContext = {
     rightFileContent: string;
 };
 export interface ResponseContext {
-    requestId: string;
+    requestId: string | undefined;
     codewhispererSessionId: string;
     nextToken?: string;
     authType?: 'iam' | 'token';
@@ -68,23 +62,17 @@ export declare abstract class CodeWhispererServiceBase {
     customizationArn?: string;
     profileArn?: string;
     abstract client: CodeWhispererSigv4Client | CodeWhispererTokenClient;
-    inflightRequests: Set<AWS.Request<any, AWSError> & RequestExtras>;
+    inflightRequests: Set<AbortController>;
     abortInflightRequests(): void;
-    trackRequest(request: AWS.Request<any, AWSError> & RequestExtras): void;
-    completeRequest(request: AWS.Request<any, AWSError> & RequestExtras): void;
     abstract getCredentialsType(): CredentialsType;
-    abstract generateSuggestions(request: BaseGenerateSuggestionsRequest): Promise<GenerateSuggestionsResponse>;
+    abstract generateSuggestions(request: GenerateSuggestionsRequest): Promise<GenerateSuggestionsResponse>;
     abstract constructSupplementalContext(document: TextDocument, position: Position, workspace: Workspace, recentEditTracker: RecentEditTracker, logging: Logging, cancellationToken: CancellationToken, opentabs: InlineCompletionWithReferencesParams['openTabFilepaths'], config: {
         includeRecentEdits: boolean;
     }): Promise<{
         supContextData: CodeWhispererSupplementalContext;
-        items: CodeWhispererTokenClient.SupplementalContextList;
+        items: SupplementalContext[];
     } | undefined>;
     constructor(codeWhispererRegion: string, codeWhispererEndpoint: string);
-    /**
-     * Updates Service Client options after client was instantiated.
-     */
-    updateClientConfig(options: ConfigurationOptions): void;
     generateItemId: () => string;
     getSubscriptionStatus(statusOnly?: boolean): Promise<{
         status: 'active' | 'active-expiring' | 'none';
@@ -100,9 +88,9 @@ export declare class CodeWhispererServiceIAM extends CodeWhispererServiceBase {
         includeRecentEdits: boolean;
     }): Promise<{
         supContextData: CodeWhispererSupplementalContext;
-        items: CodeWhispererTokenClient.SupplementalContextList;
+        items: SupplementalContext[];
     } | undefined>;
-    generateSuggestions(request: BaseGenerateSuggestionsRequest): Promise<GenerateSuggestionsResponse>;
+    generateSuggestions(request: GenerateSuggestionsRequest): Promise<GenerateSuggestionsResponse>;
     private mapCodeWhispererApiResponseToSuggestion;
 }
 /**
@@ -113,99 +101,97 @@ export declare class CodeWhispererServiceToken extends CodeWhispererServiceBase
     private credentialsProvider;
     private logging;
     client: CodeWhispererTokenClient;
-    constructor(credentialsProvider: CredentialsProvider, workspace: Workspace, logging: Logging, codeWhispererRegion: string, codeWhispererEndpoint: string, sdkInitializator: SDKInitializator);
+    constructor(credentialsProvider: CredentialsProvider, workspace: Workspace, logging: Logging, codeWhispererRegion: string, codeWhispererEndpoint: string, sdkInitializator: SDKInitializator, customUserAgent?: string);
     getCredentialsType(): CredentialsType;
     constructSupplementalContext(document: TextDocument, position: Position, workspace: Workspace, recentEditTracker: RecentEditTracker, logging: Logging, cancellationToken: CancellationToken, opentabs: InlineCompletionWithReferencesParams['openTabFilepaths'], config: {
         includeRecentEdits: boolean;
     }): Promise<{
         supContextData: CodeWhispererSupplementalContext;
-        items: CodeWhispererTokenClient.SupplementalContextList;
+        items: SupplementalContext[];
     } | undefined>;
     private withProfileArn;
-    generateSuggestions(request: BaseGenerateSuggestionsRequest): Promise<GenerateSuggestionsResponse>;
+    generateSuggestions(request: GenerateSuggestionsRequest): Promise<GenerateSuggestionsResponse>;
     private mapCodeWhispererApiResponseToSuggestion;
-    codeModernizerCreateUploadUrl(request: CodeWhispererTokenClient.CreateUploadUrlRequest): Promise<CodeWhispererTokenClient.CreateUploadUrlResponse>;
+    codeModernizerCreateUploadUrl(request: CreateUploadUrlRequest): Promise<import("@amzn/codewhisperer-runtime").CreateUploadUrlCommandOutput>;
     /**
      * @description Use this function to start the transformation job.
      * @param request
      * @returns transformationJobId - String id for the Job
      */
-    codeModernizerStartCodeTransformation(request: CodeWhispererTokenClient.StartTransformationRequest): Promise<PromiseResult<CodeWhispererTokenClient.StartTransformationResponse, AWSError>>;
+    codeModernizerStartCodeTransformation(request: StartTransformationRequest): Promise<import("@amzn/codewhisperer-runtime").StartTransformationCommandOutput>;
     /**
      * @description Use this function to stop the transformation job.
      * @param request
      * @returns transformationJobId - String id for the Job
      */
-    codeModernizerStopCodeTransformation(request: CodeWhispererTokenClient.StopTransformationRequest): Promise<PromiseResult<CodeWhispererTokenClient.StopTransformationResponse, AWSError>>;
+    codeModernizerStopCodeTransformation(request: StopTransformationRequest): Promise<import("@amzn/codewhisperer-runtime").StopTransformationCommandOutput>;
     /**
      * @description Use this function to get the status of the code transformation. We should
      * be polling this function periodically to get updated results. When this function
      * returns COMPLETED we know the transformation is done.
      */
-    codeModernizerGetCodeTransformation(request: CodeWhispererTokenClient.GetTransformationRequest): Promise<PromiseResult<CodeWhispererTokenClient.GetTransformationResponse, AWSError>>;
+    codeModernizerGetCodeTransformation(request: GetTransformationRequest): Promise<import("@amzn/codewhisperer-runtime").GetTransformationCommandOutput>;
     /**
      * @description After starting a transformation use this function to display the LLM
      * transformation plan to the user.
      * @params tranformationJobId - String id returned from StartCodeTransformationResponse
      */
-    codeModernizerGetCodeTransformationPlan(request: CodeWhispererTokenClient.GetTransformationPlanRequest): Promise<PromiseResult<CodeWhispererTokenClient.GetTransformationPlanResponse, AWSError>>;
+    codeModernizerGetCodeTransformationPlan(request: GetTransformationPlanRequest): Promise<import("@amzn/codewhisperer-runtime").GetTransformationPlanCommandOutput>;
     /**
      * @description get a pre-signed url to upload source code into S3 bucket
      */
-    createUploadUrl(request: CodeWhispererTokenClient.CreateUploadUrlRequest): Promise<PromiseResult<CodeWhispererTokenClient.CreateUploadUrlResponse, AWSError>>;
+    createUploadUrl(request: CreateUploadUrlRequest): Promise<import("@amzn/codewhisperer-runtime").CreateUploadUrlCommandOutput>;
     /**
      * @description Once source code uploaded to S3, send a request to run security scan on uploaded source code.
      */
-    startCodeAnalysis(request: CodeWhispererTokenClient.StartCodeAnalysisRequest): Promise<PromiseResult<CodeWhispererTokenClient.StartCodeAnalysisResponse, AWSError>>;
+    startCodeAnalysis(request: StartCodeAnalysisRequest): Promise<import("@amzn/codewhisperer-runtime").StartCodeAnalysisCommandOutput>;
     /**
      * @description Send a request to get the code scan status detail.
      */
-    getCodeAnalysis(request: CodeWhispererTokenClient.GetCodeAnalysisRequest): Promise<PromiseResult<CodeWhispererTokenClient.GetCodeAnalysisResponse, AWSError>>;
+    getCodeAnalysis(request: GetCodeAnalysisRequest): Promise<import("@amzn/codewhisperer-runtime").GetCodeAnalysisCommandOutput>;
     /**
      * @description Get profile details
      */
-    getProfile(request: {
-        profileArn: string;
-    }): Promise<PromiseResult<CodeWhispererTokenClient.GetProfileResponse, AWSError>>;
+    getProfile(request: GetProfileRequest): Promise<import("@amzn/codewhisperer-runtime").GetProfileCommandOutput>;
     /**
      * @description Once scan completed successfully, send a request to get list of all the findings for the given scan.
      */
-    listCodeAnalysisFindings(request: CodeWhispererTokenClient.ListCodeAnalysisFindingsRequest): Promise<PromiseResult<CodeWhispererTokenClient.ListCodeAnalysisFindingsResponse, AWSError>>;
+    listCodeAnalysisFindings(request: ListCodeAnalysisFindingsRequest): Promise<import("@amzn/codewhisperer-runtime").ListCodeAnalysisFindingsCommandOutput>;
     /**
      * @description Get list of available customizations
      */
-    listAvailableCustomizations(request: CodeWhispererTokenClient.ListAvailableCustomizationsRequest): Promise<PromiseResult<CodeWhispererTokenClient.ListAvailableCustomizationsResponse, AWSError>>;
+    listAvailableCustomizations(request: ListAvailableCustomizationsRequest): Promise<import("@amzn/codewhisperer-runtime").ListAvailableCustomizationsCommandOutput>;
     /**
      * @description Get list of available profiles
      */
-    listAvailableProfiles(request: CodeWhispererTokenClient.ListAvailableProfilesRequest): Promise<PromiseResult<CodeWhispererTokenClient.ListAvailableProfilesResponse, AWSError>>;
+    listAvailableProfiles(request: ListAvailableProfilesRequest): Promise<import("@amzn/codewhisperer-runtime").ListAvailableProfilesCommandOutput>;
     /**
      * @description Get list of available models
      */
-    listAvailableModels(request: CodeWhispererTokenClient.ListAvailableModelsRequest): Promise<PromiseResult<CodeWhispererTokenClient.ListAvailableModelsResponse, AWSError>>;
+    listAvailableModels(request: ListAvailableModelsRequest): Promise<import("@amzn/codewhisperer-runtime").ListAvailableModelsCommandOutput>;
     /**
      * @description send telemetry event to code whisperer data warehouse
      */
-    sendTelemetryEvent(request: CodeWhispererTokenClient.SendTelemetryEventRequest): Promise<PromiseResult<CodeWhispererTokenClient.SendTelemetryEventResponse, AWSError>>;
+    sendTelemetryEvent(request: SendTelemetryEventRequest): Promise<import("@amzn/codewhisperer-runtime").SendTelemetryEventCommandOutput>;
     /**
      * @description create a remote workspace
      */
-    createWorkspace(request: CodeWhispererTokenClient.CreateWorkspaceRequest): Promise<PromiseResult<CodeWhispererTokenClient.CreateWorkspaceResponse, AWSError>>;
+    createWorkspace(request: CreateWorkspaceRequest): Promise<import("@amzn/codewhisperer-runtime").CreateWorkspaceCommandOutput>;
     /**
      * @description get list of workspace metadata
      */
-    listWorkspaceMetadata(request: CodeWhispererTokenClient.ListWorkspaceMetadataRequest): Promise<PromiseResult<CodeWhispererTokenClient.ListWorkspaceMetadataResponse, AWSError>>;
+    listWorkspaceMetadata(request: ListWorkspaceMetadataRequest): Promise<import("@amzn/codewhisperer-runtime").ListWorkspaceMetadataCommandOutput>;
     /**
      * @description delete the remote workspace
      */
-    deleteWorkspace(request: CodeWhispererTokenClient.DeleteWorkspaceRequest): Promise<PromiseResult<CodeWhispererTokenClient.DeleteWorkspaceResponse, AWSError>>;
-    listFeatureEvaluations(request: CodeWhispererTokenClient.ListFeatureEvaluationsRequest): Promise<PromiseResult<CodeWhispererTokenClient.ListFeatureEvaluationsResponse, AWSError>>;
+    deleteWorkspace(request: DeleteWorkspaceRequest): Promise<import("@amzn/codewhisperer-runtime").DeleteWorkspaceCommandOutput>;
+    listFeatureEvaluations(request: ListFeatureEvaluationsRequest): Promise<import("@amzn/codewhisperer-runtime").ListFeatureEvaluationsCommandOutput>;
     /**
      * (debounced by default)
      *
      * cool api you have there 🥹
      */
-    createSubscriptionToken(request: CodeWhispererTokenClient.CreateSubscriptionTokenRequest): Promise<CodeWhispererTokenClient.CreateSubscriptionTokenResponse>;
+    createSubscriptionToken(request: CreateSubscriptionTokenRequest): Promise<CreateSubscriptionTokenResponse>;
     /**
      * Gets the Subscription status of the given user.
      *

package/out/shared/codeWhispererService.js

@@ -6,7 +6,6 @@ exports.isIAMRequest = isIAMRequest;
 exports.getFileContext = getFileContext;
 const server_interface_1 = require("@aws/language-server-runtimes/server-interface");
 const timeoutUtils_1 = require("@aws/lsp-core/out/util/timeoutUtils");
-const aws_sdk_1 = require("aws-sdk");
 const uuid_1 = require("uuid");
 const codewhisperer_1 = require("../client/sigv4/codewhisperer");
 const codewhisperer_2 = require("../client/token/codewhisperer");
@@ -16,6 +15,8 @@ const languageDetection_1 = require("./languageDetection");
 const supplementalContextUtil_1 = require("./supplementalContextUtil/supplementalContextUtil");
 const path = require("path");
 const constants_1 = require("../language-server/inline-completion/contants/constants");
+const codewhisperer_runtime_1 = require("@amzn/codewhisperer-runtime");
+const codewhisperer_3 = require("@amzn/codewhisperer");
 // Type guards for request classification
 function isTokenRequest(request) {
     return 'editorState' in request || 'predictionTypes' in request || 'supplementalContexts' in request;
@@ -66,22 +67,10 @@ class CodeWhispererServiceBase {
         });
         this.inflightRequests.clear();
     }
-    trackRequest(request) {
-        this.inflightRequests.add(request);
-    }
-    completeRequest(request) {
-        this.inflightRequests.delete(request);
-    }
     constructor(codeWhispererRegion, codeWhispererEndpoint) {
         this.codeWhispererRegion = codeWhispererRegion;
         this.codeWhispererEndpoint = codeWhispererEndpoint;
     }
-    /**
-     * Updates Service Client options after client was instantiated.
-     */
-    updateClientConfig(options) {
-        this.client.config.update(options);
-    }
     generateItemId = () => (0, uuid_1.v4)();
     async getSubscriptionStatus(statusOnly) {
         // No-op/default implementation: assume no subscription
@@ -102,50 +91,27 @@ class CodeWhispererServiceIAM extends CodeWhispererServiceBase {
         const options = {
             region: this.codeWhispererRegion,
             endpoint: this.codeWhispererEndpoint,
-            credentialProvider: new aws_sdk_1.CredentialProviderChain([
-                () => {
-                    const credentials = new aws_sdk_1.Credentials({
-                        accessKeyId: '',
-                        secretAccessKey: '',
-                        sessionToken: '',
-                    });
-                    credentials.get = callback => {
-                        logging.info('CodeWhispererServiceIAM: Attempting to get credentials');
-                        Promise.resolve(credentialsProvider.getCredentials('iam'))
-                            .then((creds) => {
-                            logging.info('CodeWhispererServiceIAM: Successfully got credentials');
-                            credentials.accessKeyId = creds.accessKeyId;
-                            credentials.secretAccessKey = creds.secretAccessKey;
-                            credentials.sessionToken = creds.sessionToken;
-                            credentials.expireTime = creds.expiration;
-                            callback();
-                        })
-                            .catch(err => {
-                            logging.error(`CodeWhispererServiceIAM: Failed to get credentials: ${err.message}`);
-                            callback(err);
-                        });
-                    };
-                    credentials.needsRefresh = () => {
-                        return (!credentials.accessKeyId ||
-                            !credentials.secretAccessKey ||
-                            (credentials.expireTime && credentials.expireTime.getTime() - Date.now() < 60000)); // 1 min buffer
+            credentials: async () => {
+                logging.info('CodeWhispererService IAM: Attempting to get credentials');
+                try {
+                    const creds = credentialsProvider.getCredentials('iam');
+                    logging.info('CodeWhispererService IAM: Successfully got credentials');
+                    return {
+                        accessKeyId: creds.accessKeyId,
+                        secretAccessKey: creds.secretAccessKey,
+                        sessionToken: creds.sessionToken,
+                        expiration: creds.expiration,
                     };
-                    credentials.refresh = callback => {
-                        credentials.get(callback);
-                    };
-                    return credentials;
-                },
-            ]),
-        };
-        this.client = (0, codewhisperer_1.createCodeWhispererSigv4Client)(options, sdkInitializator, logging);
-        // Avoid overwriting any existing client listeners
-        const clientRequestListeners = this.client.setupRequestListeners;
-        this.client.setupRequestListeners = (request) => {
-            if (clientRequestListeners) {
-                clientRequestListeners.call(this.client, request);
-            }
-            request.httpRequest.headers['x-amzn-codewhisperer-optout'] = `${!this.shareCodeWhispererContentWithAWS}`;
+                }
+                catch (err) {
+                    if (err instanceof Error) {
+                        logging.error(`CodeWhispererServiceIAM: Failed to get credentials: ${err.message}`);
+                    }
+                    throw err;
+                }
+            },
         };
+        this.client = (0, codewhisperer_1.createCodeWhispererSigv4Client)(options, sdkInitializator, logging, this.shareCodeWhispererContentWithAWS);
     }
     getCredentialsType() {
         return 'iam';
@@ -165,10 +131,10 @@ class CodeWhispererServiceIAM extends CodeWhispererServiceBase {
         if ('editorState' in request || 'predictionTypes' in request || 'supplementalContexts' in request) {
             console.warn('Advanced features not supported - using basic completion');
         }
-        const response = await this.client.generateRecommendations(iamRequest).promise();
+        const response = await this.client.send(new codewhisperer_3.GenerateRecommendationsCommand(iamRequest));
         return this.mapCodeWhispererApiResponseToSuggestion(response, {
-            requestId: response?.$response?.requestId,
-            codewhispererSessionId: response?.$response?.httpResponse?.headers['x-amzn-sessionid'],
+            requestId: response?.$metadata?.requestId ?? 'unknown',
+            codewhispererSessionId: response?.$httpHeaders?.['x-amzn-sessionid'] ?? 'unknown',
             nextToken: response.nextToken,
             authType: 'iam',
         });
@@ -196,59 +162,24 @@ class CodeWhispererServiceToken extends CodeWhispererServiceBase {
     #createSubscriptionTokenPromise;
     /** If user clicks "Upgrade" multiple times, cancel the previous wait-promise. */
     #waitUntilSubscriptionCancelSource;
-    constructor(credentialsProvider, workspace, logging, codeWhispererRegion, codeWhispererEndpoint, sdkInitializator) {
+    constructor(credentialsProvider, workspace, logging, codeWhispererRegion, codeWhispererEndpoint, sdkInitializator, customUserAgent) {
         super(codeWhispererRegion, codeWhispererEndpoint);
         this.credentialsProvider = credentialsProvider;
         this.logging = logging;
+        const tokenProvider = async () => {
+            const creds = credentialsProvider.getCredentials('bearer');
+            if (!creds?.token) {
+                throw new Error('Authorization failed, bearer token is not set');
+            }
+            return { token: creds.token, expiration: new Date() };
+        };
         const options = {
             region: this.codeWhispererRegion,
             endpoint: this.codeWhispererEndpoint,
-            onRequestSetup: [
-                req => {
-                    logging.debug(`CodeWhispererServiceToken: req=${req.operation}`);
-                    this.trackRequest(req);
-                    req.on('build', async ({ httpRequest }) => {
-                        try {
-                            const creds = credentialsProvider.getCredentials('bearer');
-                            if (!creds?.token) {
-                                throw new Error('Authorization failed, bearer token is not set');
-                            }
-                            if (credentialsProvider.getConnectionType() === 'external_idp') {
-                                httpRequest.headers['TokenType'] = 'EXTERNAL_IDP';
-                            }
-                            httpRequest.headers['Authorization'] = `Bearer ${creds.token}`;
-                            httpRequest.headers['x-amzn-codewhisperer-optout'] =
-                                `${!this.shareCodeWhispererContentWithAWS}`;
-                        }
-                        catch (err) {
-                            this.completeRequest(req);
-                            throw err;
-                        }
-                    });
-                    req.on('complete', response => {
-                        const requestStartTime = req.startTime?.getTime() || 0;
-                        const requestEndTime = new Date().getTime();
-                        const latency = requestStartTime > 0 ? requestEndTime - requestStartTime : 0;
-                        const requestBody = req.httpRequest.body ? JSON.parse(String(req.httpRequest.body)) : {};
-                        this.completeRequest(req);
-                    });
-                    req.on('error', async (error, response) => {
-                        const requestStartTime = req.startTime?.getTime() || 0;
-                        const requestEndTime = new Date().getTime();
-                        const latency = requestStartTime > 0 ? requestEndTime - requestStartTime : 0;
-                        const requestBody = req.httpRequest.body ? JSON.parse(String(req.httpRequest.body)) : {};
-                        this.completeRequest(req);
-                    });
-                    req.on('error', () => {
-                        this.completeRequest(req);
-                    });
-                    req.on('error', () => {
-                        this.completeRequest(req);
-                    });
-                },
-            ],
+            token: tokenProvider,
+            ...(customUserAgent && { customUserAgent }),
         };
-        this.client = (0, codewhisperer_2.createCodeWhispererTokenClient)(options, sdkInitializator, logging);
+        this.client = (0, codewhisperer_2.createCodeWhispererTokenClient)(options, sdkInitializator, logging, credentialsProvider, this.shareCodeWhispererContentWithAWS);
     }
     getCredentialsType() {
         return 'bearer';
@@ -269,7 +200,7 @@ class CodeWhispererServiceToken extends CodeWhispererServiceBase {
             items.push(...recentEditsContext.supplementalContextItems.map(item => ({
                 content: item.content,
                 filePath: item.filePath,
-                type: 'PreviousEditorState',
+                type: codewhisperer_runtime_1.SupplementalContextType.PREVIOUS_EDITOR_STATE,
                 metadata: {
                     previousEditorStateMetadata: {
                         timeOffset: 1000,
@@ -332,17 +263,17 @@ class CodeWhispererServiceToken extends CodeWhispererServiceBase {
             logstr += `@@request metadata@@
     "endpoint": ${this.codeWhispererEndpoint},
     "predictionType": ${tokenRequest.predictionTypes?.toString() ?? 'Not specified (COMPLETIONS)'},
-    "filename": ${tokenRequest.fileContext.filename},
-    "leftContextLength": ${request.fileContext.leftFileContent.length},
-    rightContextLength: ${request.fileContext.rightFileContent.length},
-    "language": ${tokenRequest.fileContext.programmingLanguage.languageName},
+    "filename": ${tokenRequest.fileContext?.filename},
+    "leftContextLength": ${tokenRequest.fileContext?.leftFileContent?.length},
+    rightContextLength: ${tokenRequest.fileContext?.rightFileContent?.length},
+    "language": ${tokenRequest.fileContext?.programmingLanguage?.languageName},
     "supplementalContextCount": ${tokenRequest.supplementalContexts?.length ?? 0},
     "request.nextToken": ${tokenRequest.nextToken}`;
             // "recentEdits": ${recentEditsLogStr}\n`
-            const response = await this.client.generateCompletions(this.withProfileArn(tokenRequest)).promise();
+            const response = await this.client.send(new codewhisperer_runtime_1.GenerateCompletionsCommand(this.withProfileArn(tokenRequest)));
             const responseContext = {
-                requestId: response?.$response?.requestId,
-                codewhispererSessionId: response?.$response?.httpResponse?.headers['x-amzn-sessionid'],
+                requestId: response?.$metadata?.requestId ?? 'unknown',
+                codewhispererSessionId: response?.$metadata?.httpHeaders?.['x-amzn-sessionid'] ?? 'unknown',
                 nextToken: response.nextToken,
                 // CRITICAL: Add service type for proper error handling
                 authType: 'token',
@@ -393,7 +324,7 @@ class CodeWhispererServiceToken extends CodeWhispererServiceBase {
         };
     }
     async codeModernizerCreateUploadUrl(request) {
-        return this.client.createUploadUrl(this.withProfileArn(request)).promise();
+        return this.client.send(new codewhisperer_runtime_1.CreateUploadUrlCommand(this.withProfileArn(request)));
     }
     /**
      * @description Use this function to start the transformation job.
@@ -401,7 +332,7 @@ class CodeWhispererServiceToken extends CodeWhispererServiceBase {
      * @returns transformationJobId - String id for the Job
      */
     async codeModernizerStartCodeTransformation(request) {
-        return await this.client.startTransformation(this.withProfileArn(request)).promise();
+        return await this.client.send(new codewhisperer_runtime_1.StartTransformationCommand(this.withProfileArn(request)));
     }
     /**
      * @description Use this function to stop the transformation job.
@@ -409,7 +340,7 @@ class CodeWhispererServiceToken extends CodeWhispererServiceBase {
      * @returns transformationJobId - String id for the Job
      */
     async codeModernizerStopCodeTransformation(request) {
-        return await this.client.stopTransformation(this.withProfileArn(request)).promise();
+        return await this.client.send(new codewhisperer_runtime_1.StopTransformationCommand(this.withProfileArn(request)));
     }
     /**
      * @description Use this function to get the status of the code transformation. We should
@@ -417,7 +348,7 @@ class CodeWhispererServiceToken extends CodeWhispererServiceBase {
      * returns COMPLETED we know the transformation is done.
      */
     async codeModernizerGetCodeTransformation(request) {
-        return await this.client.getTransformation(this.withProfileArn(request)).promise();
+        return await this.client.send(new codewhisperer_runtime_1.GetTransformationCommand(this.withProfileArn(request)));
     }
     /**
      * @description After starting a transformation use this function to display the LLM
@@ -425,85 +356,85 @@ class CodeWhispererServiceToken extends CodeWhispererServiceBase {
      * @params tranformationJobId - String id returned from StartCodeTransformationResponse
      */
     async codeModernizerGetCodeTransformationPlan(request) {
-        return this.client.getTransformationPlan(this.withProfileArn(request)).promise();
+        return this.client.send(new codewhisperer_runtime_1.GetTransformationPlanCommand(this.withProfileArn(request)));
     }
     /**
      * @description get a pre-signed url to upload source code into S3 bucket
      */
     async createUploadUrl(request) {
-        return this.client.createUploadUrl(this.withProfileArn(request)).promise();
+        return this.client.send(new codewhisperer_runtime_1.CreateUploadUrlCommand(this.withProfileArn(request)));
     }
     /**
      * @description Once source code uploaded to S3, send a request to run security scan on uploaded source code.
      */
     async startCodeAnalysis(request) {
-        return this.client.startCodeAnalysis(this.withProfileArn(request)).promise();
+        return this.client.send(new codewhisperer_runtime_1.StartCodeAnalysisCommand(this.withProfileArn(request)));
     }
     /**
      * @description Send a request to get the code scan status detail.
      */
     async getCodeAnalysis(request) {
-        return this.client.getCodeAnalysis(this.withProfileArn(request)).promise();
+        return this.client.send(new codewhisperer_runtime_1.GetCodeAnalysisCommand(this.withProfileArn(request)));
     }
     /**
      * @description Get profile details
      */
     async getProfile(request) {
-        return this.client.getProfile(request).promise();
+        return this.client.send(new codewhisperer_runtime_1.GetProfileCommand(request));
     }
     /**
      * @description Once scan completed successfully, send a request to get list of all the findings for the given scan.
      */
     async listCodeAnalysisFindings(request) {
-        return this.client.listCodeAnalysisFindings(this.withProfileArn(request)).promise();
+        return this.client.send(new codewhisperer_runtime_1.ListCodeAnalysisFindingsCommand(this.withProfileArn(request)));
     }
     /**
      * @description Get list of available customizations
      */
     async listAvailableCustomizations(request) {
-        return this.client.listAvailableCustomizations(this.withProfileArn(request)).promise();
+        return this.client.send(new codewhisperer_runtime_1.ListAvailableCustomizationsCommand(this.withProfileArn(request)));
     }
     /**
      * @description Get list of available profiles
      */
     async listAvailableProfiles(request) {
-        return this.client.listAvailableProfiles(request).promise();
+        return this.client.send(new codewhisperer_runtime_1.ListAvailableProfilesCommand(request));
     }
     /**
      * @description Get list of available models
      */
     async listAvailableModels(request) {
-        return this.client.listAvailableModels(request).promise();
+        return this.client.send(new codewhisperer_runtime_1.ListAvailableModelsCommand(request));
     }
     /**
      * @description send telemetry event to code whisperer data warehouse
      */
     async sendTelemetryEvent(request) {
-        return this.client.sendTelemetryEvent(this.withProfileArn(request)).promise();
+        return this.client.send(new codewhisperer_runtime_1.SendTelemetryEventCommand(this.withProfileArn(request)));
     }
     /**
      * @description create a remote workspace
      */
     async createWorkspace(request) {
-        return this.client.createWorkspace(this.withProfileArn(request)).promise();
+        return this.client.send(new codewhisperer_runtime_1.CreateWorkspaceCommand(this.withProfileArn(request)));
     }
     /**
      * @description get list of workspace metadata
      */
     async listWorkspaceMetadata(request) {
-        return this.client.listWorkspaceMetadata(this.withProfileArn(request)).promise();
+        return this.client.send(new codewhisperer_runtime_1.ListWorkspaceMetadataCommand(this.withProfileArn(request)));
     }
     /**
      * @description delete the remote workspace
      */
     async deleteWorkspace(request) {
-        return this.client.deleteWorkspace(this.withProfileArn(request)).promise();
+        return this.client.send(new codewhisperer_runtime_1.DeleteWorkspaceCommand(this.withProfileArn(request)));
     }
     /*
      * @description get the list of feature evaluations
      */
     async listFeatureEvaluations(request) {
-        return this.client.listFeatureEvaluations(this.withProfileArn(request)).promise();
+        return this.client.send(new codewhisperer_runtime_1.ListFeatureEvaluationsCommand(this.withProfileArn(request)));
     }
     /**
      * (debounced by default)
@@ -517,7 +448,7 @@ class CodeWhispererServiceToken extends CodeWhispererServiceBase {
         }
         this.#createSubscriptionTokenPromise = (async () => {
             try {
-                const r = await this.client.createSubscriptionToken(this.withProfileArn(request)).promise();
+                const r = await this.client.send(new codewhisperer_runtime_1.CreateSubscriptionTokenCommand(this.withProfileArn(request)));
                 if (!r.encodedVerificationUrl) {
                     this.logging.error(`setpaidtier
     request: ${JSON.stringify(request)}