diff --git a/Kits/ATGTK/PerformanceTimersXbox.cpp b/Kits/ATGTK/PerformanceTimersXbox.cpp
index 35add49f..b0ad06a3 100644
--- a/Kits/ATGTK/PerformanceTimersXbox.cpp
+++ b/Kits/ATGTK/PerformanceTimersXbox.cpp
@@ -330,7 +330,7 @@ void GPUCommandListTimer<t_CommandList>::Frame::EndFrame(_In_ t_CommandList* /*c
 }
 
 template<typename t_CommandList>
-void GPUCommandListTimer<t_CommandList>::Frame::ComputeFrame(_In_ t_CommandList* commandList, _Out_writes_(c_maxTimers) float* lastUpdatedValues)
+void GPUCommandListTimer<t_CommandList>::Frame::ComputeFrame(_In_ t_CommandList* commandList, _Inout_updates_(c_maxTimers) float* lastUpdatedValues)
 {
 #if defined(_DEBUG) || defined(PROFILE)
     bool blocked = false;
@@ -341,7 +341,6 @@ void GPUCommandListTimer<t_CommandList>::Frame::ComputeFrame(_In_ t_CommandList*
         if (!m_used[j])
         {
             m_timing[j] = 0.f;
-            lastUpdatedValues[j] = 0.f;
             continue;
         }
 
diff --git a/Kits/ATGTK/PerformanceTimersXbox.h b/Kits/ATGTK/PerformanceTimersXbox.h
index 6b10b214..dc87f21c 100644
--- a/Kits/ATGTK/PerformanceTimersXbox.h
+++ b/Kits/ATGTK/PerformanceTimersXbox.h
@@ -144,7 +144,7 @@ namespace DX
 
             void BeginFrame(_In_ t_CommandList* commandList);
             void EndFrame(_In_ t_CommandList* commandList);
-            void ComputeFrame(_In_ t_CommandList* commandList, _Out_writes_(c_maxTimers) float* lastUpdatedValues);
+            void ComputeFrame(_In_ t_CommandList* commandList, _Inout_updates_(c_maxTimers) float* lastUpdatedValues);
 
             void Start(_In_ t_CommandList* commandList, uint32_t timerid = 0);
             void Stop(_In_ t_CommandList* commandList, uint32_t timerid = 0);
diff --git a/README.md b/README.md
index 14897720..48668aba 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,12 @@ This repo contains game development samples written by the Microsoft Xbox Advanc
   * [Unity](gdk-samples-list.md#Unity)
   * [xCloud](gdk-samples-list.md#xCloud)
 
+## Other Samples
+
+For more samples, see [XBOX-Godot-NetRumble](https://github.com/microsoft/XBOX-Godot-NetRumble), and [XBOX-Godot-Sample](https://github.com/microsoft/XBOX-Godot-Sample).
+
+Legacy samples are also available at [DirectML Samples](https://github.com/microsoft/DirectML), [PlayFab-Samples](https://github.com/PlayFab/PlayFab-Samples), [Xbox-ATG-Samples](https://github.com/microsoft/Xbox-ATG-Samples), and [Xbox-LIVE-Samples](https://github.com/microsoft/xbox-live-samples).
+
 # Requirements
 
 * Visual Studio 2022 or later
@@ -64,10 +70,6 @@ This project has adopted the [Microsoft Open Source Code of Conduct](https://ope
 
 This project may contain trademarks or logos for projects, products, or services. Authorized use of Microsoft trademarks or logos is subject to and must follow [Microsoft's Trademark & Brand Guidelines](https://www.microsoft.com/en-us/legal/intellectualproperty/trademarks/usage/general). Use of Microsoft trademarks or logos in modified versions of this project must not cause confusion or imply Microsoft sponsorship. Any use of third-party trademarks or logos are subject to those third-party's policies.
 
-## Other Samples
-
-For more ATG samples, see [DirectML Samples](https://github.com/microsoft/DirectML), [PlayFab-Samples](https://github.com/PlayFab/PlayFab-Samples), [Xbox-ATG-Samples](https://github.com/microsoft/Xbox-ATG-Samples), and [Xbox-LIVE-Samples](https://github.com/microsoft/xbox-live-samples).
-
 ## Samples list by category
 
 [Samples List](gdk-samples-list.md)
diff --git a/Samples/Audio/SimplePlay3DSound/SimplePlay3DSound.h b/Samples/Audio/SimplePlay3DSound/SimplePlay3DSound.h
index 454887f0..4c3eecab 100644
--- a/Samples/Audio/SimplePlay3DSound/SimplePlay3DSound.h
+++ b/Samples/Audio/SimplePlay3DSound/SimplePlay3DSound.h
@@ -18,7 +18,7 @@ class Sample final : public IXAudio2EngineCallback
 public:
 
     Sample() noexcept(false);
-    virtual ~Sample();
+    ~Sample();
 
     Sample(Sample&&) = delete;
     Sample& operator= (Sample&&) = delete;
diff --git a/Samples/Audio/SimplePlaySound/SimplePlaySound.h b/Samples/Audio/SimplePlaySound/SimplePlaySound.h
index f5ce0eae..45310237 100644
--- a/Samples/Audio/SimplePlaySound/SimplePlaySound.h
+++ b/Samples/Audio/SimplePlaySound/SimplePlaySound.h
@@ -18,7 +18,7 @@ class Sample final : public IXAudio2EngineCallback
 public:
 
     Sample() noexcept(false);
-    virtual ~Sample();
+    ~Sample();
 
     Sample(Sample&&) = delete;
     Sample& operator= (Sample&&) = delete;
diff --git a/Samples/Audio/SimplePlaySoundStream/SimplePlaySoundStream.h b/Samples/Audio/SimplePlaySoundStream/SimplePlaySoundStream.h
index 18e964be..4b81d826 100644
--- a/Samples/Audio/SimplePlaySoundStream/SimplePlaySoundStream.h
+++ b/Samples/Audio/SimplePlaySoundStream/SimplePlaySoundStream.h
@@ -63,7 +63,7 @@ class Sample final : public IXAudio2EngineCallback
 public:
 
     Sample() noexcept(false);
-    virtual ~Sample();
+    ~Sample();
 
     Sample(Sample&&) = delete;
     Sample& operator= (Sample&&) = delete;
diff --git a/Samples/Tools/RemoteIterationToolsSample/CopySearchOptions.cs b/Samples/Tools/RemoteIterationToolsSample/CopySearchOptions.cs
index 98e7fe0b..a4d70423 100644
--- a/Samples/Tools/RemoteIterationToolsSample/CopySearchOptions.cs
+++ b/Samples/Tools/RemoteIterationToolsSample/CopySearchOptions.cs
@@ -5,7 +5,9 @@ public class CopySearchOptions
         public string? IncludeFilePattern { get; set; }
         public string? ExcludeFilePattern { get; set; }
         public string? ExcludeDirPattern { get; set; }
-        public ulong IncludeFileAttributes { get; set; }
-        public ulong ExcludeFileAttributes { get; set; }
+        public uint IncludeFileAttributes { get; set; }
+        public uint ExcludeFileAttributes { get; set; }
+        public uint IncludeDirectoryAttributes { get; set; }
+        public uint ExcludeDirectoryAttributes { get; set; }
     }
 }
diff --git a/Samples/Tools/RemoteIterationToolsSample/DeleteOptions.cs b/Samples/Tools/RemoteIterationToolsSample/DeleteOptions.cs
new file mode 100644
index 00000000..8c047634
--- /dev/null
+++ b/Samples/Tools/RemoteIterationToolsSample/DeleteOptions.cs
@@ -0,0 +1,8 @@
+namespace RemoteIterationToolsSample
+{
+    public class DeleteOptions
+    {
+        public string? CommonRootAlias { get; init; }
+        public bool DeleteRootFolder { get; init; }
+    }
+}
diff --git a/Samples/Tools/RemoteIterationToolsSample/DeleteSearchOptions.cs b/Samples/Tools/RemoteIterationToolsSample/DeleteSearchOptions.cs
new file mode 100644
index 00000000..666e97a1
--- /dev/null
+++ b/Samples/Tools/RemoteIterationToolsSample/DeleteSearchOptions.cs
@@ -0,0 +1,13 @@
+namespace RemoteIterationToolsSample
+{
+    public class DeleteSearchOptions
+    {
+        public string? IncludeFilePattern { get; init; }
+        public string? ExcludeFilePattern { get; init; }
+        public string? ExcludeDirPattern { get; init; }
+        public ulong IncludeFileAttributes { get; init; }
+        public ulong ExcludeFileAttributes { get; init; }
+        public ulong IncludeDirAttributes { get; init; }
+        public ulong ExcludeDirAttributes { get; init; }
+    }
+}
diff --git a/Samples/Tools/RemoteIterationToolsSample/FileAttributeSelector.xaml b/Samples/Tools/RemoteIterationToolsSample/FileAttributeSelector.xaml
new file mode 100644
index 00000000..b6c12477
--- /dev/null
+++ b/Samples/Tools/RemoteIterationToolsSample/FileAttributeSelector.xaml
@@ -0,0 +1,23 @@
+<UserControl x:Class="RemoteIterationToolsSample.FileAttributeSelector"
+             x:Name="Selector"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             Focusable="False">
+    <GroupBox Header="{Binding Label, ElementName=Selector}" Foreground="White"
+              BorderThickness="0" Padding="0" Margin="0 4 0 8">
+        <WrapPanel>
+            <WrapPanel.Resources>
+                <Style TargetType="CheckBox">
+                    <Setter Property="Foreground" Value="White"/>
+                    <Setter Property="Margin" Value="0 4 16 4"/>
+                    <Setter Property="IsChecked" Value="False"/>
+                    <Setter Property="IsThreeState" Value="False"/>
+                </Style>
+            </WrapPanel.Resources>
+            <CheckBox x:Name="ReadOnlyCheckBox" Content="Read-only"/>
+            <CheckBox x:Name="HiddenCheckBox" Content="Hidden"/>
+            <CheckBox x:Name="SystemCheckBox" Content="System"/>
+            <CheckBox x:Name="ArchiveCheckBox" Content="Archive"/>
+        </WrapPanel>
+    </GroupBox>
+</UserControl>
diff --git a/Samples/Tools/RemoteIterationToolsSample/FileAttributeSelector.xaml.cs b/Samples/Tools/RemoteIterationToolsSample/FileAttributeSelector.xaml.cs
new file mode 100644
index 00000000..e7e583ea
--- /dev/null
+++ b/Samples/Tools/RemoteIterationToolsSample/FileAttributeSelector.xaml.cs
@@ -0,0 +1,40 @@
+using System.IO;
+using System.Windows;
+
+namespace RemoteIterationToolsSample
+{
+    public partial class FileAttributeSelector : System.Windows.Controls.UserControl
+    {
+        public static readonly DependencyProperty LabelProperty =
+            DependencyProperty.Register(nameof(Label), typeof(string), typeof(FileAttributeSelector), new PropertyMetadata(""));
+
+        public string Label
+        {
+            get => (string)GetValue(LabelProperty);
+            set => SetValue(LabelProperty, value);
+        }
+
+        public FileAttributeSelector()
+        {
+            InitializeComponent();
+        }
+
+        public uint Mask
+        {
+            get
+            {
+                // These four Windows flags are the subset supported by the RIT filters.
+                FileAttributes attributes = 0;
+                if (ReadOnlyCheckBox.IsChecked == true)
+                    attributes |= FileAttributes.ReadOnly;
+                if (HiddenCheckBox.IsChecked == true)
+                    attributes |= FileAttributes.Hidden;
+                if (SystemCheckBox.IsChecked == true)
+                    attributes |= FileAttributes.System;
+                if (ArchiveCheckBox.IsChecked == true)
+                    attributes |= FileAttributes.Archive;
+                return (uint)attributes;
+            }
+        }
+    }
+}
diff --git a/Samples/Tools/RemoteIterationToolsSample/MainWindow.Delete.xaml.cs b/Samples/Tools/RemoteIterationToolsSample/MainWindow.Delete.xaml.cs
new file mode 100644
index 00000000..21962da5
--- /dev/null
+++ b/Samples/Tools/RemoteIterationToolsSample/MainWindow.Delete.xaml.cs
@@ -0,0 +1,140 @@
+using System.Windows;
+using Windows.Win32.Foundation;
+
+namespace RemoteIterationToolsSample
+{
+    public partial class MainWindow
+    {
+        private async void Delete_Click(object sender, RoutedEventArgs e)
+        {
+            if (_activeOperation != null)
+                return;
+
+            string device = DeviceIpTextBox.Text.Trim();
+            string path = DeleteRemotePathTextBox.Text.Trim();
+            if (string.IsNullOrWhiteSpace(device) || string.IsNullOrWhiteSpace(path))
+            {
+                System.Windows.MessageBox.Show("Enter a device and a remote path.", "Delete inputs required");
+                return;
+            }
+
+            var options = new DeleteOptions
+            {
+                CommonRootAlias = DeleteCommonRootAliasTextBox.Text.Trim(),
+                DeleteRootFolder = DeleteRootFolderCheckBox.IsChecked == true
+            };
+            var filters = new DeleteSearchOptions
+            {
+                IncludeFilePattern = DeleteIncludeFilePatternTextBox.Text.Trim(),
+                ExcludeFilePattern = DeleteExcludeFilePatternTextBox.Text.Trim(),
+                ExcludeDirPattern = DeleteExcludeDirPatternTextBox.Text.Trim(),
+                IncludeFileAttributes = DeleteIncludeFileAttributesSelector.Mask,
+                ExcludeFileAttributes = DeleteExcludeFileAttributesSelector.Mask,
+                IncludeDirAttributes = DeleteIncludeDirAttributesSelector.Mask,
+                ExcludeDirAttributes = DeleteExcludeDirAttributesSelector.Mask
+            };
+            string confirmation = DescribeDeleteRequest(device, path, options, filters);
+            if (System.Windows.MessageBox.Show(this, confirmation + "\n\nDelete matching content?",
+                "Confirm remote deletion", MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.No) != MessageBoxResult.Yes)
+                return;
+
+            var operation = new OperationState("Delete", device, path)
+            {
+                DeleteOptions = options,
+                DeleteSearchOptions = filters
+            };
+            if (!BeginOperation(operation))
+                return;
+
+            try
+            {
+                AppendOutput("> Remote delete request\n" + confirmation + "\n\n");
+                operation.CreateCancellationHandle();
+                operation.DeleteActive = true;
+                StopWaitingDeleteButton.IsEnabled = true;
+                DeleteProgressBar.IsIndeterminate = true;
+                DeleteStatusText.Text = "Deleting...";
+                HRESULT hr = await RemoteIteration.DeleteAsync(
+                    operation.Device, operation.RemotePath, operation.DeleteOptions, operation.DeleteSearchOptions, operation.CancellationHandle);
+
+                operation.DeleteActive = false;
+                StopWaitingDeleteButton.IsEnabled = false;
+                DeleteStatusText.Text = DescribeDeleteResult(hr, operation.StopWaitingRequested);
+                AppendOutput($"\nDelete returned HRESULT 0x{hr.Value:X8}. {DeleteStatusText.Text}\n");
+            }
+            catch (Exception ex)
+            {
+                ShowOperationFailure(operation, ex);
+                DeleteStatusText.Text = DescribeDeleteResult(new HRESULT(ex.HResult), operation.StopWaitingRequested);
+            }
+            finally
+            {
+                operation.DeleteActive = false;
+                DeleteProgressBar.IsIndeterminate = false;
+                EndOperation(operation);
+            }
+        }
+
+        private static string DescribeDeleteRequest(string device, string path, DeleteOptions options, DeleteSearchOptions filters)
+        {
+            var activeFilters = new List<string>();
+            if (!string.IsNullOrEmpty(filters.IncludeFilePattern))
+                activeFilters.Add($"Include files: {filters.IncludeFilePattern}");
+            if (!string.IsNullOrEmpty(filters.ExcludeFilePattern))
+                activeFilters.Add($"Exclude files: {filters.ExcludeFilePattern}");
+            if (!string.IsNullOrEmpty(filters.ExcludeDirPattern))
+                activeFilters.Add($"Exclude directories: {filters.ExcludeDirPattern}");
+            if (filters.IncludeFileAttributes != 0)
+                activeFilters.Add($"Include file attributes: {filters.IncludeFileAttributes}");
+            if (filters.ExcludeFileAttributes != 0)
+                activeFilters.Add($"Exclude file attributes: {filters.ExcludeFileAttributes}");
+            if (filters.IncludeDirAttributes != 0)
+                activeFilters.Add($"Include directory attributes: {filters.IncludeDirAttributes}");
+            if (filters.ExcludeDirAttributes != 0)
+                activeFilters.Add($"Exclude directory attributes: {filters.ExcludeDirAttributes}");
+
+            return $"Device: {device}\nPath: {path}\n" +
+                $"Common Root alias: {(string.IsNullOrEmpty(options.CommonRootAlias) ? "(default)" : options.CommonRootAlias)}\n" +
+                $"Remove root folder: {(options.DeleteRootFolder ? "If empty" : "No")}\n" +
+                (activeFilters.Count == 0 ? "Filters: none" : "Folder filters:\n" + string.Join("\n", activeFilters));
+        }
+
+        private static string DescribeDeleteResult(HRESULT hr, bool stopWaitingRequested)
+        {
+            if (hr.Failed)
+                return "Delete request failed." + (stopWaitingRequested ? " Remote deletion may continue." : "");
+
+            // Normal completion and an observed stop-wait signal can both return S_OK.
+            return stopWaitingRequested
+                ? "Stopped waiting. Remote deletion may continue."
+                : "Delete request completed; some items may remain.";
+        }
+
+        private void StopWaitingDelete_Click(object sender, RoutedEventArgs e)
+        {
+            OperationState? operation = _activeOperation;
+            if (operation == null || !operation.DeleteActive || operation.StopWaitingRequested || operation.CancellationHandle == null)
+                return;
+
+            operation.StopWaitingRequested = true;
+            StopWaitingDeleteButton.IsEnabled = false;
+            DeleteStatusText.Text = "Stopping wait...";
+            try
+            {
+                // The nonblocking UI-thread signal cannot race the awaited call's handle disposal.
+                HRESULT hr = RemoteIteration.RequestDeleteStopWaiting(operation.CancellationHandle);
+                AppendOutput($"Stop-wait signal returned HRESULT 0x{hr.Value:X8}.\n");
+                if (hr.Failed)
+                {
+                    DeleteStatusText.Text = "Stop-wait signal failed; the client may still be waiting.";
+                    AppendOutput(DeleteStatusText.Text + "\n");
+                }
+            }
+            catch (Exception ex)
+            {
+                AppendOutput($"Stop-wait signal failed: {ex.Message} (HRESULT 0x{ex.HResult:X8}).\n");
+                DeleteStatusText.Text = "Stop-wait signal failed; the client may still be waiting.";
+            }
+        }
+    }
+}
diff --git a/Samples/Tools/RemoteIterationToolsSample/MainWindow.xaml b/Samples/Tools/RemoteIterationToolsSample/MainWindow.xaml
index ba21f09b..b7756368 100644
--- a/Samples/Tools/RemoteIterationToolsSample/MainWindow.xaml
+++ b/Samples/Tools/RemoteIterationToolsSample/MainWindow.xaml
@@ -3,15 +3,28 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:RemoteIterationToolsSample"
         mc:Ignorable="d"
         Title="Remote Deployment" Height="961" Width="752"
-        Background="#FF1E1E24" WindowStartupLocation="CenterScreen">
+        Background="#FF1E1E24" WindowStartupLocation="CenterScreen" Closing="Window_Closing">
     <Window.Resources>
         <SolidColorBrush x:Key="CardBackground" Color="#FF2C2C34"/>
         <SolidColorBrush x:Key="AccentBrush" Color="#FF4E9AF1"/>
         <Style TargetType="TextBlock">
             <Setter Property="Foreground" Value="White"/>
         </Style>
+        <Style x:Key="StepHeading" TargetType="TextBlock" BasedOn="{StaticResource {x:Type TextBlock}}">
+            <Setter Property="FontSize" Value="16"/>
+            <Setter Property="FontWeight" Value="SemiBold"/>
+            <Setter Property="Margin" Value="0 0 0 8"/>
+            <Setter Property="TextWrapping" Value="Wrap"/>
+        </Style>
+        <Style x:Key="GuidanceText" TargetType="TextBlock" BasedOn="{StaticResource {x:Type TextBlock}}">
+            <Setter Property="FontSize" Value="12"/>
+            <Setter Property="Foreground" Value="#AAAAAA"/>
+            <Setter Property="Margin" Value="0 0 0 6"/>
+            <Setter Property="TextWrapping" Value="Wrap"/>
+        </Style>
         <Style TargetType="TextBox">
             <Setter Property="Margin" Value="0 4 0 12"/>
             <Setter Property="Padding" Value="8"/>
@@ -88,16 +101,17 @@
         </Style>
     </Window.Resources>
 
-    <ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto">
+    <ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled">
         <Grid Margin="28">
             <Grid.RowDefinitions>
+                <RowDefinition Height="Auto"/>
                 <RowDefinition Height="Auto"/>
                 <RowDefinition Height="Auto"/>
                 <RowDefinition Height="*" MinHeight="200"/>
             </Grid.RowDefinitions>
 
             <!-- Header -->
-            <TextBlock Grid.Row="0" Text="Remote Iteration Tools" FontSize="26" FontWeight="SemiBold"/>
+            <TextBlock Grid.Row="0" Text="Remote Iteration Tools" FontSize="26" FontWeight="SemiBold" TextWrapping="Wrap"/>
 
             <!-- Inputs Card -->
             <Border Grid.Row="1" Background="{StaticResource CardBackground}" Padding="20" CornerRadius="10" Margin="0 20 0 16">
@@ -117,92 +131,190 @@
                         <RowDefinition Height="Auto"/>
                     </Grid.RowDefinitions>
 
-                    <StackPanel Grid.ColumnSpan="2" Grid.Row="0">
-                        <TextBlock Text="Device" FontWeight="Bold" Margin="0 0 0 4"/>
-                        <TextBox x:Name="DeviceIpTextBox" ToolTip="e.g. 192.168.1.25" Width="224" HorizontalAlignment="Left" AutomationProperties.Name="Device name or IP address"/>
+                    <StackPanel x:Name="DeviceInputs" Grid.ColumnSpan="2" Grid.Row="0">
+                        <TextBlock Text="1. Choose a paired device" Style="{StaticResource StepHeading}"/>
+                        <TextBlock Text="Device (IP address or host name)" FontWeight="Bold" Margin="0 0 0 4"/>
+                        <TextBlock Text="Use a target with Remote Tools running, already paired with this PC. Example: 192.168.1.100 or MyDevPC."
+                                   Style="{StaticResource GuidanceText}"/>
+                        <TextBox x:Name="DeviceIpTextBox" ToolTip="IP address or resolvable host name of an already-paired device. This sample does not discover or pair devices." Width="224" HorizontalAlignment="Left" AutomationProperties.Name="Device name or IP address"/>
                     </StackPanel>
 
-                    <StackPanel Grid.Row="1" Grid.Column="0" Margin="0 8 0 0">
-                        <TextBlock Text="Source Folder" FontWeight="Bold" Margin="0 0 0 4"/>
-                        <DockPanel>
-                            <TextBox x:Name="FolderPathTextBox" MinWidth="420" ToolTip="Type a path or use Browse to select a folder" Width="524" Height="40" AutomationProperties.Name="Source folder path"/>
-                            <Button Content="Browse" Click="BrowseFolder_Click" DockPanel.Dock="Left" MinWidth="100" Height="40" Margin="10,0,0,10" HorizontalAlignment="Left" AutomationProperties.Name="Browse for source folder"/>
-                        </DockPanel>
+                    <StackPanel x:Name="SourceInputs" Grid.Row="1" Grid.Column="0" Margin="0 8 0 0">
+                        <TextBlock Text="2. Deploy a local build" Style="{StaticResource StepHeading}"/>
+                        <TextBlock Text="Source Folder (this PC)" FontWeight="Bold" Margin="0 0 0 4"/>
+                        <TextBlock Text="Local folder containing your build, e.g. C:\Builds\MyGame." Style="{StaticResource GuidanceText}"/>
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*" MaxWidth="524"/>
+                                <ColumnDefinition Width="Auto"/>
+                            </Grid.ColumnDefinitions>
+                            <TextBox x:Name="FolderPathTextBox" ToolTip="Type a path or use Browse to select a folder" Height="40" AutomationProperties.Name="Source folder path"/>
+                            <Button Grid.Column="1" Content="Browse" Click="BrowseFolder_Click" MinWidth="100" Height="40" Margin="10,0,0,10" HorizontalAlignment="Left" AutomationProperties.Name="Browse for source folder"/>
+                        </Grid>
                     </StackPanel>
 
-                    <StackPanel Grid.Row="2" Grid.Column="0" Margin="0 8 0 0">
-                        <TextBlock Text="Destination Folder" FontWeight="Bold" Margin="0 0 0 4"/>
-                        <DockPanel>
-                            <TextBox x:Name="DestinationPathTextBox" MinWidth="420" ToolTip="Remote destination relative to game root" Width="524" HorizontalAlignment="Left" AutomationProperties.Name="Destination folder path"/>
-                        </DockPanel>
+                    <StackPanel x:Name="DestinationInputs" Grid.Row="2" Grid.Column="0" Margin="0 8 0 0">
+                        <TextBlock Text="Destination Folder (device)" FontWeight="Bold" Margin="0 0 0 4"/>
+                        <TextBlock Text="Example: MyGame under the device's default Common Root, or an absolute path on the device."
+                                   Style="{StaticResource GuidanceText}"/>
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*" MaxWidth="524"/>
+                            </Grid.ColumnDefinitions>
+                            <TextBox x:Name="DestinationPathTextBox" ToolTip="Remote destination relative to the device's default Common Root, or an absolute device path." AutomationProperties.Name="Destination folder path"/>
+                        </Grid>
                     </StackPanel>
 
-                    <Expander Grid.Row="3" Grid.ColumnSpan="2" Header="Advanced Options" IsExpanded="False" Margin="0 8 0 0" Foreground="White" Style="{StaticResource ArrowExpander}">
-                        <StackPanel Margin="0 8 0 0">
-                            <TextBlock Text="Include File Pattern" FontWeight="Bold" Margin="0 0 0 4" 
-                   ToolTip="Includes files that match the exact specified names. Wildcard characters * and ? are supported. List of patterns can be separated by semicolon (;). Files with spaces in the name must be quoted. Default is everything is included."/>
-                            <TextBox x:Name="IncludeFilePatternTextBox" MinWidth="420" Width="524" HorizontalAlignment="Left" AutomationProperties.Name="Include file pattern" 
-                  ToolTip="Includes files that match the exact specified names. Wildcard characters * and ? are supported. List of patterns can be separated by semicolon (;). Files with spaces in the name must be quoted. Default is everything is included."/>
-
-                            <TextBlock Text="Exclude File Pattern" FontWeight="Bold" Margin="0 0 0 4" 
-                  ToolTip="Excludes files that match the exact specified names. Wildcard characters * and ? are supported. List of patterns can be separated by semicolon (;). Files with spaces in the name must be quoted. Default is empty (no excluded files)."/>
-                            <TextBox x:Name="ExcludeFilePatternTextBox" MinWidth="420" Width="524" HorizontalAlignment="Left" AutomationProperties.Name="Exclude file pattern" 
-                  ToolTip="Excludes files that match the exact specified names. Wildcard characters * and ? are supported. List of patterns can be separated by semicolon (;). Files with spaces in the name must be quoted. Default is empty (no excluded files)."/>
-
-                            <TextBlock Text="Exclude Directory Pattern" FontWeight="Bold" Margin="0 0 0 4" 
-                  ToolTip="Excludes directories that match the specified names and paths. Wildcard characters * and ? are supported. Default is empty, no excluded directories from being copied."/>
-                            <TextBox x:Name="ExcludeDirPatternTextBox" MinWidth="420" Width="524" HorizontalAlignment="Left" AutomationProperties.Name="Exclude directory pattern" 
-                  ToolTip="Excludes directories that match the specified names and paths. Wildcard characters * and ? are supported. Default is empty, no excluded directories from being copied."/>
-
-                            <TextBlock Text="Include File Attributes" FontWeight="Bold" Margin="0 0 0 4" 
-                  ToolTip="Include files for which any of the specified file attributes are set. Supported options are FILE_ATTRIBUTE_READONLY, FILE_ATTRIBUTE_ARCHIVE, FILE_ATTRIBUTE_SYSTEM, and FILE_ATTRIBUTE_HIDDEN. Default is 0 (All attributes are included)."/>
-                            <TextBox x:Name="IncludeFileAttributesTextBox" MinWidth="420" Width="524" HorizontalAlignment="Left" AutomationProperties.Name="Include file attributes" 
-                  ToolTip="Include files for which any of the specified file attributes are set. Supported options are FILE_ATTRIBUTE_READONLY, FILE_ATTRIBUTE_ARCHIVE, FILE_ATTRIBUTE_SYSTEM, and FILE_ATTRIBUTE_HIDDEN. Default is 0 (All attributes are included)."/>
-
-                            <TextBlock Text="Exclude File Attributes" FontWeight="Bold" Margin="0 0 0 4" 
-                  ToolTip="Exclude files for which any of the specified file attributes are set. Supported options are FILE_ATTRIBUTE_READONLY, FILE_ATTRIBUTE_ARCHIVE, FILE_ATTRIBUTE_SYSTEM, and FILE_ATTRIBUTE_HIDDEN. Default is 0 (no attributes excluded)."/>
-                            <TextBox x:Name="ExcludeFileAttributesTextBox" MinWidth="420" Width="524" HorizontalAlignment="Left" AutomationProperties.Name="Exclude file attributes" 
-                  ToolTip="Exclude files for which any of the specified file attributes are set. Supported options are FILE_ATTRIBUTE_READONLY, FILE_ATTRIBUTE_ARCHIVE, FILE_ATTRIBUTE_SYSTEM, and FILE_ATTRIBUTE_HIDDEN. Default is 0 (no attributes excluded)."/>
-                        </StackPanel>
+                    <Expander x:Name="AdvancedOptions" Grid.Row="3" Grid.ColumnSpan="2" Header="Advanced Options" IsExpanded="False" Margin="0 8 0 0" Foreground="White" Style="{StaticResource ArrowExpander}">
+                        <Grid Margin="0 8 0 0">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*" MaxWidth="524"/>
+                            </Grid.ColumnDefinitions>
+                            <StackPanel>
+                                <TextBlock Text="Optional copy filters. Leave patterns blank and attributes unchecked for an unfiltered deployment."
+                                           Style="{StaticResource GuidanceText}"/>
+                                <TextBlock Text="Include File Pattern" FontWeight="Bold" Margin="0 0 0 4"
+                                           ToolTip="Includes files that match the specified names. Wildcards * and ? and semicolon-separated patterns are supported. Default includes everything. Exclusions take precedence over inclusions."/>
+                                <TextBox x:Name="IncludeFilePatternTextBox" AutomationProperties.Name="Include file pattern"
+                                         ToolTip="Includes files that match the specified names. Wildcards * and ? and semicolon-separated patterns are supported. Default includes everything. Exclusions take precedence over inclusions."/>
+
+                                <TextBlock Text="Exclude File Pattern" FontWeight="Bold" Margin="0 0 0 4"
+                                           ToolTip="Excludes files that match the specified names. Wildcards * and ? and semicolon-separated patterns are supported. Default excludes nothing. Exclusions take precedence over inclusions."/>
+                                <TextBox x:Name="ExcludeFilePatternTextBox" AutomationProperties.Name="Exclude file pattern"
+                                         ToolTip="Excludes files that match the specified names. Wildcards * and ? and semicolon-separated patterns are supported. Default excludes nothing. Exclusions take precedence over inclusions."/>
+
+                                <TextBlock Text="Exclude Directory Pattern" FontWeight="Bold" Margin="0 0 0 4"
+                                           ToolTip="Excludes directories by name, not path. Wildcards * and ? are supported. Default excludes no directories. Exclusions take precedence over inclusions."/>
+                                <TextBox x:Name="ExcludeDirPatternTextBox" AutomationProperties.Name="Exclude directory pattern"
+                                         ToolTip="Excludes directories by name, not path. Wildcards * and ? are supported. Default excludes no directories. Exclusions take precedence over inclusions."/>
+
+                                <TextBlock Text="Match any selected attribute. No selection means no attribute filtering; exclusions win."
+                                           Style="{StaticResource GuidanceText}"/>
+                                <local:FileAttributeSelector x:Name="IncludeFileAttributesSelector" Label="Include file attributes"
+                                                             AutomationProperties.Name="Copy include file attributes"/>
+                                <local:FileAttributeSelector x:Name="ExcludeFileAttributesSelector" Label="Exclude file attributes"
+                                                             AutomationProperties.Name="Copy exclude file attributes"/>
+                            </StackPanel>
+                        </Grid>
                     </Expander>
 
-                    <StackPanel Grid.Row="4" Grid.Column="0" Margin="0 8 0 0" Orientation="Horizontal">
-                        <Button Content="Deploy" MinWidth="120" Height="35" HorizontalAlignment="Left" Click="Deploy_Click" Grid.ColumnSpan="2" AutomationProperties.Name="Deploy build"/>
-                        <Button Content="Cancel" MinWidth="120" Height="35" HorizontalAlignment="Left" Click="Cancel_Click" Grid.ColumnSpan="2" AutomationProperties.Name="Cancel deployment"/>
+                    <StackPanel Grid.Row="4" Grid.Column="0" Margin="0 8 0 0">
+                        <TextBlock Text="Deploy copies the build, then validates its remote path. It does not install or register the game. Cancel requests cancellation; wait for the final result."
+                                   Style="{StaticResource GuidanceText}"/>
+                        <WrapPanel>
+                            <Button x:Name="DeployButton" Content="Deploy" MinWidth="120" Height="35" HorizontalAlignment="Left" Click="Deploy_Click" Grid.ColumnSpan="2" AutomationProperties.Name="Deploy build"/>
+                            <Button x:Name="CancelButton" Content="Cancel" IsEnabled="False" MinWidth="120" Height="35" HorizontalAlignment="Left" Click="Cancel_Click" Grid.ColumnSpan="2" AutomationProperties.Name="Cancel deployment" ToolTip="Request copy cancellation, then wait for the native result. This does not confirm a complete deployment."/>
+                        </WrapPanel>
                     </StackPanel>
 
                     <StackPanel Grid.Row="5" Grid.Column="0" Margin="0 8 0 0" x:Name="ProgressPanel" Visibility="Visible" Grid.ColumnSpan="2">
-                        <TextBlock x:Name="ProgressStatusText" Text="Deploy Progress" FontSize="12" Margin="0 0 0 4" Foreground="#AAAAAA"/>
+                        <TextBlock x:Name="ProgressStatusText" Text="Deploy Progress" FontSize="12" Margin="0 0 0 4" Foreground="#AAAAAA" TextWrapping="Wrap"/>
                         <ProgressBar x:Name="DeploymentProgressBar" HorizontalAlignment="Stretch" Height="20" Minimum="0" Maximum="100" Value="0" Background="#222" Foreground="{StaticResource AccentBrush}" BorderBrush="#555" BorderThickness="1" AutomationProperties.Name="Deployment progress"/>
                         <TextBlock x:Name="ProgressPercentText" Text="0%" FontSize="11" Margin="0 4 25 0" Foreground="#AAAAAA" HorizontalAlignment="Right"/>
                     </StackPanel>
 
-                    <StackPanel Grid.Row="6" Grid.Column="0" Margin="0 8 0 0" >
-                        <TextBlock Text="Executable to launch" FontWeight="Bold" Margin="0 0 0 4"/>
-                        <DockPanel>
-                            <TextBox x:Name="ExecutablePathTextBox" MinWidth="420" ToolTip="Remote path relative to game root" Width="524" HorizontalAlignment="Left" AutomationProperties.Name="Executable path"/>
-                        </DockPanel>
+                    <StackPanel x:Name="ExecutableInputs" Grid.Row="6" Grid.Column="0" Margin="0 8 0 0" >
+                        <TextBlock Text="3. Launch and control the remote game" Style="{StaticResource StepHeading}"/>
+                        <TextBlock Text="Executable to launch (device)" FontWeight="Bold" Margin="0 0 0 4"/>
+                        <TextBlock Text="Example: MyGame\MyGame.exe. Relative paths start at the device's default Common Root, not Destination Folder. Absolute device paths also work."
+                                   Style="{StaticResource GuidanceText}"/>
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*" MaxWidth="524"/>
+                            </Grid.ColumnDefinitions>
+                            <TextBox x:Name="ExecutablePathTextBox" ToolTip="Remote executable relative to the device's default Common Root, or an absolute device path. This is not relative to Destination Folder." AutomationProperties.Name="Executable path"/>
+                        </Grid>
                     </StackPanel>
 
-                    <StackPanel Grid.Row="7" Grid.Column="0" Margin="0 8 0 0" Orientation="Horizontal">
-                        <Button Content="Launch" MinWidth="120" Height="35" HorizontalAlignment="Left" Click="Launch_Click" Grid.ColumnSpan="2" AutomationProperties.Name="Launch game"/>
-                        <Button Content="Launch Suspended" MinWidth="120" Height="35" HorizontalAlignment="Left" Click="LaunchSuspended_Click" Grid.ColumnSpan="2" AutomationProperties.Name="Launch game suspended"/>
-                        <Button Content="Resume" MinWidth="120" Height="35" HorizontalAlignment="Left" Click="Resume_Click" Grid.ColumnSpan="2" AutomationProperties.Name="Resume game"/>
-                        <Button Content="Terminate" MinWidth="120" Height="35" HorizontalAlignment="Left" Click="Terminate_Click" Grid.ColumnSpan="2" AutomationProperties.Name="Terminate game"/>
+                    <StackPanel x:Name="GameActions" Grid.Row="7" Grid.Column="0" Margin="0 8 0 0">
+                        <TextBlock Text="Deploy first, or use an existing build on the device. Choose Launch, or Launch Suspended then Resume. Terminate stops the last game launched through this API on that device."
+                                   Style="{StaticResource GuidanceText}"/>
+                        <WrapPanel>
+                            <Button Content="Launch" MinWidth="120" Height="35" HorizontalAlignment="Left" Click="Launch_Click" Grid.ColumnSpan="2" AutomationProperties.Name="Launch game"/>
+                            <Button Content="Launch Suspended" MinWidth="120" Height="35" HorizontalAlignment="Left" Click="LaunchSuspended_Click" Grid.ColumnSpan="2" AutomationProperties.Name="Launch game suspended"/>
+                            <Button Content="Resume" MinWidth="120" Height="35" HorizontalAlignment="Left" Click="Resume_Click" Grid.ColumnSpan="2" AutomationProperties.Name="Resume game"/>
+                            <Button Content="Terminate" MinWidth="120" Height="35" HorizontalAlignment="Left" Click="Terminate_Click" Grid.ColumnSpan="2" AutomationProperties.Name="Terminate game"/>
+                        </WrapPanel>
                     </StackPanel>
                 </Grid>
             </Border>
 
+            <Border Grid.Row="2" Background="{StaticResource CardBackground}" Padding="20" CornerRadius="10" Margin="0 0 0 16">
+                <StackPanel>
+                    <TextBlock Text="Remote deletion (optional)" Style="{StaticResource StepHeading}"/>
+                    <TextBlock Text="Delete files or folder contents on the selected device."
+                               Style="{StaticResource GuidanceText}"/>
+                    <Grid x:Name="DeleteInputs">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" MaxWidth="524"/>
+                        </Grid.ColumnDefinitions>
+                        <StackPanel>
+                            <TextBlock Text="Device (selected above)" FontWeight="Bold"/>
+                            <TextBlock Text="{Binding Text, ElementName=DeviceIpTextBox}" TextWrapping="Wrap" Margin="0 0 0 12"
+                                       AutomationProperties.Name="Remote delete device"/>
+                            <TextBlock Text="Remote folder or single-file path to delete" FontWeight="Bold" TextWrapping="Wrap"/>
+                            <TextBox x:Name="DeleteRemotePathTextBox" AutomationProperties.Name="Remote path to delete"
+                                     ToolTip="Relative to a Common Root, or an absolute path on the device."/>
+                            <TextBlock Text="Common Root alias (optional)" FontWeight="Bold"/>
+                            <TextBox x:Name="DeleteCommonRootAliasTextBox" AutomationProperties.Name="Delete Common Root alias"
+                                     ToolTip="Blank uses the default Common Root. Ignored for absolute paths."/>
+                            <CheckBox x:Name="DeleteRootFolderCheckBox" IsChecked="False" Foreground="White" Margin="0 0 0 12"
+                                      HorizontalContentAlignment="Stretch" AutomationProperties.Name="Remove delete root folder"
+                                      ToolTip="Applies to folder targets only.">
+                                <TextBlock Text="Remove root folder if empty" TextWrapping="Wrap"/>
+                            </CheckBox>
+                            <Expander x:Name="DeleteFiltersExpander" Header="Delete filters (folders only)" Style="{StaticResource ArrowExpander}" Foreground="White" Margin="0 0 0 12">
+                                <StackPanel Margin="0 8 0 0">
+                                    <TextBlock Text="Ignored for single-file targets. Exclusions take precedence."
+                                               Style="{StaticResource GuidanceText}"/>
+                                    <TextBlock Text="Include file pattern" FontWeight="Bold"/>
+                                    <TextBox x:Name="DeleteIncludeFilePatternTextBox" AutomationProperties.Name="Delete include file pattern"
+                                             ToolTip="Names with * and ? wildcards; separate patterns with semicolons. Blank includes all."/>
+                                    <TextBlock Text="Exclude file pattern" FontWeight="Bold"/>
+                                    <TextBox x:Name="DeleteExcludeFilePatternTextBox" AutomationProperties.Name="Delete exclude file pattern"
+                                             ToolTip="Names with * and ? wildcards; separate patterns with semicolons. Blank excludes none."/>
+                                    <TextBlock Text="Exclude directory names" FontWeight="Bold"/>
+                                    <TextBox x:Name="DeleteExcludeDirPatternTextBox" AutomationProperties.Name="Delete exclude directory pattern"
+                                             ToolTip="Directory names, not paths. Supports * and ? wildcards. Blank excludes none."/>
+                                    <TextBlock Text="Match any selected attribute. No selection means no attribute filtering."
+                                               Style="{StaticResource GuidanceText}"/>
+                                    <local:FileAttributeSelector x:Name="DeleteIncludeFileAttributesSelector" Label="Include file attributes"
+                                                                 AutomationProperties.Name="Delete include file attributes"/>
+                                    <local:FileAttributeSelector x:Name="DeleteExcludeFileAttributesSelector" Label="Exclude file attributes"
+                                                                 AutomationProperties.Name="Delete exclude file attributes"/>
+                                    <local:FileAttributeSelector x:Name="DeleteIncludeDirAttributesSelector" Label="Include directory attributes"
+                                                                 AutomationProperties.Name="Delete include directory attributes"/>
+                                    <local:FileAttributeSelector x:Name="DeleteExcludeDirAttributesSelector" Label="Exclude directory attributes"
+                                                                 AutomationProperties.Name="Delete exclude directory attributes"/>
+                                </StackPanel>
+                            </Expander>
+                        </StackPanel>
+                    </Grid>
+                    <WrapPanel>
+                        <Button x:Name="DeleteButton" Content="Delete..." Click="Delete_Click" MinWidth="120" Height="35"
+                                AutomationProperties.Name="Delete remote content" ToolTip="Review the request before deleting."/>
+                        <Button x:Name="StopWaitingDeleteButton" Content="Stop waiting" Click="StopWaitingDelete_Click" IsEnabled="False" MinWidth="120" Height="35"
+                                AutomationProperties.Name="Stop waiting for delete" ToolTip="Stops the client wait, not deletion already started on the endpoint."/>
+                    </WrapPanel>
+                    <ProgressBar x:Name="DeleteProgressBar" Height="12" IsIndeterminate="False" Value="0" AutomationProperties.Name="Delete request activity"/>
+                    <TextBlock x:Name="DeleteStatusText" Text="No delete request active." TextWrapping="Wrap" Margin="0 8 0 0"/>
+                </StackPanel>
+            </Border>
+
             <!-- Output Area -->
-            <Border Grid.Row="2" Background="{StaticResource CardBackground}" Padding="16" CornerRadius="10" Margin="0">
+            <Border Grid.Row="3" Background="{StaticResource CardBackground}" Padding="16" CornerRadius="10" Margin="0">
                 <Grid>
                     <Grid.RowDefinitions>
                         <RowDefinition Height="Auto"/>
                         <RowDefinition Height="*"/>
                     </Grid.RowDefinitions>
-                    <TextBlock Text="Command Output" FontWeight="Bold" Margin="0 0 0 8"/>
+                    <StackPanel>
+                        <TextBlock Text="Command Output" FontWeight="Bold" Margin="0 0 0 8"/>
+                        <TextBlock Text="Read the final result here and in the status above. Progress alone does not confirm completion."
+                                   Style="{StaticResource GuidanceText}"/>
+                    </StackPanel>
 
-                    <TextBox x:Name="OutputTextBox" Grid.Row="1" MaxHeight="300" TextWrapping="Wrap" IsReadOnly="True" AcceptsReturn="True" VerticalScrollBarVisibility="Auto" Background="#00111111" BorderThickness="0" FontFamily="Consolas" Foreground="#DDDDDD" AutomationProperties.Name="Command output"/>
+                    <TextBox x:Name="OutputTextBox" Grid.Row="1" MaxHeight="300" TextWrapping="Wrap" IsReadOnly="True" AcceptsReturn="True" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled" Background="#00111111" BorderThickness="0" FontFamily="Consolas" Foreground="#DDDDDD" AutomationProperties.Name="Command output"/>
                 </Grid>
             </Border>
         </Grid>
diff --git a/Samples/Tools/RemoteIterationToolsSample/MainWindow.xaml.cs b/Samples/Tools/RemoteIterationToolsSample/MainWindow.xaml.cs
index 0174f4bd..1b6f0fdc 100644
--- a/Samples/Tools/RemoteIterationToolsSample/MainWindow.xaml.cs
+++ b/Samples/Tools/RemoteIterationToolsSample/MainWindow.xaml.cs
@@ -1,30 +1,29 @@
-using Microsoft.Gaming.WdRemoteApi;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using System.Text;
+using Microsoft.Gaming.WdRemoteApi;
+using System.ComponentModel;
 using System.Windows;
+using System.Windows.Threading;
 using Windows.Win32.Foundation;
 
 namespace RemoteIterationToolsSample
 {
-    /// <summary>
-    /// Interaction logic for MainWindow.xaml
-    /// </summary>
     public partial class MainWindow : Window
     {
-        private WdCancellationHandleWrapper? _cancellationHandleWrapper;
-        
-        private static ulong _totalBytesToDeploy = 0;
-
-        private ProcThreadId _remoteProcessId;
+        private const int OutputBatchSize = 128;
+        private OperationState? _activeOperation;
+        private readonly DispatcherTimer _progressTimer;
 
         public MainWindow()
         {
             InitializeComponent();
+            _progressTimer = new DispatcherTimer { Interval = TimeSpan.FromMilliseconds(100) };
+            _progressTimer.Tick += ProgressTimer_Tick;
         }
 
         private void BrowseFolder_Click(object sender, RoutedEventArgs e)
         {
+            if (_activeOperation != null)
+                return;
+
             using var dialog = new System.Windows.Forms.FolderBrowserDialog();
             dialog.Description = "Select folder to deploy";
             dialog.UseDescriptionForTitle = true;
@@ -34,385 +33,357 @@ private void BrowseFolder_Click(object sender, RoutedEventArgs e)
             }
         }
 
-        [UnmanagedCallersOnly(CallConvs = new[] { typeof(CallConvStdcall) })]
-        public unsafe static HRESULT FileProgressUpdate(
-            nuint fileProgressCount,
-            WdCopyFileProgressInfo* fileUpdates,
-            WdCopyOperationSummary* summary,
-            void* context)
+        private bool BeginOperation(OperationState operation)
         {
-            try
+            if (_activeOperation != null)
+                return false;
+
+            _activeOperation = operation;
+            SetInputsEnabled(false);
+            OutputTextBox.Clear();
+            return true;
+        }
+
+        private void EndOperation(OperationState operation)
+        {
+            _progressTimer.Stop();
+            operation.Dispose();
+            if (ReferenceEquals(_activeOperation, operation))
             {
-                if (fileUpdates == null || fileProgressCount == 0)
-                {
-                    return new HRESULT(0);
-                }
+                _activeOperation = null;
+                CancelButton.IsEnabled = false;
+                StopWaitingDeleteButton.IsEnabled = false;
+                SetInputsEnabled(true);
+            }
+        }
 
-                _totalBytesToDeploy = summary->totalByteCount;
+        private void SetInputsEnabled(bool enabled)
+        {
+            DeviceInputs.IsEnabled = enabled;
+            SourceInputs.IsEnabled = enabled;
+            DestinationInputs.IsEnabled = enabled;
+            AdvancedOptions.IsEnabled = enabled;
+            DeployButton.IsEnabled = enabled;
+            ExecutableInputs.IsEnabled = enabled;
+            GameActions.IsEnabled = enabled;
+            DeleteInputs.IsEnabled = enabled;
+            DeleteButton.IsEnabled = enabled;
+        }
 
-                var fileProgressLines = new List<string>();
-                ulong deployedBytes = summary->bytesTransferredCount;
+        private void Window_Closing(object? sender, CancelEventArgs e)
+        {
+            if (_activeOperation == null)
+                return;
 
-                for (nuint i = 0; i < fileProgressCount; i++)
-                {
-                    WdCopyFileProgressInfo* info = &fileUpdates[i];
-                    string? filePath = info->relativeFilePath.ToString();
+            e.Cancel = true;
+            AppendOutput("\nWait for the active operation to return before closing. " +
+                "If it appears stalled, choose Cancel for copy or Stop waiting for delete when available, then wait for the call to return. " +
+                "If it remains unresponsive, end RemoteIterationToolsSample.exe in Task Manager as a last resort. " +
+                "Force-closing does not undo completed transfers or deletions, or confirm that the remote operation stopped.\n");
+        }
 
-                    if (info->fileSize > 0)
-                    {
-                        double pct = (double)info->bytesTransferred / info->fileSize * 100;
-                        if (info->bytesTransferred == info->fileSize)
-                        {
-                            fileProgressLines.Add($"[Completed] {filePath}\n");
-                        }
-                        else
-                        {
-                            fileProgressLines.Add($"[Deploy] {filePath} ({info->bytesTransferred:N0} / {info->fileSize:N0} bytes - {pct:F1}%)\n");
-                        }
-                    }
-                    else
-                    {
-                        fileProgressLines.Add($"[Completed] {filePath}\n");
-                    }
-                }
+        private void ProgressTimer_Tick(object? sender, EventArgs e)
+        {
+            OperationState? operation = _activeOperation;
+            if (operation == null || !operation.CopyActive)
+                return;
 
-                ulong totalFiles = summary->totalFileCount;
-                ulong totalBytes = summary->totalByteCount;
-                ulong filesCompleted = summary->filesCompletedCount;
+            if (!DrainCopyUpdates(operation))
+                _progressTimer.Stop();
+        }
 
-                System.Windows.Application.Current?.Dispatcher.InvokeAsync(() =>
+        private bool DrainCopyUpdates(OperationState operation)
+        {
+            if (!ReferenceEquals(_activeOperation, operation))
+                return false;
+
+            try
+            {
+                string output = operation.TakeOutputBatch(OutputBatchSize);
+                Exception? callbackFailure = operation.CallbackFailure;
+                if (callbackFailure != null && !operation.CallbackFailureReported)
+                    output += FormatCallbackFailure(callbackFailure);
+                if (output.Length > 0)
+                    AppendOutput(output);
+                if (callbackFailure != null)
+                    operation.CallbackFailureReported = true;
+
+                if (operation.LatestSummary is WdCopyOperationSummary summary)
                 {
-                    var mainWindow = System.Windows.Application.Current?.MainWindow as MainWindow;
-                    if (mainWindow != null)
+                    double percentage = summary.totalByteCount == 0
+                        ? 0
+                        : Math.Min((double)summary.bytesTransferredCount / summary.totalByteCount * 100, 100);
+                    DeploymentProgressBar.Value = percentage;
+                    ProgressPercentText.Text = $"{percentage:F1}%";
+                    if (!operation.CancellationRequested)
                     {
-                        foreach (var line in fileProgressLines)
-                        {
-                            mainWindow.AppendOutput(line);
-                        }
-
-                        if (totalBytes > 0)
-                        {
-                            double overallProgress = Math.Min((double)deployedBytes / totalBytes * 100, 100.0);
-                            mainWindow.DeploymentProgressBar.Value = overallProgress;
-                            mainWindow.ProgressPercentText.Text = $"{overallProgress:F1}%";
-
-                            if (filesCompleted >= totalFiles)
-                            {
-                                mainWindow.ProgressStatusText.Text = "Deployment completed.";
-                            }
-                            else
-                            {
-                                mainWindow.ProgressStatusText.Text = $"Deployed {deployedBytes:N0} / {totalBytes:N0} bytes ({filesCompleted:N0} / {totalFiles:N0} files)";
-                            }
-                        }
+                        ProgressStatusText.Text =
+                            $"Copied {summary.bytesTransferredCount:N0} / {summary.totalByteCount:N0} bytes " +
+                            $"({summary.filesCompletedCount:N0} / {summary.totalFileCount:N0} files); " +
+                            (operation.CopyActive ? "waiting for copy result." : "displaying remaining copy output.");
                     }
-                }, System.Windows.Threading.DispatcherPriority.Background);
+                }
+                return true;
+            }
+            catch (Exception ex)
+            {
+                // WPF processing errors need the same visible outcome as native callback errors.
+                operation.RecordCallbackFailure(ex);
+                ReportCallbackFailure(operation);
+                return false;
+            }
+        }
+
+        private async Task DrainRemainingCopyUpdatesAsync(OperationState operation)
+        {
+            while (ReferenceEquals(_activeOperation, operation))
+            {
+                if (!DrainCopyUpdates(operation) || !operation.HasPendingOutput)
+                    return;
 
-                return new HRESULT(0);
+                // Let input and rendering run between batches, even after the native call returns.
+                await System.Windows.Threading.Dispatcher.Yield(DispatcherPriority.Background);
             }
-            catch
+        }
+
+        private static string FormatCallbackFailure(Exception ex) =>
+            $"\n✗ Callback processing failed: {ex.Message} (HRESULT 0x{ex.HResult:X8}). " +
+            "A callback failure does not stop native copy or replace its final HRESULT.\n";
+
+        private void ReportCallbackFailure(OperationState operation)
+        {
+            if (operation.CallbackFailure is Exception ex && !operation.CallbackFailureReported)
             {
-                return new HRESULT(-1);
+                operation.CallbackFailureReported = true;
+                AppendOutput(FormatCallbackFailure(ex));
             }
         }
 
         private async void Deploy_Click(object sender, RoutedEventArgs e)
         {
+            if (_activeOperation != null)
+                return;
+
             string ip = DeviceIpTextBox.Text.Trim();
             string folder = FolderPathTextBox.Text.Trim();
             string destination = DestinationPathTextBox.Text.Trim();
-
-            if (string.IsNullOrWhiteSpace(ip))
+            if (string.IsNullOrWhiteSpace(ip) || string.IsNullOrWhiteSpace(folder) || string.IsNullOrWhiteSpace(destination))
             {
-                System.Windows.MessageBox.Show("Please enter a device name or IP Address.");
+                System.Windows.MessageBox.Show("Enter a device, a local source folder, and a remote destination folder.");
                 return;
             }
-            if (string.IsNullOrWhiteSpace(folder))
-            {
-                System.Windows.MessageBox.Show("Select a deployment folder.");
-                return;
-            }
-            if (string.IsNullOrWhiteSpace(destination))
-            {
-                System.Windows.MessageBox.Show("Enter destination folder name.");
-                return;
-            }
-
-            _cancellationHandleWrapper = new WdCancellationHandleWrapper();
 
-            
-            // Disable deploy button during deployment
-            var deployButton = sender as System.Windows.Controls.Button;
-            if (deployButton != null)
+            var operation = new OperationState("Deployment", ip, destination)
             {
-                deployButton.IsEnabled = false;
-            }
-
-            OutputTextBox.Clear();
-            
-            // Reset progress tracking
-            _totalBytesToDeploy = 0;
-            
-            AppendOutput($"> Deploying to {ip}:{destination} ...\n\n");
-            AppendOutput($"Source: {folder}\n");
-            AppendOutput($"Destination: {destination}\n\n");
-
-            string includeFilePattern = IncludeFilePatternTextBox.Text.Trim();
-            string excludeFilePattern = ExcludeFilePatternTextBox.Text.Trim();
-            string excludeDirPattern = ExcludeDirPatternTextBox.Text.Trim();
-            string includeFileAttribText = IncludeFileAttributesTextBox.Text.Trim();
-            string excludeFileAttribText = ExcludeFileAttributesTextBox.Text.Trim();
+                LocalSourcePath = folder,
+                SearchOptions = new CopySearchOptions
+                {
+                    IncludeFilePattern = IncludeFilePatternTextBox.Text.Trim(),
+                    ExcludeFilePattern = ExcludeFilePatternTextBox.Text.Trim(),
+                    ExcludeDirPattern = ExcludeDirPatternTextBox.Text.Trim(),
+                    IncludeFileAttributes = IncludeFileAttributesSelector.Mask,
+                    ExcludeFileAttributes = ExcludeFileAttributesSelector.Mask
+                }
+            };
+            if (!BeginOperation(operation))
+                return;
 
             try
             {
-                // Build search options from advanced options UI
-                CopySearchOptions searchOptions = new CopySearchOptions();
-
-                if (!string.IsNullOrEmpty(includeFilePattern))
-                    searchOptions.IncludeFilePattern = includeFilePattern;
-                if (!string.IsNullOrEmpty(excludeFilePattern))
-                    searchOptions.ExcludeFilePattern = excludeFilePattern;
-                if (!string.IsNullOrEmpty(excludeDirPattern))
-                    searchOptions.ExcludeDirPattern = excludeDirPattern;
-                if (!string.IsNullOrEmpty(includeFileAttribText))
+                DeploymentProgressBar.Value = 0;
+                ProgressPercentText.Text = "0%";
+                ProgressStatusText.Text = "Copying; waiting for progress.";
+                AppendOutput($"> Deploying to {operation.Device}:{operation.RemotePath}\nSource: {operation.LocalSourcePath}\n\n");
+                WdCopyStatusCallbacks callbacks = operation.CreateCopyCallbacks();
+                operation.CopyActive = true;
+                CancelButton.IsEnabled = true;
+                _progressTimer.Start();
+
+                HRESULT hr = await RemoteIteration.CopyAsync(
+                    remoteDevice: operation.Device,
+                    localSourcePath: operation.LocalSourcePath,
+                    remoteDestPath: operation.RemotePath,
+                    cancellationHandleWrapper: operation.CancellationHandle,
+                    searchOptions: operation.SearchOptions,
+                    statusCallbacks: callbacks);
+
+                operation.CopyActive = false;
+                CancelButton.IsEnabled = false;
+                _progressTimer.Stop();
+                // Callbacks only enqueue owned data. Drain before setting the authoritative result.
+                AppendOutput($"\nCopy returned HRESULT 0x{hr.Value:X8}.\n");
+                ProgressStatusText.Text = "Copy returned; displaying remaining output.";
+                await DrainRemainingCopyUpdatesAsync(operation);
+                if (hr.Failed)
                 {
-                    if (ulong.TryParse(includeFileAttribText, out ulong includeAttribs))
-                        searchOptions.IncludeFileAttributes = includeAttribs;
-                    else
-                    {
-                        System.Windows.MessageBox.Show("Include File Attributes must be a valid number.");
-                        return;
-                    }
+                    ProgressStatusText.Text = "Deployment failed during copy.";
+                    AppendOutput($"✗ Copy failed: HRESULT 0x{hr.Value:X8}." +
+                        (operation.CancellationRequested ? " Cancellation was also requested; this does not establish the failure's cause." : "") +
+                        " Remote path validation skipped.\n");
+                    return;
                 }
-                if (!string.IsNullOrEmpty(excludeFileAttribText))
+                if (operation.CancellationRequested)
                 {
-                    if (ulong.TryParse(excludeFileAttribText, out ulong excludeAttribs))
-                        searchOptions.ExcludeFileAttributes = excludeAttribs;
-                    else
-                    {
-                        System.Windows.MessageBox.Show("Exclude File Attributes must be a valid number.");
-                        return;
-                    }
+                    ProgressStatusText.Text = "Cancellation requested; deployment completeness not confirmed.";
+                    AppendOutput("Cancellation was requested. Copy returning success does not confirm a complete deployment. Remote path validation skipped.\n");
+                    return;
                 }
-
-                WdCopyStatusCallbacks copyStatusCallbacks = new WdCopyStatusCallbacks();
-                
-                unsafe
+                if (operation.CallbackFailure != null)
                 {
-                    copyStatusCallbacks.copyFilesStatusCallback = &FileProgressUpdate;
+                    ProgressStatusText.Text = "Copy returned success, but callback processing failed.";
+                    AppendOutput("Deployment status is not confirmed because callback processing failed. Remote path validation skipped.\n");
+                    return;
                 }
-                copyStatusCallbacks.refreshRateMs = 500;
-
-                HRESULT hr = await RemoteIteration.CopyAsync(
-                    remoteDevice: ip,
-                    localSourcePath: folder,
-                    remoteDestPath: destination,
-                    cancellationHandleWrapper: _cancellationHandleWrapper,
-                    searchOptions: searchOptions,
-                    statusCallbacks: copyStatusCallbacks);
 
+                ProgressStatusText.Text = "Copy finished. Validating remote path.";
+                AppendOutput("Validating remote path with WdRegisterRemoteXboxGame (not platform game registration).\n");
+                hr = await RemoteIteration.RegisterRemoteXboxGameAsync(operation.Device, operation.RemotePath);
+                AppendOutput($"Remote path validation returned HRESULT 0x{hr.Value:X8}.\n");
                 if (hr.Failed)
                 {
-                    AppendOutput($"\n✗ Deployment failed during copy: HRESULT 0x{hr.Value:X8}\n");
-                    System.Windows.MessageBox.Show($"Deployment failed during copy with error code: 0x{hr.Value:X8}", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+                    ProgressStatusText.Text = "Copy finished; remote path validation failed.";
                     return;
                 }
 
                 DeploymentProgressBar.Value = 100;
                 ProgressPercentText.Text = "100%";
-                ProgressStatusText.Text = "Deployment completed.";
-
-                hr = await RemoteIteration.RegisterRemoteXboxGameAsync(ip, destination);
-
-                if (hr.Failed)
-                {
-                    AppendOutput($"\n✗ Deployment failed during registration: HRESULT 0x{hr.Value:X8}\n");
-                    System.Windows.MessageBox.Show($"Deployment failed during registration with error code: 0x{hr.Value:X8}", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
-                    return;
-                }
-            }
-            catch (RemoteIterationException ex)
-            {
-                AppendOutput($"\n✗ Deployment failed: {ex.Message} (HRESULT: 0x{ex.HResult:X8})\n");
-                System.Windows.MessageBox.Show($"Deployment failed: {ex.Message}", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
-
-                ProgressStatusText.Text = "Deployment failed.";
+                ProgressStatusText.Text = "Deployment completed; remote path validated.";
             }
             catch (Exception ex)
             {
-                AppendOutput($"\n✗ Deployment failed: {ex.Message}\n");
-                System.Windows.MessageBox.Show($"Deployment failed: {ex.Message}", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
-                
+                operation.CopyActive = false;
+                CancelButton.IsEnabled = false;
+                _progressTimer.Stop();
+                await DrainRemainingCopyUpdatesAsync(operation);
+                ShowOperationFailure(operation, ex);
                 ProgressStatusText.Text = "Deployment failed.";
             }
             finally
             {
-                if (deployButton != null)
-                {
-                    deployButton.IsEnabled = true;
-                }
-
-                _cancellationHandleWrapper?.Dispose();
-                _cancellationHandleWrapper = null;
+                operation.CopyActive = false;
+                EndOperation(operation);
             }
         }
 
-        private async void Cancel_Click(object sender, RoutedEventArgs e)
+        private void Cancel_Click(object sender, RoutedEventArgs e)
         {
+            OperationState? operation = _activeOperation;
+            if (operation == null || !operation.CopyActive || operation.CancellationRequested || operation.CancellationHandle == null)
+                return;
+
+            operation.CancellationRequested = true;
+            CancelButton.IsEnabled = false;
+            ProgressStatusText.Text = "Cancellation requested; waiting for copy to return.";
+            AppendOutput("\nCancellation requested; waiting for the copy result.\n");
             try
             {
-                if(_cancellationHandleWrapper == null)
+                // The signal is nonblocking. Running it on the UI thread prevents the awaited
+                // copy continuation from disposing its handle while cancellation uses it.
+                HRESULT hr = RemoteIteration.RequestCopyCancellation(operation.CancellationHandle);
+                AppendOutput($"Cancellation signal returned HRESULT 0x{hr.Value:X8}.\n");
+                if (hr.Failed)
                 {
-                    AppendOutput("\n⚠ No deployment to cancel.\n");
-                    return;
+                    ProgressStatusText.Text = "Cancellation signal failed; waiting for copy to return.";
+                    AppendOutput("✗ Cancellation signal failed; copy may continue. Cancellation intent is retained.\n");
                 }
-
-                await RemoteIteration.CancelDeployAsync(_cancellationHandleWrapper);
-                
-                OutputTextBox.Clear();
-                AppendOutput($"Deploy cancelled \n\n");
-            }
-            catch (RemoteIterationException ex)
-            {
-                AppendOutput($"\n✗ Cancel failed: {ex.Message} (HRESULT: 0x{ex.HResult:X8})\n");
-                System.Windows.MessageBox.Show($"Cancel failed: {ex.Message}", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
             }
             catch (Exception ex)
             {
-                AppendOutput($"\n✗ Cancel failed: {ex.Message}\n");
-                System.Windows.MessageBox.Show($"Cancel failed: {ex.Message}", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+                AppendOutput($"✗ Cancellation signal failed: {ex.Message} (HRESULT 0x{ex.HResult:X8}). Copy may continue.\n");
+                ProgressStatusText.Text = "Cancellation signal failed; waiting for copy to return.";
             }
         }
-        
+
         private async void Launch_Click(object sender, RoutedEventArgs e)
         {
-            await LaunchProcessAsync(launchOptions: null);
+            await LaunchProcessAsync(null);
         }
 
         private async void LaunchSuspended_Click(object sender, RoutedEventArgs e)
         {
-            var launchOptions = new WdLaunchOptions
-            {
-                launchMode = WdLaunchMode.Suspended
-            };
-
-            await LaunchProcessAsync(launchOptions);
+            await LaunchProcessAsync(new WdLaunchOptions { launchMode = WdLaunchMode.Suspended });
         }
 
         private async Task LaunchProcessAsync(WdLaunchOptions? launchOptions)
         {
             string ip = DeviceIpTextBox.Text.Trim();
             string executable = ExecutablePathTextBox.Text.Trim();
-
-            if (string.IsNullOrWhiteSpace(ip))
-            {
-                System.Windows.MessageBox.Show("Please enter a device name or IP Address.");
-                return;
-            }
-            if (string.IsNullOrWhiteSpace(executable))
+            if (string.IsNullOrWhiteSpace(ip) || string.IsNullOrWhiteSpace(executable))
             {
-                System.Windows.MessageBox.Show("Please enter an executable path.");
+                System.Windows.MessageBox.Show("Enter a device and a remote executable path.");
                 return;
             }
 
-            OutputTextBox.Clear();
+            var operation = new OperationState("Launch", ip, executable) { LaunchOptions = launchOptions };
+            if (!BeginOperation(operation))
+                return;
 
             try
             {
-                (HRESULT hr, ProcThreadId procThreadId) = await RemoteIteration.LaunchRemoteGameAsync(
-                    remoteDevice: ip, remotePath: executable, launchOptions: launchOptions);
-
-                if (hr.Failed)
-                {
-                    AppendOutput($"\n✗ Launch failed: HRESULT 0x{hr.Value:X8}\n");
-                    System.Windows.MessageBox.Show($"Launch failed with error code: 0x{hr.Value:X8}", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
-                    return;
-                }
-
-                _remoteProcessId = procThreadId;
-
-                AppendOutput($"> Launching application on {ip} ...\n\n");
-                AppendOutput($"Path: {executable}\n");
-                AppendOutput($"\nDone. (Process ID: {_remoteProcessId.ProcessId}, Thread ID: {_remoteProcessId.ThreadId})\n");
+                AppendOutput($"> Launching {operation.RemotePath} on {operation.Device}" +
+                    (operation.LaunchOptions?.launchMode == WdLaunchMode.Suspended ? " (suspended)" : "") + " ...\n");
+                (HRESULT hr, ProcThreadId process) = await RemoteIteration.LaunchRemoteGameAsync(
+                    operation.Device, operation.RemotePath, launchOptions: operation.LaunchOptions);
+                AppendOutput(hr.Failed
+                    ? $"✗ Launch failed: HRESULT 0x{hr.Value:X8}.\n"
+                    : $"Launch succeeded (Process ID: {process.ProcessId}, Thread ID: {process.ThreadId}).\n");
             }
             catch (Exception ex)
             {
-                AppendOutput($"\n✗ Launch failed: {ex.Message}\n");
-                System.Windows.MessageBox.Show($"Launch failed: {ex.Message}", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+                ShowOperationFailure(operation, ex);
+            }
+            finally
+            {
+                EndOperation(operation);
             }
         }
 
         private async void Resume_Click(object sender, RoutedEventArgs e)
         {
-            string ip = DeviceIpTextBox.Text.Trim();
-            if (string.IsNullOrWhiteSpace(ip))
-            {
-                System.Windows.MessageBox.Show("Please enter a device name or IP Address.");
-                return;
-            }
-            OutputTextBox.Clear();
-            
-            try
-            {
-                HRESULT hr = await RemoteIteration.ResumeGameAsync(ip);
-
-                if (hr.Failed)
-                {
-                    AppendOutput($"{ip} failed to resume remote game with error 0x{hr.Value:X8}.");
-                }
-                else
-                {
-                    AppendOutput($"{ip} resumed remote game {_remoteProcessId.ProcessId} successfully.");
-                }
-            }
-            catch (RemoteIterationException ex)
-            {
-                AppendOutput($"\n✗ Resume failed: {ex.Message} (HRESULT: 0x{ex.HResult:X8})\n");
-                System.Windows.MessageBox.Show($"Resume failed: {ex.Message}", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
-            }
-            catch (Exception ex)
-            {
-                AppendOutput($"\n✗ Resume failed: {ex.Message}\n");
-                System.Windows.MessageBox.Show($"Resume failed: {ex.Message}", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
-            }
+            await ControlGameAsync(resume: true);
         }
 
         private async void Terminate_Click(object sender, RoutedEventArgs e)
         {
-            string ip = DeviceIpTextBox.Text.Trim();
+            await ControlGameAsync(resume: false);
+        }
 
+        private async Task ControlGameAsync(bool resume)
+        {
+            string ip = DeviceIpTextBox.Text.Trim();
             if (string.IsNullOrWhiteSpace(ip))
             {
-                System.Windows.MessageBox.Show("Please enter a device name or IP Address.");
+                System.Windows.MessageBox.Show("Enter a device name or IP address.");
                 return;
             }
 
-            OutputTextBox.Clear();
-            
+            var operation = new OperationState(resume ? "Resume" : "Terminate", ip);
+            if (!BeginOperation(operation))
+                return;
+
             try
             {
-                HRESULT hr = await RemoteIteration.TerminateRemoteGameAsync(ip);
-
-                if (hr.Failed)
-                {
-                    AppendOutput($"{ip} failed to terminate remote game with error 0x{hr.Value:X8}.");
-                }
-                else
-                {
-                    AppendOutput($"{ip} terminated remote game successfully.");
-                }
+                HRESULT hr = resume
+                    ? await RemoteIteration.ResumeGameAsync(operation.Device)
+                    : await RemoteIteration.TerminateRemoteGameAsync(operation.Device);
+                AppendOutput($"{operation.Name} on {operation.Device} " +
+                    (hr.Failed ? "failed" : "succeeded") + $" (HRESULT 0x{hr.Value:X8}).\n");
             }
-            catch (RemoteIterationException ex)
+            catch (Exception ex)
             {
-                AppendOutput($"\n✗ Terminate failed: {ex.Message} (HRESULT: 0x{ex.HResult:X8})\n");
-                System.Windows.MessageBox.Show($"Terminate failed: {ex.Message}", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+                ShowOperationFailure(operation, ex);
             }
-            catch (Exception ex)
+            finally
             {
-                AppendOutput($"\n✗ Terminate failed: {ex.Message}\n");
-                System.Windows.MessageBox.Show($"Terminate failed: {ex.Message}", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+                EndOperation(operation);
             }
-            
+        }
+
+        private void ShowOperationFailure(OperationState operation, Exception ex)
+        {
+            AppendOutput($"\n✗ {operation.Name} failed: {ex.Message} (HRESULT 0x{ex.HResult:X8})." +
+                (operation.CancellationRequested ? " Cancellation was also requested." : "") +
+                (operation.StopWaitingRequested ? " Remote deletion may continue." : "") + "\n");
         }
 
         private void AppendOutput(string text)
@@ -421,4 +392,4 @@ private void AppendOutput(string text)
             OutputTextBox.ScrollToEnd();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Samples/Tools/RemoteIterationToolsSample/NativeMethods.txt b/Samples/Tools/RemoteIterationToolsSample/NativeMethods.txt
index ccd10bdd..068b15f4 100644
--- a/Samples/Tools/RemoteIterationToolsSample/NativeMethods.txt
+++ b/Samples/Tools/RemoteIterationToolsSample/NativeMethods.txt
@@ -6,4 +6,6 @@ WdCancelRemoteCopy
 WdLaunchRemoteGame
 WdResumeRemoteGame
 WdTerminateRemoteGame
-WdRegisterRemoteXboxGame
\ No newline at end of file
+WdRegisterRemoteXboxGame
+WdDeleteRemoteFiles
+WdCancelRemoteDelete
\ No newline at end of file
diff --git a/Samples/Tools/RemoteIterationToolsSample/OperationState.cs b/Samples/Tools/RemoteIterationToolsSample/OperationState.cs
new file mode 100644
index 00000000..b15bd7db
--- /dev/null
+++ b/Samples/Tools/RemoteIterationToolsSample/OperationState.cs
@@ -0,0 +1,188 @@
+using Microsoft.Gaming.WdRemoteApi;
+using System.Collections.Concurrent;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Text;
+using Windows.Win32.Foundation;
+
+namespace RemoteIterationToolsSample
+{
+    internal sealed class OperationState : IDisposable
+    {
+        private GCHandle _callbackContext;
+        private Exception? _callbackFailure;
+        private CopyProgressUpdate? _latestProgressUpdate;
+        private CopyProgressUpdate? _pendingProgressUpdate;
+        private int _nextFileMessage;
+
+        public OperationState(string name, string device, string remotePath = "")
+        {
+            Name = name;
+            Device = device;
+            RemotePath = remotePath;
+        }
+
+        public string Name { get; }
+        public string Device { get; }
+        public string RemotePath { get; }
+        public string LocalSourcePath { get; init; } = "";
+        public CopySearchOptions? SearchOptions { get; init; }
+        public DeleteOptions? DeleteOptions { get; init; }
+        public DeleteSearchOptions? DeleteSearchOptions { get; init; }
+        public WdLaunchOptions? LaunchOptions { get; init; }
+        public WdCancellationHandleWrapper? CancellationHandle { get; private set; }
+        public bool CopyActive { get; set; }
+        public bool CancellationRequested { get; set; }
+        public bool DeleteActive { get; set; }
+        public bool StopWaitingRequested { get; set; }
+        public bool CallbackFailureReported { get; set; }
+        public Exception? CallbackFailure => Volatile.Read(ref _callbackFailure);
+        public ConcurrentQueue<CopyProgressUpdate> ProgressUpdates { get; } = new();
+        public ConcurrentQueue<string> Diagnostics { get; } = new();
+        public WdCopyOperationSummary? LatestSummary => Volatile.Read(ref _latestProgressUpdate)?.Summary;
+        public bool HasPendingOutput => _pendingProgressUpdate != null || !ProgressUpdates.IsEmpty || !Diagnostics.IsEmpty;
+
+        // Only the UI thread consumes batches. The budget limits dispatch work, not retained output.
+        public string TakeOutputBatch(int maximumMessages)
+        {
+            if (maximumMessages < 1)
+                throw new ArgumentOutOfRangeException(nameof(maximumMessages));
+
+            var output = new StringBuilder();
+            while (maximumMessages > 0)
+            {
+                if (Diagnostics.TryDequeue(out string? diagnostic))
+                {
+                    output.Append(diagnostic);
+                    maximumMessages--;
+                    continue;
+                }
+
+                if (_pendingProgressUpdate == null && !ProgressUpdates.TryDequeue(out _pendingProgressUpdate))
+                    break;
+
+                List<string> messages = _pendingProgressUpdate.FileMessages;
+                while (maximumMessages > 0 && _nextFileMessage < messages.Count)
+                {
+                    output.Append(messages[_nextFileMessage++]);
+                    maximumMessages--;
+                }
+
+                if (_nextFileMessage == messages.Count)
+                {
+                    // Summary-only notifications must also consume budget to bound each batch.
+                    if (messages.Count == 0)
+                        maximumMessages--;
+                    _pendingProgressUpdate = null;
+                    _nextFileMessage = 0;
+                }
+            }
+            return output.ToString();
+        }
+
+        public void CreateCancellationHandle()
+        {
+            if (CancellationHandle != null)
+                throw new InvalidOperationException("This operation already owns a cancellation handle.");
+
+            CancellationHandle = new WdCancellationHandleWrapper();
+        }
+
+        public unsafe WdCopyStatusCallbacks CreateCopyCallbacks()
+        {
+            CreateCancellationHandle();
+            _callbackContext = GCHandle.Alloc(this);
+            return new WdCopyStatusCallbacks
+            {
+                copyFilesStatusCallback = &FileProgressUpdate,
+                copyErrorCallback = &CopyDiagnostic,
+                refreshRateMs = 500, // Desired update interval, not a guaranteed cadence.
+                context = (void*)GCHandle.ToIntPtr(_callbackContext)
+            };
+        }
+
+        public void RecordCallbackFailure(Exception exception)
+        {
+            // Preserve the first failure without allocating or invoking UI code on a native thread.
+            Interlocked.CompareExchange(ref _callbackFailure, exception, null);
+        }
+
+        [UnmanagedCallersOnly(CallConvs = new[] { typeof(CallConvStdcall) })]
+        private static unsafe HRESULT FileProgressUpdate(
+            nuint fileProgressCount,
+            WdCopyFileProgressInfo* fileUpdates,
+            WdCopyOperationSummary* summary,
+            void* context)
+        {
+            // This context is owned until the blocking copy call and all its callbacks return.
+            OperationState? operation = null;
+            try
+            {
+                operation = (OperationState)GCHandle.FromIntPtr((IntPtr)context).Target!;
+                if (summary == null || (fileProgressCount > 0 && fileUpdates == null))
+                {
+                    throw new InvalidOperationException("Copy progress callback supplied missing progress data.");
+                }
+
+                var lines = new List<string>();
+                for (nuint i = 0; i < fileProgressCount; i++)
+                {
+                    WdCopyFileProgressInfo info = fileUpdates[i];
+                    string? filePath = Marshal.PtrToStringUTF8((IntPtr)info.relativeFilePath.Value);
+                    if (info.bytesTransferred == info.fileSize)
+                    {
+                        lines.Add($"[Completed] {filePath}\n");
+                    }
+                    else
+                    {
+                        lines.Add($"[Deploy] {filePath} ({info.bytesTransferred:N0} / {info.fileSize:N0} bytes)\n");
+                    }
+                }
+
+                // Copy the strings and scalar counters; no native pointer survives the callback.
+                // A summary without per-file updates is still a valid progress notification.
+                var update = new CopyProgressUpdate(lines, *summary);
+                operation.ProgressUpdates.Enqueue(update);
+                Volatile.Write(ref operation._latestProgressUpdate, update);
+                return new HRESULT(0);
+            }
+            catch (Exception ex)
+            {
+                operation?.RecordCallbackFailure(ex);
+                // A failed callback HRESULT does not stop the copy. The UI also reports this failure.
+                return new HRESULT(ex.HResult);
+            }
+        }
+
+        [UnmanagedCallersOnly(CallConvs = new[] { typeof(CallConvStdcall) })]
+        private static unsafe HRESULT CopyDiagnostic(
+            WdCopyErrorSeverity severity, PCSTR message, HRESULT error, void* context)
+        {
+            OperationState? operation = null;
+            try
+            {
+                operation = (OperationState)GCHandle.FromIntPtr((IntPtr)context).Target!;
+                operation.Diagnostics.Enqueue($"[{severity}] {Marshal.PtrToStringUTF8((IntPtr)message.Value)} (HRESULT 0x{error.Value:X8})\n");
+                return new HRESULT(0);
+            }
+            catch (Exception ex)
+            {
+                operation?.RecordCallbackFailure(ex);
+                return new HRESULT(ex.HResult);
+            }
+        }
+
+        public void Dispose()
+        {
+            // Called on the UI thread only after awaiting native work. Cancellation is signalled
+            // synchronously on that same thread, so it cannot race this resource cleanup.
+            if (_callbackContext.IsAllocated)
+            {
+                _callbackContext.Free();
+            }
+            CancellationHandle?.Dispose();
+        }
+    }
+
+    internal sealed record CopyProgressUpdate(List<string> FileMessages, WdCopyOperationSummary Summary);
+}
diff --git a/Samples/Tools/RemoteIterationToolsSample/README.md b/Samples/Tools/RemoteIterationToolsSample/README.md
index b4141fcd..345019f5 100644
--- a/Samples/Tools/RemoteIterationToolsSample/README.md
+++ b/Samples/Tools/RemoteIterationToolsSample/README.md
@@ -19,34 +19,160 @@ description: "A WPF sample application demonstrating how to use the Remote Itera
 
 # Remote Iteration Tools Sample
 
-A WPF sample application demonstrating how to use the **Remote Iteration Client API**
-(`Microsoft.GDK.RemoteIterationClientApi`) to deploy, launch, and manage game builds on
-remote Xbox devices.
+## Description
 
-## What This Sample Demonstrates
+A C# WPF sample for tool developers integrating the **Xbox PC Remote Iteration
+API**. Use it to deploy a build, launch and control a game, and delete remote
+content. The UI provides a way to exercise the API; the [code map](#code-map)
+points to the integration patterns.
 
-- **Deploy** — Copy a local game build to a remote device using delta file transfer
-- **Register** — Register a deployed game on the remote device
-- **Launch** — Start an executable on the remote device (normal or suspended)
-- **Resume** — Resume a suspended game process
-- **Terminate** — Stop a running game on the remote device
-- **Cancel** — Cancel an in-progress deployment
+## Building the Sample
 
-## Prerequisites
+Use Windows with Visual Studio WPF support or the .NET 8 SDK. Open
+`RemoteIterationToolsSample.sln` and select **x64** or **ARM64**, or build from
+this directory:
 
-- Visual Studio with support for WPF applications
-- .NET SDK installed
-- Pair remote device using [Xbox PC Remote Tools overview](https://learn.microsoft.com/en-us/gaming/gdk/docs/gdk-dev/pc-dev/overviews/remote-win-gamedev)
+```shell
+dotnet build .\RemoteIterationToolsSample.csproj -c Release -p:Platform=x64
+```
 
-## Build
+Use `-p:Platform=ARM64` for ARM64. Run the executable under
+`bin\<platform>\Release\net8.0-windows`, or start the project from Visual Studio.
+The project restores the matching API NuGet package and generates C# bindings
+from its WinMD metadata using CsWin32.
 
-Open `RemoteIterationToolsSample.sln` in Visual Studio and build the **x64** or **ARM64** configuration,
-or from the command line:
+## Using the Sample
 
-```shell
-dotnet build RemoteIterationToolsSample/RemoteIterationToolsSample.csproj -p:Platform=x64
-dotnet build RemoteIterationToolsSample/RemoteIterationToolsSample.csproj -p:Platform=ARM64
+First follow the [Remote Tools setup and pairing guide](https://learn.microsoft.com/en-us/gaming/gdk/docs/gdk-dev/pc-dev/overviews/remote-win-gamedev).
+The endpoint must be running on a paired target; the sample does not pair devices.
+
+### Deploy and launch
+
+For a local build containing `C:\Builds\MyGame\MyGame.exe`, enter:
+
+| Field | Example |
+|-------|---------|
+| Device | `MyDevPC` (a resolvable host name or IP address) |
+| Source Folder (this PC) | `C:\Builds\MyGame` |
+| Destination Folder (device) | `MyGame` |
+| Executable to launch (device) | `MyGame\MyGame.exe` |
+
+A **Common Root** is the endpoint's base directory for relative remote paths.
+With the default configuration, this example copies to:
+
+```text
+C:\Builds\MyGame\MyGame.exe
+    --Deploy--> <default Common Root>\MyGame\MyGame.exe
 ```
 
-> **Note:** The project references the `Microsoft.GDK.RemoteIterationClientApi` NuGet
-> package.
+Destination and executable paths resolve independently from that root, not from
+each other. Absolute device paths also work. See [Common Root configuration](#common-root-configuration)
+to change the base directory.
+
+1. Leave **Advanced Options** at their defaults and choose **Deploy**. Wait for
+   **"Deployment completed; remote path validated."** The validation API,
+   `WdRegisterRemoteXboxGame`, checks the remote path; it does not install or
+   register a game.
+2. Choose **Launch**, or **Launch Suspended** followed by **Resume**. Deployment
+   and launch are independent actions.
+3. Choose **Terminate** to stop the last game launched through the API on that
+   device. Resume also operates on the last suspended launch, not an arbitrary PID.
+
+Read final results and HRESULTs in the status area and **Command Output**, not
+just the progress indicator. Each new action clears the output.
+
+### Filters
+
+**Advanced Options** filters deployment; **Delete filters** applies to folder
+deletion. Name patterns accept `*` and `?`; file patterns can be separated with
+`;`. Directory exclusions match names, not paths. Exclusions take precedence.
+
+Attribute checkboxes select **Read-only**, **Hidden**, **System**, and **Archive**.
+An include group matches any selected attribute; an exclude group rejects any
+selected attribute. No selections means no attribute filtering. For example,
+checking **Hidden** and **System** under **Exclude file attributes** excludes
+either kind of file. The sample combines their flags into mask `6`, preserving
+the API's `uint` copy fields and `ulong` delete fields.
+
+See [WdCopySearchOptions](https://learn.microsoft.com/en-us/gaming/gdk/docs/reference/remoting/structs/wdcopysearchoptions)
+and [WdDeleteSearchOptions](https://learn.microsoft.com/en-us/gaming/gdk/docs/reference/remoting/structs/wddeletesearchoptions)
+for filtering semantics. [File Attribute Constants](https://learn.microsoft.com/en-us/windows/win32/fileio/file-attribute-constants)
+explains the flags; RIT supports the four offered here, not every Windows attribute.
+
+### Delete remote content
+
+Enter a remote path in **Remote deletion**, then choose **Delete...** and review
+the confirmation. Root-folder removal is off by default and only succeeds if the
+folder is left empty. Deletion is separate from Deploy.
+
+Use disposable data without directory junctions or symbolic links: deletion has
+no undo, and linked directories can lead outside the target. Prepare these
+example folders on the device, then inspect the remaining contents:
+
+| Scenario | Remote path | Settings |
+|----------|-------------|----------|
+| Clear folder contents | `RitDeleteFixture\clear` | Leave filters at defaults. Check **Remove root folder if empty** only to remove the folder too. |
+| Clean selected artifacts | `RitDeleteFixture\artifacts` | Include `*.log;*.tmp`, exclude `keep.log`, exclude directory `keep`. |
+| Delete one file | `RitDeleteFixture\one\trace.log` | Filters and root-removal settings are ignored for a single-file target. |
+
+The result **"Delete request completed; some items may remain."** reflects
+best-effort deletion, not a guarantee of an empty folder. There is no per-item
+progress. See [WdDeleteRemoteFiles](https://learn.microsoft.com/en-us/gaming/gdk/docs/reference/remoting/functions/wddeleteremotefiles)
+for the full contract.
+
+### Cancellation and operation lifetime
+
+**Cancel** requests copy cancellation. **Stop waiting** ends the client wait for
+delete; remote deletion may continue. Controls remain disabled until the client
+call returns. No follow-on operation starts automatically. The delete status
+describes the previous request and remains until another delete starts.
+
+The sample tracks cancellation intent separately from HRESULT: a success return
+after cancellation does not prove a complete copy or delete. Cancelled copies
+skip path validation. A tool using delete must decide when conflicting remote
+work is safe; see [WdCancelRemoteDelete](https://learn.microsoft.com/en-us/gaming/gdk/docs/reference/remoting/functions/wdcancelremotedelete).
+
+Closing is blocked during an active call to preserve native resource lifetime.
+For a stalled operation, request cancellation when available. Ending
+`RemoteIterationToolsSample.exe` in Task Manager is a last resort; it does not
+undo completed work or confirm that the remote operation stopped.
+
+### Common Root configuration
+
+Without configured roots, relative paths use `%ProgramData%\Microsoft GDK\gameroot`.
+Deploy and Launch use the default Common Root; Delete can select an existing
+alias. Absolute remote paths ignore the alias.
+
+On the **target device**, add `gameRoots` to
+`%ProgramData%\Microsoft GDK\wdEndpoint\wdEndpoint.json`, preserving other settings:
+
+```json
+{
+  "gameRoots": [
+    { "root": "D:\\Games", "alias": "games", "default": true }
+  ]
+}
+```
+
+Restart the endpoint after editing. With this configuration, `MyGame` resolves to
+`D:\Games\MyGame`. Add entries for other aliases as needed. The sample selects roots;
+it does not configure them. See the [Common Root configuration guide](https://learn.microsoft.com/en-us/gaming/gdk/docs/tools/tools-pc/commandlinetools/gr-wdremote#deploy,-launch,-and-terminate-applications).
+
+## Implementation notes
+
+### Code map
+
+| Pattern | Entry points |
+|---------|--------------|
+| Package and generated bindings | [Project](RemoteIterationToolsSample.csproj#L3-L37), [projection requests](NativeMethods.txt) |
+| Deploy and validate the remote path | [`Deploy_Click`](MainWindow.xaml.cs#L162-L266), [`CopyAsync` / `RegisterRemoteXboxGameAsync`](RemoteIteration.cs#L16-L80) |
+| Launch, resume, terminate | [UI handlers](MainWindow.xaml.cs#L297-L381), [native wrappers](RemoteIteration.cs#L82-L144) |
+| Delete and stop waiting | [UI handlers and confirmation](MainWindow.Delete.xaml.cs#L8-L138), [`DeleteAsync` / `RequestDeleteStopWaiting`](RemoteIteration.Delete.cs#L10-L62) |
+| Attribute flags | [`FileAttributeSelector.Mask`](FileAttributeSelector.xaml.cs#L22-L37), [copy model](CopySearchOptions.cs#L3-L13), [delete model](DeleteSearchOptions.cs#L3-L13) |
+| Single active operation and handle lifetime | [`BeginOperation` / `EndOperation` / closing guard](MainWindow.xaml.cs#L36-L83), [operation state](OperationState.cs#L10-L188) |
+| Copy cancellation and final results | [Result handling](MainWindow.xaml.cs#L208-L263), [`Cancel_Click`](MainWindow.xaml.cs#L268-L295) |
+| Responsive callback processing | [Bounded UI draining](MainWindow.xaml.cs#L85-L160), [callback capture and ownership](OperationState.cs#L42-L188) |
+
+Callbacks copy native data into operation-owned queues; the UI drains bounded
+batches and yields between them. Callback-processing failures are reported
+separately from the native HRESULT. A failed callback return does not abort copy.
diff --git a/Samples/Tools/RemoteIterationToolsSample/RemoteIteration.Delete.cs b/Samples/Tools/RemoteIterationToolsSample/RemoteIteration.Delete.cs
new file mode 100644
index 00000000..4b4f2186
--- /dev/null
+++ b/Samples/Tools/RemoteIterationToolsSample/RemoteIteration.Delete.cs
@@ -0,0 +1,64 @@
+using Microsoft.Gaming.WdRemoteApi;
+using System.Text;
+using Windows.Win32.Foundation;
+
+namespace RemoteIterationToolsSample
+{
+    public static partial class RemoteIteration
+    {
+        // Best-effort deletion has no per-item results; the API ignores status callbacks.
+        public static Task<HRESULT> DeleteAsync(
+            string remoteDevice,
+            string remoteFolderPath,
+            DeleteOptions? deleteOptions = null,
+            DeleteSearchOptions? searchOptions = null,
+            WdCancellationHandleWrapper? cancellationHandleWrapper = null)
+        {
+            return Task.Run(() =>
+            {
+                unsafe
+                {
+                    fixed (byte* aliasBytes = string.IsNullOrEmpty(deleteOptions?.CommonRootAlias) ? null : Encoding.UTF8.GetBytes(deleteOptions.CommonRootAlias + '\0'))
+                    fixed (byte* includeBytes = string.IsNullOrEmpty(searchOptions?.IncludeFilePattern) ? null : Encoding.UTF8.GetBytes(searchOptions.IncludeFilePattern + '\0'))
+                    fixed (byte* excludeBytes = string.IsNullOrEmpty(searchOptions?.ExcludeFilePattern) ? null : Encoding.UTF8.GetBytes(searchOptions.ExcludeFilePattern + '\0'))
+                    fixed (byte* directoryBytes = string.IsNullOrEmpty(searchOptions?.ExcludeDirPattern) ? null : Encoding.UTF8.GetBytes(searchOptions.ExcludeDirPattern + '\0'))
+                    {
+                        var nativeOptions = new WdDeleteOptions
+                        {
+                            commonRootAlias = new PCSTR(aliasBytes),
+                            deleteRootFolder = deleteOptions?.DeleteRootFolder == true ? (byte)1 : (byte)0
+                        };
+                        // Delete uses uint64 masks and different directory field names from copy.
+                        var nativeSearchOptions = new WdDeleteSearchOptions
+                        {
+                            includeFilePattern = new PCSTR(includeBytes),
+                            excludeFilePattern = new PCSTR(excludeBytes),
+                            excludeDirPattern = new PCSTR(directoryBytes),
+                            includeFileAttributes = searchOptions?.IncludeFileAttributes ?? 0,
+                            excludeFileAttributes = searchOptions?.ExcludeFileAttributes ?? 0,
+                            includeDirAttributes = searchOptions?.IncludeDirAttributes ?? 0,
+                            excludeDirAttributes = searchOptions?.ExcludeDirAttributes ?? 0
+                        };
+                        // CsWin32's .NET 8 UTF-8 string overload does not append NUL.
+                        return PInvoke.WdDeleteRemoteFiles(
+                            remoteDevice + '\0',
+                            remoteFolderPath + '\0',
+                            nativeOptions,
+                            nativeSearchOptions,
+                            statusCallbacks: null,
+                            cancellationHandle: cancellationHandleWrapper?.Handle);
+                    }
+                }
+            });
+        }
+
+        // Stops the client wait only; deletion already started on the endpoint continues.
+        public static HRESULT RequestDeleteStopWaiting(WdCancellationHandleWrapper cancellationHandleWrapper)
+        {
+            if (cancellationHandleWrapper.Handle.IsInvalid)
+                throw new ArgumentException("Invalid cancellation handle.");
+
+            return PInvoke.WdCancelRemoteDelete(cancellationHandleWrapper.Handle);
+        }
+    }
+}
diff --git a/Samples/Tools/RemoteIterationToolsSample/RemoteIteration.cs b/Samples/Tools/RemoteIterationToolsSample/RemoteIteration.cs
index c5a4ff30..4472687a 100644
--- a/Samples/Tools/RemoteIterationToolsSample/RemoteIteration.cs
+++ b/Samples/Tools/RemoteIterationToolsSample/RemoteIteration.cs
@@ -5,7 +5,7 @@
 
 namespace RemoteIterationToolsSample
 {
-    public static class RemoteIteration
+    public static partial class RemoteIteration
     {
         /* The WdRemoteCopy API automates copying game builds from local environments to remote devices, efficiently
          * transferring assets and binaries. It reduces manual errors by managing file movement and provides blocking
@@ -25,8 +25,6 @@ public static Task<HRESULT> CopyAsync(
         {
             return Task.Run(() =>
             {
-                Thread.CurrentThread.Name = "CopyAsync Worker";
-
                 HRESULT hr;
                 unsafe
                 {
@@ -40,11 +38,14 @@ public static Task<HRESULT> CopyAsync(
                         nativeSearchOptions.excludeDirPattern = new PCSTR(excludeDirPatternBytes);
                         nativeSearchOptions.includeFileAttributes = searchOptions?.IncludeFileAttributes ?? 0;
                         nativeSearchOptions.excludeFileAttributes = searchOptions?.ExcludeFileAttributes ?? 0;
+                        nativeSearchOptions.includeDirectoryAttributes = searchOptions?.IncludeDirectoryAttributes ?? 0;
+                        nativeSearchOptions.excludeDirectoryAttributes = searchOptions?.ExcludeDirectoryAttributes ?? 0;
 
+                        // CsWin32's string overload uses UTF-8 on .NET 8, but does not append NUL.
                         hr = PInvoke.WdRemoteCopy(
-                            remoteDevice,
-                            localSourcePath,
-                            remoteDestPath,
+                            remoteDevice + '\0',
+                            localSourcePath + '\0',
+                            remoteDestPath + '\0',
                             copyOptions,
                             nativeSearchOptions,
                             statusCallbacks,
@@ -56,7 +57,8 @@ public static Task<HRESULT> CopyAsync(
             });
         }
 
-        /* The WdRegisterRemoteXboxGame API registers a game on a remote device. */
+        /* WdRegisterRemoteXboxGame resolves and validates a remote folder path.
+         * It does not perform platform game registration. */
         public static Task<HRESULT> RegisterRemoteXboxGameAsync(
             string remoteDevice,
             string remoteFolderPath,
@@ -64,9 +66,16 @@ public static Task<HRESULT> RegisterRemoteXboxGameAsync(
         {
             return Task.Run(() =>
             {
-                Thread.CurrentThread.Name = "RegisterAsync Worker";
-                HRESULT hr = PInvoke.WdRegisterRemoteXboxGame(remoteDevice, remoteFolderPath, commonRootAlias);
-                return hr;
+                unsafe
+                {
+                    fixed (byte* deviceBytes = Encoding.UTF8.GetBytes(remoteDevice + '\0'))
+                    fixed (byte* folderBytes = Encoding.UTF8.GetBytes(remoteFolderPath + '\0'))
+                    fixed (byte* aliasBytes = string.IsNullOrEmpty(commonRootAlias) ? null : Encoding.UTF8.GetBytes(commonRootAlias + '\0'))
+                    {
+                        return PInvoke.WdRegisterRemoteXboxGame(
+                            new PCSTR(deviceBytes), new PCSTR(folderBytes), new PCSTR(aliasBytes));
+                    }
+                }
             });
         }
 
@@ -78,9 +87,7 @@ public static Task<HRESULT> TerminateRemoteGameAsync(string remoteDevice)
         {
             return Task.Run(() =>
             {
-                Thread.CurrentThread.Name = "TerminateAsync Worker";
-
-                HRESULT hr = PInvoke.WdTerminateRemoteGame(remoteDevice);
+                HRESULT hr = PInvoke.WdTerminateRemoteGame(remoteDevice + '\0');
 
                 return hr;
             });
@@ -100,23 +107,25 @@ public static Task<HRESULT> TerminateRemoteGameAsync(string remoteDevice)
         {
             return Task.Run(() =>
             {
-                Thread.CurrentThread.Name = "LaunchAsync Worker";
-
                 unsafe
                 {
-                    uint processId;
-                    uint threadId;
-                    HRESULT hr;
-                    hr = PInvoke.WdLaunchRemoteGame(
-                        remoteDevice,
-                        remotePath,
-                        args,
-                        launchOptions,
-                        out processId,
-                        out threadId
-                        );
+                    fixed (byte* deviceBytes = Encoding.UTF8.GetBytes(remoteDevice + '\0'))
+                    fixed (byte* pathBytes = Encoding.UTF8.GetBytes(remotePath + '\0'))
+                    fixed (byte* argsBytes = string.IsNullOrEmpty(args) ? null : Encoding.UTF8.GetBytes(args + '\0'))
+                    {
+                        WdLaunchOptions nativeOptions = launchOptions.GetValueOrDefault();
+                        uint processId = 0;
+                        uint threadId = 0;
+                        HRESULT hr = PInvoke.WdLaunchRemoteGame(
+                            new PCSTR(deviceBytes),
+                            new PCSTR(pathBytes),
+                            new PCSTR(argsBytes),
+                            launchOptions.HasValue ? &nativeOptions : null,
+                            &processId,
+                            &threadId);
 
-                    return (hr, new ProcThreadId(processId, threadId));
+                        return (hr, new ProcThreadId(processId, threadId));
+                    }
                 }
             });
         }
@@ -128,8 +137,7 @@ string remoteDevice
         {
             return Task.Run(() =>
             {
-                Thread.CurrentThread.Name = "ResumeGameAsync Worker";
-                HRESULT hr = PInvoke.WdResumeRemoteGame(remoteDevice);
+                HRESULT hr = PInvoke.WdResumeRemoteGame(remoteDevice + '\0');
                 return hr;
             });
         }
@@ -137,18 +145,14 @@ string remoteDevice
 
         /* Cancels an ongoing WdRemoteCopy operation. This is a non-blocking call that signals the
          * copy operation to stop as soon as possible. */
-        public static Task CancelDeployAsync(WdCancellationHandleWrapper cancellationHandleWrapper)
+        public static HRESULT RequestCopyCancellation(WdCancellationHandleWrapper cancellationHandleWrapper)
         {
-            return Task.Run(() =>
+            if (cancellationHandleWrapper.Handle.IsInvalid)
             {
-                Thread.CurrentThread.Name = "CancelDeployAsync Worker";
-                if(cancellationHandleWrapper.Handle.IsInvalid)
-                {
-                    throw new ArgumentException("Invalid cancellation handle.");
-                }
+                throw new ArgumentException("Invalid cancellation handle.");
+            }
 
-                PInvoke.WdCancelRemoteCopy(cancellationHandleWrapper.Handle);
-            });
+            return PInvoke.WdCancelRemoteCopy(cancellationHandleWrapper.Handle);
         }
     }
 
diff --git a/Samples/Tools/RemoteIterationToolsSample/RemoteIterationToolsSample.csproj b/Samples/Tools/RemoteIterationToolsSample/RemoteIterationToolsSample.csproj
index f2e8473a..5ff82d23 100644
--- a/Samples/Tools/RemoteIterationToolsSample/RemoteIterationToolsSample.csproj
+++ b/Samples/Tools/RemoteIterationToolsSample/RemoteIterationToolsSample.csproj
@@ -28,7 +28,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.GDK.RemoteIterationClientApi" Version="0.1.1-preview.26.3.27002" />
+    <PackageReference Include="Microsoft.GDK.RemoteIterationClientApi" Version="0.1.2-preview.26.9.9002" />
     <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.269">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/Samples/Tools/RemoteIterationToolsSample/WdCancellationHandleWrapper.cs b/Samples/Tools/RemoteIterationToolsSample/WdCancellationHandleWrapper.cs
index 52e1f7f5..ec3d0330 100644
--- a/Samples/Tools/RemoteIterationToolsSample/WdCancellationHandleWrapper.cs
+++ b/Samples/Tools/RemoteIterationToolsSample/WdCancellationHandleWrapper.cs
@@ -17,7 +17,7 @@ public WdCancellationHandleWrapper()
             HRESULT hr = PInvoke.WdCreateCancellationHandle(out _handle);
             if (hr.Failed)
             {
-                throw new RemoteIterationException("Failed to create copy cancellation handle", hr);
+                throw new RemoteIterationException("Failed to create cancellation handle", hr);
             }
         }
 
diff --git a/gdk-samples-list.md b/gdk-samples-list.md
index 1edd0c71..6660918e 100644
--- a/gdk-samples-list.md
+++ b/gdk-samples-list.md
@@ -1,4 +1,4 @@
-# Microsoft Game Development Kit samples list
+# Microsoft Game Development Kit samples list
 
 ## Categories