@promptbook/node 0.114.0-10 → 0.114.0-12

package/esm/index.es.js

@@ -1,8 +1,8 @@
-import { join, dirname, basename, isAbsolute, resolve, relative } from 'path';
+import { join, dirname, basename, isAbsolute, resolve, delimiter, relative } from 'path';
 import { unlink, mkdir, appendFile, writeFile, readFile, stat, access, constants, readdir, watch } from 'fs/promises';
 import _spaceTrim, { spaceTrim as spaceTrim$1 } from 'spacetrim';
 import colors from 'colors';
-import { spawn } from 'child_process';
+import { spawn, spawnSync } from 'child_process';
 import { fileURLToPath } from 'url';
 import CryptoJS from 'crypto-js';
 import hexEncoder from 'crypto-js/enc-hex';
@@ -29,7 +29,7 @@ const BOOK_LANGUAGE_VERSION = '2.0.0';
  * @generated
  * @see https://github.com/webgptorg/promptbook
  */
-const PROMPTBOOK_ENGINE_VERSION = '0.114.0-10';
+const PROMPTBOOK_ENGINE_VERSION = '0.114.0-12';
 /**
  * TODO: string_promptbook_version should be constrained to the all versions of Promptbook engine
  * Note: [💞] Ignore a discrepancy between file name and entity name
@@ -2936,14 +2936,90 @@ const PTBK_CODER_LOG_FILE_ENV_NAME = 'PTBK_CODER_LOG_FILE';
  * without the generated script and the prompt it embeds.
  */
 const SCRIPT_EXECUTION_LOG_RAW_OUTPUT_MARKER = '--- raw output ---';
+/**
+ * Command which terminates the Bash process tree rooted at the running harness.
+ *
+ * Bash's POSIX process IDs differ from Windows process IDs in Git Bash, so the Windows branch resolves the native PID
+ * before delegating to `taskkill`. Unix harnesses run in a dedicated Bash job process group, which can be terminated
+ * with its negative process ID.
+ */
+const TERMINATE_BASH_PROCESS_TREE_COMMAND = process.platform === 'win32'
+    ? spaceTrim$1(`
+              HARNESS_WINDOWS_PROCESS_ID="$(ps -l -p "$HARNESS_PROCESS_ID" | awk 'NR == 2 { print $4 }')"
+              if [ -n "$HARNESS_WINDOWS_PROCESS_ID" ]; then
+                  MSYS_NO_PATHCONV=1 taskkill.exe /PID "$HARNESS_WINDOWS_PROCESS_ID" /T /F > /dev/null 2>&1 || true
+              fi
+          `)
+    : 'kill -TERM -- "-$HARNESS_PROCESS_ID" 2>/dev/null || true';
+/**
+ * Shell condition that detects whether the Node process which owns the harness is still running.
+ *
+ * Git Bash translates process IDs and command switches, so querying the native Windows PID needs both `tasklist` and
+ * disabled MSYS path conversion there. Unix can use the native `kill -0` process existence check.
+ */
+const IS_PARENT_PROCESS_RUNNING_CONDITION = process.platform === 'win32'
+    ? 'MSYS_NO_PATHCONV=1 tasklist.exe /FI "PID eq $PARENT_CODER_PROCESS_ID" /NH | awk -v processId="$PARENT_CODER_PROCESS_ID" \'$2 == processId { isFound = 1 } END { exit isFound ? 0 : 1 }\''
+    : 'kill -0 "$PARENT_CODER_PROCESS_ID" 2>/dev/null';
+/**
+ * Environment variable that identifies the Node process responsible for a temporary harness shell.
+ */
+const PTBK_CODER_PARENT_PROCESS_ID_ENV_NAME = 'PTBK_CODER_PARENT_PROCESS_ID';
 /**
  * Small bash wrapper that preserves stdout/stderr streams while teeing both into the runtime log file.
+ *
+ * A watcher polls the owning Node process by its PID. If that process exits abruptly, the watcher stops the whole
+ * Bash and harness process tree instead of letting it continue as an orphan.
  */
 const LOGGED_BASH_WRAPPER_COMMAND = spaceTrim$1(`
+    PARENT_CODER_PROCESS_ID="\${${PTBK_CODER_PARENT_PROCESS_ID_ENV_NAME}}"
+    unset ${PTBK_CODER_PARENT_PROCESS_ID_ENV_NAME}
+
+    terminate_harness_process_tree() {
+        # Keep the EXIT cleanup intact so the wrapper can also stop its parent-process watcher.
+        trap - HUP INT TERM
+        ${TERMINATE_BASH_PROCESS_TREE_COMMAND}
+    }
+
+    is_parent_process_running() {
+        ${IS_PARENT_PROCESS_RUNNING_CONDITION}
+    }
+
     if [ -n "\${${PTBK_CODER_LOG_FILE_ENV_NAME}:-}" ]; then
-        exec > >(tee -a "\$${PTBK_CODER_LOG_FILE_ENV_NAME}") 2> >(tee -a "\$${PTBK_CODER_LOG_FILE_ENV_NAME}" >&2)
+        exec > >(tee -a "$${PTBK_CODER_LOG_FILE_ENV_NAME}") 2> >(tee -a "$${PTBK_CODER_LOG_FILE_ENV_NAME}" >&2)
+    fi
+
+    watch_parent_process() {
+        trap 'exit 0' HUP INT TERM
+
+        while is_parent_process_running; do
+            sleep 1
+        done
+
+        terminate_harness_process_tree
+    }
+
+    # Background harness jobs need their own process group on Unix so termination cannot reach the parent coder.
+    set -m
+    if ! is_parent_process_running; then
+        exit 1
     fi
-    bash "$1"
+    bash "$1" &
+    HARNESS_PROCESS_ID=$!
+
+    cleanup_parent_process_watcher() {
+        kill "$PARENT_PROCESS_WATCHER_PID" 2>/dev/null || true
+        wait "$PARENT_PROCESS_WATCHER_PID" 2>/dev/null || true
+    }
+
+    watch_parent_process &
+    PARENT_PROCESS_WATCHER_PID=$!
+
+    trap cleanup_parent_process_watcher EXIT
+    trap terminate_harness_process_tree HUP INT TERM
+
+    wait "$HARNESS_PROCESS_ID"
+    SCRIPT_EXIT_CODE=$?
+    exit "$SCRIPT_EXIT_CODE"
 `);
 /**
  * Shapes one bash invocation that optionally mirrors live script output into a temporary log file.
@@ -2999,6 +3075,38 @@ function describeTempScriptKind(scriptPath) {
     return scriptPath.toLowerCase().endsWith('.test.sh') ? 'test shell' : 'runner shell';
 }
 
+/**
+ * Standard streams used by every temporary Bash runner.
+ */
+const BASH_PROCESS_STDIO = ['pipe', 'pipe', 'pipe'];
+/**
+ * Whether the current Node process is running on Windows.
+ */
+const IS_WINDOWS$1 = process.platform === 'win32';
+/**
+ * Starts one temporary Bash script in a process tree owned by the current Node process.
+ *
+ * The wrapper watches the supplied owning process ID. When that process exits abruptly, the wrapper terminates every
+ * nested shell and harness process instead of leaving it orphaned.
+ *
+ * @private internal utility of the coding prompt runner
+ */
+function $spawnLoggedBashScript(options) {
+    var _a;
+    const bashExecution = buildLoggedBashExecution(options.scriptPath, options.logPath);
+    const parentProcessId = (_a = options.parentProcessId) !== null && _a !== void 0 ? _a : process.pid;
+    return spawn('bash', bashExecution.args, {
+        detached: !IS_WINDOWS$1,
+        env: {
+            ...process.env,
+            ...bashExecution.env,
+            [PTBK_CODER_PARENT_PROCESS_ID_ENV_NAME]: parentProcessId.toString(),
+        },
+        stdio: BASH_PROCESS_STDIO,
+        windowsHide: true,
+    });
+}
+
 /**
  * Prints one live shell output chunk to the terminal when console mirroring is enabled.
  */
@@ -3021,12 +3129,12 @@ function printLiveScriptChunk(chunk, source, shouldPrintLiveOutput) {
 async function runBashScriptWithOutput(options) {
     var _a;
     await appendScriptExecutionLogStart(options);
-    const bashExecution = buildLoggedBashExecution(options.scriptPath, options.logPath);
     const scriptPathPosix = toPosixPath(options.scriptPath);
     const shouldPrintLiveOutput = (_a = options.shouldPrintLiveOutput) !== null && _a !== void 0 ? _a : true;
     return await new Promise((resolve, reject) => {
-        const commandProcess = spawn('bash', bashExecution.args, {
-            env: bashExecution.env ? { ...process.env, ...bashExecution.env } : process.env,
+        const commandProcess = $spawnLoggedBashScript({
+            scriptPath: options.scriptPath,
+            logPath: options.logPath,
         });
         let output = '';
         let settled = false;
@@ -3085,8 +3193,9 @@ async function runBashScriptWithOutput(options) {
             const failure = new Error(spaceTrim$1(output) || `Command "bash ${scriptPathPosix}" exited with code ${code}`);
             settleWithLog(`failed with exit code ${code !== null && code !== void 0 ? code : 'unknown'}`, () => reject(failure), failure);
         };
+        // Wait for `close`, not only `exit`, because the Bash wrapper can still be flushing its tee process
+        // substitutions after the direct shell exits.
         commandProcess.on('close', handleExit);
-        commandProcess.on('exit', handleExit);
         commandProcess.on('disconnect', () => {
             const failure = new Error(`Command "bash ${scriptPathPosix}" disconnected`);
             settleWithLog('failed after disconnect', () => reject(failure), failure);
@@ -3953,6 +4062,35 @@ function isGitHubCopilotArgumentLimitError(error) {
         error.message.includes('bin/node'));
 }
 
+/**
+ * Whether the current coder process runs on Windows.
+ */
+const IS_WINDOWS = process.platform === 'win32';
+/**
+ * Stops one active temporary Bash shell together with the harness process tree it owns.
+ *
+ * Unix sends `SIGTERM` to the wrapper so its shell trap terminates the separately grouped harness job. Windows does
+ * not reliably deliver that signal to Bash, so the native `taskkill` command terminates the direct shell tree instead.
+ *
+ * @private internal utility of the coding prompt runner
+ */
+function $terminateLoggedBashProcessTree(commandProcess) {
+    if (commandProcess.exitCode !== null || commandProcess.signalCode !== null) {
+        return;
+    }
+    if (!IS_WINDOWS) {
+        commandProcess.kill('SIGTERM');
+        return;
+    }
+    if (!commandProcess.pid) {
+        return;
+    }
+    spawnSync('taskkill.exe', ['/PID', commandProcess.pid.toString(), '/T', '/F'], {
+        stdio: 'ignore',
+        windowsHide: true,
+    });
+}
+
 /**
  * Maximum number of output characters included in thrown error messages.
  */
@@ -3995,15 +4133,16 @@ async function runScriptUntilMarkerIdle(options) {
     const scriptPathPosix = toPosixPath(scriptPath);
     const shouldPrintLiveOutput = (_a = options.shouldPrintLiveOutput) !== null && _a !== void 0 ? _a : true;
     await appendScriptExecutionLogStart(options);
-    const bashExecution = buildLoggedBashExecution(scriptPath, options.logPath);
     return await new Promise((resolve, reject) => {
-        const commandProcess = spawn('bash', bashExecution.args, {
-            env: bashExecution.env ? { ...process.env, ...bashExecution.env } : process.env,
+        const commandProcess = $spawnLoggedBashScript({
+            scriptPath,
+            logPath: options.logPath,
         });
         let stdoutBuffer = '';
         let stderrBuffer = '';
         let fullOutput = '';
         let markerSeen = false;
+        let isCompletedAfterIdleTimeout = false;
         let idleTimer;
         let settled = false;
         let isSettling = false;
@@ -4045,15 +4184,16 @@ async function runScriptUntilMarkerIdle(options) {
             });
         };
         /**
-         * Finishes a marker-completed run and then asks bash to stop.
+         * Stops a marker-completed process tree after its trailing output becomes idle.
          */
         const finishAfterIdleTimeout = () => {
-            settleWithLog('completed after idle timeout', () => resolve(fullOutput));
+            isCompletedAfterIdleTimeout = true;
+            idleTimer = undefined;
             try {
-                commandProcess.kill();
+                $terminateLoggedBashProcessTree(commandProcess);
             }
             catch (_a) {
-                // Windows can report EPERM when bash exits before the idle timer fires.
+                // The close handler below still settles normally when Bash already exited before the idle timer fired.
             }
         };
         /**
@@ -4112,7 +4252,11 @@ async function runScriptUntilMarkerIdle(options) {
             const failure = code === 0 || markerSeen
                 ? undefined
                 : new Error(buildCommandFailureMessage(scriptPathPosix, code, fullOutput));
-            const status = failure ? `failed with exit code ${code !== null && code !== void 0 ? code : 'unknown'}` : 'succeeded';
+            const status = isCompletedAfterIdleTimeout
+                ? 'completed after idle timeout'
+                : failure
+                    ? `failed with exit code ${code !== null && code !== void 0 ? code : 'unknown'}`
+                    : 'succeeded';
             settleWithLog(status, () => {
                 if (!failure) {
                     resolve(fullOutput);
@@ -4121,8 +4265,9 @@ async function runScriptUntilMarkerIdle(options) {
                 reject(failure);
             });
         };
+        // Wait for `close`, not only `exit`, because the Bash wrapper can still be flushing its tee process
+        // substitutions after the direct shell exits.
         commandProcess.on('close', handleExit);
-        commandProcess.on('exit', handleExit);
         commandProcess.on('disconnect', () => {
             const failure = new Error(buildCommandFailureMessage(scriptPathPosix, null, fullOutput));
             settleWithLog('failed after disconnect', () => reject(failure), failure);
@@ -27327,6 +27472,30 @@ function applyCommitmentDefinitionSafely(requirements, commitment, commitmentCon
     }
 }
 
+/**
+ * Pattern shared by Book parsing and editor highlighting for a commitment-like line.
+ *
+ * A Book commitment keyword consists of one or more all-uppercase words with at least
+ * two characters each. This deliberately mirrors the Book editor syntax rule so an
+ * unknown keyword starts a new source block everywhere it is interpreted.
+ *
+ * @private internal constant of `getBookCommitmentLineType`
+ */
+const BOOK_COMMITMENT_LINE_TYPE_REGEX = /^\s*(?<type>[A-Z][A-Z0-9]+(?:\s+[A-Z][A-Z0-9]+)*)(?=\s|$)/;
+/**
+ * Extracts the uppercase commitment type from a Book line, including types not registered by Promptbook.
+ *
+ * @param line - One raw Book source line.
+ * @returns Matched commitment type or `null` when the line does not begin with commitment syntax.
+ *
+ * @private internal utility of Book parsing and `<BookEditor/>`
+ */
+function getBookCommitmentLineType(line) {
+    var _a;
+    const match = BOOK_COMMITMENT_LINE_TYPE_REGEX.exec(line);
+    return ((_a = match === null || match === void 0 ? void 0 : match.groups) === null || _a === void 0 ? void 0 : _a.type) || null;
+}
+
 /**
  * Consumes the agent-name prelude from raw source.
  *
@@ -27384,13 +27553,15 @@ function parseAgentSourceWithCommitments(agentSource) {
         return {
             agentName: null,
             commitments: [],
+            unknownCommitments: [],
             nonCommitmentLines: [],
         };
     }
     const { lines, agentName, agentNameLineIndex, agentNameLineNumber } = parseAgentSourcePrelude(agentSource);
     const commitments = [];
+    const unknownCommitments = [];
     const nonCommitmentLines = agentNameLineIndex >= 0 ? [lines[agentNameLineIndex]] : [];
-    // Parse commitments with multiline support
+    // Parse commitments with multiline support.
     let currentCommitment = null;
     // Process lines starting from after the agent name line
     const startIndex = agentNameLineIndex >= 0 ? agentNameLineIndex + 1 : 0;
@@ -27404,25 +27575,11 @@ function parseAgentSourceWithCommitments(agentSource) {
         // Check if this line starts or ends a code block
         if (trimmedLine.startsWith('```')) {
             isInsideCodeBlock = !isInsideCodeBlock;
-            if (currentCommitment) {
-                // If we are inside a commitment, the code block is part of it
-                currentCommitment.contentLines.push(line);
-            }
-            else {
-                // If we are not inside a commitment, the code block is non-commitment
-                nonCommitmentLines.push(line);
-            }
+            appendLineToCurrentCommitmentOrNonCommitmentLines(currentCommitment, line, nonCommitmentLines);
             continue;
         }
         if (isInsideCodeBlock) {
-            if (currentCommitment) {
-                // If we are inside a commitment and a code block, the line is part of the commitment
-                currentCommitment.contentLines.push(line);
-            }
-            else {
-                // If we are inside a code block but not a commitment, the line is non-commitment
-                nonCommitmentLines.push(line);
-            }
+            appendLineToCurrentCommitmentOrNonCommitmentLines(currentCommitment, line, nonCommitmentLines);
             continue;
         }
         // Check if this line starts a new commitment
@@ -27431,22 +27588,14 @@ function parseAgentSourceWithCommitments(agentSource) {
             const typeRegex = definition.createTypeRegex();
             const match = typeRegex.exec(line.trim());
             if (match && ((_a = match.groups) === null || _a === void 0 ? void 0 : _a.type)) {
-                // Save the previous commitment if it exists
-                if (currentCommitment) {
-                    const fullContent = currentCommitment.contentLines.join('\n');
-                    commitments.push({
-                        type: currentCommitment.type,
-                        content: spaceTrim$1(fullContent),
-                        originalLine: currentCommitment.originalStartLine,
-                        lineNumber: currentCommitment.startLineNumber,
-                    });
-                }
+                appendCurrentCommitment(currentCommitment, commitments, unknownCommitments);
                 // Extract the initial content from the commitment line
                 const fullRegex = definition.createRegex();
                 const fullMatch = fullRegex.exec(line.trim());
                 const initialContent = ((_b = fullMatch === null || fullMatch === void 0 ? void 0 : fullMatch.groups) === null || _b === void 0 ? void 0 : _b.contents) || '';
                 // Start a new commitment
                 currentCommitment = {
+                    kind: 'known',
                     type: definition.type,
                     startLineNumber: i + 1,
                     originalStartLine: line,
@@ -27456,52 +27605,90 @@ function parseAgentSourceWithCommitments(agentSource) {
                 break;
             }
         }
+        if (foundNewCommitment) {
+            continue;
+        }
+        const unknownCommitmentType = getBookCommitmentLineType(line);
+        if (unknownCommitmentType) {
+            appendCurrentCommitment(currentCommitment, commitments, unknownCommitments);
+            currentCommitment = {
+                kind: 'unknown',
+                type: unknownCommitmentType,
+                startLineNumber: i + 1,
+                originalStartLine: line,
+                sourceLines: [line],
+            };
+            continue;
+        }
         // Check if this is a horizontal line (ends any current commitment)
         const isHorizontalLine = HORIZONTAL_LINE_PATTERN$1.test(line);
         if (isHorizontalLine) {
-            // Save the current commitment if it exists
-            if (currentCommitment) {
-                const fullContent = currentCommitment.contentLines.join('\n');
-                commitments.push({
-                    type: currentCommitment.type,
-                    content: spaceTrim$1(fullContent),
-                    originalLine: currentCommitment.originalStartLine,
-                    lineNumber: currentCommitment.startLineNumber,
-                });
-                currentCommitment = null;
-            }
+            appendCurrentCommitment(currentCommitment, commitments, unknownCommitments);
+            currentCommitment = null;
             // Add horizontal line to non-commitment lines
             nonCommitmentLines.push(line);
             continue;
         }
-        if (!foundNewCommitment) {
-            if (currentCommitment) {
-                // This line belongs to the current commitment
-                currentCommitment.contentLines.push(line);
-            }
-            else {
-                // This line is not part of any commitment
-                nonCommitmentLines.push(line);
-            }
-        }
-    }
-    // Don't forget to save the last commitment if it exists
-    if (currentCommitment) {
-        const fullContent = currentCommitment.contentLines.join('\n');
-        commitments.push({
-            type: currentCommitment.type,
-            content: spaceTrim$1(fullContent),
-            originalLine: currentCommitment.originalStartLine,
-            lineNumber: currentCommitment.startLineNumber,
-        });
+        appendLineToCurrentCommitmentOrNonCommitmentLines(currentCommitment, line, nonCommitmentLines);
     }
+    appendCurrentCommitment(currentCommitment, commitments, unknownCommitments);
     return {
         agentName,
         agentNameLineNumber,
         commitments,
+        unknownCommitments,
         nonCommitmentLines,
     };
 }
+/**
+ * Stores the current known or unknown commitment in its appropriate parsed collection.
+ *
+ * @param currentCommitment - Commitment-like block collected so far.
+ * @param commitments - Parsed registered commitments to append to.
+ * @param unknownCommitments - Parsed unregistered commitments to append to.
+ *
+ * @private internal utility of `parseAgentSourceWithCommitments`
+ */
+function appendCurrentCommitment(currentCommitment, commitments, unknownCommitments) {
+    if (!currentCommitment) {
+        return;
+    }
+    if (currentCommitment.kind === 'unknown') {
+        unknownCommitments.push({
+            type: currentCommitment.type,
+            originalLine: currentCommitment.originalStartLine,
+            lineNumber: currentCommitment.startLineNumber,
+            source: spaceTrim$1(currentCommitment.sourceLines.join('\n')),
+        });
+        return;
+    }
+    commitments.push({
+        type: currentCommitment.type,
+        content: spaceTrim$1(currentCommitment.contentLines.join('\n')),
+        originalLine: currentCommitment.originalStartLine,
+        lineNumber: currentCommitment.startLineNumber,
+    });
+}
+/**
+ * Adds one source line to the active commitment-like block, or to plain source content when none is active.
+ *
+ * @param currentCommitment - Commitment-like block currently being collected.
+ * @param line - Source line to append.
+ * @param nonCommitmentLines - Plain source lines to append to when no block is active.
+ *
+ * @private internal utility of `parseAgentSourceWithCommitments`
+ */
+function appendLineToCurrentCommitmentOrNonCommitmentLines(currentCommitment, line, nonCommitmentLines) {
+    if (!currentCommitment) {
+        nonCommitmentLines.push(line);
+        return;
+    }
+    if (currentCommitment.kind === 'unknown') {
+        currentCommitment.sourceLines.push(line);
+        return;
+    }
+    currentCommitment.contentLines.push(line);
+}
 
 /**
  * Plugin for importing agent books *(`.book` files)*
@@ -27639,7 +27826,8 @@ async function augmentAgentModelRequirementsFromSource(requirements, parseResult
     requirements = await importReferencedFiles(requirements);
     requirements = appendMcpServers(requirements, agentSource);
     requirements = appendNonCommitmentContent(requirements, parseResult);
-    return appendExampleInteractions(requirements, parseResult);
+    requirements = appendExampleInteractions(requirements, parseResult);
+    return appendUnknownCommitmentContent(requirements, parseResult);
 }
 /**
  * Imports text files referenced by IMPORT commitments and appends their transformed content to the system message.
@@ -27761,6 +27949,36 @@ function appendNonCommitmentContent(requirements, parseResult) {
     }
     return appendSystemMessageSection(requirements, nonCommitmentContent);
 }
+/**
+ * Appends unknown commitment blocks as final extra context without applying commitment side effects.
+ *
+ * @param requirements - Current requirements snapshot.
+ * @param parseResult - Parsed source including unknown commitment blocks.
+ * @returns Requirements with unknown commitment context appended at the end of the system message.
+ *
+ * @private internal utility of `augmentAgentModelRequirementsFromSource`
+ */
+function appendUnknownCommitmentContent(requirements, parseResult) {
+    const unknownCommitmentContent = getUnknownCommitmentContent(parseResult);
+    if (!unknownCommitmentContent) {
+        return requirements;
+    }
+    return appendSystemMessageSection(requirements, unknownCommitmentContent);
+}
+/**
+ * Joins unknown commitment blocks into their final extra-context representation.
+ *
+ * @param parseResult - Parsed source including unknown commitment blocks.
+ * @returns Unknown commitment source blocks in their original order.
+ *
+ * @private internal utility of `appendUnknownCommitmentContent`
+ */
+function getUnknownCommitmentContent(parseResult) {
+    return parseResult.unknownCommitments
+        .map((commitment) => commitment.source)
+        .filter(Boolean)
+        .join('\n\n');
+}
 /**
  * Collects plain-text lines that were not parsed as commitments and should still become part of the final system message.
  *
@@ -39735,23 +39953,27 @@ async function locateAppOnMacOs({ macOsName, }) {
 // TODO: [🧠][♿] Maybe export through `@promptbook/node`
 
 /**
- * Attempts to locate the specified application on a Windows system by searching common installation directories.
+ * Attempts to locate the specified application on a Windows system by searching PATH and common installation directories.
  * Returns the path to the executable if found, or null otherwise.
  *
  * @private within the repository
  */
 async function locateAppOnWindows({ appName, windowsSuffix, }) {
     try {
-        const prefixes = [
+        const EXECUTABLE_FILENAME = windowsSuffix.replace(/^.*[\\/]/, '');
+        const PATH_EXECUTABLE_PATHS = (process.env.PATH || '')
+            .split(delimiter)
+            .filter(Boolean)
+            .map((pathPrefix) => join(pathPrefix, EXECUTABLE_FILENAME));
+        const INSTALLATION_EXECUTABLE_PATHS = [
             process.env.LOCALAPPDATA,
             join(process.env.LOCALAPPDATA || '', 'Programs'),
             process.env.PROGRAMFILES,
             process.env['PROGRAMFILES(X86)'],
-        ];
-        for (const prefix of prefixes) {
-            const path = prefix + windowsSuffix;
-            if (await isExecutable(path, $provideFilesystemForNode())) {
-                return path;
+        ].map((pathPrefix) => pathPrefix + windowsSuffix);
+        for (const executablePath of [...PATH_EXECUTABLE_PATHS, ...INSTALLATION_EXECUTABLE_PATHS]) {
+            if (await isExecutable(executablePath, $provideFilesystemForNode())) {
+                return executablePath;
             }
         }
         throw new Error(`Can not locate app ${appName} on Windows.`);