feat(sagemaker): Adding support for Cursor IDE

packages/amazonq/test/e2e/index.ts

@@ -4,10 +4,10 @@
  */
 
 import { runTests } from 'aws-core-vscode/test'
-import { VSCODE_EXTENSION_ID } from 'aws-core-vscode/utils'
+import { VSCODE_EXTENSION_ID_CONSTANTS } from 'aws-core-vscode/utils'
 
 export function run(): Promise<void> {
-    return runTests(process.env.TEST_DIR ?? 'test/e2e', VSCODE_EXTENSION_ID.amazonq, [
+    return runTests(process.env.TEST_DIR ?? 'test/e2e', VSCODE_EXTENSION_ID_CONSTANTS.amazonq, [
         '../../core/dist/src/testInteg/globalSetup.test.ts',
     ])
 }

packages/amazonq/test/unit/index.ts

@@ -4,10 +4,10 @@
  */
 
 import { runTests } from 'aws-core-vscode/test'
-import { VSCODE_EXTENSION_ID } from 'aws-core-vscode/utils'
+import { VSCODE_EXTENSION_ID_CONSTANTS } from 'aws-core-vscode/utils'
 
 export function run(): Promise<void> {
-    return runTests(process.env.TEST_DIR ?? ['test/unit'], VSCODE_EXTENSION_ID.amazonq, [
+    return runTests(process.env.TEST_DIR ?? ['test/unit'], VSCODE_EXTENSION_ID_CONSTANTS.amazonq, [
         '../../core/dist/src/test/globalSetup.test.ts',
     ])
 }

packages/amazonq/test/web/testRunner.ts

@@ -7,7 +7,7 @@
  * The following was influenced by this guide: https://code.visualstudio.com/api/extension-guides/web-extensions
  */
 
-import { VSCODE_EXTENSION_ID } from 'aws-core-vscode/utils'
+import { VSCODE_EXTENSION_ID_CONSTANTS } from 'aws-core-vscode/utils'
 import 'mocha' // Imports mocha for the browser, defining the `mocha` global.
 import * as vscode from 'vscode'
 
@@ -47,12 +47,12 @@ function gatherTestFiles() {
  * So this function ensures the extension has fully activated.
  */
 async function activateExtension() {
-    const extId = VSCODE_EXTENSION_ID.amazonq
+    const extId = VSCODE_EXTENSION_ID_CONSTANTS.amazonq
     const ext = vscode.extensions.getExtension(extId)
     if (!ext) {
         throw new Error(`Extension '${extId}' not found, can't activate it to run tests.`)
     }
-    await vscode.extensions.getExtension(VSCODE_EXTENSION_ID.amazonq)?.activate()
+    await vscode.extensions.getExtension(VSCODE_EXTENSION_ID_CONSTANTS.amazonq)?.activate()
 }
 
 function runMochaTests(resolve: (value: void | PromiseLike<void>) => void, reject: (reason?: any) => void) {

packages/core/scripts/test/launchTestUtilities.ts

@@ -8,7 +8,7 @@ import packageJson from '../../package.json'
 import { downloadAndUnzipVSCode, resolveCliArgsFromVSCodeExecutablePath } from '@vscode/test-electron'
 import { join, resolve } from 'path'
 import { runTests } from '@vscode/test-electron'
-import { VSCODE_EXTENSION_ID } from '../../src/shared/extensions'
+import { VSCODE_EXTENSION_ID_CONSTANTS } from '../../src/shared/extensionIds'
 import { TestOptions } from '@vscode/test-electron/out/runTest'
 
 const envvarVscodeTestVersion = 'VSCODE_TEST_VERSION'
@@ -79,14 +79,14 @@ async function getVSCodeCliArgs(params: {
     if (params.suite === 'integration' || params.suite === 'e2e') {
         disableExtensionsArgs = await getCliArgsToDisableExtensions(params.vsCodeExecutablePath, {
             except: [
-                VSCODE_EXTENSION_ID.python,
-                VSCODE_EXTENSION_ID.yaml,
-                VSCODE_EXTENSION_ID.jupyter,
-                VSCODE_EXTENSION_ID.go,
-                VSCODE_EXTENSION_ID.java,
-                VSCODE_EXTENSION_ID.javadebug,
-                VSCODE_EXTENSION_ID.git,
-                VSCODE_EXTENSION_ID.remotessh,
+                VSCODE_EXTENSION_ID_CONSTANTS.python,
+                VSCODE_EXTENSION_ID_CONSTANTS.yaml,
+                VSCODE_EXTENSION_ID_CONSTANTS.jupyter,
+                VSCODE_EXTENSION_ID_CONSTANTS.go,
+                VSCODE_EXTENSION_ID_CONSTANTS.java,
+                VSCODE_EXTENSION_ID_CONSTANTS.javadebug,
+                VSCODE_EXTENSION_ID_CONSTANTS.git,
+                VSCODE_EXTENSION_ID_CONSTANTS.remotessh.id,
             ],
         })
         disableWorkspaceTrustArg = [disableWorkspaceTrust]
@@ -160,11 +160,11 @@ async function setupVSCodeTestInstance(suite: SuiteName): Promise<string> {
 
     // Only certain test suites require specific vscode extensions to be installed
     if (suite === 'e2e' || suite === 'integration') {
-        await installVSCodeExtension(vsCodeExecutablePath, VSCODE_EXTENSION_ID.python)
-        await installVSCodeExtension(vsCodeExecutablePath, VSCODE_EXTENSION_ID.yaml)
-        await installVSCodeExtension(vsCodeExecutablePath, VSCODE_EXTENSION_ID.go)
-        await installVSCodeExtension(vsCodeExecutablePath, VSCODE_EXTENSION_ID.java)
-        await installVSCodeExtension(vsCodeExecutablePath, VSCODE_EXTENSION_ID.javadebug)
+        await installVSCodeExtension(vsCodeExecutablePath, VSCODE_EXTENSION_ID_CONSTANTS.python)
+        await installVSCodeExtension(vsCodeExecutablePath, VSCODE_EXTENSION_ID_CONSTANTS.yaml)
+        await installVSCodeExtension(vsCodeExecutablePath, VSCODE_EXTENSION_ID_CONSTANTS.go)
+        await installVSCodeExtension(vsCodeExecutablePath, VSCODE_EXTENSION_ID_CONSTANTS.java)
+        await installVSCodeExtension(vsCodeExecutablePath, VSCODE_EXTENSION_ID_CONSTANTS.javadebug)
     }
 
     console.log('VS Code Test instance has been set up')

packages/core/src/shared/extensionIds.ts

@@ -0,0 +1,37 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+// eslint-disable-next-line @typescript-eslint/naming-convention
+export const VSCODE_REMOTE_SSH_EXTENSION = {
+    vscode: {
+        id: 'ms-vscode-remote.remote-ssh',
+        minVersion: '0.74.0',
+    },
+    cursor: {
+        id: 'anysphere.remote-ssh',
+        minVersion: '1.0.2',
+    },
+} as const
+
+/**
+ * Extension IDs that don't require runtime vscode access.
+ * Safe to import in test environments.
+ */
+// eslint-disable-next-line @typescript-eslint/naming-convention
+export const VSCODE_EXTENSION_ID_CONSTANTS = {
+    awstoolkit: 'amazonwebservices.aws-toolkit-vscode',
+    amazonq: 'amazonwebservices.amazon-q-vscode',
+    python: 'ms-python.python',
+    // python depends on jupyter plugin
+    jupyter: 'ms-toolsai.jupyter',
+    yaml: 'redhat.vscode-yaml',
+    go: 'golang.go',
+    java: 'redhat.java',
+    javadebug: 'vscjava.vscode-java-debug',
+    dotnet: 'ms-dotnettools.csdevkit',
+    git: 'vscode.git',
+    // default to VSCode in test environment
+    remotessh: VSCODE_REMOTE_SSH_EXTENSION.vscode,
+} as const

packages/core/src/shared/extensions.ts

@@ -10,26 +10,30 @@ import { TelemetryService } from './telemetry/telemetryService'
 import { CredentialsStore } from '../auth/credentials/store'
 import { SamCliContext } from './sam/cli/samCliContext'
 import { UriHandler } from './vscode/uriHandler'
+import { VSCODE_EXTENSION_ID_CONSTANTS, VSCODE_REMOTE_SSH_EXTENSION } from './extensionIds'
 
+// Determine the remote SSH extension based on the editor
+const getRemoteSshExtension = () => {
+    const appName = vscode?.env?.appName?.toLowerCase()
+
+    if (appName?.includes('cursor')) {
+        return VSCODE_REMOTE_SSH_EXTENSION.cursor
+    }
+
+    return VSCODE_REMOTE_SSH_EXTENSION.vscode
+}
+
+// For actual use in IDE, not test environment
 // eslint-disable-next-line @typescript-eslint/naming-convention
 export const VSCODE_EXTENSION_ID = {
-    awstoolkit: 'amazonwebservices.aws-toolkit-vscode',
-    amazonq: 'amazonwebservices.amazon-q-vscode',
-    python: 'ms-python.python',
-    // python depends on jupyter plugin
-    jupyter: 'ms-toolsai.jupyter',
-    yaml: 'redhat.vscode-yaml',
-    go: 'golang.go',
-    java: 'redhat.java',
-    javadebug: 'vscjava.vscode-java-debug',
-    dotnet: 'ms-dotnettools.csdevkit',
-    git: 'vscode.git',
-    remotessh: 'ms-vscode-remote.remote-ssh',
+    ...VSCODE_EXTENSION_ID_CONSTANTS,
+    get remotessh() {
+        return getRemoteSshExtension()
+    },
 } as const
 
-export const vscodeExtensionMinVersion = {
-    remotessh: '0.74.0',
-}
+// Re-export for backward compatibility
+export { VSCODE_REMOTE_SSH_EXTENSION }
 
 /** @deprecated Use `extensionGlobals.ts:globals` instead. */
 export interface ExtContext {

packages/core/src/shared/remoteSession.ts

@@ -11,7 +11,7 @@ import { Settings } from '../shared/settings'
 import { showConfirmationMessage, showMessageWithCancel } from './utilities/messages'
 import { CancellationError, Timeout } from './utilities/timeoutUtils'
 import { isExtensionInstalled, showInstallExtensionMsg } from './utilities/vsCodeUtils'
-import { VSCODE_EXTENSION_ID, vscodeExtensionMinVersion } from './extensions'
+import { VSCODE_EXTENSION_ID } from './extensions'
 import { Err, Result } from '../shared/utilities/result'
 import { ToolkitError, UnknownError } from './errors'
 import { getLogger } from './logger/logger'
@@ -108,19 +108,19 @@ export async function ensureDependencies(): Promise<Result<DependencyPaths, Canc
 }
 
 export async function ensureRemoteSshInstalled(): Promise<void> {
-    if (!isExtensionInstalled(VSCODE_EXTENSION_ID.remotessh, vscodeExtensionMinVersion.remotessh)) {
+    if (!isExtensionInstalled(VSCODE_EXTENSION_ID.remotessh.id, VSCODE_EXTENSION_ID.remotessh.minVersion)) {
         showInstallExtensionMsg(
-            VSCODE_EXTENSION_ID.remotessh,
+            VSCODE_EXTENSION_ID.remotessh.id,
             'Remote SSH',
             'Connecting to Dev Environment',
-            vscodeExtensionMinVersion.remotessh
+            VSCODE_EXTENSION_ID.remotessh.minVersion
         )
 
-        if (isExtensionInstalled(VSCODE_EXTENSION_ID.remotessh)) {
+        if (isExtensionInstalled(VSCODE_EXTENSION_ID.remotessh.id)) {
             throw new ToolkitError('Remote SSH extension version is too low', {
                 cancelled: true,
                 code: RemoteSessionError.ExtensionVersionTooLow,
-                details: { expected: vscodeExtensionMinVersion.remotessh },
+                details: { expected: VSCODE_EXTENSION_ID.remotessh.minVersion },
             })
         } else {
             throw new ToolkitError('Remote SSH extension not installed', {

packages/core/src/shared/utilities/index.ts

@@ -5,6 +5,7 @@
 
 export { isExtensionInstalled, isExtensionActive } from './vsCodeUtils'
 export { VSCODE_EXTENSION_ID } from '../extensions'
+export { VSCODE_EXTENSION_ID_CONSTANTS } from '../extensionIds'
 export * from './functionUtils'
 export * as messageUtils from './messages'
 export * as CommentUtils from './commentUtils'

packages/core/src/test/awsService/sagemaker/uriHandlers.test.ts

@@ -7,14 +7,14 @@ import * as sinon from 'sinon'
 import * as vscode from 'vscode'
 import assert from 'assert'
 import { UriHandler } from '../../../shared/vscode/uriHandler'
-import { VSCODE_EXTENSION_ID } from '../../../shared/extensions'
+import { VSCODE_EXTENSION_ID_CONSTANTS } from '../../../shared/extensionIds'
 import { register } from '../../../awsService/sagemaker/uriHandlers'
 
 function createConnectUri(params: { [key: string]: string }): vscode.Uri {
     const query = Object.entries(params)
         .map(([k, v]) => `${encodeURIComponent(k)}=${encodeURIComponent(v)}`)
         .join('&')
-    return vscode.Uri.parse(`vscode://${VSCODE_EXTENSION_ID.awstoolkit}/connect/sagemaker?${query}`)
+    return vscode.Uri.parse(`vscode://${VSCODE_EXTENSION_ID_CONSTANTS.awstoolkit}/connect/sagemaker?${query}`)
 }
 
 describe('SageMaker URI handler', function () {

packages/core/src/test/codecatalyst/uriHandlers.test.ts

@@ -8,7 +8,7 @@ import * as vscode from 'vscode'
 import assert from 'assert'
 import { register } from '../../codecatalyst/uriHandlers'
 import { UriHandler } from '../../shared/vscode/uriHandler'
-import { VSCODE_EXTENSION_ID } from '../../shared/extensions'
+import { VSCODE_EXTENSION_ID_CONSTANTS } from '../../shared/extensionIds'
 import { CodeCatalystClient } from '../../shared/clients/codecatalystClient'
 import { SeverityLevel } from '../shared/vscode/message'
 import { getTestWindow } from '../shared/vscode/window'
@@ -18,14 +18,16 @@ import { builderIdStartUrl } from '../../auth/sso/constants'
 type Stub<T extends (...args: any[]) => any> = sinon.SinonStub<Parameters<T>, ReturnType<T>>
 
 function createCloneUri(target: string): vscode.Uri {
-    return vscode.Uri.parse(`vscode://${VSCODE_EXTENSION_ID.awstoolkit}/clone?url=${encodeURIComponent(target)}`)
+    return vscode.Uri.parse(
+        `vscode://${VSCODE_EXTENSION_ID_CONSTANTS.awstoolkit}/clone?url=${encodeURIComponent(target)}`
+    )
 }
 
 function createConnectUri(params: { [key: string]: any }): vscode.Uri {
     const encoded = Object.entries(params)
         .map(([k, v]) => `${encodeURIComponent(k)}=${encodeURIComponent(v)}`)
         .join('&')
-    return vscode.Uri.parse(`vscode://${VSCODE_EXTENSION_ID.awstoolkit}/connect/codecatalyst?${encoded}`)
+    return vscode.Uri.parse(`vscode://${VSCODE_EXTENSION_ID_CONSTANTS.awstoolkit}/connect/codecatalyst?${encoded}`)
 }
 
 // Tests involving `UriHandler` should _not_ couple the URI paths to the implementation.

packages/core/src/test/shared/utilities/vscodeUtils.test.ts

@@ -4,7 +4,7 @@
  */
 
 import assert from 'assert'
-import { VSCODE_EXTENSION_ID } from '../../../shared/extensions'
+import { VSCODE_EXTENSION_ID_CONSTANTS } from '../../../shared/extensionIds'
 import * as vscodeUtil from '../../../shared/utilities/vsCodeUtils'
 import * as vscode from 'vscode'
 import { getExcludePattern } from '../../../shared/fs/watchedFiles'
@@ -18,8 +18,8 @@ describe('vscodeUtils', async function () {
 
         assert.deepStrictEqual(vscodeUtil.isExtensionActive('invalid.extension'), false)
 
-        await vscodeUtil.activateExtension(VSCODE_EXTENSION_ID.awstoolkit, false)
-        assert.deepStrictEqual(vscodeUtil.isExtensionActive(VSCODE_EXTENSION_ID.awstoolkit), true)
+        await vscodeUtil.activateExtension(VSCODE_EXTENSION_ID_CONSTANTS.awstoolkit, false)
+        assert.deepStrictEqual(vscodeUtil.isExtensionActive(VSCODE_EXTENSION_ID_CONSTANTS.awstoolkit), true)
     })
 
     it('globDirPatterns()', async function () {

packages/core/src/testE2E/codecatalyst/client.test.ts

@@ -202,7 +202,7 @@ describe('Test how this codebase uses the CodeCatalyst API', function () {
         })
 
         it('prompts to install the ssh extension if not available', async function () {
-            if (isExtensionInstalled(VSCODE_EXTENSION_ID.remotessh)) {
+            if (isExtensionInstalled(VSCODE_EXTENSION_ID.remotessh.id)) {
                 skipTest(this, 'remote ssh already installed')
             }
 

packages/toolkit/test/e2e/cloudformation/index.ts

@@ -4,12 +4,12 @@
  */
 
 import { runTests } from 'aws-core-vscode/test'
-import { VSCODE_EXTENSION_ID } from 'aws-core-vscode/utils'
+import { VSCODE_EXTENSION_ID_CONSTANTS } from 'aws-core-vscode/utils'
 
 export function run(): Promise<void> {
     return runTests(
         process.env.TEST_DIR ?? ['../../core/dist/src/testE2E/cloudformation'],
-        VSCODE_EXTENSION_ID.awstoolkit,
+        VSCODE_EXTENSION_ID_CONSTANTS.awstoolkit,
         ['../../core/dist/src/testInteg/globalSetup.test.ts']
     )
 }

packages/toolkit/test/e2e/index.ts

@@ -4,12 +4,12 @@
  */
 
 import { runTests } from 'aws-core-vscode/test'
-import { VSCODE_EXTENSION_ID } from 'aws-core-vscode/utils'
+import { VSCODE_EXTENSION_ID_CONSTANTS } from 'aws-core-vscode/utils'
 
 export function run(): Promise<void> {
     return runTests(
         process.env.TEST_DIR ?? ['test/e2e', '../../core/dist/src/testE2E'],
-        VSCODE_EXTENSION_ID.awstoolkit,
+        VSCODE_EXTENSION_ID_CONSTANTS.awstoolkit,
         ['../../core/dist/src/testInteg/globalSetup.test.ts']
     )
 }

packages/toolkit/test/integ/index.ts

@@ -4,12 +4,12 @@
  */
 
 import { runTests } from 'aws-core-vscode/test'
-import { VSCODE_EXTENSION_ID } from 'aws-core-vscode/utils'
+import { VSCODE_EXTENSION_ID_CONSTANTS } from 'aws-core-vscode/utils'
 
 export function run(): Promise<void> {
     return runTests(
         process.env.TEST_DIR ?? ['test/integ', '../../core/dist/src/testInteg'],
-        VSCODE_EXTENSION_ID.awstoolkit,
+        VSCODE_EXTENSION_ID_CONSTANTS.awstoolkit,
         ['../../core/dist/src/testInteg/globalSetup.test.ts']
     )
 }

packages/toolkit/test/unit/index.ts

@@ -4,10 +4,12 @@
  */
 
 import { runTests } from 'aws-core-vscode/test'
-import { VSCODE_EXTENSION_ID } from 'aws-core-vscode/utils'
+import { VSCODE_EXTENSION_ID_CONSTANTS } from 'aws-core-vscode/utils'
 
 export function run(): Promise<void> {
-    return runTests(process.env.TEST_DIR ?? ['test/unit', '../../core/dist/src/test'], VSCODE_EXTENSION_ID.awstoolkit, [
-        '../../core/dist/src/test/globalSetup.test.ts',
-    ])
+    return runTests(
+        process.env.TEST_DIR ?? ['test/unit', '../../core/dist/src/test'],
+        VSCODE_EXTENSION_ID_CONSTANTS.awstoolkit,
+        ['../../core/dist/src/test/globalSetup.test.ts']
+    )
 }