feat(amazonq): add tutorial trackers for lsp (#7264)

## Problem
the tutorial trackers aren't implemented when using the language server

## Solution
- re-add the inlineLineAnnotationController
(inlineChatTutorialAnnotation) for adding hints with inline chat
- re-add the lineAnnotationController (inlineTutorialAnnotation) for
adding the inline suggestions tutorial

## Notes
in a future PR I'll fully deprecate the old trackers

---

- Treat all work as PUBLIC. Private `feature/x` branches will not be
squash-merged at release time.
- Your code changes must meet the guidelines in
[CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.

Author: jpinkney-aws

packages/amazonq/src/app/inline/completion.ts

@@ -35,6 +35,7 @@ import {
 } from 'aws-core-vscode/codewhisperer'
 import { InlineGeneratingMessage } from './inlineGeneratingMessage'
 import { LineTracker } from './stateTracker/lineTracker'
+import { InlineTutorialAnnotation } from './tutorials/inlineTutorialAnnotation'
 
 export class InlineCompletionManager implements Disposable {
     private disposable: Disposable
@@ -43,19 +44,27 @@ export class InlineCompletionManager implements Disposable {
     private sessionManager: SessionManager
     private recommendationService: RecommendationService
     private lineTracker: LineTracker
-    private activeStateTracker: InlineGeneratingMessage
+    private incomingGeneratingMessage: InlineGeneratingMessage
+    private inlineTutorialAnnotation: InlineTutorialAnnotation
     private readonly logSessionResultMessageName = 'aws/logInlineCompletionSessionResults'
 
-    constructor(languageClient: LanguageClient) {
+    constructor(
+        languageClient: LanguageClient,
+        sessionManager: SessionManager,
+        lineTracker: LineTracker,
+        inlineTutorialAnnotation: InlineTutorialAnnotation
+    ) {
         this.languageClient = languageClient
-        this.sessionManager = new SessionManager()
-        this.lineTracker = new LineTracker()
-        this.activeStateTracker = new InlineGeneratingMessage(this.lineTracker)
-        this.recommendationService = new RecommendationService(this.sessionManager, this.activeStateTracker)
+        this.sessionManager = sessionManager
+        this.lineTracker = lineTracker
+        this.incomingGeneratingMessage = new InlineGeneratingMessage(this.lineTracker)
+        this.recommendationService = new RecommendationService(this.sessionManager, this.incomingGeneratingMessage)
+        this.inlineTutorialAnnotation = inlineTutorialAnnotation
         this.inlineCompletionProvider = new AmazonQInlineCompletionItemProvider(
             languageClient,
             this.recommendationService,
-            this.sessionManager
+            this.sessionManager,
+            this.inlineTutorialAnnotation
         )
         this.disposable = languages.registerInlineCompletionItemProvider(
             CodeWhispererConstants.platformLanguageIds,
@@ -68,7 +77,7 @@ export class InlineCompletionManager implements Disposable {
     public dispose(): void {
         if (this.disposable) {
             this.disposable.dispose()
-            this.activeStateTracker.dispose()
+            this.incomingGeneratingMessage.dispose()
             this.lineTracker.dispose()
         }
     }
@@ -113,6 +122,7 @@ export class InlineCompletionManager implements Disposable {
             if (item.mostRelevantMissingImports?.length) {
                 await ImportAdderProvider.instance.onAcceptRecommendation(editor, item, startLine)
             }
+            this.sessionManager.incrementSuggestionCount()
         }
         commands.registerCommand('aws.amazonq.acceptInline', onInlineAcceptance)
 
@@ -157,6 +167,7 @@ export class InlineCompletionManager implements Disposable {
                     this.languageClient,
                     this.recommendationService,
                     this.sessionManager,
+                    this.inlineTutorialAnnotation,
                     false
                 )
             )
@@ -182,6 +193,7 @@ export class AmazonQInlineCompletionItemProvider implements InlineCompletionItem
         private readonly languageClient: LanguageClient,
         private readonly recommendationService: RecommendationService,
         private readonly sessionManager: SessionManager,
+        private readonly inlineTutorialAnnotation: InlineTutorialAnnotation,
         private readonly isNewSession: boolean = true
     ) {}
 
@@ -198,6 +210,9 @@ export class AmazonQInlineCompletionItemProvider implements InlineCompletionItem
                 return []
             }
 
+            // tell the tutorial that completions has been triggered
+            await this.inlineTutorialAnnotation.triggered(context.triggerKind)
+
             // make service requests if it's a new session
             await this.recommendationService.getAllRecommendations(
                 this.languageClient,

packages/amazonq/src/app/inline/sessionManager.ts

@@ -18,6 +18,8 @@ interface CodeWhispererSession {
 export class SessionManager {
     private activeSession?: CodeWhispererSession
     private activeIndex: number = 0
+    private _acceptedSuggestionCount: number = 0
+
     constructor() {}
 
     public startSession(
@@ -95,6 +97,14 @@ export class SessionManager {
         return items
     }
 
+    public get acceptedSuggestionCount(): number {
+        return this._acceptedSuggestionCount
+    }
+
+    public incrementSuggestionCount() {
+        this._acceptedSuggestionCount += 1
+    }
+
     public clear() {
         this.activeSession = undefined
         this.activeIndex = 0

packages/amazonq/src/inlineChat/decorations/inlineLineAnnotationController.ts renamed to packages/amazonq/src/app/inline/tutorials/inlineChatTutorialAnnotation.ts

@@ -3,14 +3,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Container } from 'aws-core-vscode/codewhisperer'
 import * as vscode from 'vscode'
+import { InlineTutorialAnnotation } from './inlineTutorialAnnotation'
+import { globals } from 'aws-core-vscode/shared'
 
-export class InlineLineAnnotationController {
+export class InlineChatTutorialAnnotation {
     private enabled: boolean = true
 
-    constructor(context: vscode.ExtensionContext) {
-        context.subscriptions.push(
+    constructor(private readonly inlineTutorialAnnotation: InlineTutorialAnnotation) {
+        globals.context.subscriptions.push(
             vscode.window.onDidChangeTextEditorSelection(async ({ selections, textEditor }) => {
                 let showShow = false
 
@@ -33,12 +34,12 @@ export class InlineLineAnnotationController {
     private async setVisible(editor: vscode.TextEditor, visible: boolean) {
         let needsRefresh: boolean
         if (visible) {
-            needsRefresh = await Container.instance.lineAnnotationController.tryShowInlineHint()
+            needsRefresh = await this.inlineTutorialAnnotation.tryShowInlineHint()
         } else {
-            needsRefresh = await Container.instance.lineAnnotationController.tryHideInlineHint()
+            needsRefresh = await this.inlineTutorialAnnotation.tryHideInlineHint()
         }
         if (needsRefresh) {
-            await Container.instance.lineAnnotationController.refresh(editor, 'codewhisperer')
+            await this.inlineTutorialAnnotation.refresh(editor, 'codewhisperer')
         }
     }