fix(sagemaker): improve SSH configuration error handling for SageMakare remote connections

packages/core/src/awsService/sagemaker/commands.ts

@@ -28,6 +28,7 @@ import {
     RemoteAccess,
     RemoteAccessRequiredMessage,
     SpaceStatus,
+    SshConfigError,
 } from './constants'
 import { SagemakerUnifiedStudioSpaceNode } from '../../sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioSpaceNode'
 
@@ -210,19 +211,26 @@ export async function openRemoteConnect(
         return
     }
 
-    const spaceName = node.spaceApp.SpaceName!
-    await tryRefreshNode(node)
+    try {
+        const spaceName = node.spaceApp.SpaceName!
+        await tryRefreshNode(node)
 
-    const remoteAccess = node.spaceApp.SpaceSettingsSummary?.RemoteAccess
-    const nodeStatus = node.getStatus()
+        const remoteAccess = node.spaceApp.SpaceSettingsSummary?.RemoteAccess
+        const nodeStatus = node.getStatus()
 
-    // Route to appropriate handler based on space state
-    if (nodeStatus === SpaceStatus.RUNNING && remoteAccess !== RemoteAccess.ENABLED) {
-        return handleRunningSpaceWithDisabledAccess(node, ctx, spaceName, sageMakerClient)
-    } else if (nodeStatus === SpaceStatus.STOPPED) {
-        return handleStoppedSpace(node, ctx, spaceName, sageMakerClient)
-    } else if (nodeStatus === SpaceStatus.RUNNING) {
-        return handleRunningSpaceWithEnabledAccess(node, ctx, spaceName)
+        // Route to appropriate handler based on space state
+        if (nodeStatus === SpaceStatus.RUNNING && remoteAccess !== RemoteAccess.ENABLED) {
+            return await handleRunningSpaceWithDisabledAccess(node, ctx, spaceName, sageMakerClient)
+        } else if (nodeStatus === SpaceStatus.STOPPED) {
+            return await handleStoppedSpace(node, ctx, spaceName, sageMakerClient)
+        } else if (nodeStatus === SpaceStatus.RUNNING) {
+            return await handleRunningSpaceWithEnabledAccess(node, ctx, spaceName)
+        }
+    } catch (err: any) {
+        // Suppress errors that were already shown to user
+        if (shouldSuppressError(err)) {
+            return
+        }
     }
 }
 
@@ -346,8 +354,8 @@ async function handleRunningSpaceWithDisabledAccess(
                 )
                 await tryRemoteConnection(node, ctx, progress)
             } catch (err: any) {
-                // Handle user declining instance type upgrade
-                if (err.code === InstanceTypeError) {
+                // Suppress errors that were already shown to user
+                if (shouldSuppressError(err)) {
                     return
                 }
                 throw new ToolkitError(`Remote connection failed: ${err.message}`, {
@@ -393,8 +401,8 @@ async function handleStoppedSpace(
             }
         )
     } catch (err: any) {
-        // Handle user declining instance type upgrade
-        if (err.code === InstanceTypeError) {
+        // Suppress errors that were already shown to user
+        if (shouldSuppressError(err)) {
             return
         }
         throw new ToolkitError(`Remote connection failed: ${(err as Error).message}`, {
@@ -425,3 +433,10 @@ async function handleRunningSpaceWithEnabledAccess(
         }
     )
 }
+
+/**
+ * Helper function to determine if an error should be suppressed (already shown to user)
+ */
+function shouldSuppressError(err: any): boolean {
+    return err.code === SshConfigError || err.code === InstanceTypeError
+}

packages/core/src/awsService/sagemaker/constants.ts

@@ -7,6 +7,7 @@ export const ConnectFromRemoteWorkspaceMessage =
     'Unable to establish new remote connection. Your last active VS Code window is connected to a remote workspace. To open a new SageMaker Studio connection, select your local VS Code window and try again.'
 
 export const InstanceTypeError = 'InstanceTypeError'
+export const SshConfigError = 'SshConfigError'
 
 export const InstanceTypeMinimum = 'ml.t3.large'
 
@@ -46,6 +47,10 @@ export const InstanceTypeNotSelectedMessage = (spaceName: string) => {
 export const RemoteAccessRequiredMessage =
     'This space requires remote access to be enabled.\nWould you like to restart the space and connect?\nAny unsaved work will be lost.'
 
+export const SshConfigErrorMessage = () => {
+    return `Unable to connect. ~/.ssh/config contains invalid SSH configuration. Fix the errors to continue.`
+}
+
 export const SmusDeeplinkSessionExpiredError = {
     title: 'Session Disconnected',
     message:

packages/core/src/awsService/sagemaker/model.ts

@@ -22,6 +22,7 @@ import { ToolkitError } from '../../shared/errors'
 import { SagemakerSpaceNode } from './explorer/sagemakerSpaceNode'
 import { sleep } from '../../shared/utilities/timeoutUtils'
 import { SagemakerUnifiedStudioSpaceNode } from '../../sagemakerunifiedstudio/explorer/nodes/sageMakerUnifiedStudioSpaceNode'
+import { SshConfigError, SshConfigErrorMessage } from './constants'
 
 const logger = getLogger('sagemaker')
 
@@ -96,6 +97,23 @@ export async function prepareDevEnvConnection(
     if (config.isErr()) {
         const err = config.err()
         logger.error(`sagemaker: failed to add ssh config section: ${err.message}`)
+
+        if (err instanceof ToolkitError && err.code === 'SshCheckFailed') {
+            const sshConfigPath = path.join(os.homedir(), '.ssh', 'config')
+
+            // Extracting line number from SSH error message is the best-effort.
+            // SSH error formats are not standardized and may vary across implementations.
+            await vscode.window
+                .showErrorMessage(SshConfigErrorMessage(), { modal: true, detail: err.message }, 'Open SSH Config')
+                .then((resp) => {
+                    if (resp === 'Open SSH Config') {
+                        void vscode.window.showTextDocument(vscode.Uri.file(sshConfigPath))
+                    }
+                })
+
+            throw new ToolkitError('SSH configuration error', { code: SshConfigError, cancelled: true })
+        }
+
         throw err
     }
 

packages/core/src/shared/sshConfig.ts

@@ -85,7 +85,18 @@ export class SshConfig {
     protected async matchSshSection() {
         const result = await this.checkSshOnHost()
         if (result.exitCode !== 0) {
-            return Result.err(result.error ?? new Error(`ssh check against host failed: ${result.exitCode}`))
+            // Format stderr error message
+            let errorMessage = result.stderr?.trim() || `ssh check against host failed: ${result.exitCode}`
+            const sshConfigPath = getSshConfigPath()
+            errorMessage = errorMessage.replace(new RegExp(`${sshConfigPath}:\\s*`, 'g'), '').trim()
+
+            if (result.error) {
+                // System level error
+                return Result.err(ToolkitError.chain(result.error, errorMessage))
+            }
+
+            // SSH ran but returned error exit code
+            return Result.err(new ToolkitError(errorMessage, { code: 'SshCheckFailed' }))
         }
         const matches = result.stdout.match(this.proxyCommandRegExp)
         return Result.ok(matches?.[0])

packages/core/src/test/shared/sshConfig.test.ts

@@ -26,6 +26,7 @@ class MockSshConfig extends SshConfig {
     // State variables to track logic flow.
     public testIsWin: boolean = false
     public configSection: string = ''
+    public exitCodeOverride: number = 0
 
     public async getProxyCommandWrapper(command: string): Promise<Result<string, ToolkitError>> {
         return await this.getProxyCommand(command)
@@ -51,7 +52,7 @@ class MockSshConfig extends SshConfig {
 
     protected override async checkSshOnHost(): Promise<ChildProcessResult> {
         return {
-            exitCode: 0,
+            exitCode: this.exitCodeOverride,
             error: undefined,
             stdout: this.configSection,
             stderr: '',
@@ -95,6 +96,10 @@ describe('VscodeRemoteSshConfig', async function () {
     })
 
     describe('matchSshSection', async function () {
+        beforeEach(function () {
+            config.exitCodeOverride = 0
+        })
+
         it('returns ok with match when proxycommand is present', async function () {
             const testSection = `proxycommandfdsafdsafd${testProxyCommand}sa342432`
             const result = await config.testMatchSshSection(testSection)
@@ -110,6 +115,16 @@ describe('VscodeRemoteSshConfig', async function () {
             const match = result.unwrap()
             assert.strictEqual(match, undefined)
         })
+
+        it('returns error when ssh check fails with non-zero exit code', async function () {
+            config.exitCodeOverride = 255
+            const testSection = `some config`
+            const result = await config.testMatchSshSection(testSection)
+            assert.ok(result.isErr())
+            const error = result.err()
+            assert.ok(error.message.includes('ssh check against host failed'))
+            assert.ok(error.message.includes('255'))
+        })
     })
 
     describe('verifySSHHost', async function () {
@@ -122,6 +137,7 @@ describe('VscodeRemoteSshConfig', async function () {
         })
 
         beforeEach(function () {
+            config.exitCodeOverride = 0
             promptUserToConfigureSshConfigStub.resetHistory()
         })
 

packages/toolkit/.changes/next-release/Bug Fix-3550c6a1-d356-45cc-a404-c87e2d2ee393.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "SageMaker: Enhanced SSH configuration error handling to show user-friendly modal dialogs with line numbers and an \"Open SSH Config\" button for quick fixes."
+}