npm - @aws/lsp-codewhisperer - Versions diffs - 0.0.16 → 0.0.17 - Mend

@aws/lsp-codewhisperer 0.0.16 → 0.0.17

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (1518) hide show

package/out/language-server/chat/chatEventParser.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"chatEventParser.js","sourceRoot":"","sources":["../../../src/language-server/chat/chatEventParser.ts"],"names":[],"mappings":";;;~~AAWA~~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~~aAAa~~,EAAE,CAAA;~~IAC/B~~,CAAC;IAEM,~~aAAa~~;~~QAChB~~,MAAM,UAAU,GAAe;YAC3B,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,UAAU,EAAE,IAAI,CAAC,UAAU,IAAI,IAAI;YACnC,cAAc,EAAE,IAAI,CAAC,cAAc;YACnC,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,aAAa,EAAE,IAAI,CAAC,aAAa;SACpC,CAAA;QAED,OAAO,IAAI,CAAC,KAAK;YACb,CAAC,CAAC;gBACI,OAAO,EAAE,KAAK;gBACd,IAAI,EAAE,~~UAAU~~;~~gBAChB~~,KAAK,EAAE,IAAI,CAAC,KAAK;aACpB;YACH,CAAC,CAAC;gBACI,OAAO,EAAE,IAAI;gBACb,IAAI,EAAE,~~UAAU~~;~~aACnB~~,CAAA;IACX,CAAC;;~~AA1IL~~,~~0CA2IC~~"}
1	+ {"version":3,"file":"chatEventParser.js","sourceRoot":"","sources":["../../../src/language-server/chat/chatEventParser.ts"],"names":[],"mappings":"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"}

package/out/language-server/chat/chatEventParser.test.js CHANGED Viewed

@@ -11,17 +11,20 @@ describe('ChatEventParser', () => {
         ts_sinon_1.default.assert.match(chatEventParser.processPartialEvent({
             invalidStateEvent: {
                 message: 'Invalid state!',
-                reason: 'Unknown!',
+                reason: 'INVALID_TASK_ASSIST_PLAN',
             },
         }), {
             success: false,
             data: {
-                messageId: mockMessageId,
-                body: undefined,
-                canBeVoted: true,
-                codeReference: undefined,
-                followUp: undefined,
-                relatedContent: undefined,
+                chatResult: {
+                    messageId: mockMessageId,
+                    body: undefined,
+                    canBeVoted: true,
+                    codeReference: undefined,
+                    followUp: undefined,
+                    relatedContent: undefined,
+                },
+                conversationId: undefined,
             },
             error: ts_sinon_1.default.match.string,
         });
@@ -39,12 +42,15 @@ describe('ChatEventParser', () => {
         }), {
             success: false,
             data: {
-                messageId: mockMessageId,
-                body: undefined,
-                canBeVoted: true,
-                codeReference: undefined,
-                followUp: undefined,
-                relatedContent: undefined,
+                chatResult: {
+                    messageId: mockMessageId,
+                    body: undefined,
+                    canBeVoted: true,
+                    codeReference: undefined,
+                    followUp: undefined,
+                    relatedContent: undefined,
+                },
+                conversationId: undefined,
             },
             error: ts_sinon_1.default.match.string,
         });
@@ -59,12 +65,15 @@ describe('ChatEventParser', () => {
         }), {
             success: true,
             data: {
-                messageId: mockMessageId,
-                body: 'This is an ',
-                canBeVoted: true,
-                codeReference: undefined,
-                followUp: undefined,
-                relatedContent: undefined,
+                chatResult: {
+                    messageId: mockMessageId,
+                    body: 'This is an ',
+                    canBeVoted: true,
+                    codeReference: undefined,
+                    followUp: undefined,
+                    relatedContent: undefined,
+                },
+                conversationId: undefined,
             },
         });
         assert.deepStrictEqual(chatEventParser.processPartialEvent({
@@ -74,16 +83,46 @@ describe('ChatEventParser', () => {
         }), {
             success: true,
             data: {
-                messageId: mockMessageId,
-                body: 'This is an assistant response.',
-                canBeVoted: true,
-                codeReference: undefined,
-                followUp: undefined,
-                relatedContent: undefined,
+                chatResult: {
+                    messageId: mockMessageId,
+                    body: 'This is an assistant response.',
+                    canBeVoted: true,
+                    codeReference: undefined,
+                    followUp: undefined,
+                    relatedContent: undefined,
+                },
+                conversationId: undefined,
+            },
+        });
+    });
+    it('processPartialEvent with messageMetadataEvent appends conversation id', () => {
+        const chatEventParser = new chatEventParser_1.ChatEventParser(mockMessageId, new metric_1.Metric());
+        chatEventParser.processPartialEvent({
+            messageMetadataEvent: {
+                conversationId: 'id-2345',
+            },
+        });
+        chatEventParser.processPartialEvent({
+            assistantResponseEvent: {
+                content: 'assistant response',
+            },
+        });
+        assert.deepStrictEqual(chatEventParser.getResult(), {
+            success: true,
+            data: {
+                chatResult: {
+                    messageId: mockMessageId,
+                    body: 'assistant response',
+                    canBeVoted: true,
+                    codeReference: undefined,
+                    followUp: undefined,
+                    relatedContent: undefined,
+                },
+                conversationId: 'id-2345',
             },
         });
     });
-    it('getChatResult returns the accumulated result', () => {
+    it('getResult returns the accumulated result', () => {
         const chatEventParser = new chatEventParser_1.ChatEventParser(mockMessageId, new metric_1.Metric());
         chatEventParser.processPartialEvent({
             assistantResponseEvent: {
@@ -97,23 +136,26 @@ describe('ChatEventParser', () => {
                 },
             },
         });
-        assert.deepStrictEqual(chatEventParser.getChatResult(), {
+        assert.deepStrictEqual(chatEventParser.getResult(), {
             success: true,
             data: {
-                messageId: mockMessageId,
-                body: 'This is an ',
-                followUp: {
-                    text: chatEventParser_1.ChatEventParser.FOLLOW_UP_TEXT,
-                    options: [
-                        {
-                            pillText: 'follow up 1',
-                            prompt: 'follow up 1',
-                        },
-                    ],
+                chatResult: {
+                    messageId: mockMessageId,
+                    body: 'This is an ',
+                    canBeVoted: true,
+                    codeReference: undefined,
+                    followUp: {
+                        text: chatEventParser_1.ChatEventParser.FOLLOW_UP_TEXT,
+                        options: [
+                            {
+                                pillText: 'follow up 1',
+                                prompt: 'follow up 1',
+                            },
+                        ],
+                    },
+                    relatedContent: undefined,
                 },
-                canBeVoted: true,
-                codeReference: undefined,
-                relatedContent: undefined,
+                conversationId: undefined,
             },
         });
         chatEventParser.processPartialEvent({
@@ -149,7 +191,7 @@ describe('ChatEventParser', () => {
                 ],
             },
         });
-        const expectedData = {
+        const expectedResult = {
             messageId: mockMessageId,
             body: 'This is an assistant response.',
             canBeVoted: true,
@@ -187,7 +229,11 @@ describe('ChatEventParser', () => {
                 ],
             },
         };
-        assert.deepStrictEqual(chatEventParser.getChatResult(), { success: true, data: expectedData });
+        const expectedData = {
+            chatResult: expectedResult,
+            conversationId: undefined,
+        };
+        assert.deepStrictEqual(chatEventParser.getResult(), { success: true, data: expectedData });
     });
 });
 //# sourceMappingURL=chatEventParser.test.js.map

package/out/language-server/chat/chatEventParser.test.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"chatEventParser.test.js","sourceRoot":"","sources":["../../../src/language-server/chat/chatEventParser.test.ts"],"names":[],"mappings":";;AACA,iCAAgC;AAChC,uCAA4B;AAE5B,uDAAmD;AACnD,gDAA4C;AAG5C,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAC7B,MAAM,aAAa,GAAG,iBAAiB,CAAA;IAEvC,EAAE,CAAC,6CAA6C,EAAE,GAAG,EAAE;QACnD,MAAM,eAAe,GAAG,IAAI,iCAAe,CAAC,aAAa,EAAE,IAAI,eAAM,EAAmB,CAAC,CAAA;QAEzF,kBAAK,CAAC,MAAM,CAAC,KAAK,CACd,eAAe,CAAC,mBAAmB,CAAC;YAChC,iBAAiB,EAAE;gBACf,OAAO,EAAE,gBAAgB;gBACzB,MAAM,EAAE,~~UAAU~~;~~aACrB~~;SACJ,CAAC,EACF;YACI,OAAO,EAAE,KAAK;YACd,IAAI,EAAE;gBACF,SAAS,EAAE,aAAa;~~gBACxB~~,IAAI,EAAE,SAAS;~~gBACf~~,UAAU,EAAE,IAAI;~~gBAChB~~,aAAa,EAAE,SAAS;~~gBACxB~~,QAAQ,EAAE,SAAS;~~gBACnB~~,cAAc,EAAE,SAAS;aAC5B;YACD,KAAK,EAAE,kBAAK,CAAC,KAAK,CAAC,MAAM;SAC5B,CACJ,CAAA;IACL,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,sCAAsC,EAAE,GAAG,EAAE;QAC5C,MAAM,eAAe,GAAG,IAAI,iCAAe,CAAC,aAAa,EAAE,IAAI,eAAM,EAAmB,CAAC,CAAA;QAEzF,kBAAK,CAAC,MAAM,CAAC,KAAK,CACd,eAAe,CAAC,mBAAmB,CAAC;YAChC,KAAK,EAAE;gBACH,IAAI,EAAE,yBAAyB;gBAC/B,OAAO,EAAE,QAAQ;gBACjB,MAAM,EAAE,QAAQ;gBAChB,UAAU,EAAE,KAAK;gBACjB,SAAS,EAAE,EAAE;aAChB;SACJ,CAAC,EACF;YACI,OAAO,EAAE,KAAK;YACd,IAAI,EAAE;gBACF,SAAS,EAAE,aAAa;~~gBACxB~~,IAAI,EAAE,SAAS;~~gBACf~~,UAAU,EAAE,IAAI;~~gBAChB~~,aAAa,EAAE,SAAS;~~gBACxB~~,QAAQ,EAAE,SAAS;~~gBACnB~~,cAAc,EAAE,SAAS;aAC5B;YACD,KAAK,EAAE,kBAAK,CAAC,KAAK,CAAC,MAAM;SAC5B,CACJ,CAAA;QAED,MAAM,CAAC,WAAW,CAAC,eAAe,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAA;IACvD,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,qEAAqE,EAAE,GAAG,EAAE;QAC3E,MAAM,eAAe,GAAG,IAAI,iCAAe,CAAC,aAAa,EAAE,IAAI,eAAM,EAAmB,CAAC,CAAA;QAEzF,MAAM,CAAC,eAAe,CAClB,eAAe,CAAC,mBAAmB,CAAC;YAChC,sBAAsB,EAAE;gBACpB,OAAO,EAAE,aAAa;aACzB;SACJ,CAAC,EACF;YACI,OAAO,EAAE,IAAI;YACb,IAAI,EAAE;gBACF,SAAS,EAAE,aAAa;~~gBACxB~~,IAAI,EAAE,aAAa;~~gBACnB~~,UAAU,EAAE,IAAI;~~gBAChB~~,aAAa,EAAE,SAAS;~~gBACxB~~,QAAQ,EAAE,SAAS;~~gBACnB~~,cAAc,EAAE,SAAS;aAC5B;SACJ,CACJ,CAAA;QAED,MAAM,CAAC,eAAe,CAClB,eAAe,CAAC,mBAAmB,CAAC;YAChC,sBAAsB,EAAE;gBACpB,OAAO,EAAE,qBAAqB;aACjC;SACJ,CAAC,EACF;YACI,OAAO,EAAE,IAAI;YACb,IAAI,EAAE;gBACF,SAAS,EAAE,aAAa;~~gBACxB~~,IAAI,EAAE,gCAAgC;~~gBACtC~~,UAAU,EAAE,IAAI;~~gBAChB~~,aAAa,EAAE,SAAS;~~gBACxB~~,QAAQ,EAAE,SAAS;~~gBACnB~~,cAAc,EAAE,SAAS;aAC5B;SACJ,CACJ,CAAA;IACL,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,~~8CAA8C~~,EAAE,GAAG,EAAE;~~QACpD~~,MAAM,eAAe,GAAG,IAAI,iCAAe,CAAC,aAAa,EAAE,IAAI,eAAM,EAAmB,CAAC,CAAA;QAEzF,eAAe,CAAC,mBAAmB,CAAC;YAChC,sBAAsB,EAAE;gBACpB,OAAO,EAAE,aAAa;aACzB;SACJ,CAAC,CAAA;QAEF,eAAe,CAAC,mBAAmB,CAAC;YAChC,mBAAmB,EAAE;gBACjB,cAAc,EAAE;oBACZ,OAAO,EAAE,aAAa;iBACzB;aACJ;SACJ,CAAC,CAAA;QAEF,MAAM,CAAC,eAAe,CAAC,eAAe,CAAC,~~aAAa~~,EAAE,EAAE;~~YACpD~~,OAAO,EAAE,IAAI;YACb,IAAI,EAAE;gBACF,SAAS,EAAE,aAAa;~~gBACxB~~,IAAI,EAAE,aAAa;~~gBACnB~~,QAAQ,EAAE;~~oBACN~~,IAAI,EAAE,iCAAe,CAAC,cAAc;~~oBACpC~~,OAAO,EAAE;~~wBACL~~;~~4BACI~~,QAAQ,EAAE,aAAa;~~4BACvB~~,MAAM,EAAE,aAAa;~~yBACxB~~;qBACJ;~~iBACJ;gBACD~~,~~UAAU~~,EAAE,~~IAAI;gBAChB,aAAa,EAAE,~~SAAS;~~gBACxB~~,cAAc,EAAE,SAAS;aAC5B;SACJ,CAAC,CAAA;QAEF,eAAe,CAAC,mBAAmB,CAAC;YAChC,mBAAmB,EAAE;gBACjB,cAAc,EAAE;oBACZ,OAAO,EAAE,aAAa;iBACzB;aACJ;SACJ,CAAC,CAAA;QAEF,eAAe,CAAC,mBAAmB,CAAC;YAChC,kBAAkB,EAAE;gBAChB,UAAU,EAAE;oBACR;wBACI,WAAW,EAAE,KAAK;wBAClB,UAAU,EAAE,kBAAkB;qBACjC;iBACJ;aACJ;SACJ,CAAC,CAAA;QAEF,eAAe,CAAC,mBAAmB,CAAC;YAChC,sBAAsB,EAAE;gBACpB,OAAO,EAAE,qBAAqB;aACjC;SACJ,CAAC,CAAA;QACF,eAAe,CAAC,mBAAmB,CAAC;YAChC,0BAA0B,EAAE;gBACxB,qBAAqB,EAAE;oBACnB;wBACI,KAAK,EAAE,UAAU;wBACjB,OAAO,EAAE,UAAU;wBACnB,GAAG,EAAE,mBAAmB;qBAC3B;iBACJ;aACJ;SACJ,CAAC,CAAA;QAEF,MAAM,~~YAAY~~,GAAe;~~YAC7B~~,SAAS,EAAE,aAAa;YACxB,IAAI,EAAE,gCAAgC;YACtC,UAAU,EAAE,IAAI;YAChB,cAAc,EAAE;gBACZ,OAAO,EAAE;oBACL;wBACI,KAAK,EAAE,UAAU;wBACjB,IAAI,EAAE,UAAU;wBAChB,GAAG,EAAE,mBAAmB;qBAC3B;iBACJ;aACJ;YACD,aAAa,EAAE;gBACX;oBACI,WAAW,EAAE,KAAK;oBAClB,UAAU,EAAE,kBAAkB;oBAC9B,yBAAyB,EAAE,SAAS;oBACpC,WAAW,EAAE,iCAAe,CAAC,wBAAwB,CAAC;wBAClD,WAAW,EAAE,KAAK;wBAClB,UAAU,EAAE,kBAAkB;qBACjC,CAAC;iBACL;aACJ;YACD,QAAQ,EAAE;gBACN,IAAI,EAAE,iCAAe,CAAC,cAAc;gBACpC,OAAO,EAAE;oBACL;wBACI,QAAQ,EAAE,aAAa;wBACvB,MAAM,EAAE,aAAa;qBACxB;oBACD;wBACI,QAAQ,EAAE,aAAa;wBACvB,MAAM,EAAE,aAAa;qBACxB;iBACJ;aACJ;SACJ,CAAA;QAED,MAAM,CAAC,eAAe,CAAC,eAAe,CAAC,~~aAAa~~,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC,CAAA;~~IAClG~~,CAAC,CAAC,CAAA;AACN,CAAC,CAAC,CAAA"}
1	+ {"version":3,"file":"chatEventParser.test.js","sourceRoot":"","sources":["../../../src/language-server/chat/chatEventParser.test.ts"],"names":[],"mappings":"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"}

package/out/language-server/chat/chatSessionService.d.ts CHANGED Viewed

@@ -1,13 +1,13 @@
-import { CodeWhispererStreamingClientConfig, GenerateAssistantResponseCommandInput, GenerateAssistantResponseCommandOutput } from '@amzn/codewhisperer-streaming';
+import { CodeWhispererStreamingClientConfig, SendMessageCommandInput, SendMessageCommandOutput } from '@amzn/codewhisperer-streaming';
 import { CredentialsProvider } from '@aws/language-server-runtimes/server-interface';
 export type ChatSessionServiceConfig = CodeWhispererStreamingClientConfig;
 export declare class ChatSessionService {
     #private;
     shareCodeWhispererContentWithAWS: boolean;
-    get sessionId(): string | undefined;
-    set sessionId(value: string | undefined);
+    get conversationId(): string | undefined;
+    set conversationId(value: string | undefined);
     constructor(credentialsProvider: CredentialsProvider, config?: CodeWhispererStreamingClientConfig);
-    generateAssistantResponse(request: GenerateAssistantResponseCommandInput): Promise<GenerateAssistantResponseCommandOutput>;
+    sendMessage(request: SendMessageCommandInput): Promise<SendMessageCommandOutput>;
     clear(): void;
     dispose(): void;
     abortRequest(): void;

package/out/language-server/chat/chatSessionService.js CHANGED Viewed

@@ -4,28 +4,29 @@ exports.ChatSessionService = void 0;
 const codewhisperer_streaming_1 = require("@amzn/codewhisperer-streaming");
 const util_retry_1 = require("@aws-sdk/util-retry");
 const utils_1 = require("../utils");
+const constants_1 = require("../../constants");
 class ChatSessionService {
     shareCodeWhispererContentWithAWS = false;
-    #codeWhispererRegion = 'us-east-1';
-    #codeWhispererEndpoint = 'https://codewhisperer.us-east-1.amazonaws.com/';
+    #codeWhispererRegion = constants_1.AWS_Q_REGION;
+    #codeWhispererEndpoint = constants_1.AWS_Q_ENDPOINT_URL;
     #abortController;
     #credentialsProvider;
     #config;
-    #sessionId;
-    get sessionId() {
-        return this.#sessionId;
+    #conversationId;
+    get conversationId() {
+        return this.#conversationId;
     }
-    set sessionId(value) {
-        this.#sessionId = value;
+    set conversationId(value) {
+        this.#conversationId = value;
     }
     constructor(credentialsProvider, config) {
         this.#credentialsProvider = credentialsProvider;
         this.#config = config;
     }
-    async generateAssistantResponse(request) {
+    async sendMessage(request) {
         this.#abortController = new AbortController();
-        if (this.#sessionId && request.conversationState) {
-            request.conversationState.conversationId = this.#sessionId;
+        if (this.#conversationId && request.conversationState) {
+            request.conversationState.conversationId = this.#conversationId;
         }
         const client = new codewhisperer_streaming_1.CodeWhispererStreaming({
             region: this.#codeWhispererRegion,
@@ -34,15 +35,14 @@ class ChatSessionService {
             retryStrategy: new util_retry_1.ConfiguredRetryStrategy(0, (attempt) => 500 + attempt ** 10),
             ...this.#config,
         });
-        const response = await client.generateAssistantResponse(request, {
+        const response = await client.sendMessage(request, {
             abortSignal: this.#abortController?.signal,
         });
-        this.#sessionId = response.conversationId;
         return response;
     }
     clear() {
         this.#abortController?.abort();
-        this.#sessionId = undefined;
+        this.#conversationId = undefined;
     }
     dispose() {
         this.#abortController?.abort();

package/out/language-server/chat/chatSessionService.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"chatSessionService.js","sourceRoot":"","sources":["../../../src/language-server/chat/chatSessionService.ts"],"names":[],"mappings":";;;AAAA,2EAKsC;AACtC,oDAA6D;AAE7D,oCAAqD;~~AAGrD~~,MAAa,kBAAkB;IACpB,gCAAgC,GAAG,KAAK,CAAA;IACtC,oBAAoB,GAAG,~~WAAW~~,CAAA;~~IAClC~~,sBAAsB,GAAG,~~gDAAgD~~,CAAA;~~IAClF~~,gBAAgB,CAAkB;IAClC,oBAAoB,CAAqB;IACzC,OAAO,CAAqC;IAC5C,~~UAAU~~,CAAS;~~IAEnB~~,IAAW,~~SAAS~~;~~QAChB~~,OAAO,IAAI,CAAC,~~UAAU~~,CAAA;~~IAC1B~~,CAAC;IAED,IAAW,~~SAAS~~,CAAC,KAAyB;~~QAC1C~~,IAAI,CAAC,~~UAAU~~,GAAG,KAAK,CAAA;~~IAC3B~~,CAAC;IAED,YAAY,mBAAwC,EAAE,MAA2C;QAC7F,IAAI,CAAC,oBAAoB,GAAG,mBAAmB,CAAA;QAC/C,IAAI,CAAC,OAAO,GAAG,MAAM,CAAA;IACzB,CAAC;IAEM,KAAK,CAAC,~~yBAAyB~~,~~CAClC~~,~~OAA8C~~;~~QAE9C~~,IAAI,CAAC,gBAAgB,GAAG,IAAI,eAAe,EAAE,CAAA;QAE7C,IAAI,IAAI,CAAC,~~UAAU~~,IAAI,OAAO,CAAC,iBAAiB,EAAE,CAAC;~~YAC/C~~,OAAO,CAAC,iBAAiB,CAAC,cAAc,GAAG,IAAI,CAAC,~~UAAU~~,CAAA;~~QAC9D~~,CAAC;QAED,MAAM,MAAM,GAAG,IAAI,gDAAsB,CAAC;YACtC,MAAM,EAAE,IAAI,CAAC,oBAAoB;YACjC,QAAQ,EAAE,IAAI,CAAC,sBAAsB;YACrC,KAAK,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,IAAA,kCAA0B,EAAC,IAAI,CAAC,oBAAoB,CAAC,EAAE,CAAC;YAC9F,aAAa,EAAE,IAAI,oCAAuB,CAAC,CAAC,EAAE,CAAC,OAAe,EAAE,EAAE,CAAC,GAAG,GAAG,OAAO,IAAI,EAAE,CAAC;YACvF,GAAG,IAAI,CAAC,OAAO;SAClB,CAAC,CAAA;QAEF,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,~~yBAAyB~~,CAAC,OAAO,EAAE;~~YAC7D~~,WAAW,EAAE,IAAI,CAAC,gBAAgB,EAAE,MAAM;SAC7C,CAAC,CAAA;QAEF,~~IAAI,CAAC,UAAU,GAAG,QAAQ,CAAC,cAAc,CAAA;QAEzC,~~OAAO,QAAQ,CAAA;IACnB,CAAC;IAEM,KAAK;QACR,IAAI,CAAC,gBAAgB,EAAE,KAAK,EAAE,CAAA;QAC9B,IAAI,CAAC,~~UAAU~~,GAAG,SAAS,CAAA;~~IAC/B~~,CAAC;IAEM,OAAO;QACV,IAAI,CAAC,gBAAgB,EAAE,KAAK,EAAE,CAAA;IAClC,CAAC;IAEM,YAAY;QACf,IAAI,CAAC,gBAAgB,EAAE,KAAK,EAAE,CAAA;IAClC,CAAC;CACJ;~~AA5DD~~,~~gDA4DC~~"}
1	+ {"version":3,"file":"chatSessionService.js","sourceRoot":"","sources":["../../../src/language-server/chat/chatSessionService.ts"],"names":[],"mappings":";;;AAAA,2EAKsC;AACtC,oDAA6D;AAE7D,oCAAqD;AACrD,+CAAkE;AAGlE,MAAa,kBAAkB;IACpB,gCAAgC,GAAG,KAAK,CAAA;IACtC,oBAAoB,GAAG,wBAAY,CAAA;IACnC,sBAAsB,GAAG,8BAAkB,CAAA;IACpD,gBAAgB,CAAkB;IAClC,oBAAoB,CAAqB;IACzC,OAAO,CAAqC;IAC5C,eAAe,CAAS;IAExB,IAAW,cAAc;QACrB,OAAO,IAAI,CAAC,eAAe,CAAA;IAC/B,CAAC;IAED,IAAW,cAAc,CAAC,KAAyB;QAC/C,IAAI,CAAC,eAAe,GAAG,KAAK,CAAA;IAChC,CAAC;IAED,YAAY,mBAAwC,EAAE,MAA2C;QAC7F,IAAI,CAAC,oBAAoB,GAAG,mBAAmB,CAAA;QAC/C,IAAI,CAAC,OAAO,GAAG,MAAM,CAAA;IACzB,CAAC;IAEM,KAAK,CAAC,WAAW,CAAC,OAAgC;QACrD,IAAI,CAAC,gBAAgB,GAAG,IAAI,eAAe,EAAE,CAAA;QAE7C,IAAI,IAAI,CAAC,eAAe,IAAI,OAAO,CAAC,iBAAiB,EAAE,CAAC;YACpD,OAAO,CAAC,iBAAiB,CAAC,cAAc,GAAG,IAAI,CAAC,eAAe,CAAA;QACnE,CAAC;QAED,MAAM,MAAM,GAAG,IAAI,gDAAsB,CAAC;YACtC,MAAM,EAAE,IAAI,CAAC,oBAAoB;YACjC,QAAQ,EAAE,IAAI,CAAC,sBAAsB;YACrC,KAAK,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,IAAA,kCAA0B,EAAC,IAAI,CAAC,oBAAoB,CAAC,EAAE,CAAC;YAC9F,aAAa,EAAE,IAAI,oCAAuB,CAAC,CAAC,EAAE,CAAC,OAAe,EAAE,EAAE,CAAC,GAAG,GAAG,OAAO,IAAI,EAAE,CAAC;YACvF,GAAG,IAAI,CAAC,OAAO;SAClB,CAAC,CAAA;QAEF,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,OAAO,EAAE;YAC/C,WAAW,EAAE,IAAI,CAAC,gBAAgB,EAAE,MAAM;SAC7C,CAAC,CAAA;QAEF,OAAO,QAAQ,CAAA;IACnB,CAAC;IAEM,KAAK;QACR,IAAI,CAAC,gBAAgB,EAAE,KAAK,EAAE,CAAA;QAC9B,IAAI,CAAC,eAAe,GAAG,SAAS,CAAA;IACpC,CAAC;IAEM,OAAO;QACV,IAAI,CAAC,gBAAgB,EAAE,KAAK,EAAE,CAAA;IAClC,CAAC;IAEM,YAAY;QACf,IAAI,CAAC,gBAAgB,EAAE,KAAK,EAAE,CAAA;IAClC,CAAC;CACJ;AAxDD,gDAwDC"}

package/out/language-server/chat/chatSessionService.test.js CHANGED Viewed

@@ -5,7 +5,7 @@ const assert = require("assert");
 const ts_sinon_1 = require("ts-sinon");
 const chatSessionService_1 = require("./chatSessionService");
 describe('Chat Session Service', () => {
-    let generateAssistantResponseStub;
+    let sendMessageStub;
     let abortStub;
     let chatSessionService;
     const mockCredentialsProvider = {
@@ -25,58 +25,52 @@ describe('Chat Session Service', () => {
         },
     };
     const mockRequestResponse = {
-        conversationId: mockConversationId,
         $metadata: {},
-        generateAssistantResponseResponse: undefined,
+        sendMessageResponse: undefined,
     };
     beforeEach(() => {
         abortStub = ts_sinon_1.default.stub(AbortController.prototype, 'abort');
-        generateAssistantResponseStub = ts_sinon_1.default
-            .stub(codewhisperer_streaming_1.CodeWhispererStreaming.prototype, 'generateAssistantResponse')
+        sendMessageStub = ts_sinon_1.default
+            .stub(codewhisperer_streaming_1.CodeWhispererStreaming.prototype, 'sendMessage')
             .callsFake(() => Promise.resolve(mockRequestResponse));
         chatSessionService = new chatSessionService_1.ChatSessionService(mockCredentialsProvider);
     });
     afterEach(() => {
-        generateAssistantResponseStub.restore();
+        sendMessageStub.restore();
         abortStub.restore();
     });
-    describe('calling GenerateAssistantResponse', () => {
-        it('should call generate assistant response from the streaming client and set the session id ', async () => {
-            await chatSessionService.generateAssistantResponse(mockRequestParams);
-            ts_sinon_1.default.assert.calledOnceWithExactly(generateAssistantResponseStub, mockRequestParams, ts_sinon_1.default.match.object);
-            assert.strictEqual(chatSessionService.sessionId, mockConversationId);
-        });
-        it('should fill in conversationId with session id in the request if exists', async () => {
-            await chatSessionService.generateAssistantResponse(mockRequestParams);
-            ts_sinon_1.default.assert.calledOnceWithExactly(generateAssistantResponseStub, mockRequestParams, ts_sinon_1.default.match.object);
-            await chatSessionService.generateAssistantResponse(mockRequestParams);
+    describe('calling SendMessage', () => {
+        it('should fill in conversationId in the request if exists', async () => {
+            await chatSessionService.sendMessage(mockRequestParams);
+            ts_sinon_1.default.assert.calledOnceWithExactly(sendMessageStub, mockRequestParams, ts_sinon_1.default.match.object);
+            chatSessionService.conversationId = mockConversationId;
+            await chatSessionService.sendMessage(mockRequestParams);
             const requestParamsWithConversationId = {
                 conversationState: {
                     ...mockRequestParams.conversationState,
                     conversationId: mockConversationId,
                 },
             };
-            assert.ok(generateAssistantResponseStub
-                .getCall(1)
-                .calledWithExactly(requestParamsWithConversationId, ts_sinon_1.default.match.object));
+            assert.ok(sendMessageStub.getCall(1).calledWithExactly(requestParamsWithConversationId, ts_sinon_1.default.match.object));
         });
     });
     it('abortRequest() aborts request with AbortController', async () => {
-        await chatSessionService.generateAssistantResponse(mockRequestParams);
+        await chatSessionService.sendMessage(mockRequestParams);
         chatSessionService.abortRequest();
         ts_sinon_1.default.assert.calledOnce(abortStub);
     });
     it('dispose() calls aborts outgoing requests', async () => {
-        await chatSessionService.generateAssistantResponse(mockRequestParams);
+        await chatSessionService.sendMessage(mockRequestParams);
         chatSessionService.dispose();
         ts_sinon_1.default.assert.calledOnce(abortStub);
     });
-    it('clear() reset session id and aborts outgoing request', async () => {
-        await chatSessionService.generateAssistantResponse(mockRequestParams);
-        assert.strictEqual(chatSessionService.sessionId, mockConversationId);
+    it('clear() resets conversation id and aborts outgoing request', async () => {
+        await chatSessionService.sendMessage(mockRequestParams);
+        chatSessionService.conversationId = mockConversationId;
+        assert.strictEqual(chatSessionService.conversationId, mockConversationId);
         chatSessionService.clear();
         ts_sinon_1.default.assert.calledOnce(abortStub);
-        assert.strictEqual(chatSessionService.sessionId, undefined);
+        assert.strictEqual(chatSessionService.conversationId, undefined);
     });
 });
 //# sourceMappingURL=chatSessionService.test.js.map

package/out/language-server/chat/chatSessionService.test.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"chatSessionService.test.js","sourceRoot":"","sources":["../../../src/language-server/chat/chatSessionService.test.ts"],"names":[],"mappings":";;AAAA,2EAIsC;AAEtC,iCAAgC;AAChC,uCAA4B;AAC5B,6DAAyD;AAEzD,QAAQ,CAAC,sBAAsB,EAAE,GAAG,EAAE;IAClC,IAAI,~~6BAAwD~~,CAAA;~~IAC5D~~,IAAI,SAAoC,CAAA;IACxC,IAAI,kBAAsC,CAAA;IAC1C,MAAM,uBAAuB,GAAwB;QACjD,cAAc,EAAE,kBAAK,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC;QAC1C,cAAc,EAAE,kBAAK,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC,CAAC;QAC9E,qBAAqB,EAAE,kBAAK,CAAC,IAAI,EAAE;KACtC,CAAA;IAED,MAAM,kBAAkB,GAAG,oBAAoB,CAAA;IAE/C,MAAM,iBAAiB,~~GAA0C~~;~~QAC7D~~,iBAAiB,EAAE;YACf,eAAe,EAAE,QAAQ;YACzB,cAAc,EAAE;gBACZ,gBAAgB,EAAE;oBACd,OAAO,EAAE,OAAO;iBACnB;aACJ;SACJ;KACJ,CAAA;IAED,MAAM,mBAAmB,~~GAA2C~~;~~QAChE~~,~~cAAc,EAAE,kBAAkB;QAClC,~~SAAS,EAAE,EAAE;QACb,~~iCAAiC~~,EAAE,SAAS;~~KAC/C~~,CAAA;IAED,UAAU,CAAC,GAAG,EAAE;QACZ,SAAS,GAAG,kBAAK,CAAC,IAAI,CAAC,eAAe,CAAC,SAAS,EAAE,OAAO,CAAC,CAAA;QAE1D,~~6BAA6B~~,GAAG,kBAAK;~~aAChC~~,IAAI,CAAC,gDAAsB,CAAC,SAAS,EAAE,~~2BAA2B~~,CAAC;~~aACnE~~,SAAS,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC,CAAA;QAE1D,kBAAkB,GAAG,IAAI,uCAAkB,CAAC,uBAAuB,CAAC,CAAA;IACxE,CAAC,CAAC,CAAA;IAEF,SAAS,CAAC,GAAG,EAAE;QACX,~~6BAA6B~~,CAAC,OAAO,EAAE,CAAA;~~QACvC~~,SAAS,CAAC,OAAO,EAAE,CAAA;IACvB,CAAC,CAAC,CAAA;IAEF,QAAQ,CAAC,~~mCAAmC~~,EAAE,GAAG,EAAE;~~QAC/C~~,EAAE,CAAC,~~2FAA2F~~,EAAE,KAAK,IAAI,EAAE;~~YACvG~~,MAAM,kBAAkB,CAAC,~~yBAAyB~~,CAAC,iBAAiB,CAAC,CAAA;~~YAErE~~,kBAAK,CAAC,MAAM,CAAC,qBAAqB,CAAC,~~6BAA6B~~,EAAE,iBAAiB,EAAE,kBAAK,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;~~YACxG~~,~~MAAM,CAAC,WAAW,CAAC,~~kBAAkB,CAAC,~~SAAS~~,~~EAAE~~,kBAAkB,~~CAAC,~~CAAA;~~QACxE~~,~~CAAC,CAAC,CAAA;QAEF,EAAE,CAAC,wEAAwE,EAAE,KAAK,IAAI,EAAE;YACpF,~~MAAM,kBAAkB,CAAC,~~yBAAyB~~,CAAC,iBAAiB,CAAC,CAAA;~~YAErE~~,~~kBAAK,CAAC,~~MAAM~~,CAAC,qBAAqB,CAAC,6BAA6B,EAAE,iBAAiB,EAAE,kBAAK,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;YAExG,MAAM,kBAAkB,CAAC,yBAAyB,CAAC,iBAAiB,CAAC,CAAA;YAErE,MAAM~~,+BAA+B,GAAG;gBACpC,iBAAiB,EAAE;oBACf,GAAG,iBAAiB,CAAC,iBAAiB;oBACtC,cAAc,EAAE,kBAAkB;iBACrC;aACJ,CAAA;YAED,MAAM,CAAC,EAAE,~~CACL~~,~~6BAA6B;iBACxB~~,OAAO,CAAC,CAAC,CAAC~~;iBACV~~,iBAAiB,CAAC,+BAA+B,EAAE,kBAAK,CAAC,KAAK,CAAC,MAAM,CAAC,~~CAC9E~~,CAAA;~~QACL~~,CAAC,CAAC,CAAA;IACN,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,oDAAoD,EAAE,KAAK,IAAI,EAAE;QAChE,MAAM,kBAAkB,CAAC,~~yBAAyB~~,CAAC,iBAAiB,CAAC,CAAA;~~QAErE~~,kBAAkB,CAAC,YAAY,EAAE,CAAA;QAEjC,kBAAK,CAAC,MAAM,CAAC,UAAU,CAAC,SAAS,CAAC,CAAA;IACtC,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,0CAA0C,EAAE,KAAK,IAAI,EAAE;QACtD,MAAM,kBAAkB,CAAC,~~yBAAyB~~,CAAC,iBAAiB,CAAC,CAAA;~~QAErE~~,kBAAkB,CAAC,OAAO,EAAE,CAAA;QAE5B,kBAAK,CAAC,MAAM,CAAC,UAAU,CAAC,SAAS,CAAC,CAAA;IACtC,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,~~sDAAsD~~,EAAE,KAAK,IAAI,EAAE;~~QAClE~~,MAAM,kBAAkB,CAAC,~~yBAAyB~~,CAAC,iBAAiB,CAAC,CAAA;~~QAErE~~,MAAM,CAAC,WAAW,CAAC,kBAAkB,CAAC,~~SAAS~~,EAAE,kBAAkB,CAAC,CAAA;~~QAEpE~~,kBAAkB,CAAC,KAAK,EAAE,CAAA;QAE1B,kBAAK,CAAC,MAAM,CAAC,UAAU,CAAC,SAAS,CAAC,CAAA;QAClC,MAAM,CAAC,WAAW,CAAC,kBAAkB,CAAC,~~SAAS~~,EAAE,SAAS,CAAC,CAAA;~~IAC/D~~,CAAC,CAAC,CAAA;AACN,CAAC,CAAC,CAAA"}
1	+ {"version":3,"file":"chatSessionService.test.js","sourceRoot":"","sources":["../../../src/language-server/chat/chatSessionService.test.ts"],"names":[],"mappings":"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"}

package/out/language-server/chat/contexts/documentContext.d.ts CHANGED Viewed

@@ -2,14 +2,12 @@ import { EditorState, TextDocument as CwsprTextDocument } from '@amzn/codewhispe
 import { CursorState } from '@aws/language-server-runtimes/server-interface';
 import { TextDocument } from 'vscode-languageserver-textdocument';
 import { Features } from '../../types';
-import { DocumentFqnExtractorConfig } from './documentFqnExtractor';
 export type DocumentContext = CwsprTextDocument & {
     cursorState?: EditorState['cursorState'];
     hasCodeSnippet: boolean;
     totalEditorCharacters: number;
 };
-export interface DocumentContextExtractorConfig extends DocumentFqnExtractorConfig {
-    config?: DocumentFqnExtractorConfig;
+export interface DocumentContextExtractorConfig {
     logger?: Features['logging'];
     characterLimits?: number;
 }
@@ -17,7 +15,6 @@ export declare class DocumentContextExtractor {
     #private;
     private static readonly DEFAULT_CHARACTER_LIMIT;
     constructor(config?: DocumentContextExtractorConfig);
-    dispose(): void;
     /**
      * From the given the cursor state, we want to give Q context up to the characters limit
      * on both sides of the cursor.

package/out/language-server/chat/contexts/documentContext.js CHANGED Viewed

@@ -2,21 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DocumentContextExtractor = void 0;
 const languageDetection_1 = require("../../languageDetection");
-const documentFqnExtractor_1 = require("./documentFqnExtractor");
 const utils_1 = require("./utils");
 class DocumentContextExtractor {
     static DEFAULT_CHARACTER_LIMIT = 9000;
     #characterLimits;
     #logger;
-    #documentSymbolExtractor;
     constructor(config) {
-        const { characterLimits, ...fqnConfig } = config ?? {};
         this.#logger = config?.logger;
-        this.#characterLimits = characterLimits ?? DocumentContextExtractor.DEFAULT_CHARACTER_LIMIT;
-        this.#documentSymbolExtractor = new documentFqnExtractor_1.DocumentFqnExtractor(fqnConfig);
-    }
-    dispose() {
-        this.#documentSymbolExtractor.dispose();
+        this.#characterLimits = config?.characterLimits ?? DocumentContextExtractor.DEFAULT_CHARACTER_LIMIT;
     }
     /**
      * From the given the cursor state, we want to give Q context up to the characters limit
@@ -32,20 +25,11 @@ class DocumentContextExtractor {
         const codeBlockRange = (0, utils_1.getExtendedCodeBlockRange)(document, targetRange, this.#characterLimits);
         const rangeWithinCodeBlock = (0, utils_1.getSelectionWithinExtendedRange)(targetRange, codeBlockRange);
         const languageId = (0, languageDetection_1.getLanguageId)(document);
-        let documentSymbols = [];
-        try {
-            // best effort to extract symbols
-            documentSymbols = await this.#documentSymbolExtractor.extractDocumentSymbols(document, codeBlockRange, languageId);
-        }
-        catch (e) {
-            this.#logger?.log(`Error extracting document symbols but continuing on. ${e instanceof Error ? e.message : 'Unknown error'}`);
-        }
         return {
             cursorState: rangeWithinCodeBlock ? { range: rangeWithinCodeBlock } : undefined,
             text: document.getText(codeBlockRange),
             programmingLanguage: languageId ? { languageName: languageId } : undefined,
             relativeFilePath: document.uri,
-            documentSymbols,
             hasCodeSnippet: Boolean(rangeWithinCodeBlock),
             totalEditorCharacters: document.getText().length,
         };

package/out/language-server/chat/contexts/documentContext.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"documentContext.js","sourceRoot":"","sources":["../../../../src/language-server/chat/contexts/documentContext.ts"],"names":[],"mappings":";;;AAGA,+DAAuD;AAEvD,~~iEAAyF;AACzF,~~mCAAoF;~~AAcpF~~,MAAa,wBAAwB;IACzB,MAAM,CAAU,uBAAuB,GAAG,IAAI,CAAA;IAEtD,gBAAgB,CAAQ;IACxB,OAAO,CAAsB;~~IAC7B~~,~~wBAAwB,CAAsB;IAE9C,~~YAAY,MAAuC;QAC/C,~~MAAM,EAAE,eAAe,EAAE,GAAG,SAAS,EAAE,GAAG,MAAM,~~IAAI,~~EAAE,CAAA;QAEtD,IAAI,~~CAAC,OAAO,GAAG,MAAM,EAAE,MAAM,CAAA;QAC7B,IAAI,CAAC,gBAAgB,GAAG,eAAe,IAAI,wBAAwB,CAAC,uBAAuB,CAAA;~~QAC3F~~,~~IAAI,~~CAAC~~,wBAAwB,GAAG,IAAI,2CAAoB,CAAC,SAAS,CAAC,CAAA~~;~~IACvE,CAAC;IAEM,OAAO;QACV,IAAI,CAAC,wBAAwB,CAAC,OAAO,EAAE,CAAA;IAC3C,CAAC;~~IAED;;;OAGG;IACI,KAAK,CAAC,sBAAsB,CAAC,QAAsB,EAAE,WAAwB;QAChF,MAAM,WAAW,GACb,UAAU,IAAI,WAAW;YACrB,CAAC,CAAC;gBACI,KAAK,EAAE,WAAW,CAAC,QAAQ;gBAC3B,GAAG,EAAE,WAAW,CAAC,QAAQ;aAC5B;YACH,CAAC,CAAC,WAAW,CAAC,KAAK,CAAA;QAE3B,MAAM,cAAc,GAAG,IAAA,iCAAyB,EAAC,QAAQ,EAAE,WAAW,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAA;QAE9F,MAAM,oBAAoB,GAAG,IAAA,uCAA+B,EAAC,WAAW,EAAE,cAAc,CAAC,CAAA;QAEzF,MAAM,UAAU,GAAG,IAAA,iCAAa,EAAC,QAAQ,CAAC,CAAA;QAE1C,~~IAAI,eAAe,GAAqB,EAAE,CAAA;QAE1C,IAAI,CAAC;YACD,iCAAiC;YACjC,eAAe,GAAG,MAAM,IAAI,CAAC,wBAAwB,CAAC,sBAAsB,CACxE,QAAQ,EACR,cAAc,EACd,UAAU,CACb,CAAA;QACL,CAAC;QAAC,~~OAAO~~,CAAC,EAAE,CAAC~~;~~YACT,IAAI,CAAC,OAAO,EAAE,GAAG,CACb,wDAAwD,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe,EAAE,CAC7G,CAAA;QACL,CAAC;QAED,OAAO;~~YACH,WAAW,EAAE,oBAAoB,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,oBAAoB,EAAE,CAAC,CAAC,CAAC,SAAS;YAC/E,IAAI,EAAE,QAAQ,CAAC,OAAO,CAAC,cAAc,CAAC;YACtC,mBAAmB,EAAE,UAAU,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,SAAS;YAC1E,gBAAgB,EAAE,QAAQ,CAAC,GAAG;YAC9B,~~eAAe;YACf,~~cAAc,EAAE,OAAO,CAAC,oBAAoB,CAAC;YAC7C,qBAAqB,EAAE,QAAQ,CAAC,OAAO,EAAE,CAAC,MAAM;SACnD,CAAA;IACL,CAAC;;~~AA9DL~~,~~4DA+DC~~"}
1	+ {"version":3,"file":"documentContext.js","sourceRoot":"","sources":["../../../../src/language-server/chat/contexts/documentContext.ts"],"names":[],"mappings":";;;AAGA,+DAAuD;AAEvD,mCAAoF;AAapF,MAAa,wBAAwB;IACzB,MAAM,CAAU,uBAAuB,GAAG,IAAI,CAAA;IAEtD,gBAAgB,CAAQ;IACxB,OAAO,CAAsB;IAE7B,YAAY,MAAuC;QAC/C,IAAI,CAAC,OAAO,GAAG,MAAM,EAAE,MAAM,CAAA;QAC7B,IAAI,CAAC,gBAAgB,GAAG,MAAM,EAAE,eAAe,IAAI,wBAAwB,CAAC,uBAAuB,CAAA;IACvG,CAAC;IAED;;;OAGG;IACI,KAAK,CAAC,sBAAsB,CAAC,QAAsB,EAAE,WAAwB;QAChF,MAAM,WAAW,GACb,UAAU,IAAI,WAAW;YACrB,CAAC,CAAC;gBACI,KAAK,EAAE,WAAW,CAAC,QAAQ;gBAC3B,GAAG,EAAE,WAAW,CAAC,QAAQ;aAC5B;YACH,CAAC,CAAC,WAAW,CAAC,KAAK,CAAA;QAE3B,MAAM,cAAc,GAAG,IAAA,iCAAyB,EAAC,QAAQ,EAAE,WAAW,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAA;QAE9F,MAAM,oBAAoB,GAAG,IAAA,uCAA+B,EAAC,WAAW,EAAE,cAAc,CAAC,CAAA;QAEzF,MAAM,UAAU,GAAG,IAAA,iCAAa,EAAC,QAAQ,CAAC,CAAA;QAE1C,OAAO;YACH,WAAW,EAAE,oBAAoB,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,oBAAoB,EAAE,CAAC,CAAC,CAAC,SAAS;YAC/E,IAAI,EAAE,QAAQ,CAAC,OAAO,CAAC,cAAc,CAAC;YACtC,mBAAmB,EAAE,UAAU,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,SAAS;YAC1E,gBAAgB,EAAE,QAAQ,CAAC,GAAG;YAC9B,cAAc,EAAE,OAAO,CAAC,oBAAoB,CAAC;YAC7C,qBAAqB,EAAE,QAAQ,CAAC,OAAO,EAAE,CAAC,MAAM;SACnD,CAAA;IACL,CAAC;;AAtCL,4DAuCC"}

package/out/language-server/chat/contexts/documentContext.test.js CHANGED Viewed

@@ -4,15 +4,11 @@ const assert = require("assert");
 const ts_sinon_1 = require("ts-sinon");
 const vscode_languageserver_textdocument_1 = require("vscode-languageserver-textdocument");
 const documentContext_1 = require("./documentContext");
-const documentFqnExtractor_1 = require("./documentFqnExtractor");
 describe('DocumentContext', () => {
     const mockTypescriptCodeBlock = `function test() {
     console.log('test')
 }`;
     const mockTSDocument = vscode_languageserver_textdocument_1.TextDocument.create('file://test.ts', 'typescript', 1, mockTypescriptCodeBlock);
-    beforeEach(() => {
-        ts_sinon_1.default.stub(documentFqnExtractor_1.DocumentFqnExtractor.prototype, 'extractDocumentSymbols').resolves([]);
-    });
     afterEach(() => {
         ts_sinon_1.default.restore();
     });
@@ -22,7 +18,6 @@ describe('DocumentContext', () => {
             const expected = {
                 programmingLanguage: { languageName: 'typescript' },
                 relativeFilePath: 'file://test.ts',
-                documentSymbols: [],
                 text: "console.log('test')",
                 hasCodeSnippet: true,
                 totalEditorCharacters: mockTypescriptCodeBlock.length,
@@ -59,7 +54,6 @@ describe('DocumentContext', () => {
             const expected = {
                 programmingLanguage: { languageName: 'typescript' },
                 relativeFilePath: 'file://test.ts',
-                documentSymbols: [],
                 text: "console.log('test')",
                 hasCodeSnippet: true,
                 totalEditorCharacters: mockTypescriptCodeBlock.length,
@@ -101,7 +95,6 @@ describe('DocumentContext', () => {
         const expectedResult = {
             programmingLanguage: { languageName: 'go' },
             relativeFilePath: 'file://test.go',
-            documentSymbols: [],
             text: 'fmt.Println("test")',
             totalEditorCharacters: mockGoCodeBLock.length,
             hasCodeSnippet: true,

package/out/language-server/chat/contexts/documentContext.test.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"documentContext.test.js","sourceRoot":"","sources":["../../../../src/language-server/chat/contexts/documentContext.test.ts"],"names":[],"mappings":";;AACA,iCAAgC;AAChC,uCAA4B;AAC5B,2FAAiE;AACjE,uDAA6E;~~AAC7E~~,~~iEAA6D;AAE7D,~~QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAC7B,MAAM,uBAAuB,GAAG;;EAElC,CAAA;IACE,MAAM,cAAc,GAAG,iDAAY,CAAC,MAAM,CAAC,gBAAgB,EAAE,YAAY,EAAE,CAAC,EAAE,uBAAuB,CAAC,CAAA;IAEtG,~~UAAU,CAAC,GAAG,EAAE;QACZ,kBAAK,CAAC,IAAI,CAAC,2CAAoB,CAAC,~~SAAS,~~EAAE,wBAAwB,~~CAAC,~~CAAC,QAAQ,CAAC,EAAE,CAAC,CAAA;IACrF,CAAC,CAAC,CAAA;IAEF,SAAS,CAAC,~~GAAG,EAAE;QACX,kBAAK,CAAC,OAAO,EAAE,CAAA;IACnB,CAAC,CAAC,CAAA;IAEF,QAAQ,CAAC,6CAA6C,EAAE,GAAG,EAAE;QACzD,EAAE,CAAC,2CAA2C,EAAE,KAAK,IAAI,EAAE;YACvD,MAAM,wBAAwB,GAAG,IAAI,0CAAwB,CAAC,EAAE,eAAe,EAAE,EAAE,EAAE,CAAC,CAAA;YACtF,MAAM,QAAQ,GAAoB;gBAC9B,mBAAmB,EAAE,EAAE,YAAY,EAAE,YAAY,EAAE;gBACnD,gBAAgB,EAAE,gBAAgB;gBAClC,~~eAAe,EAAE,EAAE;gBACnB,~~IAAI,EAAE,qBAAqB;gBAC3B,cAAc,EAAE,IAAI;gBACpB,qBAAqB,EAAE,uBAAuB,CAAC,MAAM;gBACrD,WAAW,EAAE;oBACT,KAAK,EAAE;wBACH,KAAK,EAAE;4BACH,IAAI,EAAE,CAAC;4BACP,SAAS,EAAE,CAAC;yBACf;wBACD,GAAG,EAAE;4BACD,IAAI,EAAE,CAAC;4BACP,SAAS,EAAE,EAAE;yBAChB;qBACJ;iBACJ;aACJ,CAAA;YAED,MAAM,MAAM,GAAG,MAAM,wBAAwB,CAAC,sBAAsB,CAAC,cAAc,EAAE;gBACjF,qBAAqB;gBACrB,KAAK,EAAE;oBACH,KAAK,EAAE;wBACH,IAAI,EAAE,CAAC;wBACP,SAAS,EAAE,EAAE;qBAChB;oBACD,GAAG,EAAE;wBACD,IAAI,EAAE,CAAC;wBACP,SAAS,EAAE,EAAE;qBAChB;iBACJ;aACJ,CAAC,CAAA;YAEF,MAAM,CAAC,eAAe,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;QAC5C,CAAC,CAAC,CAAA;QAEF,EAAE,CAAC,8CAA8C,EAAE,KAAK,IAAI,EAAE;YAC1D,MAAM,wBAAwB,GAAG,IAAI,0CAAwB,CAAC,EAAE,eAAe,EAAE,EAAE,EAAE,CAAC,CAAA;YACtF,MAAM,QAAQ,GAAoB;gBAC9B,mBAAmB,EAAE,EAAE,YAAY,EAAE,YAAY,EAAE;gBACnD,gBAAgB,EAAE,gBAAgB;gBAClC,~~eAAe,EAAE,EAAE;gBACnB,~~IAAI,EAAE,qBAAqB;gBAC3B,cAAc,EAAE,IAAI;gBACpB,qBAAqB,EAAE,uBAAuB,CAAC,MAAM;gBACrD,WAAW,EAAE;oBACT,KAAK,EAAE;wBACH,KAAK,EAAE;4BACH,IAAI,EAAE,CAAC;4BACP,SAAS,EAAE,CAAC;yBACf;wBACD,GAAG,EAAE;4BACD,IAAI,EAAE,CAAC;4BACP,SAAS,EAAE,EAAE;yBAChB;qBACJ;iBACJ;aACJ,CAAA;YAED,MAAM,MAAM,GAAG,MAAM,wBAAwB,CAAC,sBAAsB,CAAC,cAAc,EAAE;gBACjF,4BAA4B;gBAC5B,KAAK,EAAE;oBACH,KAAK,EAAE;wBACH,IAAI,EAAE,CAAC;wBACP,SAAS,EAAE,EAAE;qBAChB;oBACD,GAAG,EAAE;wBACD,IAAI,EAAE,CAAC;wBACP,SAAS,EAAE,EAAE;qBAChB;iBACJ;aACJ,CAAC,CAAA;YAEF,MAAM,CAAC,eAAe,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;QAC5C,CAAC,CAAC,CAAA;IACN,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,mCAAmC,EAAE,KAAK,IAAI,EAAE;QAC/C,MAAM,wBAAwB,GAAG,IAAI,0CAAwB,CAAC,EAAE,eAAe,EAAE,EAAE,EAAE,CAAC,CAAA;QAEtF,MAAM,eAAe,GAAG;;EAE9B,CAAA;QACM,MAAM,YAAY,GAAG,iDAAY,CAAC,MAAM,CAAC,gBAAgB,EAAE,IAAI,EAAE,CAAC,EAAE,eAAe,CAAC,CAAA;QAEpF,MAAM,cAAc,GAAoB;YACpC,mBAAmB,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE;YAC3C,gBAAgB,EAAE,gBAAgB;YAClC,~~eAAe,EAAE,EAAE;YACnB,~~IAAI,EAAE,qBAAqB;YAC3B,qBAAqB,EAAE,eAAe,CAAC,MAAM;YAC7C,cAAc,EAAE,IAAI;YACpB,WAAW,EAAE;gBACT,KAAK,EAAE;oBACH,KAAK,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE;oBAChC,GAAG,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE;iBAClC;aACJ;SACJ,CAAA;QACD,MAAM,MAAM,GAAG,MAAM,wBAAwB,CAAC,sBAAsB,CAAC,YAAY,EAAE;YAC/E,KAAK,EAAE;gBACH,KAAK,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE;gBAChC,GAAG,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE;aAClC;SACJ,CAAC,CAAA;QAEF,MAAM,CAAC,eAAe,CAAC,MAAM,EAAE,cAAc,CAAC,CAAA;IAClD,CAAC,CAAC,CAAA;AACN,CAAC,CAAC,CAAA"}
1	+ {"version":3,"file":"documentContext.test.js","sourceRoot":"","sources":["../../../../src/language-server/chat/contexts/documentContext.test.ts"],"names":[],"mappings":"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"}

package/out/language-server/chat/contexts/triggerContext.d.ts CHANGED Viewed

@@ -1,10 +1,10 @@
 import { TriggerType } from '@aws/chat-client-ui-types';
-import { GenerateAssistantResponseCommandInput } from '@amzn/codewhisperer-streaming';
+import { SendMessageCommandInput, UserIntent } from '@amzn/codewhisperer-streaming';
 import { ChatParams } from '@aws/language-server-runtimes/server-interface';
 import { Features } from '../../types';
 import { DocumentContext } from './documentContext';
 export interface TriggerContext extends Partial<DocumentContext> {
-    userIntent?: string;
+    userIntent?: UserIntent;
     triggerType?: TriggerType;
 }
 export declare class QChatTriggerContext {
@@ -12,7 +12,6 @@ export declare class QChatTriggerContext {
     private static readonly DEFAULT_CURSOR_STATE;
     constructor(workspace: Features['workspace'], logger: Features['logging']);
     getNewTriggerContext(params: ChatParams): Promise<TriggerContext>;
-    getChatParamsFromTrigger(params: ChatParams, triggerContext: TriggerContext, customizationArn?: string): GenerateAssistantResponseCommandInput;
-    dispose(): void;
+    getChatParamsFromTrigger(params: ChatParams, triggerContext: TriggerContext, customizationArn?: string): SendMessageCommandInput;
     extractDocumentContext(input: Pick<ChatParams, 'cursorState' | 'textDocument'>): Promise<DocumentContext | undefined>;
 }

package/out/language-server/chat/contexts/triggerContext.js CHANGED Viewed

@@ -34,7 +34,6 @@ class QChatTriggerContext {
                                         text: triggerContext.text,
                                         programmingLanguage: triggerContext.programmingLanguage,
                                         relativeFilePath: triggerContext.relativeFilePath,
-                                        documentSymbols: triggerContext.documentSymbols,
                                     },
                                 },
                             }
@@ -47,9 +46,6 @@ class QChatTriggerContext {
         };
         return data;
     }
-    dispose() {
-        this.#documentContextExtractor.dispose();
-    }
     // public for testing
     async extractDocumentContext(input) {
         const { textDocument: textDocumentIdentifier, cursorState } = input;

package/out/language-server/chat/contexts/triggerContext.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"triggerContext.js","sourceRoot":"","sources":["../../../../src/language-server/chat/contexts/triggerContext.ts"],"names":[],"mappings":";;;AACA,~~2EAAkH~~;~~AAGlH~~,uDAA6E;AAO7E,MAAa,mBAAmB;IACpB,MAAM,CAAU,oBAAoB,GAAgB,EAAE,QAAQ,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,EAAE,CAAA;IAEnG,UAAU,CAAuB;IACjC,yBAAyB,CAA0B;IAEnD,YAAY,SAAgC,EAAE,MAA2B;QACrE,IAAI,CAAC,UAAU,GAAG,SAAS,CAAA;QAC3B,IAAI,CAAC,yBAAyB,GAAG,IAAI,0CAAwB,CAAC,EAAE,MAAM,EAAE,CAAC,CAAA;IAC7E,CAAC;IAED,KAAK,CAAC,oBAAoB,CAAC,MAAkB;QACzC,MAAM,eAAe,GAAgC,MAAM,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAA;QAE9F,OAAO;YACH,GAAG,eAAe;YAClB,UAAU,EAAE,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC;SAChE,CAAA;IACL,CAAC;IAED,wBAAwB,CACpB,MAAkB,EAClB,cAA8B,EAC9B,gBAAyB;QAEzB,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,CAAA;QAEzB,MAAM,IAAI,~~GAA0C~~;~~YAChD~~,iBAAiB,EAAE;gBACf,eAAe,EAAE,yCAAe,CAAC,MAAM;gBACvC,cAAc,EAAE;oBACZ,gBAAgB,EAAE;wBACd,OAAO,EAAE,MAAM,CAAC,aAAa,IAAI,MAAM,CAAC,MAAM;wBAC9C,uBAAuB,EACnB,cAAc,CAAC,WAAW,IAAI,cAAc,CAAC,gBAAgB;4BACzD,CAAC,CAAC;gCACI,WAAW,EAAE;oCACT,WAAW,EAAE,cAAc,CAAC,WAAW;oCACvC,QAAQ,EAAE;wCACN,IAAI,EAAE,cAAc,CAAC,IAAI;wCACzB,mBAAmB,EAAE,cAAc,CAAC,mBAAmB;wCACvD,gBAAgB,EAAE,cAAc,CAAC,gBAAgB;~~wCACjD,eAAe,EAAE,cAAc,CAAC,eAAe~~;~~qCAClD;~~iCACJ;6BACJ;4BACH,CAAC,CAAC,SAAS;wBACnB,UAAU,EAAE,cAAc,CAAC,UAAU;qBACxC;iBACJ;gBACD,gBAAgB;aACnB;SACJ,CAAA;QAED,OAAO,IAAI,CAAA;IACf,CAAC;~~IAEM,OAAO;QACV,IAAI,CAAC,yBAAyB,CAAC,OAAO,EAAE,CAAA;IAC5C,CAAC;~~IAED,qBAAqB;IACrB,KAAK,CAAC,sBAAsB,CACxB,KAAuD;QAEvD,MAAM,EAAE,YAAY,EAAE,sBAAsB,EAAE,WAAW,EAAE,GAAG,KAAK,CAAA;QAEnE,MAAM,YAAY,GACd,sBAAsB,EAAE,GAAG,IAAI,CAAC,MAAM,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,sBAAsB,CAAC,GAAG,CAAC,CAAC,CAAA;QAEtG,OAAO,YAAY;YACf,CAAC,CAAC,IAAI,CAAC,yBAAyB,CAAC,sBAAsB,CACjD,YAAY;YACZ,2HAA2H;YAC3H,iEAAiE;YACjE,WAAW,EAAE,CAAC,CAAC,CAAC,IAAI,mBAAmB,CAAC,oBAAoB,CAC/D;YACH,CAAC,CAAC,SAAS,CAAA;IACnB,CAAC;IAED,sBAAsB,CAAC,MAAe;QAClC,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YACvB,OAAO,SAAS,CAAA;QACpB,CAAC;aAAM,IAAI,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;YAClC,OAAO,oCAAU,CAAC,sBAAsB,CAAA;QAC5C,CAAC;aAAM,IAAI,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;YACnC,OAAO,oCAAU,CAAC,gCAAgC,CAAA;QACtD,CAAC;aAAM,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;YAC9B,OAAO,oCAAU,CAAC,2BAA2B,CAAA;QACjD,CAAC;aAAM,IAAI,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;YACnC,OAAO,oCAAU,CAAC,YAAY,CAAA;QAClC,CAAC;QAED,OAAO,SAAS,CAAA;IACpB,CAAC;;~~AA9FL~~,~~kDA+FC~~"}
1	+ {"version":3,"file":"triggerContext.js","sourceRoot":"","sources":["../../../../src/language-server/chat/contexts/triggerContext.ts"],"names":[],"mappings":"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"}

package/out/language-server/chat/contexts/triggerContexts.test.js CHANGED Viewed

@@ -14,7 +14,6 @@ describe('QChatTriggerContext', () => {
         text: '',
         programmingLanguage: { languageName: 'typescript' },
         relativeFilePath: 'file://test.ts',
-        documentSymbols: [],
         hasCodeSnippet: false,
         totalEditorCharacters: 0,
     };