@aws/lsp-codewhisperer 0.0.72 → 0.0.74
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.
- package/CHANGELOG.md +55 -0
- package/out/client/token/bearer-token-service.json +85 -0
- package/out/language-server/agenticChat/agenticChatController.d.ts +14 -1
- package/out/language-server/agenticChat/agenticChatController.js +117 -74
- package/out/language-server/agenticChat/agenticChatController.js.map +1 -1
- package/out/language-server/agenticChat/agenticChatResultStream.d.ts +4 -27
- package/out/language-server/agenticChat/agenticChatResultStream.js +15 -31
- package/out/language-server/agenticChat/agenticChatResultStream.js.map +1 -1
- package/out/language-server/agenticChat/constants/constants.d.ts +2 -0
- package/out/language-server/agenticChat/constants/constants.js +3 -1
- package/out/language-server/agenticChat/constants/constants.js.map +1 -1
- package/out/language-server/agenticChat/context/additionalContextProvider.js +1 -1
- package/out/language-server/agenticChat/context/additionalContextProvider.js.map +1 -1
- package/out/language-server/agenticChat/qAgenticChatServer.js +1 -1
- package/out/language-server/agenticChat/qAgenticChatServer.js.map +1 -1
- package/out/language-server/agenticChat/tools/fileSearch.d.ts +1 -0
- package/out/language-server/agenticChat/tools/fileSearch.js +4 -0
- package/out/language-server/agenticChat/tools/fileSearch.js.map +1 -1
- package/out/language-server/agenticChat/tools/mcp/mcpEventHandler.d.ts +7 -0
- package/out/language-server/agenticChat/tools/mcp/mcpEventHandler.js +71 -40
- package/out/language-server/agenticChat/tools/mcp/mcpEventHandler.js.map +1 -1
- package/out/language-server/agenticChat/tools/mcp/mcpManager.d.ts +4 -0
- package/out/language-server/agenticChat/tools/mcp/mcpManager.js +65 -36
- package/out/language-server/agenticChat/tools/mcp/mcpManager.js.map +1 -1
- package/out/language-server/agenticChat/tools/mcp/mcpUtils.d.ts +1 -1
- package/out/language-server/agenticChat/tools/mcp/mcpUtils.js +5 -39
- package/out/language-server/agenticChat/tools/mcp/mcpUtils.js.map +1 -1
- package/out/language-server/agenticChat/tools/mcp/profileStatusMonitor.d.ts +34 -0
- package/out/language-server/agenticChat/tools/mcp/profileStatusMonitor.js +159 -0
- package/out/language-server/agenticChat/tools/mcp/profileStatusMonitor.js.map +1 -0
- package/out/language-server/agenticChat/tools/qCodeAnalysis/codeReview.js +5 -0
- package/out/language-server/agenticChat/tools/qCodeAnalysis/codeReview.js.map +1 -1
- package/out/language-server/agenticChat/tools/toolServer.js +123 -23
- package/out/language-server/agenticChat/tools/toolServer.js.map +1 -1
- package/out/language-server/chat/qChatServer.js +1 -1
- package/out/language-server/chat/qChatServer.js.map +1 -1
- package/out/language-server/inline-completion/codePercentage.d.ts +2 -0
- package/out/language-server/inline-completion/codePercentage.js +10 -2
- package/out/language-server/inline-completion/codePercentage.js.map +1 -1
- package/out/language-server/inline-completion/codeWhispererServer.d.ts +1 -0
- package/out/language-server/inline-completion/codeWhispererServer.js +119 -109
- package/out/language-server/inline-completion/codeWhispererServer.js.map +1 -1
- package/out/language-server/inline-completion/constants.d.ts +1 -1
- package/out/language-server/inline-completion/constants.js +26 -2
- package/out/language-server/inline-completion/constants.js.map +1 -1
- package/out/language-server/inline-completion/diffUtils.d.ts +15 -0
- package/out/language-server/inline-completion/diffUtils.js +53 -0
- package/out/language-server/inline-completion/diffUtils.js.map +1 -1
- package/out/language-server/inline-completion/editCompletionHandler.d.ts +3 -0
- package/out/language-server/inline-completion/editCompletionHandler.js +55 -76
- package/out/language-server/inline-completion/editCompletionHandler.js.map +1 -1
- package/out/language-server/inline-completion/session/sessionManager.d.ts +5 -5
- package/out/language-server/inline-completion/session/sessionManager.js +11 -8
- package/out/language-server/inline-completion/session/sessionManager.js.map +1 -1
- package/out/language-server/inline-completion/telemetry.d.ts +4 -3
- package/out/language-server/inline-completion/telemetry.js +20 -10
- package/out/language-server/inline-completion/telemetry.js.map +1 -1
- package/out/language-server/inline-completion/trigger.d.ts +2 -11
- package/out/language-server/inline-completion/trigger.js.map +1 -1
- package/out/language-server/netTransform/resources/SupportedProjects.d.ts +3 -0
- package/out/language-server/netTransform/resources/SupportedProjects.js +3 -0
- package/out/language-server/netTransform/resources/SupportedProjects.js.map +1 -1
- package/out/language-server/netTransform/transformHandler.js +0 -13
- package/out/language-server/netTransform/transformHandler.js.map +1 -1
- package/out/language-server/netTransform/validation.d.ts +1 -5
- package/out/language-server/netTransform/validation.js +1 -21
- package/out/language-server/netTransform/validation.js.map +1 -1
- package/out/language-server/workspaceContext/IdleWorkspaceManager.d.ts +14 -0
- package/out/language-server/workspaceContext/IdleWorkspaceManager.js +42 -0
- package/out/language-server/workspaceContext/IdleWorkspaceManager.js.map +1 -0
- package/out/language-server/workspaceContext/artifactManager.js +14 -0
- package/out/language-server/workspaceContext/artifactManager.js.map +1 -1
- package/out/language-server/workspaceContext/dependency/dependencyDiscoverer.d.ts +1 -1
- package/out/language-server/workspaceContext/dependency/dependencyDiscoverer.js +2 -1
- package/out/language-server/workspaceContext/dependency/dependencyDiscoverer.js.map +1 -1
- package/out/language-server/workspaceContext/workspaceContextServer.js +4 -7
- package/out/language-server/workspaceContext/workspaceContextServer.js.map +1 -1
- package/out/language-server/workspaceContext/workspaceFolderManager.d.ts +10 -5
- package/out/language-server/workspaceContext/workspaceFolderManager.js +140 -85
- package/out/language-server/workspaceContext/workspaceFolderManager.js.map +1 -1
- package/out/shared/amazonQServiceManager/AmazonQTokenServiceManager.js +13 -0
- package/out/shared/amazonQServiceManager/AmazonQTokenServiceManager.js.map +1 -1
- package/out/shared/amazonQServiceManager/BaseAmazonQServiceManager.d.ts +1 -0
- package/out/shared/amazonQServiceManager/BaseAmazonQServiceManager.js +3 -0
- package/out/shared/amazonQServiceManager/BaseAmazonQServiceManager.js.map +1 -1
- package/out/shared/codeWhispererService.d.ts +16 -9
- package/out/shared/codeWhispererService.js +55 -16
- package/out/shared/codeWhispererService.js.map +1 -1
- package/out/shared/telemetry/telemetryService.d.ts +2 -2
- package/out/shared/telemetry/telemetryService.js +5 -7
- package/out/shared/telemetry/telemetryService.js.map +1 -1
- package/out/shared/telemetryUtils.d.ts +1 -1
- package/out/shared/telemetryUtils.js +7 -3
- package/out/shared/telemetryUtils.js.map +1 -1
- package/out/shared/utils.js +4 -1
- package/out/shared/utils.js.map +1 -1
- package/package.json +3 -3
|
@@ -37,6 +37,9 @@ export declare class EditCompletionHandler {
|
|
|
37
37
|
onEditCompletion(params: InlineCompletionWithReferencesParams, token: CancellationToken): Promise<InlineCompletionListWithReferences>;
|
|
38
38
|
_invoke(params: InlineCompletionWithReferencesParams, token: CancellationToken, textDocument: TextDocument, inferredLanguageId: CodewhispererLanguage, currentSession: CodeWhispererSession | undefined): Promise<InlineCompletionListWithReferences>;
|
|
39
39
|
processSuggestionResponse(suggestionResponse: GenerateSuggestionsResponse, session: CodeWhispererSession, isNewSession: boolean, selectionRange?: Range, textDocument?: TextDocument): Promise<{
|
|
40
|
+
sessionId: string;
|
|
41
|
+
items: never[];
|
|
42
|
+
} | {
|
|
40
43
|
items: {
|
|
41
44
|
insertText: string;
|
|
42
45
|
isInlineEdit: boolean;
|
|
@@ -3,11 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.EditCompletionHandler = void 0;
|
|
4
4
|
const protocol_1 = require("@aws/language-server-runtimes/protocol");
|
|
5
5
|
const codeWhispererService_1 = require("../../shared/codeWhispererService");
|
|
6
|
+
const sessionManager_1 = require("./session/sessionManager");
|
|
6
7
|
const languageDetection_1 = require("../../shared/languageDetection");
|
|
7
8
|
const workspaceFolderManager_1 = require("../workspaceContext/workspaceFolderManager");
|
|
8
9
|
const trigger_1 = require("./trigger");
|
|
9
10
|
const telemetry_1 = require("./telemetry");
|
|
10
|
-
const mergeRightUtils_1 = require("./mergeRightUtils");
|
|
11
11
|
const lsp_core_1 = require("@aws/lsp-core");
|
|
12
12
|
const utils_1 = require("../../shared/utils");
|
|
13
13
|
const errors_1 = require("../../shared/amazonQServiceManager/errors");
|
|
@@ -56,16 +56,16 @@ class EditCompletionHandler {
|
|
|
56
56
|
*/
|
|
57
57
|
documentChanged() {
|
|
58
58
|
if (this.debounceTimeout) {
|
|
59
|
-
this.
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
59
|
+
if (this.isWaiting) {
|
|
60
|
+
this.hasDocumentChangedSinceInvocation = true;
|
|
61
|
+
}
|
|
62
|
+
else {
|
|
63
|
+
this.logging.info(`refresh and debounce edits suggestion for another ${constants_1.EDIT_DEBOUNCE_INTERVAL_MS}`);
|
|
64
|
+
this.debounceTimeout.refresh();
|
|
65
|
+
}
|
|
64
66
|
}
|
|
65
67
|
}
|
|
66
68
|
async onEditCompletion(params, token) {
|
|
67
|
-
this.hasDocumentChangedSinceInvocation = false;
|
|
68
|
-
this.debounceTimeout = undefined;
|
|
69
69
|
// On every new completion request close current inflight session.
|
|
70
70
|
const currentSession = this.sessionManager.getCurrentSession();
|
|
71
71
|
if (currentSession && currentSession.state == 'REQUESTING' && !params.partialResultToken) {
|
|
@@ -90,52 +90,61 @@ class EditCompletionHandler {
|
|
|
90
90
|
return constants_1.EMPTY_RESULT;
|
|
91
91
|
}
|
|
92
92
|
if (params.partialResultToken && currentSession) {
|
|
93
|
+
// Close ACTIVE session. We shouldn't record Discard trigger decision for trigger with nextToken.
|
|
94
|
+
if (currentSession && currentSession.state === 'ACTIVE') {
|
|
95
|
+
this.sessionManager.discardSession(currentSession);
|
|
96
|
+
}
|
|
97
|
+
const newSession = this.sessionManager.createSession({
|
|
98
|
+
document: textDocument,
|
|
99
|
+
startPosition: params.position,
|
|
100
|
+
triggerType: 'AutoTrigger',
|
|
101
|
+
language: currentSession.language,
|
|
102
|
+
requestContext: currentSession.requestContext,
|
|
103
|
+
autoTriggerType: undefined,
|
|
104
|
+
triggerCharacter: '',
|
|
105
|
+
classifierResult: undefined,
|
|
106
|
+
classifierThreshold: undefined,
|
|
107
|
+
credentialStartUrl: currentSession.credentialStartUrl,
|
|
108
|
+
supplementalMetadata: currentSession.supplementalMetadata,
|
|
109
|
+
customizationArn: currentSession.customizationArn,
|
|
110
|
+
});
|
|
93
111
|
// subsequent paginated requests for current session
|
|
94
112
|
try {
|
|
95
113
|
const suggestionResponse = await this.codeWhispererService.generateSuggestions({
|
|
96
|
-
...
|
|
114
|
+
...newSession.requestContext,
|
|
97
115
|
nextToken: `${params.partialResultToken}`,
|
|
98
116
|
});
|
|
99
|
-
return await this.processSuggestionResponse(suggestionResponse,
|
|
117
|
+
return await this.processSuggestionResponse(suggestionResponse, newSession, true, params.context.selectedCompletionInfo?.range);
|
|
100
118
|
}
|
|
101
119
|
catch (error) {
|
|
102
120
|
return this.handleSuggestionsErrors(error, currentSession);
|
|
103
121
|
}
|
|
104
122
|
}
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
123
|
+
return new Promise(async (resolve) => {
|
|
124
|
+
this.debounceTimeout = setTimeout(async () => {
|
|
125
|
+
try {
|
|
126
|
+
this.isWaiting = true;
|
|
127
|
+
const result = await this._invoke(params, token, textDocument, inferredLanguageId, currentSession).finally(() => {
|
|
128
|
+
this.isWaiting = false;
|
|
129
|
+
});
|
|
130
|
+
if (this.hasDocumentChangedSinceInvocation) {
|
|
131
|
+
this.logging.info('EditCompletionHandler - Document changed during execution, resolving empty result');
|
|
132
|
+
resolve({
|
|
133
|
+
sessionId: sessionManager_1.SessionManager.getInstance('EDITS').getActiveSession()?.id ?? '',
|
|
134
|
+
items: [],
|
|
114
135
|
});
|
|
115
|
-
if (this.hasDocumentChangedSinceInvocation) {
|
|
116
|
-
if (attempt < constants_1.EDIT_STALE_RETRY_COUNT) {
|
|
117
|
-
this.logging.info(`Document changed during execution, retrying (attempt ${attempt + 1})`);
|
|
118
|
-
this.hasDocumentChangedSinceInvocation = false;
|
|
119
|
-
const retryResult = await invokeWithRetry(attempt + 1);
|
|
120
|
-
resolve(retryResult);
|
|
121
|
-
}
|
|
122
|
-
else {
|
|
123
|
-
this.logging.info('Max retries reached, returning empty result');
|
|
124
|
-
resolve(constants_1.EMPTY_RESULT);
|
|
125
|
-
}
|
|
126
|
-
}
|
|
127
|
-
else {
|
|
128
|
-
this.logging.info('No document changes, resolving result');
|
|
129
|
-
resolve(result);
|
|
130
|
-
}
|
|
131
136
|
}
|
|
132
|
-
|
|
133
|
-
this.
|
|
137
|
+
else {
|
|
138
|
+
this.logging.info('EditCompletionHandler - No document changes, resolving result');
|
|
139
|
+
resolve(result);
|
|
134
140
|
}
|
|
135
|
-
}
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
141
|
+
}
|
|
142
|
+
finally {
|
|
143
|
+
this.debounceTimeout = undefined;
|
|
144
|
+
this.hasDocumentChangedSinceInvocation = false;
|
|
145
|
+
}
|
|
146
|
+
}, constants_1.EDIT_DEBOUNCE_INTERVAL_MS);
|
|
147
|
+
});
|
|
139
148
|
}
|
|
140
149
|
async _invoke(params, token, textDocument, inferredLanguageId, currentSession) {
|
|
141
150
|
// Build request context
|
|
@@ -184,15 +193,6 @@ class EditCompletionHandler {
|
|
|
184
193
|
}
|
|
185
194
|
// Close ACTIVE session and record Discard trigger decision immediately
|
|
186
195
|
if (currentSession && currentSession.state === 'ACTIVE') {
|
|
187
|
-
if (this.editsEnabled && currentSession.suggestionType === codeWhispererService_1.SuggestionType.EDIT) {
|
|
188
|
-
const mergedSuggestions = (0, mergeRightUtils_1.mergeEditSuggestionsWithFileContext)(currentSession, textDocument, fileContext);
|
|
189
|
-
if (mergedSuggestions.length > 0) {
|
|
190
|
-
return {
|
|
191
|
-
items: mergedSuggestions,
|
|
192
|
-
sessionId: currentSession.id,
|
|
193
|
-
};
|
|
194
|
-
}
|
|
195
|
-
}
|
|
196
196
|
// Emit user trigger decision at session close time for active session
|
|
197
197
|
this.sessionManager.discardSession(currentSession);
|
|
198
198
|
const streakLength = this.editsEnabled ? this.sessionManager.getAndUpdateStreakLength(false) : 0;
|
|
@@ -247,32 +247,11 @@ class EditCompletionHandler {
|
|
|
247
247
|
// API response was recieved, we can activate session now
|
|
248
248
|
this.sessionManager.activateSession(session);
|
|
249
249
|
// Process suggestions to apply Empty or Filter filters
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
.
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
return false;
|
|
256
|
-
}
|
|
257
|
-
return true;
|
|
258
|
-
})
|
|
259
|
-
// References setting filter
|
|
260
|
-
.filter(suggestion => {
|
|
261
|
-
// State to track whether code with references should be included in
|
|
262
|
-
// the response. No locking or concurrency controls, filtering is done
|
|
263
|
-
// right before returning and is only guaranteed to be consistent within
|
|
264
|
-
// the context of a single response.
|
|
265
|
-
const { includeSuggestionsWithCodeReferences } = this.amazonQServiceManager.getConfiguration();
|
|
266
|
-
if (includeSuggestionsWithCodeReferences) {
|
|
267
|
-
return true;
|
|
268
|
-
}
|
|
269
|
-
if (suggestion.references == null || suggestion.references.length === 0) {
|
|
270
|
-
return true;
|
|
271
|
-
}
|
|
272
|
-
// Filter out suggestions that have references when includeSuggestionsWithCodeReferences setting is true
|
|
273
|
-
session.setSuggestionState(suggestion.itemId, 'Filter');
|
|
274
|
-
return false;
|
|
275
|
-
});
|
|
250
|
+
if (suggestionResponse.suggestions.length === 0) {
|
|
251
|
+
this.sessionManager.closeSession(session);
|
|
252
|
+
await (0, telemetry_1.emitEmptyUserTriggerDecisionTelemetry)(this.telemetryService, session, this.documentChangedListener.timeSinceLastUserModification, this.editsEnabled ? this.sessionManager.getAndUpdateStreakLength(false) : 0);
|
|
253
|
+
return constants_1.EMPTY_RESULT;
|
|
254
|
+
}
|
|
276
255
|
return {
|
|
277
256
|
items: suggestionResponse.suggestions
|
|
278
257
|
.map(suggestion => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"editCompletionHandler.js","sourceRoot":"","sources":["../../../src/language-server/inline-completion/editCompletionHandler.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"editCompletionHandler.js","sourceRoot":"","sources":["../../../src/language-server/inline-completion/editCompletionHandler.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@ import { CodewhispererLanguage } from '../../../shared/languageDetection';
|
|
|
5
5
|
import { CodeWhispererSupplementalContext } from '../../../shared/models/model';
|
|
6
6
|
type SessionState = 'REQUESTING' | 'ACTIVE' | 'CLOSED' | 'ERROR' | 'DISCARD';
|
|
7
7
|
export type UserDecision = 'Empty' | 'Filter' | 'Discard' | 'Accept' | 'Ignore' | 'Reject' | 'Unseen';
|
|
8
|
-
type UserTriggerDecision = 'Accept' | 'Reject' | 'Empty' | 'Discard';
|
|
8
|
+
export type UserTriggerDecision = 'Accept' | 'Reject' | 'Empty' | 'Discard';
|
|
9
9
|
interface CachedSuggestion extends Suggestion {
|
|
10
10
|
insertText?: string;
|
|
11
11
|
}
|
|
@@ -28,7 +28,9 @@ export declare class CodeWhispererSession {
|
|
|
28
28
|
document: TextDocument;
|
|
29
29
|
startTime: number;
|
|
30
30
|
closeTime?: number;
|
|
31
|
-
|
|
31
|
+
private _state;
|
|
32
|
+
get state(): SessionState;
|
|
33
|
+
private set state(value);
|
|
32
34
|
codewhispererSessionId?: string;
|
|
33
35
|
startPosition: Position;
|
|
34
36
|
discardInflightSessionOnNewInvocation: Boolean;
|
|
@@ -60,8 +62,6 @@ export declare class CodeWhispererSession {
|
|
|
60
62
|
includeImportsWithSuggestions?: boolean;
|
|
61
63
|
codewhispererSuggestionImportCount: number;
|
|
62
64
|
suggestionType?: string;
|
|
63
|
-
hasEditsPending?: boolean;
|
|
64
|
-
recentItemId?: string;
|
|
65
65
|
constructor(data: SessionData);
|
|
66
66
|
generateSessionId(): string;
|
|
67
67
|
get lastSuggestionIndex(): number;
|
|
@@ -85,7 +85,7 @@ export declare class CodeWhispererSession {
|
|
|
85
85
|
* Determines trigger decision based on the most recent user action.
|
|
86
86
|
* Uses the last processed itemId to determine the overall session decision.
|
|
87
87
|
*/
|
|
88
|
-
|
|
88
|
+
getUserTriggerDecision(itemId?: string): UserTriggerDecision | undefined;
|
|
89
89
|
}
|
|
90
90
|
export declare class SessionManager {
|
|
91
91
|
private static _completionInstance?;
|
|
@@ -9,7 +9,13 @@ class CodeWhispererSession {
|
|
|
9
9
|
startTime;
|
|
10
10
|
// Time when Session was closed and final state of user decisions is recorded in suggestionsStates
|
|
11
11
|
closeTime = 0;
|
|
12
|
-
|
|
12
|
+
_state;
|
|
13
|
+
get state() {
|
|
14
|
+
return this._state;
|
|
15
|
+
}
|
|
16
|
+
set state(newState) {
|
|
17
|
+
this._state = newState;
|
|
18
|
+
}
|
|
13
19
|
codewhispererSessionId;
|
|
14
20
|
startPosition = {
|
|
15
21
|
line: 0,
|
|
@@ -42,9 +48,7 @@ class CodeWhispererSession {
|
|
|
42
48
|
includeImportsWithSuggestions;
|
|
43
49
|
codewhispererSuggestionImportCount = 0;
|
|
44
50
|
suggestionType;
|
|
45
|
-
hasEditsPending = false;
|
|
46
51
|
// Track the most recent itemId for paginated Edit suggestions
|
|
47
|
-
recentItemId;
|
|
48
52
|
constructor(data) {
|
|
49
53
|
this.id = this.generateSessionId();
|
|
50
54
|
this.document = data.document;
|
|
@@ -59,7 +63,7 @@ class CodeWhispererSession {
|
|
|
59
63
|
this.classifierThreshold = data.classifierThreshold;
|
|
60
64
|
this.customizationArn = data.customizationArn;
|
|
61
65
|
this.supplementalMetadata = data.supplementalMetadata;
|
|
62
|
-
this.
|
|
66
|
+
this._state = 'REQUESTING';
|
|
63
67
|
this.startTime = new Date().getTime();
|
|
64
68
|
}
|
|
65
69
|
// This function makes it possible to stub uuidv4 calls in tests
|
|
@@ -147,7 +151,6 @@ class CodeWhispererSession {
|
|
|
147
151
|
// No recommendation was accepted, but user have seen this suggestion
|
|
148
152
|
this.setSuggestionState(itemId, 'Reject');
|
|
149
153
|
}
|
|
150
|
-
this.recentItemId = itemId;
|
|
151
154
|
}
|
|
152
155
|
this.firstCompletionDisplayLatency = firstCompletionDisplayLatency;
|
|
153
156
|
this.totalSessionDisplayTime = totalSessionDisplayTime;
|
|
@@ -193,14 +196,14 @@ class CodeWhispererSession {
|
|
|
193
196
|
* Determines trigger decision based on the most recent user action.
|
|
194
197
|
* Uses the last processed itemId to determine the overall session decision.
|
|
195
198
|
*/
|
|
196
|
-
|
|
199
|
+
getUserTriggerDecision(itemId) {
|
|
197
200
|
// Force Discard trigger decision when session was explicitly discarded by server
|
|
198
201
|
if (this.state === 'DISCARD') {
|
|
199
202
|
return 'Discard';
|
|
200
203
|
}
|
|
201
|
-
if (!
|
|
204
|
+
if (!itemId)
|
|
202
205
|
return;
|
|
203
|
-
const state = this.getSuggestionState(
|
|
206
|
+
const state = this.getSuggestionState(itemId);
|
|
204
207
|
if (state === 'Accept')
|
|
205
208
|
return 'Accept';
|
|
206
209
|
if (state === 'Reject')
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sessionManager.js","sourceRoot":"","sources":["../../../../src/language-server/inline-completion/session/sessionManager.ts"],"names":[],"mappings":";;;AAMA,+BAAmC;AAEnC,+EAK6C;
|
|
1
|
+
{"version":3,"file":"sessionManager.js","sourceRoot":"","sources":["../../../../src/language-server/inline-completion/session/sessionManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import { Telemetry, IdeDiagnostic } from '@aws/language-server-runtimes/server-interface';
|
|
2
2
|
import { AWSError } from 'aws-sdk';
|
|
3
|
-
import { CodeWhispererSession } from './session/sessionManager';
|
|
3
|
+
import { CodeWhispererSession, UserTriggerDecision } from './session/sessionManager';
|
|
4
4
|
import { TelemetryService } from '../../shared/telemetry/telemetryService';
|
|
5
5
|
export declare const emitServiceInvocationTelemetry: (telemetry: Telemetry, session: CodeWhispererSession, requestId: string) => void;
|
|
6
6
|
export declare const emitServiceInvocationFailure: (telemetry: Telemetry, session: CodeWhispererSession, error: Error | AWSError) => void;
|
|
7
7
|
export declare const emitPerceivedLatencyTelemetry: (telemetry: Telemetry, session: CodeWhispererSession) => void;
|
|
8
|
-
export declare
|
|
9
|
-
export declare const
|
|
8
|
+
export declare function emitEmptyUserTriggerDecisionTelemetry(telemetryService: TelemetryService, session: CodeWhispererSession, timeSinceLastUserModification?: number, streakLength?: number): Promise<void>;
|
|
9
|
+
export declare const emitUserTriggerDecisionTelemetry: (telemetry: Telemetry, telemetryService: TelemetryService, session: CodeWhispererSession, timeSinceLastUserModification?: number, addedCharsCountForEditSuggestion?: number, deletedCharsCountForEditSuggestion?: number, addedIdeDiagnostics?: IdeDiagnostic[], removedIdeDiagnostics?: IdeDiagnostic[], streakLength?: number, itemId?: string) => Promise<void>;
|
|
10
|
+
export declare const emitAggregatedUserTriggerDecisionTelemetry: (telemetryService: TelemetryService, session: CodeWhispererSession, userTriggerDecision: UserTriggerDecision, timeSinceLastUserModification?: number, addedCharsCountForEditSuggestion?: number, deletedCharsCountForEditSuggestion?: number, addedIdeDiagnostics?: IdeDiagnostic[], removedIdeDiagnostics?: IdeDiagnostic[], streakLength?: number) => Promise<void>;
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.emitAggregatedUserTriggerDecisionTelemetry = exports.emitUserTriggerDecisionTelemetry = exports.emitPerceivedLatencyTelemetry = exports.emitServiceInvocationFailure = exports.emitServiceInvocationTelemetry = void 0;
|
|
4
|
+
exports.emitEmptyUserTriggerDecisionTelemetry = emitEmptyUserTriggerDecisionTelemetry;
|
|
4
5
|
const utils_1 = require("../../shared/utils");
|
|
5
6
|
const codeWhispererService_1 = require("../../shared/codeWhispererService");
|
|
6
7
|
const emitServiceInvocationTelemetry = (telemetry, session, requestId) => {
|
|
@@ -90,7 +91,20 @@ const emitPerceivedLatencyTelemetry = (telemetry, session) => {
|
|
|
90
91
|
});
|
|
91
92
|
};
|
|
92
93
|
exports.emitPerceivedLatencyTelemetry = emitPerceivedLatencyTelemetry;
|
|
93
|
-
|
|
94
|
+
async function emitEmptyUserTriggerDecisionTelemetry(telemetryService, session, timeSinceLastUserModification, streakLength) {
|
|
95
|
+
// Prevent reporting user decision if it was already sent
|
|
96
|
+
if (session.reportedUserDecision) {
|
|
97
|
+
return;
|
|
98
|
+
}
|
|
99
|
+
// Non-blocking
|
|
100
|
+
(0, exports.emitAggregatedUserTriggerDecisionTelemetry)(telemetryService, session, 'Empty', timeSinceLastUserModification, 0, 0, [], [], streakLength)
|
|
101
|
+
.then()
|
|
102
|
+
.catch(e => { })
|
|
103
|
+
.finally(() => {
|
|
104
|
+
session.reportedUserDecision = true;
|
|
105
|
+
});
|
|
106
|
+
}
|
|
107
|
+
const emitUserTriggerDecisionTelemetry = async (telemetry, telemetryService, session, timeSinceLastUserModification, addedCharsCountForEditSuggestion, deletedCharsCountForEditSuggestion, addedIdeDiagnostics, removedIdeDiagnostics, streakLength, itemId) => {
|
|
94
108
|
// Prevent reporting user decision if it was already sent
|
|
95
109
|
if (session.reportedUserDecision) {
|
|
96
110
|
return;
|
|
@@ -98,22 +112,18 @@ const emitUserTriggerDecisionTelemetry = async (telemetry, telemetryService, ses
|
|
|
98
112
|
// Edits show one suggestion sequentially (with pagination), so use latest itemId state;
|
|
99
113
|
// Completions show multiple suggestions together, so aggregate all states
|
|
100
114
|
const userTriggerDecision = session.suggestionType === codeWhispererService_1.SuggestionType.EDIT
|
|
101
|
-
? session.
|
|
115
|
+
? session.getUserTriggerDecision(itemId)
|
|
102
116
|
: session.getAggregatedUserTriggerDecision();
|
|
103
117
|
// Can not emit previous trigger decision if it's not available on the session
|
|
104
118
|
if (!userTriggerDecision) {
|
|
105
119
|
return;
|
|
106
120
|
}
|
|
107
|
-
await (0, exports.emitAggregatedUserTriggerDecisionTelemetry)(telemetryService, session, timeSinceLastUserModification, addedCharsCountForEditSuggestion, deletedCharsCountForEditSuggestion, addedIdeDiagnostics, removedIdeDiagnostics, streakLength);
|
|
108
|
-
|
|
109
|
-
const hasPendingEditTelemetry = session.suggestionType === codeWhispererService_1.SuggestionType.EDIT && session.acceptedSuggestionId && session.hasEditsPending;
|
|
110
|
-
if (!hasPendingEditTelemetry) {
|
|
111
|
-
session.reportedUserDecision = true;
|
|
112
|
-
}
|
|
121
|
+
await (0, exports.emitAggregatedUserTriggerDecisionTelemetry)(telemetryService, session, userTriggerDecision, timeSinceLastUserModification, addedCharsCountForEditSuggestion, deletedCharsCountForEditSuggestion, addedIdeDiagnostics, removedIdeDiagnostics, streakLength);
|
|
122
|
+
session.reportedUserDecision = true;
|
|
113
123
|
};
|
|
114
124
|
exports.emitUserTriggerDecisionTelemetry = emitUserTriggerDecisionTelemetry;
|
|
115
|
-
const emitAggregatedUserTriggerDecisionTelemetry = (telemetryService, session, timeSinceLastUserModification, addedCharsCountForEditSuggestion, deletedCharsCountForEditSuggestion, addedIdeDiagnostics, removedIdeDiagnostics, streakLength) => {
|
|
116
|
-
return telemetryService.emitUserTriggerDecision(session, timeSinceLastUserModification, addedCharsCountForEditSuggestion, deletedCharsCountForEditSuggestion, addedIdeDiagnostics, removedIdeDiagnostics, streakLength);
|
|
125
|
+
const emitAggregatedUserTriggerDecisionTelemetry = (telemetryService, session, userTriggerDecision, timeSinceLastUserModification, addedCharsCountForEditSuggestion, deletedCharsCountForEditSuggestion, addedIdeDiagnostics, removedIdeDiagnostics, streakLength) => {
|
|
126
|
+
return telemetryService.emitUserTriggerDecision(session, userTriggerDecision, timeSinceLastUserModification, addedCharsCountForEditSuggestion, deletedCharsCountForEditSuggestion, addedIdeDiagnostics, removedIdeDiagnostics, streakLength);
|
|
117
127
|
};
|
|
118
128
|
exports.emitAggregatedUserTriggerDecisionTelemetry = emitAggregatedUserTriggerDecisionTelemetry;
|
|
119
129
|
//# sourceMappingURL=telemetry.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"telemetry.js","sourceRoot":"","sources":["../../../src/language-server/inline-completion/telemetry.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"telemetry.js","sourceRoot":"","sources":["../../../src/language-server/inline-completion/telemetry.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,17 +1,8 @@
|
|
|
1
|
-
import { CodewhispererLanguage } from '../../shared/languageDetection';
|
|
2
1
|
import { SessionManager } from './session/sessionManager';
|
|
3
2
|
import { InlineCompletionWithReferencesParams } from '@aws/language-server-runtimes/protocol';
|
|
4
3
|
import { CursorTracker } from './tracker/cursorTracker';
|
|
5
4
|
import { RecentEditTracker } from './tracker/codeEditTracker';
|
|
6
|
-
import { CodeWhispererServiceBase } from '../../shared/codeWhispererService';
|
|
5
|
+
import { CodeWhispererServiceBase, ClientFileContext } from '../../shared/codeWhispererService';
|
|
7
6
|
export declare class NepTrigger {
|
|
8
7
|
}
|
|
9
|
-
export declare function shouldTriggerEdits(service: CodeWhispererServiceBase, fileContext:
|
|
10
|
-
fileUri: string;
|
|
11
|
-
filename: string;
|
|
12
|
-
programmingLanguage: {
|
|
13
|
-
languageName: CodewhispererLanguage;
|
|
14
|
-
};
|
|
15
|
-
leftFileContent: string;
|
|
16
|
-
rightFileContent: string;
|
|
17
|
-
}, inlineParams: InlineCompletionWithReferencesParams, cursorTracker: CursorTracker, recentEditsTracker: RecentEditTracker, sessionManager: SessionManager, editsEnabled: boolean): NepTrigger | undefined;
|
|
8
|
+
export declare function shouldTriggerEdits(service: CodeWhispererServiceBase, fileContext: ClientFileContext, inlineParams: InlineCompletionWithReferencesParams, cursorTracker: CursorTracker, recentEditsTracker: RecentEditTracker, sessionManager: SessionManager, editsEnabled: boolean): NepTrigger | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"trigger.js","sourceRoot":"","sources":["../../../src/language-server/inline-completion/trigger.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"trigger.js","sourceRoot":"","sources":["../../../src/language-server/inline-completion/trigger.ts"],"names":[],"mappings":";;;AAaA,gDA2CC;AAtDD,wFAAoF;AAGpF,4EAI0C;AAE1C,MAAa,UAAU;CAAG;AAA1B,gCAA0B;AAE1B,SAAgB,kBAAkB,CAC9B,OAAiC,EACjC,WAA8B,EAC9B,YAAkD,EAClD,aAA4B,EAC5B,kBAAqC,EACrC,cAA8B,EAC9B,YAAqB;IAErB,IAAI,CAAC,YAAY,EAAE,CAAC;QAChB,OAAO,SAAS,CAAA;IACpB,CAAC;IACD,0IAA0I;IAC1I,IAAI,CAAC,CAAC,OAAO,YAAY,gDAAyB,CAAC,EAAE,CAAC;QAClD,OAAO,SAAS,CAAA;IACpB,CAAC;IAED,MAAM,oBAAoB,GAAG,YAAY,CAAC,oBAAoB,CAAA;IAC9D,MAAM,mBAAmB,GACrB,oBAAoB,EAAE,cAAc;QACpC,oBAAoB,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC;QAC9C,oBAAoB,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,SAAS,CAAA;IAE7D,wFAAwF;IACxF,MAAM,iBAAiB,GAAG,mBAAmB;QACzC,CAAC,CAAC,oBAAoB,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,IAAI;QAC7C,CAAC,CAAC,CAAC,WAAW,CAAC,eAAe,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAA;IAEvD,MAAM,gBAAgB,GAAG,cAAc,CAAC,kBAAkB,EAAE,EAAE,gCAAgC,EAAE,CAAA;IAChG,MAAM,GAAG,GAAG,IAAA,qDAAyB,EAAC;QAClC,WAAW,EAAE,WAAW;QACxB,OAAO,EAAE,YAAY,CAAC,QAAQ,CAAC,IAAI;QACnC,IAAI,EAAE,iBAAiB;QACvB,gBAAgB,EAAE,gBAAgB,IAAI,EAAE;QACxC,aAAa,EAAE,aAAa;QAC5B,WAAW,EAAE,kBAAkB;KAClC,CAAC,CAAA;IAEF,IAAI,GAAG,CAAC,aAAa,EAAE,CAAC;QACpB,OAAO,IAAI,UAAU,EAAE,CAAA;IAC3B,CAAC;SAAM,CAAC;QACJ,OAAO,SAAS,CAAA;IACpB,CAAC;AACL,CAAC"}
|
|
@@ -1,6 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.unsupportedViewComponents = exports.supportedProjects = void 0;
|
|
4
|
+
/**
|
|
5
|
+
* Reference only - validation moved to backend service.
|
|
6
|
+
*/
|
|
4
7
|
exports.supportedProjects = [
|
|
5
8
|
'AspNetCoreMvc',
|
|
6
9
|
'AspNetCoreWebApi',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SupportedProjects.js","sourceRoot":"","sources":["../../../../src/language-server/netTransform/resources/SupportedProjects.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"SupportedProjects.js","sourceRoot":"","sources":["../../../../src/language-server/netTransform/resources/SupportedProjects.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACU,QAAA,iBAAiB,GAAG;IAC7B,eAAe;IACf,kBAAkB;IAClB,wBAAwB;IACxB,WAAW;IACX,cAAc;IACd,gBAAgB;IAChB,sBAAsB;IACtB,WAAW;IACX,YAAY;IACZ,YAAY;IACZ,cAAc;IACd,QAAQ;IACR,OAAO;IACP,OAAO;IACP,SAAS;CACZ,CAAA;AAEY,QAAA,yBAAyB,GAAG,CAAC,UAAU,EAAE,yBAAyB,CAAC,CAAA"}
|
|
@@ -28,19 +28,6 @@ class TransformHandler {
|
|
|
28
28
|
var unsupportedProjects = [];
|
|
29
29
|
const isProject = validation.isProject(userInputrequest);
|
|
30
30
|
const containsUnsupportedViews = await validation.checkForUnsupportedViews(userInputrequest, isProject, this.logging);
|
|
31
|
-
if (isProject) {
|
|
32
|
-
let isValid = validation.validateProject(userInputrequest, this.logging);
|
|
33
|
-
if (!isValid) {
|
|
34
|
-
return {
|
|
35
|
-
Error: 'NotSupported',
|
|
36
|
-
IsSupported: false,
|
|
37
|
-
ContainsUnsupportedViews: containsUnsupportedViews,
|
|
38
|
-
};
|
|
39
|
-
}
|
|
40
|
-
}
|
|
41
|
-
else {
|
|
42
|
-
unsupportedProjects = validation.validateSolution(userInputrequest);
|
|
43
|
-
}
|
|
44
31
|
const artifactManager = new artifactManager_1.ArtifactManager(this.workspace, this.logging, this.getWorkspacePath(userInputrequest.SolutionRootPath));
|
|
45
32
|
try {
|
|
46
33
|
const payloadFilePath = await this.zipCodeAsync(userInputrequest, artifactManager);
|