Point release edits (#25310)

includes 
[Return early in activate from env var collection
](e5ebde6)
[Resolve REPL regression on indentation, disable PyREPL only when
shel…](9fe753a)
[bundle envs ext with
stable](205084f)

---------

Co-authored-by: Anthony Kim <[email protected]>

Author: eleanorjboyd

.github/actions/build-vsix/action.yml

@@ -70,15 +70,8 @@ runs:
       shell: bash
 
     - name: Update optional extension dependencies
-      run: |
-        if [[ "${VSIX_NAME}" == *"insiders"* ]]; then
-        npm run addExtensionPackDependenciesPreRelease
-        else
-        npm run addExtensionPackDependencies
-        fi
+      run: npm run addExtensionPackDependencies
       shell: bash
-      env:
-        VSIX_NAME: ${{ inputs.vsix_name }}
 
     - name: Build Webpack
       run: |

build/azure-pipeline.pre-release.yml

@@ -91,7 +91,7 @@ extends:
       - script: python ./build/update_package_file.py
         displayName: Update telemetry in package.json
 
-      - script: npm run addExtensionPackDependenciesPreRelease
+      - script: npm run addExtensionPackDependencies
         displayName: Update optional extension dependencies
 
       - script: npx gulp prePublishBundle

gulpfile.js

@@ -93,23 +93,16 @@ gulp.task('addExtensionPackDependencies', async () => {
     await addExtensionPackDependencies();
 });
 
-// This task adds 'ms-python.vscode-python-envs' as required deps only for pre-release builds.
-gulp.task('addExtensionPackDependenciesPreRelease', async () => {
-    await buildLicense();
-    await addExtensionPackDependencies(true);
-});
-
-async function addExtensionPackDependencies(isPreRelease = false) {
+async function addExtensionPackDependencies() {
     // Update the package.json to add extension pack dependencies at build time so that
     // extension dependencies need not be installed during development
     const packageJsonContents = await fsExtra.readFile('package.json', 'utf-8');
     const packageJson = JSON.parse(packageJsonContents);
-    let deps = ['ms-python.vscode-pylance', 'ms-python.debugpy'];
-    if (isPreRelease) {
-        deps.push('ms-python.vscode-python-envs');
-    }
-    packageJson.extensionPack = deps.concat(packageJson.extensionPack ? packageJson.extensionPack : []);
-
+    packageJson.extensionPack = [
+        'ms-python.vscode-pylance',
+        'ms-python.debugpy',
+        'ms-python.vscode-python-envs',
+    ].concat(packageJson.extensionPack ? packageJson.extensionPack : []);
     // Remove potential duplicates.
     packageJson.extensionPack = packageJson.extensionPack.filter(
         (item, index) => packageJson.extensionPack.indexOf(item) === index,

package.json

@@ -1671,7 +1671,6 @@
         "format-fix": "prettier --write 'src/**/*.ts' 'build/**/*.js' '.github/**/*.yml' gulpfile.js",
         "clean": "gulp clean",
         "addExtensionPackDependencies": "gulp addExtensionPackDependencies",
-        "addExtensionPackDependenciesPreRelease": "gulp addExtensionPackDependenciesPreRelease",
         "updateBuildNumber": "gulp updateBuildNumber",
         "verifyBundle": "gulp verifyBundle",
         "webpack": "webpack"

package.nls.json

@@ -72,7 +72,7 @@
     "python.tensorBoard.logDirectory.description": "Set this setting to your preferred TensorBoard log directory to skip log directory prompt when starting TensorBoard.",
     "python.tensorBoard.logDirectory.markdownDeprecationMessage": "Tensorboard support has been moved to the extension [Tensorboard extension](https://marketplace.visualstudio.com/items?itemName=ms-toolsai.tensorboard). Instead use the setting `tensorBoard.logDirectory`.",
     "python.tensorBoard.logDirectory.deprecationMessage": "Tensorboard support has been moved to the extension Tensorboard extension. Instead use the setting `tensorBoard.logDirectory`.",
-    "python.terminal.shellIntegration.enabled.description": "Enable [shell integration](https://code.visualstudio.com/docs/terminal/shell-integration) for the terminals running python. Shell integration enhances the terminal experience by enabling command decorations, run recent command, improving accessibility among other things.",
+    "python.terminal.shellIntegration.enabled.description": "Enable [shell integration](https://code.visualstudio.com/docs/terminal/shell-integration) for the terminals running python. Shell integration enhances the terminal experience by enabling command decorations, run recent command, improving accessibility among other things. Note: PyREPL (available in Python 3.13+) is automatically disabled when shell integration is enabled to avoid cursor indentation issues.",
     "python.terminal.activateEnvInCurrentTerminal.description": "Activate Python Environment in the current Terminal on load of the Extension.",
     "python.terminal.activateEnvironment.description": "Activate Python Environment in all Terminals created.",
     "python.terminal.executeInFileDir.description": "When executing a file in the terminal, whether to use execute in the file's directory, instead of the current open folder.",

python_files/pythonrc.py

@@ -5,7 +5,6 @@
     import readline
 
 original_ps1 = ">>> "
-use_shell_integration = sys.version_info < (3, 13)
 is_wsl = "microsoft-standard-WSL" in platform.release()
 
 
@@ -75,7 +74,7 @@ def __str__(self):
         return result
 
 
-if sys.platform != "win32" and (not is_wsl) and use_shell_integration:
+if sys.platform != "win32" and (not is_wsl):
     sys.ps1 = PS1()
 
 if sys.platform == "darwin":

src/client/common/configSettings.ts

@@ -377,7 +377,9 @@ export class PythonSettings implements IPythonSettings {
                   launchArgs: [],
                   activateEnvironment: true,
                   activateEnvInCurrentTerminal: false,
-                  enableShellIntegration: false,
+                  shellIntegration: {
+                      enabled: false,
+                  },
               };
 
         this.REPL = pythonSettings.get<IREPLSettings>('REPL')!;

src/client/common/types.ts

@@ -188,7 +188,9 @@ export interface ITerminalSettings {
     readonly launchArgs: string[];
     readonly activateEnvironment: boolean;
     readonly activateEnvInCurrentTerminal: boolean;
-    readonly enableShellIntegration: boolean;
+    readonly shellIntegration: {
+        enabled: boolean;
+    };
 }
 
 export interface IREPLSettings {

src/client/extensionActivation.ts

@@ -53,7 +53,7 @@ import { DebuggerTypeName } from './debugger/constants';
 import { StopWatch } from './common/utils/stopWatch';
 import { registerReplCommands, registerReplExecuteOnEnter, registerStartNativeReplCommand } from './repl/replCommands';
 import { registerTriggerForTerminalREPL } from './terminals/codeExecution/terminalReplWatcher';
-import { registerBasicRepl, registerPythonStartup } from './terminals/pythonStartup';
+import { registerPythonStartup } from './terminals/pythonStartup';
 import { registerPixiFeatures } from './pythonEnvironments/common/environmentManagers/pixi';
 import { registerCustomTerminalLinkProvider } from './terminals/pythonStartupLinkProvider';
 import { registerEnvExtFeatures } from './envExt/api.internal';
@@ -184,7 +184,6 @@ async function activateLegacy(ext: ExtensionState, startupStopWatch: StopWatch):
             serviceManager.get<ITerminalAutoActivation>(ITerminalAutoActivation).register();
 
             await registerPythonStartup(ext.context);
-            await registerBasicRepl(ext.context);
 
             serviceManager.get<ICodeExecutionManager>(ICodeExecutionManager).registerCommands();
 

src/client/terminals/codeExecution/helper.ts

@@ -99,10 +99,12 @@ export class CodeExecutionHelper implements ICodeExecutionHelper {
             const endLineVal = activeEditor?.selection?.end.line ?? 0;
             const emptyHighlightVal = activeEditor?.selection?.isEmpty ?? true;
             let smartSendSettingsEnabledVal = true;
+            let shellIntegrationEnabled = false;
             const configuration = this.serviceContainer.get<IConfigurationService>(IConfigurationService);
             if (configuration) {
                 const pythonSettings = configuration.getSettings(this.activeResourceService.getActiveResource());
                 smartSendSettingsEnabledVal = pythonSettings.REPL.enableREPLSmartSend;
+                shellIntegrationEnabled = pythonSettings.terminal.shellIntegration.enabled;
             }
 
             const input = JSON.stringify({
@@ -125,6 +127,16 @@ export class CodeExecutionHelper implements ICodeExecutionHelper {
                 await this.moveToNextBlock(lineOffset, activeEditor);
             }
 
+            // For new _pyrepl for Python3.13+ && !shellIntegration, we need to send code via bracketed paste mode.
+            if (object.attach_bracket_paste && !shellIntegrationEnabled && _replType === ReplType.terminal) {
+                let trimmedNormalized = object.normalized.replace(/\n$/, '');
+                if (trimmedNormalized.endsWith(':\n')) {
+                    // In case where statement is unfinished via :, truncate so auto-indentation lands nicely.
+                    trimmedNormalized = trimmedNormalized.replace(/\n$/, '');
+                }
+                return `\u001b[200~${trimmedNormalized}\u001b[201~`;
+            }
+
             return parse(object.normalized);
         } catch (ex) {
             traceError(ex, 'Python: Failed to normalize code for execution in terminal');