From 54a0788838a851ae24de79d01f7b6a2abe0f3bea Mon Sep 17 00:00:00 2001
From: Jakub Jares <jajares@microsoft.com>
Date: Fri, 3 Apr 2026 11:42:19 +0200
Subject: [PATCH] Fix #2657: Optimize Clear-TestDrive to delete only root new
 items

Copilot-generated fix.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 src/functions/TestDrive.ps1       | 28 +++++++++--
 tst/functions/TestDrive.Tests.ps1 | 83 +++++++++++++++++++++++++++++++
 2 files changed, 107 insertions(+), 4 deletions(-)

diff --git a/src/functions/TestDrive.ps1 b/src/functions/TestDrive.ps1
index e1374f33f..f175ddf38 100644
--- a/src/functions/TestDrive.ps1
+++ b/src/functions/TestDrive.ps1
@@ -112,12 +112,32 @@ function Clear-TestDrive {
 
         Remove-TestDriveSymbolicLinks -Path $TestDrivePath
 
-        foreach ($i in [IO.Directory]::GetFileSystemEntries($TestDrivePath, '*.*', [System.IO.SearchOption]::AllDirectories)) {
-            if ($Exclude -contains $i) {
-                continue
+        $allCurrent = [IO.Directory]::GetFileSystemEntries($TestDrivePath, '*.*', [System.IO.SearchOption]::AllDirectories)
+
+        # Collect new items (those not in the snapshot taken before the test)
+        $newItems = foreach ($i in $allCurrent) {
+            if ($Exclude -notcontains $i) {
+                $i
             }
+        }
 
-            & $SafeCommands['Remove-Item'] -Force -Recurse $i -ErrorAction Ignore
+        if (-not $newItems) {
+            return
+        }
+
+        # Build a set of new item paths for O(1) parent lookups
+        $newItemSet = [System.Collections.Generic.HashSet[string]]::new(
+            [string[]]@($newItems),
+            [System.StringComparer]::OrdinalIgnoreCase)
+
+        # Only delete "root" new items (those whose parent directory is not also a new item).
+        # Deleting with -Recurse removes all descendants in one call, avoiding redundant
+        # Remove-Item calls on already-deleted children.
+        foreach ($item in $newItemSet) {
+            $parent = [IO.Path]::GetDirectoryName($item)
+            if (-not $newItemSet.Contains($parent)) {
+                & $SafeCommands['Remove-Item'] -Path $item -Force -Recurse -ErrorAction Ignore
+            }
         }
     }
 }
diff --git a/tst/functions/TestDrive.Tests.ps1 b/tst/functions/TestDrive.Tests.ps1
index cd4e57963..521026561 100644
--- a/tst/functions/TestDrive.Tests.ps1
+++ b/tst/functions/TestDrive.Tests.ps1
@@ -100,6 +100,89 @@ InPesterModuleScope {
 
         }
     }
+
+    # Regression test for https://github.com/pester/Pester/issues/2657
+    # Clear-TestDrive was O(n) per item because it called Remove-Item on every child
+    # individually, even children of directories being removed. The fix uses a HashSet
+    # to only remove "root" new items, letting -Recurse handle descendants.
+    Describe "Clear-TestDrive" {
+        It "Removes new files but keeps excluded (baseline) files" {
+            $root = New-RandomTempDirectory
+            try {
+                # Create baseline items (simulate what exists before a test)
+                $baseFile = Join-Path $root 'baseline.txt'
+                Set-Content -Path $baseFile -Value 'keep'
+                $baseDir = Join-Path $root 'basedir'
+                $null = New-Item -ItemType Directory -Path $baseDir
+                $baseNested = Join-Path $baseDir 'nested.txt'
+                Set-Content -Path $baseNested -Value 'keep'
+
+                # Snapshot the baseline
+                $snapshot = Get-TestDriveChildItem -TestDrivePath $root
+
+                # Create new items (simulate what a test creates)
+                $newFile = Join-Path $root 'new.txt'
+                Set-Content -Path $newFile -Value 'remove'
+                $newDir = Join-Path $root 'newdir'
+                $null = New-Item -ItemType Directory -Path $newDir
+                $newNested = Join-Path $newDir 'child.txt'
+                Set-Content -Path $newNested -Value 'remove'
+
+                # Run Clear-TestDrive
+                Clear-TestDrive -TestDrivePath $root -Exclude $snapshot
+
+                # Baseline items should still exist
+                $baseFile | Should -Exist
+                $baseNested | Should -Exist
+
+                # New items should be removed
+                $newFile | Should -Not -Exist
+                $newDir | Should -Not -Exist
+                $newNested | Should -Not -Exist
+            }
+            finally {
+                Remove-Item -Path $root -Recurse -Force -ErrorAction Ignore
+            }
+        }
+
+        It "Handles empty test drive (no new items)" {
+            $root = New-RandomTempDirectory
+            try {
+                $baseFile = Join-Path $root 'only.txt'
+                Set-Content -Path $baseFile -Value 'keep'
+                $snapshot = Get-TestDriveChildItem -TestDrivePath $root
+
+                # No new items created — Clear should be a no-op
+                Clear-TestDrive -TestDrivePath $root -Exclude $snapshot
+
+                $baseFile | Should -Exist
+            }
+            finally {
+                Remove-Item -Path $root -Recurse -Force -ErrorAction Ignore
+            }
+        }
+
+        It "Removes nested new directory in one call (parent removal covers children)" {
+            $root = New-RandomTempDirectory
+            try {
+                $snapshot = Get-TestDriveChildItem -TestDrivePath $root
+
+                # Create a deep nested structure
+                $deepDir = Join-Path $root 'a/b/c'
+                $null = New-Item -ItemType Directory -Path $deepDir -Force
+                Set-Content -Path (Join-Path $deepDir 'deep.txt') -Value 'remove'
+                Set-Content -Path (Join-Path $root 'a/b/mid.txt') -Value 'remove'
+
+                Clear-TestDrive -TestDrivePath $root -Exclude $snapshot
+
+                # The entire 'a' tree should be gone
+                Join-Path $root 'a' | Should -Not -Exist
+            }
+            finally {
+                Remove-Item -Path $root -Recurse -Force -ErrorAction Ignore
+            }
+        }
+    }
 }
 
 Describe 'Repair missing TestDrive' {