WIP: Fix up debug config resolution stuff

Wow this was a mess.

Author: andyleejordan

package.json

@@ -497,7 +497,7 @@
               "name": "PowerShell Attach Interactive Session Runspace",
               "type": "PowerShell",
               "request": "attach",
-              "processId": "current"
+              "processId": 0
             }
           },
           {
@@ -588,29 +588,26 @@
             "properties": {
               "computerName": {
                 "type": "string",
-                "description": "Optional: The computer name to which a remote session will be established.  Works only on PowerShell 4 and above."
+                "description": "Optional: The computer name to which a remote session will be established."
               },
               "processId": {
-                "type": "string",
-                "description": "The process id of the PowerShell host process to attach to.  Works only on PowerShell 5 and above.",
-                "default": null
+                "type": "number",
+                "description": "Optional: The ID of the PowerShell host process to attach to. A value of 0 (the default) means the Extension Terminal.",
+                "default": 0
               },
               "runspaceId": {
-                "type": [
-                  "string",
-                  "number"
-                ],
-                "description": "Optional: The ID of the runspace to debug in the attached process.  Defaults to 1.  Works only on PowerShell 5 and above.",
-                "default": null
+                "type": "number",
+                "description": "Optional: The ID of the runspace to debug in the attached process. Defaults to 1.",
+                "default": 1
               },
               "runspaceName": {
                 "type": "string",
-                "description": "Optional: The Name of the runspace to debug in the attached process.  Works only on PowerShell 5 and above.",
+                "description": "Optional: The name of the runspace to debug in the attached process.",
                 "default": null
               },
               "customPipeName": {
                 "type": "string",
-                "description": "The custom pipe name of the PowerShell host process to attach to.  Works only on PowerShell 6.2 and above.",
+                "description": "The custom pipe name of the PowerShell host process to attach to.",
                 "default": null
               }
             }

src/features/DebugSession.ts

@@ -426,6 +426,7 @@ export class DebugSessionFeature extends LanguageClientConsumer
             this.logger.writeVerbose(`Dotnet attach debug configuration: ${JSON.stringify(dotnetAttachConfig, undefined, 2)}`);
             this.logger.writeVerbose(`Attached dotnet debugger to process: ${pid}`);
         }
+
         return this.tempSessionDetails;
     }
 
@@ -452,7 +453,7 @@ export class DebugSessionFeature extends LanguageClientConsumer
         };
     }
 
-    /** Fetches all available vscode launch configurations. This is abstracted out for easier testing */
+    /** Fetches all available vscode launch configurations. This is abstracted out for easier testing. */
     private getLaunchConfigurations(): DebugConfiguration[] {
         return workspace.getConfiguration("launch").get<DebugConfiguration[]>("configurations") ?? [];
     }
@@ -471,6 +472,10 @@ export class DebugSessionFeature extends LanguageClientConsumer
             return PREVENT_DEBUG_START;
         }
 
+        if (config.processId  === 0 || config.processId === "current") {
+            config.processId = await this.sessionManager.getLanguageServerPid();
+        }
+
         // If nothing is set, prompt for the processId.
         if (!config.customPipeName && !config.processId) {
             config.processId = await commands.executeCommand("PowerShell.PickPSHostProcess");
@@ -528,12 +533,13 @@ export class SpecifyScriptArgsFeature implements Disposable {
         if (text !== undefined) {
             await this.context.workspaceState.update(powerShellDbgScriptArgsKey, text);
         }
+
         return text;
     }
 }
 
 interface IProcessItem extends QuickPickItem {
-    pid: string;    // payload for the QuickPick UI
+    processId: number; // payload for the QuickPick UI
 }
 
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
@@ -542,7 +548,7 @@ interface IGetPSHostProcessesArguments {
 
 interface IPSHostProcessInfo {
     processName: string;
-    processId: string;
+    processId: number;
     appDomainName: string;
     mainWindowTitle: string;
 }
@@ -551,19 +557,16 @@ export const GetPSHostProcessesRequestType =
     new RequestType<IGetPSHostProcessesArguments, IPSHostProcessInfo[], string>("powerShell/getPSHostProcesses");
 
 export class PickPSHostProcessFeature extends LanguageClientConsumer {
-
     private command: Disposable;
     private waitingForClientToken?: CancellationTokenSource;
     private getLanguageClientResolve?: (value: LanguageClient) => void;
 
     constructor(private logger: ILogger) {
         super();
 
-        this.command =
-            commands.registerCommand("PowerShell.PickPSHostProcess", () => {
-                return this.getLanguageClient()
-                    .then((_) => this.pickPSHostProcess(), (_) => undefined);
-            });
+        this.command = commands.registerCommand("PowerShell.PickPSHostProcess", async () => {
+            return this.pickPSHostProcess();
+        });
     }
 
     public override setLanguageClient(languageClient: LanguageClient): void {
@@ -617,25 +620,24 @@ export class PickPSHostProcessFeature extends LanguageClientConsumer {
         }
     }
 
-    private async pickPSHostProcess(): Promise<string | undefined> {
+    private async pickPSHostProcess(): Promise<number | undefined> {
+        // We need the language client in order to send the request.
+        await this.getLanguageClient();
+
         // Start with the current PowerShell process in the list.
-        const items: IProcessItem[] = [{
-            label: "Current",
-            description: "The current PowerShell Extension process.",
-            pid: "current",
-        }];
+        const items: IProcessItem[] = [];
 
         const response = await this.languageClient?.sendRequest(GetPSHostProcessesRequestType, {});
         for (const process of response ?? []) {
             let windowTitle = "";
             if (process.mainWindowTitle) {
-                windowTitle = `, Title: ${process.mainWindowTitle}`;
+                windowTitle = `, ${process.mainWindowTitle}`;
             }
 
             items.push({
                 label: process.processName,
                 description: `PID: ${process.processId.toString()}${windowTitle}`,
-                pid: process.processId,
+                processId: process.processId,
             });
         }
 
@@ -648,9 +650,10 @@ export class PickPSHostProcessFeature extends LanguageClientConsumer {
             matchOnDescription: true,
             matchOnDetail: true,
         };
+
         const item = await window.showQuickPick(items, options);
 
-        return item ? item.pid : undefined;
+        return item?.processId ?? undefined;
     }
 
     private clearWaitingToken(): void {
@@ -660,7 +663,7 @@ export class PickPSHostProcessFeature extends LanguageClientConsumer {
 }
 
 interface IRunspaceItem extends QuickPickItem {
-    id: string;    // payload for the QuickPick UI
+    id: number; // payload for the QuickPick UI
 }
 
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
@@ -677,18 +680,16 @@ export const GetRunspaceRequestType =
     new RequestType<IGetRunspaceRequestArguments, IRunspace[], string>("powerShell/getRunspace");
 
 export class PickRunspaceFeature extends LanguageClientConsumer {
-
     private command: Disposable;
     private waitingForClientToken?: CancellationTokenSource;
     private getLanguageClientResolve?: (value: LanguageClient) => void;
 
     constructor(private logger: ILogger) {
         super();
-        this.command =
-            commands.registerCommand("PowerShell.PickRunspace", (processId) => {
-                return this.getLanguageClient()
-                    .then((_) => this.pickRunspace(processId), (_) => undefined);
-            }, this);
+
+        this.command = commands.registerCommand("PowerShell.PickRunspace",
+            async (processId) => { return this.pickRunspace(processId); },
+            this);
     }
 
     public override setLanguageClient(languageClient: LanguageClient): void {
@@ -734,28 +735,26 @@ export class PickRunspaceFeature extends LanguageClientConsumer {
                             this.clearWaitingToken();
                             reject();
 
-                            void this.logger.writeAndShowError("Attach to PowerShell host process: PowerShell session took too long to start.");
+                            void this.logger.writeAndShowError(
+                                "Attach to PowerShell host process: PowerShell session took too long to start.");
                         }
                     }, 60000);
                 },
             );
         }
     }
 
-    private async pickRunspace(processId: string): Promise<string | undefined> {
+    private async pickRunspace(processId: number): Promise<number | undefined> {
+        // We need the language client in order to send the request.
+        await this.getLanguageClient();
+
         const response = await this.languageClient?.sendRequest(GetRunspaceRequestType, { processId });
         const items: IRunspaceItem[] = [];
         for (const runspace of response ?? []) {
-            // Skip default runspace
-            if ((runspace.id === 1 || runspace.name === "PSAttachRunspace")
-                && processId === "current") {
-                continue;
-            }
-
             items.push({
                 label: runspace.name,
                 description: `ID: ${runspace.id} - ${runspace.availability}`,
-                id: runspace.id.toString(),
+                id: runspace.id,
             });
         }
 
@@ -764,9 +763,10 @@ export class PickRunspaceFeature extends LanguageClientConsumer {
             matchOnDescription: true,
             matchOnDetail: true,
         };
+
         const item = await window.showQuickPick(items, options);
 
-        return item ? item.id : undefined;
+        return item?.id ?? undefined;
     }
 
     private clearWaitingToken(): void {

src/session.ts

@@ -303,6 +303,13 @@ export class SessionManager implements Middleware {
         return this.sessionDetails;
     }
 
+    public async getLanguageServerPid(): Promise<number | undefined> {
+        if (this.languageServerProcess === undefined) {
+            void this.logger.writeAndShowError("PowerShell Extension Terminal unavailable!");
+        }
+        return this.languageServerProcess?.getPid();
+    }
+
     public getPowerShellVersionDetails(): IPowerShellVersionDetails | undefined {
         return this.versionDetails;
     }