@aws/lsp-codewhisperer 0.0.32 → 0.0.33

package/out/shared/telemetry/types.d.ts

@@ -132,6 +132,9 @@ export interface TransformationJobArtifactsDownloadedEvent {
     transformationJobId: string;
     error: string;
 }
+export interface PollingCancelledEvent {
+    CancelPollingEnabled: Boolean;
+}
 export interface TransformationFailureEvent {
     [key: string]: any;
     category: string;
@@ -147,7 +150,9 @@ export declare enum ChatTelemetryEventName {
     AddMessage = "amazonq_addMessage",
     RunCommand = "amazonq_runCommand",
     MessageResponseError = "amazonq_messageResponseError",
-    ModifyCode = "amazonq_modifyCode"
+    ModifyCode = "amazonq_modifyCode",
+    ToolUseSuggested = "amazonq_toolUseSuggested",
+    InteractWithAgenticChat = "amazonq_interactWithAgenticChat"
 }
 export interface ChatTelemetryEventMap {
     [ChatTelemetryEventName.EnterFocusChat]: EnterFocusChatEvent;
@@ -160,7 +165,23 @@ export interface ChatTelemetryEventMap {
     [ChatTelemetryEventName.RunCommand]: RunCommandEvent;
     [ChatTelemetryEventName.MessageResponseError]: MessageResponseErrorEvent;
     [ChatTelemetryEventName.ModifyCode]: ModifyCodeEvent;
+    [ChatTelemetryEventName.ToolUseSuggested]: ToolUseSuggestedEvent;
+    [ChatTelemetryEventName.InteractWithAgenticChat]: InteractWithAgenticChatEvent;
 }
+export type ToolUseSuggestedEvent = {
+    credentialStartUrl?: string;
+    cwsprChatConversationId: string;
+    cwsprChatConversationType: ChatConversationType;
+    cwsprToolName: string;
+    cwsprToolUseId: string;
+    languageServerVersion?: string;
+};
+export type InteractWithAgenticChatEvent = {
+    credentialStartUrl?: string;
+    cwsprChatConversationId: string;
+    cwsprChatConversationType: ChatConversationType;
+    cwsprAgenticChatInteractionType: AgenticChatInteractionType;
+};
 export type ModifyCodeEvent = {
     cwsprChatConversationId: string;
     cwsprChatMessageId: string;
@@ -190,6 +211,18 @@ export type AddMessageEvent = {
     cwsprChatResponseLength?: number;
     cwsprChatConversationType: ChatConversationType;
     codewhispererCustomizationArn?: string;
+    languageServerVersion?: string;
+    cwsprChatHasContextList?: boolean;
+    cwsprChatFolderContextCount?: number;
+    cwsprChatFileContextCount?: number;
+    cwsprChatFileContextLength?: number;
+    cwsprChatRuleContextCount?: number;
+    cwsprChatRuleContextLength?: number;
+    cwsprChatPromptContextCount?: number;
+    cwsprChatPromptContextLength?: number;
+    cwsprChatFocusFileContextLength?: number;
+    cwsprChatCodeContextCount?: number;
+    cwsprChatCodeContextLength?: number;
 };
 export type EnterFocusChatEvent = {
     credentialStartUrl?: string;
@@ -216,7 +249,8 @@ export declare enum ChatInteractionType {
     Downvote = "downvote",
     ClickBodyLink = "clickBodyLink"
 }
-export type ChatConversationType = 'Chat' | 'Assign' | 'Transform';
+export type ChatConversationType = 'Chat' | 'Assign' | 'Transform' | 'AgenticChat' | 'AgenticChatWithToolUse';
+export type AgenticChatInteractionType = 'RejectDiff' | 'GeneratedDiff' | 'RunCommand' | 'GeneratedCommand' | 'StopChat';
 export type InteractWithMessageEvent = {
     credentialStartUrl?: string;
     cwsprChatConversationId: string;
@@ -250,6 +284,7 @@ export type MessageResponseErrorEvent = {
     cwsprChatRepsonseCode: number;
     cwsprChatRequestLength?: number;
     cwsprChatConversationType: ChatConversationType;
+    languageServerVersion?: string;
 };
 export type RunCommandEvent = {
     credentialStartUrl?: string;

package/out/shared/telemetry/types.js

@@ -13,6 +13,8 @@ var ChatTelemetryEventName;
     ChatTelemetryEventName["RunCommand"] = "amazonq_runCommand";
     ChatTelemetryEventName["MessageResponseError"] = "amazonq_messageResponseError";
     ChatTelemetryEventName["ModifyCode"] = "amazonq_modifyCode";
+    ChatTelemetryEventName["ToolUseSuggested"] = "amazonq_toolUseSuggested";
+    ChatTelemetryEventName["InteractWithAgenticChat"] = "amazonq_interactWithAgenticChat";
 })(ChatTelemetryEventName || (exports.ChatTelemetryEventName = ChatTelemetryEventName = {}));
 var ChatInteractionType;
 (function (ChatInteractionType) {

package/out/shared/telemetry/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/shared/telemetry/types.ts"],"names":[],"mappings":";;;AA4JA,IAAY,sBAWX;AAXD,WAAY,sBAAsB;IAC9B,mEAAyC,CAAA;IACzC,iEAAuC,CAAA;IACvC,mFAAyD,CAAA;IACzD,iFAAuD,CAAA;IACvD,yEAA+C,CAAA;IAC/C,6EAAmD,CAAA;IACnD,2DAAiC,CAAA;IACjC,2DAAiC,CAAA;IACjC,+EAAqD,CAAA;IACrD,2DAAiC,CAAA;AACrC,CAAC,EAXW,sBAAsB,sCAAtB,sBAAsB,QAWjC;AAiED,IAAY,mBAUX;AAVD,WAAY,mBAAmB;IAC3B,wDAAiC,CAAA;IACjC,kDAA2B,CAAA;IAC3B,oCAAa,CAAA;IACb,8CAAuB,CAAA;IACvB,sDAA+B,CAAA;IAC/B,wDAAiC,CAAA;IACjC,wCAAiB,CAAA;IACjB,4CAAqB,CAAA;IACrB,sDAA+B,CAAA;AACnC,CAAC,EAVW,mBAAmB,mCAAnB,mBAAmB,QAU9B"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/shared/telemetry/types.ts"],"names":[],"mappings":";;;AAgKA,IAAY,sBAaX;AAbD,WAAY,sBAAsB;IAC9B,mEAAyC,CAAA;IACzC,iEAAuC,CAAA;IACvC,mFAAyD,CAAA;IACzD,iFAAuD,CAAA;IACvD,yEAA+C,CAAA;IAC/C,6EAAmD,CAAA;IACnD,2DAAiC,CAAA;IACjC,2DAAiC,CAAA;IACjC,+EAAqD,CAAA;IACrD,2DAAiC,CAAA;IACjC,uEAA6C,CAAA;IAC7C,qFAA2D,CAAA;AAC/D,CAAC,EAbW,sBAAsB,sCAAtB,sBAAsB,QAajC;AAiGD,IAAY,mBAUX;AAVD,WAAY,mBAAmB;IAC3B,wDAAiC,CAAA;IACjC,kDAA2B,CAAA;IAC3B,oCAAa,CAAA;IACb,8CAAuB,CAAA;IACvB,sDAA+B,CAAA;IAC/B,wDAAiC,CAAA;IACjC,wCAAiB,CAAA;IACjB,4CAAqB,CAAA;IACrB,sDAA+B,CAAA;AACnC,CAAC,EAVW,mBAAmB,mCAAnB,mBAAmB,QAU9B"}

package/out/shared/telemetryUtils.d.ts

@@ -1,4 +1,5 @@
 import { InitializeParams, Platform, ServerInfo } from '@aws/language-server-runtimes/server-interface';
 import { UserContext } from '../client/token/codewhispererbearertokenclient';
 export declare const getUserAgent: (initializeParams: InitializeParams, serverInfo?: ServerInfo) => string;
+export declare const getIdeCategory: (initializeParams: InitializeParams) => string;
 export declare const makeUserContextObject: (initializeParams: InitializeParams, platform: Platform, product: string) => UserContext | undefined;

package/out/shared/telemetryUtils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeUserContextObject = exports.getUserAgent = void 0;
+exports.makeUserContextObject = exports.getIdeCategory = exports.getUserAgent = void 0;
 const USER_AGENT_PREFIX = 'AWS-Language-Servers';
 const getUserAgent = (initializeParams, serverInfo) => {
     const format = (s) => s.replace(/\s/g, '-');
@@ -39,8 +39,9 @@ const getUserAgent = (initializeParams, serverInfo) => {
 };
 exports.getUserAgent = getUserAgent;
 const IDE_CATEGORY_MAP = {
+    // TODO: VSCode key needs to change for getting the correct coefficient value for inline
     'AmazonQ-For-VSCode': 'VSCODE',
-    'Amazon-Q-For-JetBrains': 'JETBRAINS',
+    'Amazon Q For JetBrains': 'JETBRAINS',
     'AmazonQ-For-Eclipse': 'ECLIPSE',
     'AWS-Toolkit-For-VisualStudio': 'VISUAL_STUDIO',
 };
@@ -56,6 +57,7 @@ const getIdeCategory = (initializeParams) => {
     }
     return ideCategory || 'UNKNOWN';
 };
+exports.getIdeCategory = getIdeCategory;
 // Map result from https://github.com/aws/language-server-runtimes/blob/main/runtimes/server-interface/runtime.ts#L6 to expected Operating system
 const getOperatingSystem = (platform) => {
     switch (platform) {
@@ -74,7 +76,7 @@ const getOperatingSystem = (platform) => {
 // This behaviour may change in the future, when API will accept not enumerated values in API definition.
 const makeUserContextObject = (initializeParams, platform, product) => {
     const userContext = {
-        ideCategory: getIdeCategory(initializeParams),
+        ideCategory: (0, exports.getIdeCategory)(initializeParams),
         operatingSystem: getOperatingSystem(platform),
         product: product,
         clientId: initializeParams.initializationOptions?.aws?.clientInfo?.clientId,

package/out/shared/telemetryUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"telemetryUtils.js","sourceRoot":"","sources":["../../src/shared/telemetryUtils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"telemetryUtils.js","sourceRoot":"","sources":["../../src/shared/telemetryUtils.ts"],"names":[],"mappings":"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"}

package/out/shared/testUtils.d.ts

@@ -1,5 +1,5 @@
 import { TextDocument } from 'vscode-languageserver-textdocument';
-import { ResponseContext, Suggestion } from './codeWhispererService';
+import { CodeWhispererServiceBase, ResponseContext, Suggestion } from './codeWhispererService';
 import { TestFeatures } from '@aws/language-server-runtimes/testing';
 import { SsoConnectionType } from './utils';
 export declare const HELLO_WORLD_IN_CSHARP = "class HelloWorld\n{\n    static void Main()\n    {\n        Console.WriteLine(\"Hello World!\");\n    }\n}";
@@ -78,3 +78,4 @@ export declare const createIterableResponse: <T>(data: T[]) => AsyncIterable<T>;
  */
 export declare function shuffleList<T>(list: T[]): T[];
 export declare const setCredentialsForAmazonQTokenServiceManagerFactory: (getFeatures: () => TestFeatures) => (connectionType: SsoConnectionType) => void;
+export declare const stubCodeWhispererService: <C extends CodeWhispererServiceBase>() => import("ts-sinon").StubbedInstance<C>;

package/out/shared/testUtils.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setCredentialsForAmazonQTokenServiceManagerFactory = exports.createIterableResponse = exports.EMPTY_RESULT = exports.EXPECTED_RESULT_WITHOUT_REFERENCES = exports.EXPECTED_RESULT_WITH_REFERENCES = exports.EXPECTED_SUGGESTION_LIST = exports.EXPECTED_REFERENCE = exports.EXPECTED_RESULT = exports.EXPECTED_SESSION_ID = exports.EXPECTED_RESPONSE_CONTEXT = exports.EXPECTED_SUGGESTION = exports.SOME_SINGLE_LINE_FILE = exports.SINGLE_LINE_FILE_CUTOFF_INDEX = exports.HELLO_WORLD_LINE = exports.SAMPLE_FILE_OF_60_LINES_IN_JAVA = exports.SOME_FILE_WITH_EXTENSION = exports.SOME_UNSUPPORTED_FILE = exports.SOME_CLOSED_FILE = exports.SOME_FILE_WITH_ALT_CASED_LANGUAGE_ID = exports.SOME_FILE = exports.HELLO_WORLD_WITH_WINDOWS_ENDING = exports.SPECIAL_CHARACTER_HELLO_WORLD = exports.HELLO_WORLD_IN_CSHARP = void 0;
+exports.stubCodeWhispererService = exports.setCredentialsForAmazonQTokenServiceManagerFactory = exports.createIterableResponse = exports.EMPTY_RESULT = exports.EXPECTED_RESULT_WITHOUT_REFERENCES = exports.EXPECTED_RESULT_WITH_REFERENCES = exports.EXPECTED_SUGGESTION_LIST = exports.EXPECTED_REFERENCE = exports.EXPECTED_RESULT = exports.EXPECTED_SESSION_ID = exports.EXPECTED_RESPONSE_CONTEXT = exports.EXPECTED_SUGGESTION = exports.SOME_SINGLE_LINE_FILE = exports.SINGLE_LINE_FILE_CUTOFF_INDEX = exports.HELLO_WORLD_LINE = exports.SAMPLE_FILE_OF_60_LINES_IN_JAVA = exports.SOME_FILE_WITH_EXTENSION = exports.SOME_UNSUPPORTED_FILE = exports.SOME_CLOSED_FILE = exports.SOME_FILE_WITH_ALT_CASED_LANGUAGE_ID = exports.SOME_FILE = exports.HELLO_WORLD_WITH_WINDOWS_ENDING = exports.SPECIAL_CHARACTER_HELLO_WORLD = exports.HELLO_WORLD_IN_CSHARP = void 0;
 exports.shuffleList = shuffleList;
 const vscode_languageserver_textdocument_1 = require("vscode-languageserver-textdocument");
+const ts_sinon_1 = require("ts-sinon");
 exports.HELLO_WORLD_IN_CSHARP = `class HelloWorld
 {
     static void Main()
@@ -188,4 +189,12 @@ const setCredentialsForAmazonQTokenServiceManagerFactory = (getFeatures) => {
     };
 };
 exports.setCredentialsForAmazonQTokenServiceManagerFactory = setCredentialsForAmazonQTokenServiceManagerFactory;
+const stubCodeWhispererService = () => {
+    const service = (0, ts_sinon_1.stubInterface)();
+    // by default, sinon will add method stubs instead of settings these to undefined, which can lead to unintended test errors.
+    service.customizationArn = undefined;
+    service.profileArn = undefined;
+    return service;
+};
+exports.stubCodeWhispererService = stubCodeWhispererService;
 //# sourceMappingURL=testUtils.js.map

package/out/shared/testUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"testUtils.js","sourceRoot":"","sources":["../../src/shared/testUtils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"testUtils.js","sourceRoot":"","sources":["../../src/shared/testUtils.ts"],"names":[],"mappings":"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"}

package/out/shared/utils.d.ts

@@ -4,6 +4,34 @@ import { Suggestion } from './codeWhispererService';
 import { CodewhispererCompletionType } from './telemetry/types';
 export type SsoConnectionType = 'builderId' | 'identityCenter' | 'none';
 export declare function isAwsError(error: unknown): error is AWSError;
+/**
+ * Returns the identifier the given error.
+ * Depending on the implementation, the identifier may exist on a
+ * different property.
+ */
+export declare function getErrorId(error: Error): string;
+/**
+ * Derives an error message from the given error object.
+ * Depending on the Error, the property used to derive the message can vary.
+ *
+ * @param withCause Append the message(s) from the cause chain, recursively.
+ *                  The message(s) are delimited by ' | '. Eg: msg1 | causeMsg1 | causeMsg2
+ */
+export declare function getErrorMsg(err: Error | undefined, withCause?: boolean): string | undefined;
+/**
+ * Removes potential PII from a string, for logging/telemetry.
+ *
+ * Examples:
+ * - "Failed to save c:/fooß/bar/baz.txt" => "Failed to save c:/xß/x/x.txt"
+ * - "EPERM for dir c:/Users/user1/.aws/sso/cache/abc123.json" => "EPERM for dir c:/Users/x/.aws/sso/cache/x.json"
+ */
+export declare function scrubNames(s: string, username?: string): string;
+/**
+ * Gets the (partial) error message detail for the `reasonDesc` field.
+ *
+ * @param err Error object, or message text
+ */
+export declare function getTelemetryReasonDesc(err: unknown | undefined): string | undefined;
 export declare function isObject(value: unknown): value is {
     [key: number | string | symbol]: any;
 };
@@ -19,3 +47,5 @@ export declare function getUnmodifiedAcceptedTokens(origin: string, after: strin
 export declare function getEndPositionForAcceptedSuggestion(content: string, startPosition: Position): Position;
 export declare function safeGet<T, E extends Error>(object: T | undefined, customError?: E): T;
 export declare function isStringOrNull(object: any): object is string | null;
+export declare function getHttpStatusCode(err: unknown): number | undefined;
+export declare function hasConnectionExpired(error: any): boolean;

package/out/shared/utils.js

@@ -2,6 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.flattenMetric = void 0;
 exports.isAwsError = isAwsError;
+exports.getErrorId = getErrorId;
+exports.getErrorMsg = getErrorMsg;
+exports.scrubNames = scrubNames;
+exports.getTelemetryReasonDesc = getTelemetryReasonDesc;
 exports.isObject = isObject;
 exports.isNullish = isNullish;
 exports.isBool = isBool;
@@ -14,14 +18,164 @@ exports.getUnmodifiedAcceptedTokens = getUnmodifiedAcceptedTokens;
 exports.getEndPositionForAcceptedSuggestion = getEndPositionForAcceptedSuggestion;
 exports.safeGet = safeGet;
 exports.isStringOrNull = isStringOrNull;
+exports.getHttpStatusCode = getHttpStatusCode;
+exports.hasConnectionExpired = hasConnectionExpired;
 const fastest_levenshtein_1 = require("fastest-levenshtein");
 const constants_1 = require("./constants");
+const utils_1 = require("../language-server/chat/utils");
 function isAwsError(error) {
     if (error === undefined) {
         return false;
     }
     return error instanceof Error && hasCode(error) && hasTime(error);
 }
+/**
+ * Returns the identifier the given error.
+ * Depending on the implementation, the identifier may exist on a
+ * different property.
+ */
+function getErrorId(error) {
+    // prioritize code over the name
+    return hasCode(error) ? error.code : error.name;
+}
+/**
+ * Derives an error message from the given error object.
+ * Depending on the Error, the property used to derive the message can vary.
+ *
+ * @param withCause Append the message(s) from the cause chain, recursively.
+ *                  The message(s) are delimited by ' | '. Eg: msg1 | causeMsg1 | causeMsg2
+ */
+function getErrorMsg(err, withCause = false) {
+    if (err === undefined) {
+        return undefined;
+    }
+    // Non-standard SDK fields added by the OIDC service, to conform to the OAuth spec
+    // (https://datatracker.ietf.org/doc/html/rfc6749#section-4.1.2.1) :
+    // - error: code per the OAuth spec
+    // - error_description: improved error message provided by OIDC service. Prefer this to
+    //   `message` if present.
+    //   https://github.com/aws/aws-toolkit-jetbrains/commit/cc9ed87fa9391dd39ac05cbf99b4437112fa3d10
+    // - error_uri: not provided by OIDC currently?
+    //
+    // Example:
+    //
+    //      [error] API response (oidc.us-east-1.amazonaws.com /token): {
+    //        name: 'InvalidGrantException',
+    //        '$fault': 'client',
+    //        '$metadata': {
+    //          httpStatusCode: 400,
+    //          requestId: '7f5af448-5af7-45f2-8e47-5808deaea4ab',
+    //          extendedRequestId: undefined,
+    //          cfId: undefined
+    //        },
+    //        error: 'invalid_grant',
+    //        error_description: 'Invalid refresh token provided',
+    //        message: 'UnknownError'
+    //      }
+    const anyDesc = err.error_description;
+    const errDesc = typeof anyDesc === 'string' ? anyDesc.trim() : '';
+    let msg = errDesc !== '' ? errDesc : err.message?.trim();
+    if (typeof msg !== 'string') {
+        return undefined;
+    }
+    // append the cause's message
+    if (withCause) {
+        const errorId = getErrorId(err);
+        // - prepend id to message
+        // - If a generic error does not have the `name` field explicitly set, it returns a generic 'Error' name. So skip since it is useless.
+        if (errorId && errorId !== 'Error') {
+            msg = `${errorId}: ${msg}`;
+        }
+        const cause = err.cause;
+        return `${msg}${cause ? ' | ' + getErrorMsg(cause, withCause) : ''}`;
+    }
+    return msg;
+}
+/**
+ * Removes potential PII from a string, for logging/telemetry.
+ *
+ * Examples:
+ * - "Failed to save c:/fooß/bar/baz.txt" => "Failed to save c:/xß/x/x.txt"
+ * - "EPERM for dir c:/Users/user1/.aws/sso/cache/abc123.json" => "EPERM for dir c:/Users/x/.aws/sso/cache/x.json"
+ */
+function scrubNames(s, username) {
+    let r = '';
+    const fileExtRe = /\.[^.\/]+$/;
+    const slashdot = /^[~.]*[\/\\]*/;
+    /** Allowlisted filepath segments. */
+    const keep = new Set([
+        '~',
+        '.',
+        '..',
+        '.aws',
+        'aws',
+        'sso',
+        'cache',
+        'credentials',
+        'config',
+        'Users',
+        'users',
+        'home',
+        'tmp',
+        'aws-toolkit-vscode',
+        'globalStorage', // from vscode globalStorageUri
+        constants_1.crashMonitoringDirName,
+    ]);
+    if (username && username.length > 2) {
+        s = s.replaceAll(username, 'x');
+    }
+    // Replace contiguous whitespace with 1 space.
+    s = s.replace(/\s+/g, ' ');
+    // 1. split on whitespace.
+    // 2. scrub words that match username or look like filepaths.
+    const words = s.split(/\s+/);
+    for (const word of words) {
+        const pathSegments = word.split(/[\/\\]/);
+        if (pathSegments.length < 2) {
+            // Not a filepath.
+            r += ' ' + word;
+            continue;
+        }
+        // Replace all (non-allowlisted) ASCII filepath segments with "x".
+        // "/foo/bar/aws/sso/" => "/x/x/aws/sso/"
+        let scrubbed = '';
+        // Get the frontmatter ("/", "../", "~/", or "./").
+        const start = word.trimStart().match(slashdot)?.[0] ?? '';
+        pathSegments[0] = pathSegments[0].trimStart().replace(slashdot, '');
+        for (const seg of pathSegments) {
+            if (constants_1.driveLetterRegex.test(seg)) {
+                scrubbed += seg;
+            }
+            else if (keep.has(seg)) {
+                scrubbed += '/' + seg;
+            }
+            else {
+                // Save the first non-ASCII (unicode) char, if any.
+                const nonAscii = seg.match(/[^\p{ASCII}]/u)?.[0] ?? '';
+                // Replace all chars (except [^…]) with "x" .
+                const ascii = seg.replace(/[^$[\](){}:;'" ]+/g, 'x');
+                scrubbed += `/${ascii}${nonAscii}`;
+            }
+        }
+        // includes leading '.', eg: '.json'
+        const fileExt = pathSegments[pathSegments.length - 1].match(fileExtRe) ?? '';
+        r += ` ${start.replace(/\\/g, '/')}${scrubbed.replace(/^[\/\\]+/, '')}${fileExt}`;
+    }
+    return r.trim();
+}
+// Port of implementation in AWS Toolkit for VSCode
+// https://github.com/aws/aws-toolkit-vscode/blob/c22efa03e73b241564c8051c35761eb8620edb83/packages/core/src/shared/errors.ts#L455
+/**
+ * Gets the (partial) error message detail for the `reasonDesc` field.
+ *
+ * @param err Error object, or message text
+ */
+function getTelemetryReasonDesc(err) {
+    const m = typeof err === 'string' ? err : (getErrorMsg(err, true) ?? '');
+    const msg = scrubNames(m);
+    // Truncate message as these strings can be very long.
+    return msg && msg.length > 0 ? msg.substring(0, 350) : undefined;
+}
 function hasCode(error) {
     return typeof error.code === 'string';
 }
@@ -127,4 +281,34 @@ function safeGet(object, customError) {
 function isStringOrNull(object) {
     return typeof object === 'string' || object === null;
 }
+// Port of implementation in AWS Toolkit for VSCode
+// https://github.com/aws/aws-toolkit-vscode/blob/c22efa03e73b241564c8051c35761eb8620edb83/packages/core/src/shared/errors.ts#L648
+function getHttpStatusCode(err) {
+    if (hasResponse(err) && err?.$response?.statusCode !== undefined) {
+        return err?.$response?.statusCode;
+    }
+    if (hasMetadata(err) && err.$metadata?.httpStatusCode !== undefined) {
+        return err.$metadata?.httpStatusCode;
+    }
+    if (hasCause(err) && err.cause.$metadata?.httpStatusCode !== undefined) {
+        return err.cause.$metadata.httpStatusCode;
+    }
+    return undefined;
+}
+function hasResponse(error) {
+    return typeof error?.$response === 'object';
+}
+function hasMetadata(error) {
+    return typeof error?.$metadata === 'object';
+}
+function hasCause(error) {
+    return typeof error?.cause === 'object';
+}
+function hasConnectionExpired(error) {
+    if (error instanceof Error) {
+        const authFollowType = (0, utils_1.getAuthFollowUpType)(error);
+        return authFollowType == 're-auth';
+    }
+    return false;
+}
 //# sourceMappingURL=utils.js.map

package/out/shared/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/shared/utils.ts"],"names":[],"mappings":";;;AAQA,gCAMC;AAUD,4BAEC;AAED,8BAEC;AAED,wBAEC;AAED,8CAIC;AAED,8BAMC;AAED,0CAKC;AAED,gEAYC;AAsBD,oDAIC;AASD,kEAEC;AAED,kFAoBC;AAED,0BAMC;AAED,wCAEC;AA1ID,6DAA8C;AAG9C,2CAA8E;AAG9E,SAAgB,UAAU,CAAC,KAAc;IACrC,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QACtB,OAAO,KAAK,CAAA;IAChB,CAAC;IAED,OAAO,KAAK,YAAY,KAAK,IAAI,OAAO,CAAC,KAAK,CAAC,IAAI,OAAO,CAAC,KAAK,CAAC,CAAA;AACrE,CAAC;AAED,SAAS,OAAO,CAAI,KAAQ;IACxB,OAAO,OAAQ,KAA4B,CAAC,IAAI,KAAK,QAAQ,CAAA;AACjE,CAAC;AAED,SAAS,OAAO,CAAC,KAAY;IACzB,OAAQ,KAA4B,CAAC,IAAI,YAAY,IAAI,CAAA;AAC7D,CAAC;AAED,SAAgB,QAAQ,CAAC,KAAc;IACnC,OAAO,OAAO,CAAC,KAAK,CAAC,IAAI,OAAO,KAAK,KAAK,QAAQ,CAAA;AACtD,CAAC;AAED,SAAgB,SAAS,CAAC,KAAc;IACpC,OAAO,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,CAAA;AAChD,CAAC;AAED,SAAgB,MAAM,CAAC,KAAc;IACjC,OAAO,OAAO,KAAK,KAAK,SAAS,CAAA;AACrC,CAAC;AAED,SAAgB,iBAAiB,CAAC,UAAsB;IACpD,MAAM,aAAa,GAAG,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,MAAM,CAAA;IAE9F,OAAO,aAAa,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAA;AAC/C,CAAC;AAED,SAAgB,SAAS,CAAC,UAAkB;IACxC,IAAI,CAAC;QACD,OAAO,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAA;IACjC,CAAC;IAAC,MAAM,CAAC;QACL,MAAM,IAAI,KAAK,CAAC,+BAA+B,UAAU,EAAE,CAAC,CAAA;IAChE,CAAC;AACL,CAAC;AAED,SAAgB,eAAe,CAAC,KAAU;IACtC,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;QACzB,OAAO,KAAK,CAAC,OAAO,CAAA;IACxB,CAAC;IACD,OAAO,MAAM,CAAC,KAAK,CAAC,CAAA;AACxB,CAAC;AAED,SAAgB,0BAA0B,CAAC,mBAAwC;IAC/E,IAAI,CAAC,mBAAmB,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,CAAC;QAChD,MAAM,IAAI,KAAK,CAAC,sCAA0B,CAAC,CAAA;IAC/C,CAAC;IAED,MAAM,WAAW,GAAG,mBAAmB,CAAC,cAAc,CAAC,QAAQ,CAAsB,CAAA;IAErF,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,sCAA0B,CAAC,CAAA;IAC/C,CAAC;IAED,OAAO,WAAW,CAAC,KAAK,CAAA;AAC5B,CAAC;AAEM,MAAM,aAAa,GAAG,CAAC,GAAQ,EAAE,MAAM,GAAG,EAAE,EAAE,EAAE;IACnD,MAAM,SAAS,GAAQ,EAAE,CAAA;IAEzB,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;QAC3B,MAAM,KAAK,GAAG,GAAG,CAAC,GAAG,CAAC,CAAA;QAEtB,IAAI,MAAM,KAAK,EAAE,EAAE,CAAC;YAChB,GAAG,GAAG,GAAG,GAAG,GAAG,CAAA;QACnB,CAAC;QAED,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;YAC9C,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE,IAAA,qBAAa,EAAC,KAAK,EAAE,MAAM,GAAG,GAAG,CAAC,CAAC,CAAA;QAChE,CAAC;aAAM,CAAC;YACJ,SAAS,CAAC,MAAM,GAAG,GAAG,CAAC,GAAG,KAAK,CAAA;QACnC,CAAC;IACL,CAAC,CAAC,CAAA;IAEF,OAAO,SAAS,CAAA;AACpB,CAAC,CAAA;AAlBY,QAAA,aAAa,iBAkBzB;AAED,SAAgB,oBAAoB,CAAC,mBAAwC;IACzE,MAAM,kBAAkB,GAAG,mBAAmB,CAAC,qBAAqB,EAAE,CAAA;IACtE,MAAM,QAAQ,GAAG,kBAAkB,EAAE,GAAG,EAAE,QAAQ,CAAA;IAClD,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,gCAAoB,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,gBAAgB,CAAA;AACxG,CAAC;AAED,mDAAmD;AACnD,uHAAuH;AACvH,0GAA0G;AAC1G,qFAAqF;AACrF,iHAAiH;AACjH,uHAAuH;AACvH,qHAAqH;AACrH,SAAgB,2BAA2B,CAAC,MAAc,EAAE,KAAa;IACrE,OAAO,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,IAAA,8BAAQ,EAAC,MAAM,EAAE,KAAK,CAAC,CAAA;AAC1E,CAAC;AAED,SAAgB,mCAAmC,CAAC,OAAe,EAAE,aAAuB;IACxF,MAAM,aAAa,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IACzC,MAAM,qBAAqB,GAAG,aAAa,CAAC,MAAM,CAAA;IAElD,oCAAoC;IACpC,IAAI,WAAW,CAAA;IACf,IAAI,qBAAqB,KAAK,CAAC,EAAE,CAAC;QAC9B,uEAAuE;QACvE,WAAW,GAAG;YACV,IAAI,EAAE,aAAa,CAAC,IAAI;YACxB,SAAS,EAAE,aAAa,CAAC,SAAS,GAAG,OAAO,CAAC,MAAM;SACtD,CAAA;IACL,CAAC;SAAM,CAAC;QACJ,yEAAyE;QACzE,WAAW,GAAG;YACV,IAAI,EAAE,aAAa,CAAC,IAAI,GAAG,qBAAqB,GAAG,CAAC;YACpD,SAAS,EAAE,aAAa,CAAC,qBAAqB,GAAG,CAAC,CAAC,CAAC,MAAM;SAC7D,CAAA;IACL,CAAC;IACD,OAAO,WAAW,CAAA;AACtB,CAAC;AAED,SAAgB,OAAO,CAAqB,MAAqB,EAAE,WAAe;IAC9E,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QACvB,MAAM,WAAW,IAAI,IAAI,KAAK,CAAC,qBAAqB,MAAM,CAAC,MAAM,CAAC,qCAAqC,CAAC,CAAA;IAC5G,CAAC;IAED,OAAO,MAAM,CAAA;AACjB,CAAC;AAED,SAAgB,cAAc,CAAC,MAAW;IACtC,OAAO,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,IAAI,CAAA;AACxD,CAAC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/shared/utils.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@aws/lsp-codewhisperer",
-    "version": "0.0.32",
+    "version": "0.0.33",
     "description": "CodeWhisperer Language Server",
     "main": "out/index.js",
     "repository": {
@@ -21,32 +21,45 @@
         "lint": "npm run lint:src",
         "lint:bundle:webworker": "webpack --config webpack.lint.config.js && eslint bundle/aws-lsp-codewhisperer-webworker.js # Verify compatibility with web runtime target",
         "lint:src": "eslint src/ --ext .ts,.tsx",
-        "test:unit": "ts-mocha -b \"./src/**/*.test.ts\"",
+        "test:unit": "ts-mocha --timeout 0 -b \"./src/**/*.test.ts\"",
         "test": "npm run lint && npm run test:unit",
         "prepack": "npm run compile && ts-node ../../script/link_bundled_dependencies.ts",
         "postinstall": "node ./script/install_transitive_dep.js"
     },
     "dependencies": {
-        "@amzn/codewhisperer-streaming": "file:../../core/codewhisperer-streaming/amzn-codewhisperer-streaming-1.0.0.tgz",
+        "@amzn/amazon-q-developer-streaming-client": "file:../../core/q-developer-streaming-client/amzn-amazon-q-developer-streaming-client-1.0.0.tgz",
+        "@amzn/codewhisperer-streaming": "file:../../core/codewhisperer-streaming/amzn-codewhisperer-streaming-1.0.6.tgz",
+        "@aws-sdk/util-arn-parser": "^3.723.0",
         "@aws-sdk/util-retry": "^3.374.0",
-        "@aws/chat-client-ui-types": "^0.1.12",
-        "@aws/language-server-runtimes": "^0.2.53",
-        "@aws/lsp-core": "^0.0.3",
+        "@aws/chat-client-ui-types": "^0.1.32",
+        "@aws/language-server-runtimes": "^0.2.75",
+        "@aws/lsp-core": "^0.0.4",
+        "@modelcontextprotocol/sdk": "^1.9.0",
         "@smithy/node-http-handler": "^2.5.0",
         "adm-zip": "^0.5.10",
         "archiver": "^7.0.1",
         "aws-sdk": "^2.1403.0",
+        "chokidar": "^4.0.3",
         "deepmerge": "^4.3.1",
+        "diff": "^7.0.0",
         "fastest-levenshtein": "^1.0.16",
+        "fdir": "^6.4.3",
         "got": "^11.8.5",
         "hpagent": "^1.2.0",
+        "ignore": "^7.0.3",
         "js-md5": "^0.8.3",
+        "lokijs": "^1.5.12",
+        "picomatch": "^4.0.2",
+        "shlex": "2.1.2",
         "uuid": "^11.0.5",
         "vscode-uri": "^3.1.0"
     },
     "devDependencies": {
         "@types/adm-zip": "^0.5.5",
         "@types/archiver": "^6.0.2",
+        "@types/diff": "^7.0.2",
+        "@types/local-indexing": "file:./types/types-local-indexing-1.0.0.tgz",
+        "@types/lokijs": "^1.5.14",
         "@types/uuid": "^9.0.8",
         "assert": "^2.1.0",
         "copyfiles": "^2.4.1",
@@ -70,6 +83,7 @@
         "endOfLine": "lf"
     },
     "bundleDependencies": [
-        "@amzn/codewhisperer-streaming"
+        "@amzn/codewhisperer-streaming",
+        "@amzn/amazon-q-developer-streaming-client"
     ]
 }

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

@@ -1,53 +0,0 @@
-import { HeaderBag, HttpMessage, HttpRequest as IHttpRequest, QueryParameterBag, URI } from "@smithy/types";
-type HttpRequestOptions = Partial<HttpMessage> & Partial<URI> & {
-    method?: string;
-};
-/**
- * Use the distinct IHttpRequest interface from @smithy/types instead.
- * This should not be used due to
- * overlapping with the concrete class' name.
- *
- * This is not marked deprecated since that would mark the concrete class
- * deprecated as well.
- */
-export interface HttpRequest extends IHttpRequest {
-}
-/**
- * @public
- */
-export { IHttpRequest };
-/**
- * @public
- */
-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);
-    /**
-     * Note: this does not deep-clone the body.
-     */
-    static clone(request: IHttpRequest): HttpRequest;
-    /**
-     * 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: unknown): request is HttpRequest;
-    /**
-     * @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(): HttpRequest;
-}