Refactor outputMarker to only extract from output, not construct command

Co-authored-by: TheLarkInn <3408176+TheLarkInn@users.noreply.github.com>

Author: Copilot

vscode-extensions/debug-certificate-manager-vscode-extension/src/extension.ts

@@ -207,14 +207,15 @@ export function activate(context: vscode.ExtensionContext): void {
         let homeDir: string;
 
         if (vscode.env.remoteName) {
+          const markerPrefix: string = '<<<HOMEDIR_START>>>';
+          const markerSuffix: string = '<<<HOMEDIR_END>>>';
           homeDir = await runWorkspaceCommandAsync({
             terminalOptions: { name: 'debug-certificate-manager', hideFromUser: true },
-            commandLine: '',
+            commandLine: `node -p "'${markerPrefix}' + require('os').homedir() + '${markerSuffix}'"`,
             terminal,
             outputMarker: {
-              expression: "require('os').homedir()",
-              prefix: '<<<HOMEDIR_START>>>',
-              suffix: '<<<HOMEDIR_END>>>'
+              prefix: markerPrefix,
+              suffix: markerSuffix
             }
           });
           terminal.writeLine(`Running command to resolve home directory: ${homeDir}`);

vscode-extensions/playwright-local-browser-server-vscode-extension/src/extension.ts

@@ -45,14 +45,15 @@ async function writeExtensionInstalledFileAsync(terminal: ITerminal): Promise<vo
     let tempDir: string;
 
     if (vscode.env.remoteName) {
+      const markerPrefix: string = '<<<TEMPDIR_START>>>';
+      const markerSuffix: string = '<<<TEMPDIR_END>>>';
       tempDir = await runWorkspaceCommandAsync({
         terminalOptions: { name: 'playwright-local-browser-server', hideFromUser: true },
-        commandLine: '',
+        commandLine: `node -p "'${markerPrefix}' + require('node:os').tmpdir() + '${markerSuffix}'"`,
         terminal,
         outputMarker: {
-          expression: "require('node:os').tmpdir()",
-          prefix: '<<<TEMPDIR_START>>>',
-          suffix: '<<<TEMPDIR_END>>>'
+          prefix: markerPrefix,
+          suffix: markerSuffix
         }
       });
 

vscode-extensions/vscode-shared/src/runWorkspaceCommandAsync.ts

@@ -7,16 +7,11 @@ import { stripVTControlCharacters } from 'node:util';
 
 /**
  * Options for extracting a specific value from the command output using markers.
- * When provided, the command will be wrapped with the specified markers, and only
- * the content between them will be returned. This is useful for extracting specific
+ * When provided, the function will search for the markers in the command output and
+ * return only the content between them. This is useful for extracting specific
  * values from shell output that may contain additional noise.
  */
 export interface IOutputMarkerOptions {
-  /**
-   * The expression to evaluate and wrap with markers. This will be inserted between
-   * the prefix and suffix markers in the command output.
-   */
-  expression: string;
   /**
    * The prefix marker used to identify the start of the desired output.
    */
@@ -37,19 +32,11 @@ export async function runWorkspaceCommandAsync({
   commandLine: string;
   terminal: ITerminal;
   /**
-   * Optional marker options for extracting specific output. When provided, the
-   * commandLine is constructed as: `node -p "'${prefix}' + ${expression} + '${suffix}'"`
-   * and the returned output will be only the content between the markers.
+   * Optional marker options for extracting specific output from the command result.
+   * When provided, the returned output will be only the content between the markers.
    */
   outputMarker?: IOutputMarkerOptions;
 }): Promise<string> {
-  // If outputMarker is provided, construct the command with markers
-  let effectiveCommandLine: string;
-  if (outputMarker) {
-    effectiveCommandLine = `node -p "'${outputMarker.prefix}' + ${outputMarker.expression} + '${outputMarker.suffix}'"`;
-  } else {
-    effectiveCommandLine = commandLine;
-  }
   const vsTerminal: vscode.Terminal = vscode.window.createTerminal(terminalOptions);
 
   // wait for shell to bootup and vs code shell integration to kick-in
@@ -123,8 +110,8 @@ export async function runWorkspaceCommandAsync({
       }
     );
 
-    shellIntegration.executeCommand(effectiveCommandLine);
-    terminal.writeLine(`Executing command: ${effectiveCommandLine}`);
+    shellIntegration.executeCommand(commandLine);
+    terminal.writeLine(`Executing command: ${commandLine}`);
   }).finally(() => {
     vsTerminal.dispose();
   });