cleanup cleanup everybody everywhere

eleanorjboyd · eleanorjboyd · commit 267007baa55d · 2026-01-09T09:14:14.000-08:00
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -28,7 +28,7 @@
             "source.fixAll.eslint": "explicit",
             "source.organizeImports.isort": "explicit"
         },
-        "editor.defaultFormatter": "charliermarsh.ruff",
+        "editor.defaultFormatter": "charliermarsh.ruff"
     },
     "[rust]": {
         "editor.defaultFormatter": "rust-lang.rust-analyzer",
@@ -67,12 +67,106 @@
     "git.pullBeforeCheckout": true,
     // Open merge editor for resolving conflicts.
     "git.mergeEditor": true,
-    "python.testing.pytestArgs": [
-        "python_files/tests"
-    ],
+    "python.testing.pytestArgs": ["python_files/tests"],
     "python.testing.unittestEnabled": false,
     "python.testing.pytestEnabled": true,
-    "rust-analyzer.linkedProjects": [
-        ".\\python-env-tools\\Cargo.toml"
-    ]
+    "rust-analyzer.linkedProjects": [".\\python-env-tools\\Cargo.toml"],
+    "chat.tools.terminal.autoApprove": {
+        "cd": true,
+        "echo": true,
+        "ls": true,
+        "pwd": true,
+        "cat": true,
+        "head": true,
+        "tail": true,
+        "findstr": true,
+        "wc": true,
+        "tr": true,
+        "cut": true,
+        "cmp": true,
+        "which": true,
+        "basename": true,
+        "dirname": true,
+        "realpath": true,
+        "readlink": true,
+        "stat": true,
+        "file": true,
+        "du": true,
+        "df": true,
+        "sleep": true,
+        "nl": true,
+        "grep": true,
+        "/^git(\\s+(-C\\s+\\S+|--no-pager))*\\s+status\\b/": true,
+        "/^git(\\s+(-C\\s+\\S+|--no-pager))*\\s+log\\b/": true,
+        "/^git(\\s+(-C\\s+\\S+|--no-pager))*\\s+show\\b/": true,
+        "/^git(\\s+(-C\\s+\\S+|--no-pager))*\\s+diff\\b/": true,
+        "/^git(\\s+(-C\\s+\\S+|--no-pager))*\\s+ls-files\\b/": true,
+        "/^git(\\s+(-C\\s+\\S+|--no-pager))*\\s+grep\\b/": true,
+        "/^git(\\s+(-C\\s+\\S+|--no-pager))*\\s+branch\\b/": true,
+        "/^git(\\s+(-C\\s+\\S+|--no-pager))*\\s+branch\\b.*-(d|D|m|M|-delete|-force)\\b/": false,
+        "Get-ChildItem": true,
+        "Get-Content": true,
+        "Get-Date": true,
+        "Get-Random": true,
+        "Get-Location": true,
+        "Write-Host": true,
+        "Write-Output": true,
+        "Out-String": true,
+        "Split-Path": true,
+        "Join-Path": true,
+        "Start-Sleep": true,
+        "Where-Object": true,
+        "/^Select-[a-z0-9]/i": true,
+        "/^Measure-[a-z0-9]/i": true,
+        "/^Compare-[a-z0-9]/i": true,
+        "/^Format-[a-z0-9]/i": true,
+        "/^Sort-[a-z0-9]/i": true,
+        "column": true,
+        "/^column\\b.*-c\\s+[0-9]{4,}/": false,
+        "date": true,
+        "/^date\\b.*(-s|--set)\\b/": false,
+        "find": true,
+        "/^find\\b.*-(delete|exec|execdir|fprint|fprintf|fls|ok|okdir)\\b/": false,
+        "rg": true,
+        "/^rg\\b.*(--pre|--hostname-bin)\\b/": false,
+        "sed": true,
+        "/^sed\\b.*(-[a-zA-Z]*(e|i|I|f)[a-zA-Z]*|--expression|--file|--in-place)\\b/": false,
+        "/^sed\\b.*(/e|/w|;W)/": false,
+        "sort": true,
+        "/^sort\\b.*-(o|S)\\b/": false,
+        "tree": true,
+        "/^tree\\b.*-o\\b/": false,
+        "rm": false,
+        "rmdir": false,
+        "del": false,
+        "Remove-Item": false,
+        "ri": false,
+        "rd": false,
+        "erase": false,
+        "dd": false,
+        "kill": false,
+        "ps": false,
+        "top": false,
+        "Stop-Process": false,
+        "spps": false,
+        "taskkill": false,
+        "taskkill.exe": false,
+        "curl": false,
+        "wget": false,
+        "Invoke-RestMethod": false,
+        "Invoke-WebRequest": false,
+        "irm": false,
+        "iwr": false,
+        "chmod": false,
+        "chown": false,
+        "Set-ItemProperty": false,
+        "sp": false,
+        "Set-Acl": false,
+        "jq": false,
+        "xargs": false,
+        "eval": false,
+        "Invoke-Expression": false,
+        "iex": false,
+        "npx tsc": true
+    }
 }
diff --git a/src/client/testing/testController/common/projectAdapter.ts b/src/client/testing/testController/common/projectAdapter.ts
@@ -3,13 +3,7 @@
 
 import { TestItem, Uri } from 'vscode';
 import { TestProvider } from '../../types';
-import {
-    ITestDiscoveryAdapter,
-    ITestExecutionAdapter,
-    ITestResultResolver,
-    DiscoveredTestPayload,
-    DiscoveredTestNode,
-} from './types';
+import { ITestDiscoveryAdapter, ITestExecutionAdapter, ITestResultResolver } from './types';
 import { PythonEnvironment, PythonProject } from '../../../envExt/types';
 
 /**
@@ -72,19 +66,6 @@ export interface ProjectAdapter {
      */
     resultResolver: ITestResultResolver;
 
-    // === DISCOVERY STATE ===
-    /**
-     * Raw discovery data before filtering (all discovered tests).
-     * Cleared after ownership resolution to save memory.
-     */
-    rawDiscoveryData?: DiscoveredTestPayload;
-
-    /**
-     * Filtered tests that this project owns (after API verification).
-     * This is the tree structure passed to populateTestTree().
-     */
-    ownedTests?: DiscoveredTestNode;
-
     /**
      * Absolute paths of nested projects to ignore during discovery.
      * Used to pass --ignore flags to pytest or exclusion filters to unittest.
@@ -109,41 +90,3 @@ export interface ProjectAdapter {
      */
     projectRootTestItem?: TestItem;
 }
-
-/**
- * Temporary state used during workspace-wide test discovery.
- * Created at the start of discovery and cleared after ownership resolution.
- */
-export interface WorkspaceDiscoveryState {
-    /**
-     * The workspace being discovered.
-     */
-    workspaceUri: Uri;
-
-    /**
-     * Maps test file paths to the set of projects that discovered them.
-     * Used to detect overlapping discovery.
-     */
-    fileToProjects: Map<string, Set<ProjectAdapter>>;
-
-    /**
-     * Maps test file paths to their owning project (after API resolution).
-     * Value is the ProjectAdapter whose pythonProject.uri matches API response.
-     */
-    fileOwnership: Map<string, ProjectAdapter>;
-
-    /**
-     * Progress tracking for parallel discovery.
-     */
-    projectsCompleted: Set<string>;
-
-    /**
-     * Total number of projects in this workspace.
-     */
-    totalProjects: number;
-
-    /**
-     * Whether all projects have completed discovery.
-     */
-    isComplete: boolean;
-}
diff --git a/src/client/testing/testController/controller.ts b/src/client/testing/testController/controller.ts
@@ -53,7 +53,7 @@ import { ITestDebugLauncher } from '../common/types';
 import { PythonResultResolver } from './common/resultResolver';
 import { onDidSaveTextDocument } from '../../common/vscodeApis/workspaceApis';
 import { IEnvironmentVariablesProvider } from '../../common/variables/types';
-import { ProjectAdapter, WorkspaceDiscoveryState } from './common/projectAdapter';
+import { ProjectAdapter } from './common/projectAdapter';
 import { getProjectId, createProjectDisplayName } from './common/projectUtils';
 import { PythonProject, PythonEnvironment } from '../../envExt/types';
 import { getEnvExtApi, useEnvExtension } from '../../envExt/api.internal';
@@ -83,9 +83,6 @@ export class PythonTestController implements ITestController, IExtensionSingleAc
     // Note: Project URI strings match Python Environments extension's Map<string, PythonProject> keys
     private readonly workspaceProjects: Map<Uri, Map<string, ProjectAdapter>> = new Map();
 
-    // Temporary state for tracking overlaps during discovery (created/destroyed per refresh)
-    private readonly workspaceDiscoveryState: Map<Uri, WorkspaceDiscoveryState> = new Map();
-
     // TODO: Phase 3-4 - Add these maps when implementing execution:
     // - vsIdToProject: Map<string, ProjectAdapter> - Fast lookup for test execution
     // - fileUriToProject: Map<string, ProjectAdapter> - File watching and change detection
@@ -640,17 +637,6 @@ export class PythonTestController implements ITestController, IExtensionSingleAc
         const projects = Array.from(projectsMap.values());
         traceInfo(`[test-by-project] Starting discovery for ${projects.length} project(s) in workspace`);
 
-        // Initialize discovery state for overlap tracking
-        const discoveryState: WorkspaceDiscoveryState = {
-            workspaceUri,
-            fileToProjects: new Map(),
-            fileOwnership: new Map(),
-            projectsCompleted: new Set(),
-            totalProjects: projects.length,
-            isComplete: false,
-        };
-        this.workspaceDiscoveryState.set(workspaceUri, discoveryState);
-
         try {
             // PHASE 3: Compute nested project relationships BEFORE discovery
             const projectIgnores = this.computeNestedProjectIgnores(workspaceUri);
@@ -669,38 +655,26 @@ export class PythonTestController implements ITestController, IExtensionSingleAc
                 }
             }
 
+            // Track completion for progress logging
+            const projectsCompleted = new Set<string>();
+
             // Run discovery for all projects in parallel (now with ignore lists populated)
             // Each project will populate TestItems independently via existing flow
-            await Promise.all(projects.map((project) => this.discoverProject(project, discoveryState)));
+            await Promise.all(projects.map((project) => this.discoverProject(project, projectsCompleted)));
 
-            // Mark discovery complete
-            discoveryState.isComplete = true;
             traceInfo(
-                `[test-by-project] Discovery complete: ${discoveryState.projectsCompleted.size}/${projects.length} projects succeeded`,
-            );
-
-            // Log overlap information for debugging
-            const overlappingFiles = Array.from(discoveryState.fileToProjects.entries()).filter(
-                ([, projects]) => projects.size > 1,
+                `[test-by-project] Discovery complete: ${projectsCompleted.size}/${projects.length} projects succeeded`,
             );
-            if (overlappingFiles.length > 0) {
-                traceInfo(`[test-by-project] Found ${overlappingFiles.length} file(s) discovered by multiple projects`);
-            }
-
-            // TODO: Phase 3 - Resolve overlaps and rebuild test tree with proper ownership
-            // await this.resolveOverlapsAndAssignTests(workspaceUri);
-        } finally {
-            // Clean up temporary discovery state
-            this.workspaceDiscoveryState.delete(workspaceUri);
+        } catch (error) {
+            traceError(`[test-by-project] Discovery failed for workspace ${workspaceUri.fsPath}:`, error);
         }
     }
 
     /**
-     * Phase 2: Runs test discovery for a single project.
+     * Runs test discovery for a single project.
      * Uses the existing discovery flow which populates TestItems automatically.
-     * Tracks which files were discovered for overlap detection in Phase 3.
      */
-    private async discoverProject(project: ProjectAdapter, discoveryState: WorkspaceDiscoveryState): Promise<void> {
+    private async discoverProject(project: ProjectAdapter, projectsCompleted: Set<string>): Promise<void> {
         try {
             traceInfo(`[test-by-project] Discovering tests for project: ${project.projectName}`);
             project.isDiscovering = true;
@@ -728,51 +702,18 @@ export class PythonTestController implements ITestController, IExtensionSingleAc
                 project, // Pass project for access to projectUri and other project-specific data
             );
 
-            // Track which files this project discovered by inspecting created TestItems
-            // This data will be used in Phase 3 for overlap resolution
-            this.trackProjectDiscoveredFiles(project, discoveryState);
-
             // Mark project as completed
-            discoveryState.projectsCompleted.add(project.projectId);
+            projectsCompleted.add(project.projectId);
             traceInfo(`[test-by-project] Project ${project.projectName} discovery completed`);
         } catch (error) {
             traceError(`[test-by-project] Discovery failed for project ${project.projectName}:`, error);
             // Individual project failures don't block others
-            discoveryState.projectsCompleted.add(project.projectId); // Still mark as completed
+            projectsCompleted.add(project.projectId); // Still mark as completed
         } finally {
             project.isDiscovering = false;
         }
     }
 
-    /**
-     * Tracks which files a project discovered by inspecting its TestItems.
-     * Populates the fileToProjects map for overlap detection in Phase 3.
-     */
-    private trackProjectDiscoveredFiles(project: ProjectAdapter, discoveryState: WorkspaceDiscoveryState): void {
-        // Get all test items for this project from its result resolver
-        const testItems = project.resultResolver.runIdToTestItem;
-
-        // Extract unique file paths from test items
-        const filePaths = new Set<string>();
-        testItems.forEach((testItem) => {
-            if (testItem.uri) {
-                filePaths.add(testItem.uri.fsPath);
-            }
-        });
-
-        // Track which projects discovered each file
-        filePaths.forEach((filePath) => {
-            if (!discoveryState.fileToProjects.has(filePath)) {
-                discoveryState.fileToProjects.set(filePath, new Set());
-            }
-            discoveryState.fileToProjects.get(filePath)!.add(project);
-        });
-
-        traceVerbose(
-            `[test-by-project] Project ${project.projectName} discovered ${filePaths.size} file(s) with ${testItems.size} test(s)`,
-        );
-    }
-
     /**
      * Discovers tests for all workspaces in the workspace folders.
      */
