Merge branch 'main' into default-interpreter-path

.github/actions/install-python/action.yml

@@ -14,7 +14,6 @@ runs:
         curl https://raw.githubusercontent.com/posit-dev/qa-example-content/main/requirements.txt --output requirements.txt
         python3 -m pip install --upgrade pip
         python3 -m pip install -r requirements.txt
-        python3 -m pip install ipykernel
 
     - name: Verify Python Version
       shell: bash
@@ -51,7 +50,7 @@ runs:
         PYTHON_ALTERNATE_VERSION="${{ inputs.alternate_version }}"
         echo "Installing Python version $PYTHON_ALTERNATE_VERSION using pyenv..."
         pyenv install -s "$PYTHON_ALTERNATE_VERSION"
-        
+
         pyenv versions
 
         pyenv global "$PYTHON_ALTERNATE_VERSION"

.github/workflows/positron-python-ci.yml

@@ -1,6 +1,7 @@
 name: 'Positron Python CI'
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - main

.github/workflows/test-e2e-linux.yml

@@ -33,6 +33,11 @@ on:
         description: "Whether or not to report results to TestRail."
         default: false
         type: boolean
+      enable_currents_reporter:
+        required: false
+        description: "Whether or not to report results to Currents."
+        type: boolean
+        default: true
 
   workflow_dispatch:
     inputs:
@@ -142,8 +147,13 @@ jobs:
           COMMIT_INFO_MESSAGE: ${{ github.event.head_commit.message }}
           PWTEST_BLOB_DO_NOT_REMOVE: 1
           CURRENTS_TAG: ${{ inputs.currents_tags || 'electron/linux' }}
+          ENABLE_CURRENTS_REPORTER: ${{ inputs.enable_currents_reporter }}
         run: |
-          DISPLAY=:10 npx playwright test --project ${{ inputs.project }} --workers 2 --grep "${{ env.PW_TAGS }}" --repeat-each ${{ inputs.repeat_each }} --max-failures 10
+          if [ "${{ inputs.project }}" == "e2e-electron" ]; then
+            DISPLAY=:10 npx playwright test --project ${{ inputs.project }} --workers 2 --grep "${{ env.PW_TAGS }}" --grep-invert @:web-only --repeat-each ${{ inputs.repeat_each }} --max-failures 10
+          else
+            DISPLAY=:10 npx playwright test --project ${{ inputs.project }} --workers 2 --grep "${{ env.PW_TAGS }}" --repeat-each ${{ inputs.repeat_each }} --max-failures 10
+          fi
 
       - name: Upload Playwright Report to S3
         if: ${{ success() || failure() }}

.github/workflows/test-e2e-windows.yml

@@ -23,10 +23,15 @@ on:
         default: ""
         type: string
       report_testrail:
-          required: false
-          description: "Whether or not to report results to TestRail."
-          default: false
-          type: boolean
+        required: false
+        description: "Whether or not to report results to TestRail."
+        default: false
+        type: boolean
+      enable_currents_reporter:
+        required: false
+        description: "Whether or not to report results to Currents."
+        type: boolean
+        default: true
 
   workflow_dispatch:
     inputs:
@@ -108,7 +113,7 @@ jobs:
           curl https://raw.githubusercontent.com/posit-dev/qa-example-content/main/requirements.txt --output requirements.txt
           python -m pip install --upgrade pip
           python -m pip install -r requirements.txt
-          python -m pip install ipykernel trcli
+          python -m pip install trcli
 
       # Alternate python version
       - name: Install Python 3.13.0
@@ -180,6 +185,7 @@ jobs:
           COMMIT_INFO_MESSAGE: ${{ github.event.head_commit.message }} # only works on push events
           PWTEST_BLOB_DO_NOT_REMOVE: 1
           CURRENTS_TAG: ${{ inputs.currents_tags || 'electron/win'}}
+          ENABLE_CURRENTS_REPORTER: ${{ inputs.enable_currents_reporter }}
         if: ${{ !cancelled() }}
         run: npx playwright test --project "e2e-windows" --grep "${{ env.PW_TAGS }}" --workers 2 --repeat-each ${{ inputs.repeat_each }} --max-failures 10
 

.github/workflows/test-pull-request.yml

@@ -38,6 +38,7 @@ jobs:
       display_name: "electron (linux)"
       currents_tags: "pull-request,electron/linux,${{ needs.pr-tags.outputs.tags }}"
       report_testrail: false
+      enable_currents_reporter: false
     secrets: inherit
 
   e2e-windows-electron:
@@ -50,6 +51,7 @@ jobs:
       display_name: "electron (windows)"
       currents_tags: "pull-request,electron/windows,${{ needs.pr-tags.outputs.tags }}"
       report_testrail: false
+      enable_currents_reporter: false
     secrets: inherit
 
   e2e-linux-browser:
@@ -63,6 +65,7 @@ jobs:
       project: "e2e-browser"
       currents_tags: "pull-request,browser/linux,${{ needs.pr-tags.outputs.tags }}"
       report_testrail: false
+      enable_currents_reporter: false
     secrets: inherit
 
   unit-tests:

build/gulpfile.extensions.js

@@ -30,6 +30,7 @@ const ext = require('./lib/extensions');
 const compilations = [
 	// --- Start Positron ---
 	'extensions/open-remote-ssh/tsconfig.json',
+	'extensions/positron-assistant/tsconfig.json',
 	'extensions/positron-code-cells/tsconfig.json',
 	'extensions/positron-connections/tsconfig.json',
 	'extensions/positron-duckdb/tsconfig.json',

build/gulpfile.reh.js

@@ -27,7 +27,7 @@ const File = require('vinyl');
 const fs = require('fs');
 const glob = require('glob');
 const { compileBuildTask } = require('./gulpfile.compile');
-const { cleanExtensionsBuildTask, compileNonNativeExtensionsBuildTask, compileNativeExtensionsBuildTask, compileExtensionMediaBuildTask } = require('./gulpfile.extensions');
+const { cleanExtensionsBuildTask, compileNonNativeExtensionsBuildTask, compileNativeExtensionsBuildTask, compileExtensionMediaBuildTask, copyExtensionBinariesTask } = require('./gulpfile.extensions');
 // --- Start Positron ---
 const { vscodeWebEntryPoints, vscodeWebResourceIncludes, createVSCodeWebFileContentMapper } = require('./gulpfile.vscode.web');
 const { positronBuildNumber } = require('./utils');
@@ -288,6 +288,7 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
 			'vscode-test-resolver',
 			'positron-zed',
 			'positron-javascript',
+			'positron-assistant',
 		];
 		// --- End Positron ---
 		const localWorkspaceExtensions = glob.sync('extensions/*/package.json')
@@ -550,6 +551,9 @@ function tweakProductForServerWeb(product) {
 				cleanExtensionsBuildTask,
 				compileNonNativeExtensionsBuildTask,
 				compileExtensionMediaBuildTask,
+				// --- Start Positron ---
+				copyExtensionBinariesTask,
+				// --- End Positron ---
 				minified ? minifyTask : bundleTask,
 				serverTaskCI
 			));

build/gulpfile.vscode.js

@@ -31,7 +31,7 @@ const { config } = require('./lib/electron');
 const createAsar = require('./lib/asar').createAsar;
 const minimist = require('minimist');
 const { compileBuildTask } = require('./gulpfile.compile');
-const { compileNonNativeExtensionsBuildTask, compileNativeExtensionsBuildTask, compileAllExtensionsBuildTask, compileExtensionMediaBuildTask, cleanExtensionsBuildTask } = require('./gulpfile.extensions');
+const { compileNonNativeExtensionsBuildTask, compileNativeExtensionsBuildTask, compileAllExtensionsBuildTask, compileExtensionMediaBuildTask, cleanExtensionsBuildTask, copyExtensionBinariesTask } = require('./gulpfile.extensions');
 const { promisify } = require('util');
 const glob = promisify(require('glob'));
 const rcedit = promisify(require('rcedit'));
@@ -605,6 +605,9 @@ BUILD_TARGETS.forEach(buildTarget => {
 			cleanExtensionsBuildTask,
 			compileNonNativeExtensionsBuildTask,
 			compileExtensionMediaBuildTask,
+			// --- Start Positron ---
+			copyExtensionBinariesTask,
+			// --- End Positron ---
 			minified ? minifyVSCodeTask : bundleVSCodeTask,
 			vscodeTaskCI
 		));

build/lib/extensions.ts

@@ -374,6 +374,7 @@ const excludedExtensions = [
 	// --- Start Positron ---
 	'positron-zed',
 	'positron-javascript',
+	'positron-assistant',
 	// --- End Positron ---
 ];
 

build/lib/i18n.resources.json

@@ -182,6 +182,10 @@
 			"name": "vs/workbench/contrib/performance",
 			"project": "vscode-workbench"
 		},
+		{
+			"name": "vs/workbench/contrib/positronAssistant",
+			"project": "vscode-workbench"
+		},
 		{
 			"name": "vs/workbench/contrib/positronVariables",
 			"project": "vscode-workbench"

build/npm/dirs.js

@@ -12,6 +12,7 @@ const dirs = [
 	'extensions',
 	// --- Start Positron ---
 	'extensions/open-remote-ssh',
+	'extensions/positron-assistant',
 	'extensions/positron-code-cells',
 	'extensions/positron-connections',
 	'extensions/positron-duckdb',

build/secrets/.secrets.baseline

@@ -159,7 +159,7 @@
         "filename": ".github/workflows/test-pull-request.yml",
         "hashed_secret": "3e26d6750975d678acb8fa35a0f69237881576b0",
         "is_verified": false,
-        "line_number": 41,
+        "line_number": 42,
         "is_secret": false
       }
     ],
@@ -1940,5 +1940,5 @@
       }
     ]
   },
-  "generated_at": "2025-01-27T19:50:17Z"
+  "generated_at": "2025-02-21T16:51:27Z"
 }

extensions/positron-assistant/extension.webpack.config.js

@@ -0,0 +1,20 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (C) 2024 Posit Software, PBC. All rights reserved.
+ *  Licensed under the Elastic License 2.0. See LICENSE.txt for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+//@ts-check
+
+'use strict';
+
+const withDefaults = require('../shared.webpack.config');
+
+module.exports = withDefaults({
+	context: __dirname,
+	entry: {
+		extension: './src/extension.ts',
+	},
+	node: {
+		__dirname: false
+	}
+});