@aws/lsp-codewhisperer 0.0.32 → 0.0.33

package/node_modules/@amzn/codewhisperer-streaming/node_modules/@smithy/node-http-handler/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smithy/node-http-handler",
-  "version": "3.3.3",
+  "version": "4.0.4",
   "description": "Provides a way to make requests",
   "scripts": {
     "build": "concurrently 'yarn:build:cjs' 'yarn:build:es' 'yarn:build:types && yarn build:types:downlevel'",
@@ -11,7 +11,7 @@
     "stage-release": "rimraf ./.release && yarn pack && mkdir ./.release && tar zxvf ./package.tgz --directory ./.release && rm ./package.tgz",
     "clean": "rimraf ./dist-* && rimraf *.tsbuildinfo || exit 0",
     "lint": "eslint -c ../../.eslintrc.js \"src/**/*.ts\"",
-    "format": "prettier --config ../../prettier.config.js --ignore-path ../.prettierignore --write \"**/*.{ts,md,json}\"",
+    "format": "prettier --config ../../prettier.config.js --ignore-path ../../.prettierignore --write \"**/*.{ts,md,json}\"",
     "extract:docs": "api-extractor run --local",
     "test": "yarn g:vitest run",
     "test:watch": "yarn g:vitest watch"
@@ -26,21 +26,21 @@
   "module": "./dist-es/index.js",
   "types": "./dist-types/index.d.ts",
   "dependencies": {
-    "@smithy/abort-controller": "^3.1.9",
-    "@smithy/protocol-http": "^4.1.8",
-    "@smithy/querystring-builder": "^3.0.11",
-    "@smithy/types": "^3.7.2",
+    "@smithy/abort-controller": "^4.0.2",
+    "@smithy/protocol-http": "^5.1.0",
+    "@smithy/querystring-builder": "^4.0.2",
+    "@smithy/types": "^4.2.0",
     "tslib": "^2.6.2"
   },
   "devDependencies": {
-    "@types/node": "^16.18.96",
+    "@types/node": "^18.11.9",
     "concurrently": "7.0.0",
     "downlevel-dts": "0.10.1",
     "rimraf": "3.0.2",
     "typedoc": "0.23.23"
   },
   "engines": {
-    "node": ">=16.0.0"
+    "node": ">=18.0.0"
   },
   "typesVersions": {
     "<4.0": {
@@ -52,10 +52,10 @@
   "files": [
     "dist-*/**"
   ],
-  "homepage": "https://github.com/awslabs/smithy-typescript/tree/main/packages/node-http-handler",
+  "homepage": "https://github.com/smithy-lang/smithy-typescript/tree/main/packages/node-http-handler",
   "repository": {
     "type": "git",
-    "url": "https://github.com/awslabs/smithy-typescript.git",
+    "url": "https://github.com/smithy-lang/smithy-typescript.git",
     "directory": "packages/node-http-handler"
   },
   "typedoc": {

package/node_modules/@amzn/codewhisperer-streaming/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@amzn/codewhisperer-streaming",
     "description": "@amzn/codewhisperer-streaming client",
-    "version": "1.0.0",
+    "version": "1.0.6",
     "scripts": {
         "build": "concurrently 'npm:build:cjs' 'npm:build:es' 'npm:build:types'",
         "build:cjs": "tsc -p tsconfig.cjs.json",
@@ -19,55 +19,55 @@
         "tslib": "^2.6.2",
         "@aws-crypto/sha256-browser": "5.2.0",
         "@aws-crypto/sha256-js": "5.2.0",
-        "@aws-sdk/core": "3.658.1",
-        "@aws-sdk/middleware-host-header": "3.654.0",
-        "@aws-sdk/middleware-logger": "3.654.0",
-        "@aws-sdk/middleware-recursion-detection": "3.654.0",
-        "@aws-sdk/middleware-user-agent": "3.654.0",
-        "@aws-sdk/region-config-resolver": "3.654.0",
-        "@aws-sdk/token-providers": "3.654.0",
-        "@aws-sdk/types": "3.654.0",
-        "@aws-sdk/util-user-agent-browser": "3.654.0",
-        "@aws-sdk/util-user-agent-node": "3.654.0",
-        "@smithy/config-resolver": "^3.0.8",
-        "@smithy/core": "^2.4.6",
-        "@smithy/eventstream-serde-browser": "^3.0.9",
-        "@smithy/eventstream-serde-config-resolver": "^3.0.6",
-        "@smithy/eventstream-serde-node": "^3.0.8",
-        "@smithy/fetch-http-handler": "^3.2.8",
-        "@smithy/hash-node": "^3.0.6",
-        "@smithy/invalid-dependency": "^3.0.6",
-        "@smithy/middleware-content-length": "^3.0.8",
-        "@smithy/middleware-retry": "^3.0.21",
-        "@smithy/middleware-serde": "^3.0.6",
-        "@smithy/middleware-stack": "^3.0.6",
-        "@smithy/node-config-provider": "^3.1.7",
-        "@smithy/node-http-handler": "^3.2.3",
-        "@smithy/protocol-http": "^4.1.3",
-        "@smithy/smithy-client": "^3.3.5",
-        "@smithy/types": "^3.4.2",
-        "@smithy/url-parser": "^3.0.6",
-        "@smithy/util-base64": "^3.0.0",
-        "@smithy/util-body-length-browser": "^3.0.0",
-        "@smithy/util-body-length-node": "^3.0.0",
-        "@smithy/util-defaults-mode-browser": "^3.0.21",
-        "@smithy/util-defaults-mode-node": "^3.0.21",
-        "@smithy/util-middleware": "^3.0.6",
-        "@smithy/util-retry": "^3.0.6",
-        "@smithy/util-utf8": "^3.0.0",
+        "@aws-sdk/core": "3.731.0",
+        "@aws-sdk/middleware-host-header": "3.731.0",
+        "@aws-sdk/middleware-logger": "3.731.0",
+        "@aws-sdk/middleware-recursion-detection": "3.731.0",
+        "@aws-sdk/middleware-user-agent": "3.731.0",
+        "@aws-sdk/region-config-resolver": "3.731.0",
+        "@aws-sdk/token-providers": "3.731.1",
+        "@aws-sdk/types": "3.731.0",
+        "@aws-sdk/util-user-agent-browser": "3.731.0",
+        "@aws-sdk/util-user-agent-node": "3.731.0",
+        "@smithy/config-resolver": "^4.0.1",
+        "@smithy/core": "^3.1.1",
+        "@smithy/eventstream-serde-browser": "^4.0.1",
+        "@smithy/eventstream-serde-config-resolver": "^4.0.1",
+        "@smithy/eventstream-serde-node": "^4.0.1",
+        "@smithy/fetch-http-handler": "^5.0.1",
+        "@smithy/hash-node": "^4.0.1",
+        "@smithy/invalid-dependency": "^4.0.1",
+        "@smithy/middleware-content-length": "^4.0.1",
+        "@smithy/middleware-retry": "^4.0.3",
+        "@smithy/middleware-serde": "^4.0.1",
+        "@smithy/middleware-stack": "^4.0.1",
+        "@smithy/node-config-provider": "^4.0.1",
+        "@smithy/node-http-handler": "^4.0.2",
+        "@smithy/protocol-http": "^5.0.1",
+        "@smithy/smithy-client": "^4.1.2",
+        "@smithy/types": "^4.1.0",
+        "@smithy/url-parser": "^4.0.1",
+        "@smithy/util-base64": "^4.0.0",
+        "@smithy/util-body-length-browser": "^4.0.0",
+        "@smithy/util-body-length-node": "^4.0.0",
+        "@smithy/util-defaults-mode-browser": "^4.0.3",
+        "@smithy/util-defaults-mode-node": "^4.0.3",
+        "@smithy/util-middleware": "^4.0.1",
+        "@smithy/util-retry": "^4.0.1",
+        "@smithy/util-utf8": "^4.0.0",
+        "@types/uuid": "^9.0.1",
         "uuid": "^9.0.1"
     },
     "devDependencies": {
-        "@tsconfig/node16": "16.1.3",
+        "@tsconfig/node18": "18.2.4",
         "concurrently": "7.0.0",
         "downlevel-dts": "0.10.1",
         "rimraf": "^3.0.0",
-        "typescript": "~4.9.5",
-        "@types/node": "^16.18.96",
-        "@types/uuid": "^9.0.4"
+        "typescript": "~5.2.2",
+        "@types/node": "^18.19.69"
     },
     "engines": {
-        "node": ">=16.0.0"
+        "node": ">=18.0.0"
     },
     "typesVersions": {
         "<4.0": {

package/node_modules/@smithy/protocol-http/dist-cjs/extensions/httpExtensionConfiguration.js

@@ -0,0 +1 @@
+module.exports = require("../index.js");

package/node_modules/@smithy/protocol-http/dist-cjs/extensions/index.js

@@ -0,0 +1 @@
+module.exports = require("../index.js");

package/node_modules/@smithy/protocol-http/dist-cjs/httpRequest.js

@@ -0,0 +1 @@
+module.exports = require("./index.js");

package/node_modules/@smithy/protocol-http/dist-cjs/httpResponse.js

@@ -0,0 +1 @@
+module.exports = require("./index.js");

package/node_modules/{@amzn/codewhisperer-streaming/node_modules/@smithy → @smithy}/protocol-http/dist-cjs/index.js

@@ -24,7 +24,6 @@ __export(src_exports, {
   Fields: () => Fields,
   HttpRequest: () => HttpRequest,
   HttpResponse: () => HttpResponse,
-  IHttpRequest: () => import_types.HttpRequest,
   getHttpHandlerExtensionConfiguration: () => getHttpHandlerExtensionConfiguration,
   isValidHostname: () => isValidHostname,
   resolveHttpHandlerRuntimeConfig: () => resolveHttpHandlerRuntimeConfig
@@ -157,7 +156,6 @@ __name(_Fields, "Fields");
 var Fields = _Fields;
 
 // src/httpRequest.ts
-
 var _HttpRequest = class _HttpRequest {
   constructor(options) {
     this.method = options.method || "GET";
@@ -172,40 +170,20 @@ var _HttpRequest = class _HttpRequest {
     this.password = options.password;
     this.fragment = options.fragment;
   }
-  /**
-   * Note: this does not deep-clone the body.
-   */
-  static clone(request) {
-    const cloned = new _HttpRequest({
-      ...request,
-      headers: { ...request.headers }
-    });
-    if (cloned.query) {
-      cloned.query = cloneQuery(cloned.query);
-    }
-    return cloned;
-  }
-  /**
-   * This method only actually asserts that request is the interface {@link IHttpRequest},
-   * and not necessarily this concrete class. Left in place for API stability.
-   *
-   * Do not call instance methods on the input of this function, and
-   * do not assume it has the HttpRequest prototype.
-   */
   static isInstance(request) {
-    if (!request) {
+    if (!request)
       return false;
-    }
     const req = request;
     return "method" in req && "protocol" in req && "hostname" in req && "path" in req && typeof req["query"] === "object" && typeof req["headers"] === "object";
   }
-  /**
-   * @deprecated use static HttpRequest.clone(request) instead. It's not safe to call
-   * this method because {@link HttpRequest.isInstance} incorrectly
-   * asserts that IHttpRequest (interface) objects are of type HttpRequest (class).
-   */
   clone() {
-    return _HttpRequest.clone(this);
+    const cloned = new _HttpRequest({
+      ...this,
+      headers: { ...this.headers }
+    });
+    if (cloned.query)
+      cloned.query = cloneQuery(cloned.query);
+    return cloned;
   }
 };
 __name(_HttpRequest, "HttpRequest");

package/node_modules/@smithy/protocol-http/dist-cjs/isValidHostname.js

@@ -0,0 +1 @@
+module.exports = require("./index.js");

package/node_modules/@smithy/protocol-http/dist-cjs/types.js

@@ -0,0 +1 @@
+module.exports = require("./index.js");

package/node_modules/@smithy/protocol-http/dist-es/httpHandler.js

@@ -0,0 +1 @@
+export {};

package/node_modules/{@amzn/codewhisperer-streaming/node_modules/@smithy → @smithy}/protocol-http/dist-es/httpRequest.js

@@ -16,20 +16,9 @@ export class HttpRequest {
         this.password = options.password;
         this.fragment = options.fragment;
     }
-    static clone(request) {
-        const cloned = new HttpRequest({
-            ...request,
-            headers: { ...request.headers },
-        });
-        if (cloned.query) {
-            cloned.query = cloneQuery(cloned.query);
-        }
-        return cloned;
-    }
     static isInstance(request) {
-        if (!request) {
+        if (!request)
             return false;
-        }
         const req = request;
         return ("method" in req &&
             "protocol" in req &&
@@ -39,7 +28,13 @@ export class HttpRequest {
             typeof req["headers"] === "object");
     }
     clone() {
-        return HttpRequest.clone(this);
+        const cloned = new HttpRequest({
+            ...this,
+            headers: { ...this.headers },
+        });
+        if (cloned.query)
+            cloned.query = cloneQuery(cloned.query);
+        return cloned;
     }
 }
 function cloneQuery(query) {

package/node_modules/@smithy/protocol-http/dist-es/types.js

@@ -0,0 +1 @@
+export {};

package/node_modules/@smithy/protocol-http/dist-types/httpRequest.d.ts

@@ -0,0 +1,23 @@
+import { HeaderBag, HttpMessage, HttpRequest as IHttpRequest, QueryParameterBag, URI } from "@smithy/types";
+type HttpRequestOptions = Partial<HttpMessage> & Partial<URI> & {
+    method?: string;
+};
+export interface HttpRequest extends IHttpRequest {
+}
+export declare class HttpRequest implements HttpMessage, URI {
+    method: string;
+    protocol: string;
+    hostname: string;
+    port?: number;
+    path: string;
+    query: QueryParameterBag;
+    headers: HeaderBag;
+    username?: string;
+    password?: string;
+    fragment?: string;
+    body?: any;
+    constructor(options: HttpRequestOptions);
+    static isInstance(request: unknown): request is HttpRequest;
+    clone(): HttpRequest;
+}
+export {};

package/node_modules/@smithy/protocol-http/dist-types/ts3.4/httpRequest.d.ts

@@ -0,0 +1,23 @@
+import { HeaderBag, HttpMessage, HttpRequest as IHttpRequest, QueryParameterBag, URI } from "@smithy/types";
+type HttpRequestOptions = Partial<HttpMessage> & Partial<URI> & {
+    method?: string;
+};
+export interface HttpRequest extends IHttpRequest {
+}
+export declare class HttpRequest implements HttpMessage, URI {
+    method: string;
+    protocol: string;
+    hostname: string;
+    port?: number;
+    path: string;
+    query: QueryParameterBag;
+    headers: HeaderBag;
+    username?: string;
+    password?: string;
+    fragment?: string;
+    body?: any;
+    constructor(options: HttpRequestOptions);
+    static isInstance(request: unknown): request is HttpRequest;
+    clone(): HttpRequest;
+}
+export {};

package/node_modules/{@amzn/codewhisperer-streaming/node_modules/@smithy → @smithy}/protocol-http/package.json

@@ -1,18 +1,17 @@
 {
   "name": "@smithy/protocol-http",
-  "version": "4.1.8",
+  "version": "3.3.0",
   "scripts": {
     "build": "concurrently 'yarn:build:cjs' 'yarn:build:es' 'yarn:build:types && yarn build:types:downlevel'",
     "build:cjs": "node ../../scripts/inline protocol-http",
     "build:es": "yarn g:tsc -p tsconfig.es.json",
     "build:types": "yarn g:tsc -p tsconfig.types.json",
-    "build:types:downlevel": "rimraf dist-types/ts3.4 && downlevel-dts dist-types dist-types/ts3.4",
+    "build:types:downlevel": "downlevel-dts dist-types dist-types/ts3.4",
     "stage-release": "rimraf ./.release && yarn pack && mkdir ./.release && tar zxvf ./package.tgz --directory ./.release && rm ./package.tgz",
     "clean": "rimraf ./dist-* && rimraf *.tsbuildinfo || exit 0",
     "lint": "eslint -c ../../.eslintrc.js \"src/**/*.ts\"",
     "format": "prettier --config ../../prettier.config.js --ignore-path ../.prettierignore --write \"**/*.{ts,md,json}\"",
-    "test": "yarn g:vitest run",
-    "test:watch": "yarn g:vitest watch"
+    "test": "yarn g:jest"
   },
   "main": "./dist-cjs/index.js",
   "module": "./dist-es/index.js",
@@ -24,11 +23,11 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@smithy/types": "^3.7.2",
+    "@smithy/types": "^2.12.0",
     "tslib": "^2.6.2"
   },
   "engines": {
-    "node": ">=16.0.0"
+    "node": ">=14.0.0"
   },
   "typesVersions": {
     "<4.0": {
@@ -47,6 +46,7 @@
     "directory": "packages/protocol-http"
   },
   "devDependencies": {
+    "@tsconfig/recommended": "1.0.1",
     "concurrently": "7.0.0",
     "downlevel-dts": "0.10.1",
     "rimraf": "3.0.2",

package/out/client/sigv4/codewhisperer.d.ts

@@ -1,5 +1,5 @@
 import { ServiceConfigurationOptions } from 'aws-sdk/lib/service';
 import CodeWhispererClient = require('./codewhisperersigv4client');
-import { SDKInitializator } from '@aws/language-server-runtimes/server-interface';
+import { SDKInitializator, Logging } from '@aws/language-server-runtimes/server-interface';
 export type CodeWhispererSigv4ClientConfigurationOptions = ServiceConfigurationOptions;
-export declare function createCodeWhispererSigv4Client(options: ServiceConfigurationOptions, sdkInitializator: SDKInitializator): CodeWhispererClient;
+export declare function createCodeWhispererSigv4Client(options: ServiceConfigurationOptions, sdkInitializator: SDKInitializator, logging: Logging): CodeWhispererClient;

package/out/client/sigv4/codewhisperer.js

@@ -3,10 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createCodeWhispererSigv4Client = createCodeWhispererSigv4Client;
 const aws_sdk_1 = require("aws-sdk");
 const apiConfig = require('./service.json');
-function createCodeWhispererSigv4Client(options, sdkInitializator) {
-    return createService(options, sdkInitializator);
+function createCodeWhispererSigv4Client(options, sdkInitializator, logging) {
+    return createService(options, sdkInitializator, logging);
 }
-function createService(options, sdkInitializator) {
+function createService(options, sdkInitializator, logging) {
+    logging.log(`Passing client for class Service to sdkInitializator (v2) for additional setup (e.g. proxy)`);
     const client = sdkInitializator.v2(aws_sdk_1.Service, { apiConfig, ...options });
     return client;
 }

package/out/client/sigv4/codewhisperer.js.map

@@ -1 +1 @@
-{"version":3,"file":"codewhisperer.js","sourceRoot":"","sources":["../../../src/client/sigv4/codewhisperer.ts"],"names":[],"mappings":";;AAQA,wEAKC;AAbD,qCAAiC;AAEjC,MAAM,SAAS,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAA;AAM3C,SAAgB,8BAA8B,CAC1C,OAAoC,EACpC,gBAAkC;IAElC,OAAO,aAAa,CAAC,OAAO,EAAE,gBAAgB,CAAwB,CAAA;AAC1E,CAAC;AAED,SAAS,aAAa,CAAC,OAAoC,EAAE,gBAAkC;IAC3F,MAAM,MAAM,GAAG,gBAAgB,CAAC,EAAE,CAAC,iBAAO,EAAE,EAAE,SAAS,EAAE,GAAG,OAAO,EAAS,CAAC,CAAA;IAC7E,OAAO,MAAM,CAAA;AACjB,CAAC"}
+{"version":3,"file":"codewhisperer.js","sourceRoot":"","sources":["../../../src/client/sigv4/codewhisperer.ts"],"names":[],"mappings":";;AAQA,wEAMC;AAdD,qCAAiC;AAEjC,MAAM,SAAS,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAA;AAM3C,SAAgB,8BAA8B,CAC1C,OAAoC,EACpC,gBAAkC,EAClC,OAAgB;IAEhB,OAAO,aAAa,CAAC,OAAO,EAAE,gBAAgB,EAAE,OAAO,CAAwB,CAAA;AACnF,CAAC;AAED,SAAS,aAAa,CAClB,OAAoC,EACpC,gBAAkC,EAClC,OAAgB;IAEhB,OAAO,CAAC,GAAG,CAAC,6FAA6F,CAAC,CAAA;IAC1G,MAAM,MAAM,GAAG,gBAAgB,CAAC,EAAE,CAAC,iBAAO,EAAE,EAAE,SAAS,EAAE,GAAG,OAAO,EAAS,CAAC,CAAA;IAC7E,OAAO,MAAM,CAAA;AACjB,CAAC"}

package/out/client/streamingClient/codewhispererStreamingClient.d.ts

@@ -1,6 +1,6 @@
 import { CodeWhispererStreaming, CodeWhispererStreamingClientConfig } from '@amzn/codewhisperer-streaming';
-import { SDKInitializator } from '@aws/language-server-runtimes/server-interface';
+import { SDKInitializator, Logging } from '@aws/language-server-runtimes/server-interface';
 export declare class StreamingClient {
-    getStreamingClient(credentialsProvider: any, codeWhispererRegion: string, codeWhispererEndpoint: string, sdkInitializator: SDKInitializator, config?: CodeWhispererStreamingClientConfig): Promise<CodeWhispererStreaming>;
+    getStreamingClient(credentialsProvider: any, codeWhispererRegion: string, codeWhispererEndpoint: string, sdkInitializator: SDKInitializator, logging: Logging, config?: CodeWhispererStreamingClientConfig): Promise<CodeWhispererStreaming>;
 }
-export declare function createStreamingClient(credentialsProvider: any, codeWhispererRegion: string, codeWhispererEndpoint: string, sdkInitializator: SDKInitializator, config?: CodeWhispererStreamingClientConfig): Promise<CodeWhispererStreaming>;
+export declare function createStreamingClient(credentialsProvider: any, codeWhispererRegion: string, codeWhispererEndpoint: string, sdkInitializator: SDKInitializator, logging: Logging, config?: CodeWhispererStreamingClientConfig): Promise<CodeWhispererStreaming>;

package/out/client/streamingClient/codewhispererStreamingClient.js

@@ -6,13 +6,14 @@ const codewhisperer_streaming_1 = require("@amzn/codewhisperer-streaming");
 const util_retry_1 = require("@aws-sdk/util-retry");
 // TODO: refactor and combine with language-server/streamingClientService.ts when no longer in use
 class StreamingClient {
-    async getStreamingClient(credentialsProvider, codeWhispererRegion, codeWhispererEndpoint, sdkInitializator, config) {
-        return await createStreamingClient(credentialsProvider, codeWhispererRegion, codeWhispererEndpoint, sdkInitializator, config);
+    async getStreamingClient(credentialsProvider, codeWhispererRegion, codeWhispererEndpoint, sdkInitializator, logging, config) {
+        return await createStreamingClient(credentialsProvider, codeWhispererRegion, codeWhispererEndpoint, sdkInitializator, logging, config);
     }
 }
 exports.StreamingClient = StreamingClient;
-async function createStreamingClient(credentialsProvider, codeWhispererRegion, codeWhispererEndpoint, sdkInitializator, config) {
+async function createStreamingClient(credentialsProvider, codeWhispererRegion, codeWhispererEndpoint, sdkInitializator, logging, config) {
     const creds = credentialsProvider.getCredentials('bearer');
+    logging.log(`Passing client for class CodeWhispererStreaming to sdkInitializator (v3) for additional setup (e.g. proxy)`);
     const streamingClient = sdkInitializator(codewhisperer_streaming_1.CodeWhispererStreaming, {
         region: codeWhispererRegion,
         endpoint: codeWhispererEndpoint,

package/out/client/streamingClient/codewhispererStreamingClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"codewhispererStreamingClient.js","sourceRoot":"","sources":["../../../src/client/streamingClient/codewhispererStreamingClient.ts"],"names":[],"mappings":";;;AAsBA,sDAiBC;AAvCD,2EAA0G;AAC1G,oDAA6D;AAG7D,kGAAkG;AAClG,MAAa,eAAe;IACjB,KAAK,CAAC,kBAAkB,CAC3B,mBAAwB,EACxB,mBAA2B,EAC3B,qBAA6B,EAC7B,gBAAkC,EAClC,MAA2C;QAE3C,OAAO,MAAM,qBAAqB,CAC9B,mBAAmB,EACnB,mBAAmB,EACnB,qBAAqB,EACrB,gBAAgB,EAChB,MAAM,CACT,CAAA;IACL,CAAC;CACJ;AAhBD,0CAgBC;AACM,KAAK,UAAU,qBAAqB,CACvC,mBAAwB,EACxB,mBAA2B,EAC3B,qBAA6B,EAC7B,gBAAkC,EAClC,MAA2C;IAE3C,MAAM,KAAK,GAAG,mBAAmB,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAA;IAE1D,MAAM,eAAe,GAAG,gBAAgB,CAAC,gDAAsB,EAAE;QAC7D,MAAM,EAAE,mBAAmB;QAC3B,QAAQ,EAAE,qBAAqB;QAC/B,KAAK,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE;QAC7B,aAAa,EAAE,IAAI,oCAAuB,CAAC,CAAC,EAAE,CAAC,OAAe,EAAE,EAAE,CAAC,GAAG,GAAG,OAAO,IAAI,EAAE,CAAC;QACvF,GAAG,MAAM;KACZ,CAAC,CAAA;IACF,OAAO,eAAe,CAAA;AAC1B,CAAC"}
+{"version":3,"file":"codewhispererStreamingClient.js","sourceRoot":"","sources":["../../../src/client/streamingClient/codewhispererStreamingClient.ts"],"names":[],"mappings":";;;AAwBA,sDAqBC;AA7CD,2EAA0G;AAC1G,oDAA6D;AAG7D,kGAAkG;AAClG,MAAa,eAAe;IACjB,KAAK,CAAC,kBAAkB,CAC3B,mBAAwB,EACxB,mBAA2B,EAC3B,qBAA6B,EAC7B,gBAAkC,EAClC,OAAgB,EAChB,MAA2C;QAE3C,OAAO,MAAM,qBAAqB,CAC9B,mBAAmB,EACnB,mBAAmB,EACnB,qBAAqB,EACrB,gBAAgB,EAChB,OAAO,EACP,MAAM,CACT,CAAA;IACL,CAAC;CACJ;AAlBD,0CAkBC;AACM,KAAK,UAAU,qBAAqB,CACvC,mBAAwB,EACxB,mBAA2B,EAC3B,qBAA6B,EAC7B,gBAAkC,EAClC,OAAgB,EAChB,MAA2C;IAE3C,MAAM,KAAK,GAAG,mBAAmB,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAA;IAE1D,OAAO,CAAC,GAAG,CACP,4GAA4G,CAC/G,CAAA;IACD,MAAM,eAAe,GAAG,gBAAgB,CAAC,gDAAsB,EAAE;QAC7D,MAAM,EAAE,mBAAmB;QAC3B,QAAQ,EAAE,qBAAqB;QAC/B,KAAK,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE;QAC7B,aAAa,EAAE,IAAI,oCAAuB,CAAC,CAAC,EAAE,CAAC,OAAe,EAAE,EAAE,CAAC,GAAG,GAAG,OAAO,IAAI,EAAE,CAAC;QACvF,GAAG,MAAM;KACZ,CAAC,CAAA;IACF,OAAO,eAAe,CAAA;AAC1B,CAAC"}

package/out/client/token/codewhisperer.d.ts

@@ -1,7 +1,7 @@
 import { AWSError } from 'aws-sdk';
 import { ServiceConfigurationOptions } from 'aws-sdk/lib/service';
 import CodeWhispererClient = require('./codewhispererbearertokenclient');
-import { SDKInitializator } from '@aws/language-server-runtimes/server-interface';
+import { SDKInitializator, Logging } from '@aws/language-server-runtimes/server-interface';
 export interface RequestExtras {
     readonly service: AWS.Service;
     readonly operation: string;
@@ -11,5 +11,5 @@ type RequestListener = (request: AWS.Request<any, AWSError> & RequestExtras) =>
 export interface CodeWhispererTokenClientConfigurationOptions extends ServiceConfigurationOptions {
     onRequestSetup?: RequestListener | RequestListener[];
 }
-export declare function createCodeWhispererTokenClient(options: CodeWhispererTokenClientConfigurationOptions, sdkInitializator: SDKInitializator): CodeWhispererClient;
+export declare function createCodeWhispererTokenClient(options: CodeWhispererTokenClientConfigurationOptions, sdkInitializator: SDKInitializator, logging: Logging): CodeWhispererClient;
 export {};

package/out/client/token/codewhisperer.js

@@ -3,14 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createCodeWhispererTokenClient = createCodeWhispererTokenClient;
 const aws_sdk_1 = require("aws-sdk");
 const apiConfig = require('./bearer-token-service.json');
-function createCodeWhispererTokenClient(options, sdkInitializator) {
-    return createService(options, sdkInitializator);
+function createCodeWhispererTokenClient(options, sdkInitializator, logging) {
+    return createService(options, sdkInitializator, logging);
 }
-function createService(options, sdkInitializator) {
+function createService(options, sdkInitializator, logging) {
     const onRequest = options?.onRequestSetup ?? [];
     const listeners = Array.isArray(onRequest) ? onRequest : [onRequest];
     const opt = { ...options };
     delete opt.onRequestSetup;
+    logging.log(`Passing client for class Service to sdkInitializator (v2) for additional setup (e.g. proxy)`);
     const client = sdkInitializator.v2(aws_sdk_1.Service, { apiConfig, ...options });
     const originalClient = client.setupRequestListeners.bind(client);
     client.setupRequestListeners = (request) => {

package/out/client/token/codewhisperer.js.map

@@ -1 +1 @@
-{"version":3,"file":"codewhisperer.js","sourceRoot":"","sources":["../../../src/client/token/codewhisperer.ts"],"names":[],"mappings":";;AAsBA,wEAKC;AA3BD,qCAAoD;AAEpD,MAAM,SAAS,GAAG,OAAO,CAAC,6BAA6B,CAAC,CAAA;AAoBxD,SAAgB,8BAA8B,CAC1C,OAAqD,EACrD,gBAAkC;IAElC,OAAO,aAAa,CAAC,OAAO,EAAE,gBAAgB,CAAwB,CAAA;AAC1E,CAAC;AAED,SAAS,aAAa,CAClB,OAAqD,EACrD,gBAAkC;IAElC,MAAM,SAAS,GAAG,OAAO,EAAE,cAAc,IAAI,EAAE,CAAA;IAC/C,MAAM,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;IACpE,MAAM,GAAG,GAAG,EAAE,GAAG,OAAO,EAAE,CAAA;IAC1B,OAAO,GAAG,CAAC,cAAc,CAAA;IACzB,MAAM,MAAM,GAAG,gBAAgB,CAAC,EAAE,CAAC,iBAAO,EAAE,EAAE,SAAS,EAAE,GAAG,OAAO,EAAS,CAAC,CAAA;IAC7E,MAAM,cAAc,GAAG,MAAM,CAAC,qBAAqB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IAEhE,MAAM,CAAC,qBAAqB,GAAG,CAAC,OAA+B,EAAE,EAAE;QAC/D,cAAc,CAAC,OAAO,CAAC,CAAA;QACvB,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAqD,CAAC,CAAC,CAAA;IACpF,CAAC,CAAA;IAED,OAAO,MAAM,CAAA;AACjB,CAAC"}
+{"version":3,"file":"codewhisperer.js","sourceRoot":"","sources":["../../../src/client/token/codewhisperer.ts"],"names":[],"mappings":";;AAqBA,wEAMC;AA3BD,qCAAoD;AAEpD,MAAM,SAAS,GAAG,OAAO,CAAC,6BAA6B,CAAC,CAAA;AAmBxD,SAAgB,8BAA8B,CAC1C,OAAqD,EACrD,gBAAkC,EAClC,OAAgB;IAEhB,OAAO,aAAa,CAAC,OAAO,EAAE,gBAAgB,EAAE,OAAO,CAAwB,CAAA;AACnF,CAAC;AAED,SAAS,aAAa,CAClB,OAAqD,EACrD,gBAAkC,EAClC,OAAgB;IAEhB,MAAM,SAAS,GAAG,OAAO,EAAE,cAAc,IAAI,EAAE,CAAA;IAC/C,MAAM,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;IACpE,MAAM,GAAG,GAAG,EAAE,GAAG,OAAO,EAAE,CAAA;IAC1B,OAAO,GAAG,CAAC,cAAc,CAAA;IACzB,OAAO,CAAC,GAAG,CAAC,6FAA6F,CAAC,CAAA;IAC1G,MAAM,MAAM,GAAG,gBAAgB,CAAC,EAAE,CAAC,iBAAO,EAAE,EAAE,SAAS,EAAE,GAAG,OAAO,EAAS,CAAC,CAAA;IAC7E,MAAM,cAAc,GAAG,MAAM,CAAC,qBAAqB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IAEhE,MAAM,CAAC,qBAAqB,GAAG,CAAC,OAA+B,EAAE,EAAE;QAC/D,cAAc,CAAC,OAAO,CAAC,CAAA;QACvB,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAqD,CAAC,CAAC,CAAA;IACpF,CAAC,CAAA;IAED,OAAO,MAAM,CAAA;AACjB,CAAC"}

package/out/index.d.ts

@@ -4,3 +4,4 @@ export * from './language-server/chat/qChatServer';
 export * as QAgenticChatServer from './language-server/agenticChat/qAgenticChatServer';
 export * from './shared/proxy-server';
 export * from './language-server/netTransform/netTransformServer';
+export { AmazonQServiceServerIAM, AmazonQServiceServerToken } from './shared/amazonQServer';

package/out/index.js

@@ -14,11 +14,14 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.QAgenticChatServer = void 0;
+exports.AmazonQServiceServerToken = exports.AmazonQServiceServerIAM = exports.QAgenticChatServer = void 0;
 __exportStar(require("./language-server/securityScan/codeWhispererSecurityScanServer"), exports);
 __exportStar(require("./language-server/inline-completion/codeWhispererServer"), exports);
 __exportStar(require("./language-server/chat/qChatServer"), exports);
 exports.QAgenticChatServer = require("./language-server/agenticChat/qAgenticChatServer");
 __exportStar(require("./shared/proxy-server"), exports);
 __exportStar(require("./language-server/netTransform/netTransformServer"), exports);
+var amazonQServer_1 = require("./shared/amazonQServer");
+Object.defineProperty(exports, "AmazonQServiceServerIAM", { enumerable: true, get: function () { return amazonQServer_1.AmazonQServiceServerIAM; } });
+Object.defineProperty(exports, "AmazonQServiceServerToken", { enumerable: true, get: function () { return amazonQServer_1.AmazonQServiceServerToken; } });
 //# sourceMappingURL=index.js.map

package/out/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,iGAA8E;AAC9E,0FAAuE;AACvE,qEAAkD;AAClD,yFAAsF;AACtF,wDAAqC;AACrC,oFAAiE"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,iGAA8E;AAC9E,0FAAuE;AACvE,qEAAkD;AAClD,yFAAsF;AACtF,wDAAqC;AACrC,oFAAiE;AACjE,wDAA2F;AAAlF,wHAAA,uBAAuB,OAAA;AAAE,0HAAA,yBAAyB,OAAA"}

package/out/language-server/agenticChat/agenticChatController.d.ts

@@ -2,27 +2,52 @@
  * Copied from ../chat/chatController.ts for the purpose of developing a divergent implementation.
  * Will be deleted or merged.
  */
-import { FeedbackParams, InsertToCursorPositionParams, InlineChatParams } from '@aws/language-server-runtimes/protocol';
+import { ToolUse } from '@amzn/codewhisperer-streaming';
+import { ButtonClickParams, ButtonClickResult, InlineChatResultParams, PromptInputOptionChangeParams } from '@aws/language-server-runtimes/protocol';
+import { FeedbackParams, InsertToCursorPositionParams, InlineChatParams, ConversationClickParams, ListConversationsParams, TabBarActionParams, CreatePromptParams, FileClickParams } from '@aws/language-server-runtimes/protocol';
 import { CancellationToken, Chat, ChatParams, ChatResult, EndChatParams, QuickActionParams, ResponseError, TabAddParams, TabRemoveParams, TabChangeParams, InlineChatResult } from '@aws/language-server-runtimes/server-interface';
 import { Features, LspHandlers } from '../types';
 import { ChatSessionManagementService } from '../chat/chatSessionManagementService';
 import { TelemetryService } from '../../shared/telemetry/telemetryService';
 import { AmazonQTokenServiceManager } from '../../shared/amazonQServiceManager/AmazonQTokenServiceManager';
 import { AmazonQWorkspaceConfig } from '../../shared/amazonQServiceManager/configurationUtils';
-type ChatHandlers = Omit<LspHandlers<Chat>, 'openTab' | 'sendChatUpdate' | 'onFileClicked' | 'onInlineChatPrompt' | 'sendContextCommands' | 'onCreatePrompt' | 'onListConversations' | 'onConversationClick'>;
+import { ChatSessionService } from '../chat/chatSessionService';
+import { AgenticChatResultStream } from './agenticChatResultStream';
+type ChatHandlers = Omit<LspHandlers<Chat>, 'openTab' | 'sendChatUpdate' | 'sendContextCommands' | 'onListConversations' | 'onConversationClick' | 'onTabBarAction' | 'getSerializedChat' | 'chatOptionsUpdate'>;
 export declare class AgenticChatController implements ChatHandlers {
     #private;
-    constructor(chatSessionManagementService: ChatSessionManagementService, features: Features, telemetryService: TelemetryService, amazonQServiceManager?: AmazonQTokenServiceManager);
+    constructor(chatSessionManagementService: ChatSessionManagementService, features: Features, telemetryService: TelemetryService, serviceManager?: AmazonQTokenServiceManager);
+    onButtonClick(params: ButtonClickParams): Promise<ButtonClickResult>;
+    onCreatePrompt(params: CreatePromptParams): Promise<void>;
     dispose(): void;
+    onListConversations(params: ListConversationsParams): Promise<import("@aws/language-server-runtimes/protocol").ListConversationsResult>;
+    onConversationClick(params: ConversationClickParams): Promise<import("@aws/language-server-runtimes/protocol").ConversationClickResult>;
     onChatPrompt(params: ChatParams, token: CancellationToken): Promise<ChatResult | ResponseError<ChatResult>>;
+    /**
+     * Creates a promise that does not resolve until the user accepts or rejects the tool usage.
+     * @param toolUseId
+     * @param toolUseName
+     * @param resultStream
+     * @param promptBlockId id of approval block. This allows us to overwrite the buttons with 'accepted' or 'rejected' text.
+     * @param session
+     */
+    waitForToolApproval(toolUse: ToolUse, resultStream: AgenticChatResultStream, promptBlockId: number, session: ChatSessionService): Promise<void>;
+    /**
+     * Determines if error is thrown as a result of a user action (Ex. rejecting tool, stop button)
+     * @param err
+     * @returns
+     */
+    isUserAction(err: unknown, token?: CancellationToken): boolean;
     onInlineChatPrompt(params: InlineChatParams, token: CancellationToken): Promise<InlineChatResult | ResponseError<InlineChatResult>>;
+    onInlineChatResult(handler: InlineChatResultParams): Promise<void>;
     onCodeInsertToCursorPosition(params: InsertToCursorPositionParams): Promise<void>;
     onCopyCodeToClipboard(): void;
     onEndChat(params: EndChatParams, _token: CancellationToken): boolean;
+    onFileClicked(params: FileClickParams): Promise<void>;
     onFollowUpClicked(): void;
     onInfoLinkClick(): void;
     onLinkClick(): void;
-    onReady(): void;
+    onReady(): Promise<void>;
     onSendFeedback({ tabId, feedbackPayload }: FeedbackParams): void;
     onSourceLinkClick(): void;
     onTabAdd(params: TabAddParams): void;
@@ -35,6 +60,12 @@ export declare class AgenticChatController implements ChatHandlers {
         messageId: string;
         body: string;
     };
+    onTabBarAction(params: TabBarActionParams): Promise<{
+        success: boolean;
+        tabId?: string;
+        action: import("@aws/language-server-runtimes/protocol").TabBarAction;
+    }>;
+    onPromptInputOptionChange(params: PromptInputOptionChangeParams): void;
     updateConfiguration: (newConfig: AmazonQWorkspaceConfig) => void;
 }
 export {};