Remove "Reset to Default" command and UI elements

Co-authored-by: eleanorjboyd <[email protected]>

Author: Copilot

package.json

@@ -160,12 +160,7 @@
                 "category": "Python",
                 "icon": "$(check)"
             },
-            {
-                "command": "python-envs.reset",
-                "title": "%python-envs.reset.title%",
-                "category": "Python",
-                "icon": "$(sync)"
-            },
+
             {
                 "command": "python-envs.remove",
                 "title": "%python-envs.remove.title%",
@@ -276,10 +271,7 @@
                     "command": "python-envs.setEnv",
                     "when": "false"
                 },
-                {
-                    "command": "python-envs.reset",
-                    "when": "false"
-                },
+
                 {
                     "command": "python-envs.remove",
                     "when": "false"
@@ -401,10 +393,7 @@
                     "group": "inline",
                     "when": "view == python-projects && viewItem =~ /.*python-workspace.*/"
                 },
-                {
-                    "command": "python-envs.reset",
-                    "when": "view == python-projects && viewItem =~ /.*python-workspace.*/"
-                },
+
                 {
                     "command": "python-envs.createTerminal",
                     "group": "inline",

package.nls.json

@@ -22,7 +22,7 @@
     "python-envs.createAny.title": "Create Environment",
     "python-envs.set.title": "Set Project Environment",
     "python-envs.setEnv.title": "Set As Project Environment",
-    "python-envs.reset.title": "Reset to Default",
+
     "python-envs.remove.title": "Delete Environment",
     "python-envs.refreshAllManagers.title": "Refresh All Environment Managers",
     "python-envs.refreshPackages.title": "Refresh Packages List",

src/extension.ts

@@ -32,7 +32,6 @@ import {
     refreshPackagesCommand,
     removeEnvironmentCommand,
     removePythonProject,
-    resetEnvironmentCommand,
     runAsTaskCommand,
     runInDedicatedTerminalCommand,
     runInTerminalCommand,
@@ -61,6 +60,7 @@ import { EnvManagerView } from './features/views/envManagersView';
 import { ProjectView } from './features/views/projectView';
 import { PythonStatusBarImpl } from './features/views/pythonStatusBar';
 import { updateViewsAndStatus } from './features/views/revealHandler';
+import { ProjectItem } from './features/views/treeViewItems';
 import { EnvironmentManagers, ProjectCreators, PythonProjectManager } from './internal.api';
 import { registerSystemPythonFeatures } from './managers/builtin/main';
 import { SysPythonManager } from './managers/builtin/sysPythonManager';
@@ -186,9 +186,7 @@ export async function activate(context: ExtensionContext): Promise<PythonEnviron
         commands.registerCommand('python-envs.setEnv', async (item) => {
             await setEnvironmentCommand(item, envManagers, projectManager);
         }),
-        commands.registerCommand('python-envs.reset', async (item) => {
-            await resetEnvironmentCommand(item, envManagers, projectManager);
-        }),
+
         commands.registerCommand('python-envs.setEnvManager', async () => {
             await setEnvManagerCommand(envManagers, projectManager);
         }),
@@ -206,7 +204,14 @@ export async function activate(context: ExtensionContext): Promise<PythonEnviron
             await addPythonProjectCommand(resource, projectManager, envManagers, projectCreators);
         }),
         commands.registerCommand('python-envs.removePythonProject', async (item) => {
-            await resetEnvironmentCommand(item, envManagers, projectManager);
+            // Clear environment association before removing project
+            if (item instanceof ProjectItem) {
+                const uri = item.project.uri;
+                const manager = envManagers.getEnvironmentManager(uri);
+                if (manager) {
+                    manager.set(uri, undefined);
+                }
+            }
             await removePythonProject(item, projectManager);
         }),
         commands.registerCommand('python-envs.clearCache', async () => {

src/features/envCommands.ts

@@ -329,34 +329,7 @@ async function setEnvironmentForProjects(
     await em.setEnvironments(uris, environment);
 }
 
-export async function resetEnvironmentCommand(
-    context: unknown,
-    em: EnvironmentManagers,
-    wm: PythonProjectManager,
-): Promise<void> {
-    if (context instanceof ProjectItem) {
-        const view = context as ProjectItem;
-        return resetEnvironmentCommand(view.project.uri, em, wm);
-    } else if (context instanceof Uri) {
-        const uri = context as Uri;
-        const manager = em.getEnvironmentManager(uri);
-        if (manager) {
-            manager.set(uri, undefined);
-        } else {
-            showErrorMessage(`No environment manager found for: ${uri.fsPath}`);
-            traceError(`No environment manager found for ${uri.fsPath}`);
-        }
-        return;
-    } else if (context === undefined) {
-        const pw = await pickProject(wm.getProjects());
-        if (pw) {
-            return resetEnvironmentCommand(pw.uri, em, wm);
-        }
-        return;
-    }
-    traceError(`Invalid context for unset environment command: ${context}`);
-    showErrorMessage('Invalid context for unset environment');
-}
+
 
 export async function setEnvManagerCommand(em: EnvironmentManagers, wm: PythonProjectManager): Promise<void> {
     const projects = await pickProjectMany(wm.getProjects());