@@ -430,14 +430,16 @@ export class Remote {
430430return
431431}
432432
433+ const logDir = this . getLogDir ( featureSet )
434+
433435// This ensures the Remote SSH extension resolves the host to execute the
434436// Coder binary properly.
435437//
436438// If we didn't write to the SSH config file, connecting would fail with
437439// "Host not found".
438440try {
439441this . storage . writeToCoderOutputChannel ( "Updating SSH config..." )
440- await this . updateSSHConfig ( workspaceRestClient , parts . label , parts . host , binaryPath , featureSet )
442+ await this . updateSSHConfig ( workspaceRestClient , parts . label , parts . host , binaryPath , logDir )
441443} catch ( error ) {
442444this . storage . writeToCoderOutputChannel ( `Failed to configure SSH:${ error } )
443445throw error
@@ -450,7 +452,7 @@ export class Remote {
450452return
451453}
452454disposables . push ( this . showNetworkUpdates ( pid ) )
453- this . commands . workspaceLogPath = path . join ( this . storage . getLogPath ( ) , `${ pid } )
455+ this . commands . workspaceLogPath = logDir ? path . join ( logDir , `${ pid } ) : undefined
454456} )
455457
456458// Register the label formatter again because SSH overrides it!
@@ -476,34 +478,33 @@ export class Remote {
476478}
477479
478480/**
479- * Format's the --log-dir argument for the ProxyCommand
481+ * Return the --log-dir argument value for the ProxyCommand. It may be an
482+ * empty string if the setting is not set or the cli does not support it.
480483 */
481- private async formatLogArg ( featureSet :FeatureSet ) :Promise < string > {
484+ private getLogDir ( featureSet :FeatureSet ) :string {
482485if ( ! featureSet . proxyLogDirectory ) {
483486return ""
484487}
485-
486488// If the proxyLogDirectory is not set in the extension settings we don't send one.
487- // Question for Asher: How do VSCode extension settings behave in terms of semver for the extension?
488- const logDir = expandPath ( String ( vscode . workspace . getConfiguration ( ) . get ( "coder.proxyLogDirectory" ) ?? "" ) . trim ( ) )
489+ return expandPath ( String ( vscode . workspace . getConfiguration ( ) . get ( "coder.proxyLogDirectory" ) ?? "" ) . trim ( ) )
490+ }
491+
492+ /**
493+ * Formats the --log-dir argument for the ProxyCommand after making sure it
494+ * has been created.
495+ */
496+ private async formatLogArg ( logDir :string ) :Promise < string > {
489497if ( ! logDir ) {
490498return ""
491499}
492-
493500await fs . mkdir ( logDir , { recursive :true } )
494501this . storage . writeToCoderOutputChannel ( `SSH proxy diagnostics are being written to${ logDir } )
495502return ` --log-dir${ escape ( logDir ) }
496503}
497504
498505// updateSSHConfig updates the SSH configuration with a wildcard that handles
499506// all Coder entries.
500- private async updateSSHConfig (
501- restClient :Api ,
502- label :string ,
503- hostName :string ,
504- binaryPath :string ,
505- featureSet :FeatureSet ,
506- ) {
507+ private async updateSSHConfig ( restClient :Api , label :string , hostName :string , binaryPath :string , logDir :string ) {
507508let deploymentSSHConfig = { }
508509try {
509510const deploymentConfig = await restClient . getDeploymentSSHConfig ( )
@@ -585,7 +586,7 @@ export class Remote {
585586Host :label ?`${ AuthorityPrefix } ${ label } :`${ AuthorityPrefix } ,
586587ProxyCommand :`${ escape ( binaryPath ) } ${ headerArg } ${ escape (
587588this . storage . getNetworkInfoPath ( ) ,
588- ) } ${ await this . formatLogArg ( featureSet ) } ${ escape ( this . storage . getSessionTokenPath ( label ) ) } ${ escape (
589+ ) } ${ await this . formatLogArg ( logDir ) } ${ escape ( this . storage . getSessionTokenPath ( label ) ) } ${ escape (
589590this . storage . getUrlPath ( label ) ,
590591) } ,
591592ConnectTimeout :"0" ,