Merge branch 'main' into rchiodo-add-pyrefly-exclude-setting

rchiodo · web-flow · commit efd9277dacba · 2026-07-29T10:43:51.000-07:00
diff --git a/.github/actions/build-vsix/action.yml b/.github/actions/build-vsix/action.yml
@@ -15,11 +15,12 @@ runs:
         node-version: ${{ inputs.node_version }}
         cache: 'npm'
 
-    # Minimum supported version is Python 3.9
-    - name: Use Python 3.9
+    # Minimum supported version is Python 3.10 (debugpy no longer supports Python 3.9,
+    # and pip 26.1+ requires Python >= 3.10)
+    - name: Use Python 3.10
       uses: actions/setup-python@v5
       with:
-        python-version: 3.9
+        python-version: '3.10'
 
     - name: Pip cache
       uses: actions/cache@v4
diff --git a/.github/actions/lint/action.yml b/.github/actions/lint/action.yml
@@ -30,7 +30,7 @@ runs:
     - name: Install Python
       uses: actions/setup-python@v5
       with:
-        python-version: '3.9'
+        python-version: '3.10'
 
     - name: Pip cache
       uses: actions/cache@v4
diff --git a/.github/workflows/pr-check.yml b/.github/workflows/pr-check.yml
@@ -50,8 +50,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest]
-        python: ['3.9', '3.10', '3.11', '3.12', '3.13']
+        os: [ubuntu-latest, windows-2022]
+        python: ['3.10', '3.11', '3.12', '3.13']
 
     steps:
       - name: Checkout
@@ -60,11 +60,12 @@ jobs:
           path: ${{ env.special-working-directory-relative }}
           persist-credentials: false
 
-      # Install bundled libs using 3.9 even though you test it on other versions.
-      - name: Use Python 3.9
+      # Install bundled libs using 3.10 (minimum supported; debugpy dropped 3.9 support,
+      # and pip 26.1+ requires Python >= 3.10).
+      - name: Use Python 3.10
         uses: actions/setup-python@v5
         with:
-          python-version: '3.9'
+          python-version: '3.10'
 
       - name: Update pip, install pipx and install wheel
         run: python -m pip install -U pip pipx wheel
diff --git a/.github/workflows/push-check.yml b/.github/workflows/push-check.yml
@@ -55,8 +55,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest]
-        python: ['3.9', '3.10', '3.11', '3.12', '3.13']
+        os: [ubuntu-latest, windows-2022]
+        python: ['3.10', '3.11', '3.12', '3.13']
 
     steps:
       - name: Checkout
@@ -65,11 +65,12 @@ jobs:
           path: ${{ env.special-working-directory-relative }}
           persist-credentials: false
 
-      # Install bundled libs using 3.9 even though you test it on other versions.
-      - name: Use Python 3.9
+      # Install bundled libs using 3.10 (minimum supported; debugpy dropped 3.9 support,
+      # and pip 26.1+ requires Python >= 3.10).
+      - name: Use Python 3.10
         uses: actions/setup-python@v5
         with:
-          python-version: '3.9'
+          python-version: '3.10'
 
       - name: Update pip, install pipx and install wheel
         run: python -m pip install -U pip pipx wheel
diff --git a/bundled/scripts/noConfigScripts/debugpy b/bundled/scripts/noConfigScripts/debugpy
@@ -1,4 +1,4 @@
-#! /bin/bash
+#! /usr/bin/env bash
 # Bash script
 export DEBUGPY_ADAPTER_ENDPOINTS=$VSCODE_DEBUGPY_ADAPTER_ENDPOINTS
 python3 $BUNDLED_DEBUGPY_PATH --listen 0 --wait-for-client $@
diff --git a/noxfile.py b/noxfile.py
@@ -25,7 +25,7 @@
 
 # Single source of truth for the debugpy version we bundle.
 # Update this when bumping debugpy (and update bundled/libs/debugpy accordingly).
-DEBUGPY_VERSION = "1.8.20"
+DEBUGPY_VERSION = "1.8.21"
 
 
 def _build_debugpy_wheel_requests(vsce_target: str, version: str) -> list[dict]:
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
     "name": "debugpy",
     "displayName": "Python Debugger",
     "description": "Python Debugger extension using debugpy.",
-    "version": "2026.5.0-dev",
+    "version": "2026.7.0-dev",
     "publisher": "ms-python",
     "enabledApiProposals": [
         "portsAttributes",
@@ -747,7 +747,7 @@
     "dependencies": {
         "@vscode/debugadapter": "^1.65.0",
         "@vscode/debugprotocol": "^1.65.0",
-        "@vscode/extension-telemetry": "^0.8.4",
+        "@vscode/extension-telemetry": "^1.5.2",
         "@vscode/python-extension": "^1.0.6",
         "@vscode/windows-process-tree": "^0.7.0",
         "fs-extra": "^11.2.0",
diff --git a/src/extension/debugger/attachQuickPick/provider.ts b/src/extension/debugger/attachQuickPick/provider.ts
@@ -3,7 +3,8 @@
 
 'use strict';
 
-import { l10n } from 'vscode';
+import * as path from 'path';
+import { env, l10n } from 'vscode';
 import type { IProcessInfo } from '@vscode/windows-process-tree';
 import { getOSType, OSType } from '../../common/platform';
 import { PsProcessParser } from './psProcessParser';
@@ -16,6 +17,14 @@ import { logProcess } from '../../common/process/logger';
 export class AttachProcessProvider implements IAttachProcessProvider {
     constructor() {}
 
+    public _loadWindowsProcessTree(): typeof import('@vscode/windows-process-tree') {
+        const wpcPath = path.join(env.appRoot, 'node_modules', '@vscode', 'windows-process-tree');
+        // Use eval to bypass webpack's require interception for loading native addon at runtime
+        // eslint-disable-next-line no-eval
+        const nodeRequire = eval('require') as NodeJS.Require;
+        return nodeRequire(wpcPath);
+    }
+
     public getAttachItems(): Promise<IAttachItem[]> {
         return this._getInternalProcessEntries().then((processEntries) => {
             processEntries.sort(
@@ -63,7 +72,7 @@ export class AttachProcessProvider implements IAttachProcessProvider {
 
         if (osType === OSType.Windows) {
             try {
-                const wpc = require('@vscode/windows-process-tree');
+                const wpc = this._loadWindowsProcessTree();
                 const processList = await new Promise<IProcessInfo[]>((resolve) => {
                     wpc.getAllProcesses(
                         (processes: IProcessInfo[]) => resolve(processes),
diff --git a/src/extension/debugger/hooks/childProcessAttachService.ts b/src/extension/debugger/hooks/childProcessAttachService.ts
@@ -22,7 +22,18 @@ import { traceLog } from '../../common/log/logging';
 export class ChildProcessAttachService implements IChildProcessAttachService {
     @captureTelemetry(EventName.DEBUGGER_ATTACH_TO_CHILD_PROCESS)
     public async attach(data: AttachRequestArguments & DebugConfiguration, parentSession: DebugSession): Promise<void> {
-        const debugConfig: AttachRequestArguments & DebugConfiguration = data;
+        const debugConfig: AttachRequestArguments & DebugConfiguration = { ...data };
+
+        // Remove the 'purpose' field from the child process debug configuration.
+        // The child session inherits the parent's configuration (including 'purpose')
+        // via debugpy's notify_of_subprocess. If the parent is a test debug session
+        // (purpose: ['debug-test']), the child would also appear to be a test session.
+        // This can cause the Python extension's test adapter to incorrectly treat the
+        // child process session termination as the end of the test run, which results
+        // in premature disconnection of the parent (test runner) debug session.
+        // See: https://github.com/microsoft/vscode-python-debugger/issues/981
+        delete debugConfig.purpose;
+
         const debugSessionOption: DebugSessionOptions = {
             parentSession: parentSession,
             lifecycleManagedByParent: true,
diff --git a/src/extension/telemetry/index.ts b/src/extension/telemetry/index.ts
@@ -2,7 +2,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-import TelemetryReporter from '@vscode/extension-telemetry';
+import type { TelemetryReporter } from '@vscode/extension-telemetry';
 
 import { isTestExecution } from '../common/constants';
 import { StopWatch } from '../common/utils/stopWatch';
diff --git a/src/extension/telemetry/reporter.ts b/src/extension/telemetry/reporter.ts
@@ -1,17 +1,15 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-import TelemetryReporter from '@vscode/extension-telemetry';
+import { TelemetryReporter } from '@vscode/extension-telemetry';
 import { AppinsightsKey, isTestExecution } from '../common/constants';
 
 export function getTelemetryReporter(telemetryReporter: TelemetryReporter | undefined) {
     if (!isTestExecution() && telemetryReporter) {
         return telemetryReporter;
     }
 
-    // eslint-disable-next-line @typescript-eslint/naming-convention
-    const Reporter = require('@vscode/extension-telemetry').default as typeof TelemetryReporter;
-    telemetryReporter = new Reporter(AppinsightsKey, [
+    telemetryReporter = new TelemetryReporter(AppinsightsKey, [
         {
             lookup: /(errorName|errorMessage|errorStack)/g,
         },
diff --git a/src/test/.vscode/launch.json b/src/test/.vscode/launch.json
@@ -0,0 +1,35 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "launch a file",
+            "type": "debugpy",
+            "request": "launch",
+            "program": "${file}",
+            "args": [],
+            "console": "integratedTerminal",
+            "justMyCode": false
+        },
+        {
+            "name": "attach to a local port",
+            "type": "debugpy",
+            "request": "attach",
+            "port": 5678,
+            "host": "localhost",
+            "pathMappings": [
+                {
+                    "localRoot": "${workspaceFolder}",
+                    "remoteRoot": "."
+                }
+            ],
+            "justMyCode": false
+        },
+        {
+            "name": "attach to a local PID",
+            "type": "debugpy",
+            "request": "attach",
+            "processId": "${command:pickProcess}",
+            "justMyCode": false
+        }
+    ]
+}
diff --git a/src/test/pythonFiles/debugging/test_multiproc.py b/src/test/pythonFiles/debugging/test_multiproc.py
@@ -0,0 +1,57 @@
+"""
+Pytest test file demonstrating the multiprocessing issue when debugging.
+
+When debugging pytest tests, creating a child process via multiprocessing.Process
+and then waiting for it via process.join() can cause premature exit of the debug
+session. Specifically, the debugger terminates immediately after the child process
+terminates (i.e., at the point where process.join() returns), before reaching
+subsequent statements in the test body.
+
+This file contains tests that reproduce the issue described in:
+https://github.com/microsoft/vscode-python-debugger/issues/981
+
+Workaround: Use a launch.json with "-s" (--capture=no) in pytest args, or
+launch pytest via a custom launch.json with "module": "pytest".
+"""
+import multiprocessing as mp
+import time
+
+
+def _child_main() -> None:
+    """Simple child process that sleeps briefly then exits."""
+    time.sleep(0.25)
+
+
+def test_multiprocessing_join_in_test_body() -> None:
+    """
+    Regression test: process.join() in a pytest test body should not cause
+    premature debugger exit.
+
+    When debugging this test, the debugger should reach print("after!") and
+    the assertion, not exit immediately after process.join() returns.
+    """
+    proc = mp.Process(
+        target=_child_main,
+        name="debug_multiprocessing_test_body_child",
+    )
+    proc.daemon = True
+    proc.start()
+    print("before!")
+    proc.join(10)
+    print("after!")
+    assert proc.exitcode == 0
+
+
+def test_multiprocessing_nondaemon_join() -> None:
+    """
+    Variant: non-daemon child process with join().
+
+    Should behave the same as the daemon variant when debugging.
+    """
+    proc = mp.Process(
+        target=_child_main,
+        name="debug_multiprocessing_nondaemon_child",
+    )
+    proc.start()
+    proc.join(10)
+    assert proc.exitcode == 0
diff --git a/src/test/pythonFiles/debugging/wait_for_file.py b/src/test/pythonFiles/debugging/wait_for_file.py
@@ -0,0 +1,40 @@
+"""
+Wait for a file to appear, then print 'done!' and exit.
+
+This script is used to keep a debug session alive (by pausing the script
+until the test harness is ready to terminate it), and to produce a known
+output (useful for verifying that output was captured correctly).
+
+Usage:
+    python wait_for_file.py <done_file> [output_file]
+"""
+import os
+import sys
+import time
+
+
+def wait_for_file(path: str) -> None:
+    while not os.path.exists(path):
+        time.sleep(0.1)
+
+
+def main() -> None:
+    args = sys.argv[1:]
+    if not args:
+        print("usage: wait_for_file.py <done_file> [output_file]", file=sys.stderr)
+        sys.exit(1)
+
+    done_file = args[0]
+    output_file = args[1] if len(args) > 1 else None
+
+    wait_for_file(done_file)
+
+    if output_file:
+        with open(output_file, "w") as f:
+            f.write("done!\n")
+    else:
+        print("done!")
+
+
+if __name__ == "__main__":
+    main()
diff --git a/src/test/unittest/attachQuickPick/provider.unit.test.ts b/src/test/unittest/attachQuickPick/provider.unit.test.ts
@@ -13,7 +13,6 @@ import { IAttachItem } from '../../../extension/debugger/attachQuickPick/types';
 import { WmicProcessParser } from '../../../extension/debugger/attachQuickPick/wmicProcessParser';
 import * as platform from '../../../extension/common/platform';
 import * as rawProcessApis from '../../../extension/common/process/rawProcessApis';
-import * as wpc from '@vscode/windows-process-tree';
 
 use(chaiAsPromised);
 
@@ -27,7 +26,12 @@ suite('Attach to process - process provider', () => {
         provider = new AttachProcessProvider();
         getOSTypeStub = sinon.stub(platform, 'getOSType');
         plainExecStub = sinon.stub(rawProcessApis, 'plainExec');
-        getAllProcessesStub = sinon.stub(wpc, 'getAllProcesses');
+        getAllProcessesStub = sinon.stub();
+        sinon.stub(provider, '_loadWindowsProcessTree').returns({
+            getAllProcesses: getAllProcessesStub,
+            // eslint-disable-next-line @typescript-eslint/naming-convention
+            ProcessDataFlag: { None: 0, Memory: 1, CommandLine: 2 },
+        } as any);
     });
 
     teardown(() => {
diff --git a/src/test/unittest/hooks/childProcessAttachService.unit.test.ts b/src/test/unittest/hooks/childProcessAttachService.unit.test.ts
diff --git a/webpack.config.js b/webpack.config.js
