merge in master

Author: Hweinstock

.changes/next-release/Bug Fix-3e5e67c4-5bde-4d7d-b473-c1f772430c4f.json

@@ -1,4 +1,4 @@
 {
 	"type": "Bug Fix",
-	"description": "CodeWhisperer: Bug resulting failure of enhanced file context fetching"
-}
+	"description": "CodeWhisperer: issue with fetching enhanced file context"
+}

.changes/next-release/Bug Fix-e9afd2b9-cd47-4013-a2c0-8618d7b2ed15.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "User setting for \"Share CodeWhisperer Content With AWS\" was not reflected in workspace-level settings"
+}

.changes/next-release/Feature-5baff9c0-54b5-4ed3-8a3e-a74800cc5af5.json

@@ -0,0 +1,4 @@
+{
+	"type": "Feature",
+	"description": "CodeWhisperer: Improve Java suggestion quality with enhanced file context fetching"
+}

.changes/next-release/Feature-fb427da2-9ded-464d-ab03-11d52a46b604.json

@@ -0,0 +1,4 @@
+{
+	"type": "Feature",
+	"description": "Lambda \"Download\" action now expects \".mjs\" extension for Node18+ lambdas"
+}

.github/workflows/node.js.yml

@@ -14,6 +14,7 @@ jobs:
         name: test macOS
         runs-on: macos-latest
         strategy:
+            fail-fast: false
             matrix:
                 node-version: [16.x]
                 vscode-version: [minimum, stable, insiders]

package-lock.json

@@ -251,7 +251,8 @@
                 "aws.codeWhisperer.shareCodeWhispererContentWithAWS": {
                     "type": "boolean",
                     "markdownDescription": "%AWS.configuration.description.codewhisperer.shareCodeWhispererContentWithAWS%",
-                    "default": true
+                    "default": true,
+                    "scope": "application"
                 },
                 "aws.codeWhisperer.javaCompilationOutput": {
                     "type": "string",
@@ -3501,7 +3502,7 @@
         "@types/uuid": "^9.0.1",
         "@types/vscode": "^1.65.0",
         "@types/vscode-webview": "^1.57.1",
-        "@types/xml2js": "^0.4.8",
+        "@types/xml2js": "^0.4.11",
         "@typescript-eslint/eslint-plugin": "^5.59.0",
         "@typescript-eslint/parser": "^5.59.1",
         "@vscode/codicons": "^0.0.33",
@@ -3516,7 +3517,7 @@
         "eslint-plugin-no-null": "^1.0.2",
         "glob": "^7.1.7",
         "husky": "^7.0.2",
-        "json-schema-to-typescript": "^12.0.0",
+        "json-schema-to-typescript": "^13.0.2",
         "marked": "^5.0.4",
         "mocha": "^10.1.0",
         "mocha-junit-reporter": "^2.2.0",

package.json

@@ -2,7 +2,7 @@
 
 # Usage:
 #   When connecting to a dev environment
-#       AWS_REGION=… AWS_SSM_CLI=… CODECATALYST_ENDPOINT=… BEARER_TOKEN_LOCATION=… SPACE_NAME=… PROJECT_NAME=… DEVENV_ID=… ./codecatalyst_connect
+#       AWS_REGION=… AWS_SSM_CLI=… STREAM_URL=… TOKEN=… LOG_FILE_LOCATION==… ./ec2_connect
 
 set -e
 set -u

resources/ec2_connect

@@ -12,16 +12,17 @@ import { CodeCatalystCommands } from './commands'
 import { GitExtension } from '../shared/extensions/git'
 import { CodeCatalystAuthenticationProvider } from './auth'
 import { registerDevfileWatcher } from './devfile'
-import { DevEnvClient } from '../shared/clients/devenvClient'
+import { DevEnvClient, DevEnvActivity } from '../shared/clients/devenvClient'
 import { watchRestartingDevEnvs } from './reconnect'
 import { PromptSettings } from '../shared/settings'
 import { dontShow } from '../shared/localizedText'
 import { getIdeProperties, isCloud9 } from '../shared/extensionUtilities'
 import { Commands } from '../shared/vscode/commands2'
 import { getCodeCatalystConfig } from '../shared/clients/codecatalystClient'
-import { getThisDevEnv } from './model'
 import { isDevenvVscode } from './utils'
+import { getThisDevEnv } from './model'
 import { getLogger } from '../shared/logger/logger'
+import { InactivityMessage, shouldTrackUserActivity } from './devEnv'
 
 const localize = nls.loadMessageBundle()
 
@@ -38,6 +39,10 @@ export async function activate(ctx: ExtContext): Promise<void> {
         ...Object.values(CodeCatalystCommands.declared).map(c => c.register(commands))
     )
 
+    Commands.register('aws.codecatalyst.removeConnection', () => {
+        authProvider.removeSavedConnection()
+    })
+
     if (!isCloud9()) {
         GitExtension.instance.registerRemoteSourceProvider(remoteSourceProvider).then(disposable => {
             ctx.extensionContext.subscriptions.push(disposable)
@@ -56,11 +61,6 @@ export async function activate(ctx: ExtContext): Promise<void> {
         watchRestartingDevEnvs(ctx, authProvider)
     }
 
-    ctx.extensionContext.subscriptions.push(DevEnvClient.instance)
-    if (DevEnvClient.instance.id) {
-        ctx.extensionContext.subscriptions.push(registerDevfileWatcher(DevEnvClient.instance))
-    }
-
     const thisDevenv = (await getThisDevEnv(authProvider))?.unwrapOrElse(err => {
         getLogger().warn('codecatalyst: failed to get current Dev Enviroment: %s', err)
         return undefined
@@ -69,6 +69,11 @@ export async function activate(ctx: ExtContext): Promise<void> {
     if (!thisDevenv) {
         getLogger().verbose('codecatalyst: not a devenv, getThisDevEnv() returned empty')
     } else {
+        ctx.extensionContext.subscriptions.push(DevEnvClient.instance)
+        if (DevEnvClient.instance.id) {
+            ctx.extensionContext.subscriptions.push(registerDevfileWatcher(DevEnvClient.instance))
+        }
+
         getLogger().info('codecatalyst: Dev Environment ides=%O', thisDevenv?.summary.ides)
         if (!isCloud9() && thisDevenv && !isDevenvVscode(thisDevenv.summary.ides)) {
             // Prevent Toolkit from reconnecting to a "non-vscode" devenv by actively closing it.
@@ -95,11 +100,17 @@ export async function activate(ctx: ExtContext): Promise<void> {
                 }
             })
         }
-    }
 
-    Commands.register('aws.codecatalyst.removeConnection', () => {
-        authProvider.removeSavedConnection()
-    })
+        const maxInactivityMinutes = thisDevenv.summary.inactivityTimeoutMinutes
+        const devEnvClient = thisDevenv.devenvClient
+        const devEnvActivity = await DevEnvActivity.instanceIfActivityTrackingEnabled(devEnvClient)
+        if (shouldTrackUserActivity(maxInactivityMinutes) && devEnvActivity) {
+            const inactivityMessage = new InactivityMessage()
+            inactivityMessage.setupMessage(maxInactivityMinutes, devEnvActivity)
+
+            ctx.extensionContext.subscriptions.push(inactivityMessage, devEnvActivity)
+        }
+    }
 }
 
 async function showReadmeFileOnFirstLoad(workspaceState: vscode.ExtensionContext['workspaceState']): Promise<void> {