Remote mandatory param and update logic to exclude temp consoles

Author: jborean93

module/PowerShellEditorServices/Commands/Public/Start-DebugAttachSession.ps1

@@ -30,7 +30,7 @@ function Start-DebugAttachSession {
         [string]
         $RunspaceName,
 
-        [Parameter(Mandatory)]
+        [Parameter()]
         [int]
         $RunspaceId,
 
@@ -46,7 +46,7 @@ function Start-DebugAttachSession {
     $ErrorActionPreference = 'Stop'
 
     try {
-        if ($RunspaceId -and $RunspaceName) {
+        if ($PSBoundParameters.ContainsKey('RunspaceId') -and $RunspaceName) {
             $err = [ErrorRecord]::new(
                 [ArgumentException]::new("Cannot specify both RunspaceId and RunspaceName parameters"),
                 "InvalidRunspaceParameters",
@@ -62,7 +62,7 @@ function Start-DebugAttachSession {
         $debugServer = Get-Variable -Name __psEditorServices_DebugServer -ValueOnly -ErrorAction Ignore
         if (-not $debugServer) {
             $err = [ErrorRecord]::new(
-                [Exception]::new("Cannot start a new attach debug session unless running in an existing debug session"),
+                [Exception]::new("Cannot start a new attach debug session unless running in an existing launch debug session not in a temporary console"),
                 "NoDebugSession",
                 [ErrorCategory]::InvalidOperation,
                 $null)

module/docs/Start-DebugAttachSession.md

@@ -1,5 +1,6 @@
 ---
 external help file: PowerShellEditorServices.Commands-help.xml
+Module Name: PowerShellEditorServices.Commands
 online version: https://github.com/PowerShell/PowerShellEditorServices/tree/main/module/docs/Start-DebugAttachSession.md
 schema: 2.0.0
 ---
@@ -14,19 +15,19 @@ Starts a new debug session attached to the specified PowerShell instance.
 
 ### ProcessId (Default)
 ```
-Start-DebugAttachSession [-Name <String>] [-ProcessId <Int32>] [-RunspaceName <String>] -RunspaceId <Int32>
+Start-DebugAttachSession [-Name <String>] [-ProcessId <Int32>] [-RunspaceName <String>] [-RunspaceId <Int32>]
  [-ComputerName <String>] [-AsJob] [<CommonParameters>]
 ```
 
 ### CustomPipeName
 ```
 Start-DebugAttachSession [-Name <String>] [-CustomPipeName <String>] [-RunspaceName <String>]
- -RunspaceId <Int32> [-ComputerName <String>] [-AsJob] [<CommonParameters>]
+ [-RunspaceId <Int32>] [-ComputerName <String>] [-AsJob] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
 
-The Start-DebugAttachSession function can be used to start a new debug session that is attached to the specified PowerShell instance. The caller must be running in an existing launched debug session and the newly attached session will be treated as a child debug session in a new temporary console. If the callers script ends before the new debug session is completed, the debug session for the child will also end.
+The Start-DebugAttachSession function can be used to start a new debug session that is attached to the specified PowerShell instance. The caller must be running in an existing launched debug session, the launched session is not running in a temporary console, and the launched session is not entered into a remote PSSession. If the callers script ends before the new debug session is completed, the debug session for the child will also end.
 
 The function will return once the attach response was received by the debug server. For an example, an attach request will return once PowerShell has attached to the process and has called `Debug-Runspace`. If you need to return early use the `-AsJob` parameter to return a `Job` object immediately that can be used to wait for the response at a later time.
 
@@ -166,7 +167,7 @@ Type: Int32
 Parameter Sets: (All)
 Aliases:
 
-Required: True
+Required: False
 Position: Named
 Default value: None
 Accept pipeline input: False

src/PowerShellEditorServices/Services/DebugAdapter/Handlers/DisconnectHandler.cs

@@ -56,15 +56,16 @@ public async Task<DisconnectResponse> Handle(DisconnectArguments request, Cancel
                 _debugStateService.ExecutionCompleted = true;
                 _debugService.Abort();
 
-                if (!_debugStateService.IsAttachSession)
+                if (!_debugStateService.IsAttachSession && !_debugStateService.IsUsingTempIntegratedConsole)
                 {
                     await _executionService.ExecutePSCommandAsync(
                         new PSCommand().AddCommand("Remove-Variable")
                             .AddParameter("Name", DebugService.PsesGlobalVariableDebugServerName)
                             .AddParameter("Force", true),
                         cancellationToken).ConfigureAwait(false);
                 }
-                else if (_debugStateService.IsInteractiveDebugSession)
+
+                if (_debugStateService.IsInteractiveDebugSession && _debugStateService.IsRemoteAttach)
                 {
                     // Pop the sessions
                     if (_runspaceContext.CurrentRunspace.RunspaceOrigin == RunspaceOrigin.EnteredProcess)

src/PowerShellEditorServices/Services/DebugAdapter/Handlers/LaunchAndAttachHandler.cs

@@ -179,16 +179,22 @@ public async Task<LaunchResponse> Handle(PsesLaunchRequestArguments request, Can
 
                 _logger.LogTrace("Working dir " + (string.IsNullOrEmpty(workingDir) ? "not set." : $"set to '{workingDir}'"));
 
-                PSCommand setVariableCmd = new PSCommand().AddCommand("Set-Variable")
-                    .AddParameter("Name", DebugService.PsesGlobalVariableDebugServerName)
-                    .AddParameter("Value", _debugAdapterServer)
-                    .AddParameter("Description", "DO NOT USE: for internal use only.")
-                    .AddParameter("Scope", "Global")
-                    .AddParameter("Option", "ReadOnly");
-
-                await _executionService.ExecutePSCommandAsync(
-                    setVariableCmd,
-                    cancellationToken).ConfigureAwait(false);
+                if (!request.CreateTemporaryIntegratedConsole)
+                {
+                    // Start-DebugAttachSession attaches in a new temp console
+                    // so we cannot set this var if already running in that
+                    // console.
+                    PSCommand setVariableCmd = new PSCommand().AddCommand("Set-Variable")
+                        .AddParameter("Name", DebugService.PsesGlobalVariableDebugServerName)
+                        .AddParameter("Value", _debugAdapterServer)
+                        .AddParameter("Description", "DO NOT USE: for internal use only.")
+                        .AddParameter("Scope", "Global")
+                        .AddParameter("Option", "ReadOnly");
+
+                    await _executionService.ExecutePSCommandAsync(
+                        setVariableCmd,
+                        cancellationToken).ConfigureAwait(false);
+                }
             }
 
             // Prepare arguments to the script - if specified